perf: remove useless code

AElfProject · Sep 20, 2024 · a0f10e3 · a0f10e3
1 parent 530234d
commit a0f10e3
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 29 deletions.
diff --git a/src/AElf.EntityMapping.Elasticsearch/ElasticsearchCollectionNameProvider.cs b/src/AElf.EntityMapping.Elasticsearch/ElasticsearchCollectionNameProvider.cs
@@ -12,19 +12,16 @@ public class ElasticsearchCollectionNameProvider<TEntity> : CollectionNameProvid
 {
     private readonly IElasticIndexService _elasticIndexService;
     private readonly IShardingKeyProvider<TEntity> _shardingKeyProvider;
-    // private readonly ICollectionRouteKeyProvider<TEntity> _collectionRouteKeyProvider;
     private readonly AElfEntityMappingOptions _entityMappingOptions;
     private readonly ILogger<ElasticsearchCollectionNameProvider<TEntity>> _logger;
 
     public ElasticsearchCollectionNameProvider(IShardingKeyProvider<TEntity> shardingKeyProvider,
         IElasticIndexService elasticIndexService,
-        // ICollectionRouteKeyProvider<TEntity> collectionRouteKeyProvider,
         IOptions<AElfEntityMappingOptions> entityMappingOptions,
         ILogger<ElasticsearchCollectionNameProvider<TEntity>> logger)
     {
         _elasticIndexService = elasticIndexService;
         _shardingKeyProvider = shardingKeyProvider;
-        // _collectionRouteKeyProvider = collectionRouteKeyProvider;
         _entityMappingOptions = entityMappingOptions.Value;
         _logger = logger;
     }
@@ -42,7 +39,6 @@ protected override async Task<List<string>> GetCollectionNameAsync(List<Collecti
         var shardKeyCollectionNames = await _shardingKeyProvider.GetCollectionNameAsync(conditions);
         if (shardKeyCollectionNames.IsNullOrEmpty())
         {
-            // return await _collectionRouteKeyProvider.GetCollectionNameAsync(conditions);
             return new List<string> { GetDefaultCollectionName() };
         }
 
@@ -72,9 +68,7 @@ protected override async Task<List<string>> GetCollectionNameByEntityAsync(List<
 
     protected override async Task<string> GetCollectionNameByIdAsync<TKey>(TKey id)
     {
-        // if (!_shardingKeyProvider.IsShardingCollection())
-            return GetDefaultCollectionName();
-        // return await _collectionRouteKeyProvider.GetCollectionNameAsync(id.ToString());
+        return GetDefaultCollectionName();
     }
 
     protected override string FormatCollectionName(string name)

diff --git a/src/AElf.EntityMapping.Elasticsearch/IndexNameHelper.cs b/src/AElf.EntityMapping.Elasticsearch/IndexNameHelper.cs
@@ -29,11 +29,4 @@ public static string GetDefaultFullIndexName(Type type,string collectionPrefix)
             : $"{collectionPrefix.ToLower()}.{GetDefaultIndexName(type)}";
         return fullIndexName;
     }
-    public static string GetCollectionRouteKeyIndexName(Type type, string fieldName,string collectionPrefix)
-    {
-        var routeIndexName= collectionPrefix.IsNullOrWhiteSpace()
-            ? $"route.{type.Name.ToLower()}.{fieldName.ToLower()}"
-            : $"{collectionPrefix.ToLower()}.route.{type.Name.ToLower()}.{fieldName.ToLower()}";
-        return routeIndexName;
-    }
 }
diff --git a/src/AElf.EntityMapping.Elasticsearch/Services/IElasticIndexService.cs b/src/AElf.EntityMapping.Elasticsearch/Services/IElasticIndexService.cs
@@ -8,7 +8,5 @@ Task CreateIndexAsync(string indexName, Type indexEntityType, int shard = 1, int
     Task CreateIndexTemplateAsync(string indexTemplateName, string indexName, Type indexEntityType, int numberOfShards,
         int numberOfReplicas);
 
-    // Task CreateCollectionRouteKeyIndexAsync(Type indexEntityType, int numberOfShards,
-    //     int numberOfReplicas);
     Task DeleteIndexAsync(string collectionName = null, CancellationToken cancellationToken = default);
 }
diff --git a/test/AElf.EntityMapping.Elasticsearch.Tests/ElasticIndexServiceTests.cs b/test/AElf.EntityMapping.Elasticsearch.Tests/ElasticIndexServiceTests.cs
@@ -10,21 +10,9 @@ namespace AElf.EntityMapping.Elasticsearch;
 public class ElasticIndexServiceTests: AElfElasticsearchTestBase
 {
     private readonly IElasticIndexService _elasticIndexService;
-    // private readonly IDistributedCache<List<CollectionRouteKeyItem<BlockIndex>>> _indexMarkFieldCache;
 
     public ElasticIndexServiceTests()
     {
         _elasticIndexService = GetRequiredService<IElasticIndexService>();
-        // _indexMarkFieldCache= GetRequiredService<IDistributedCache<List<CollectionRouteKeyItem<BlockIndex>>>>();
     }
-
-    // [Fact]
-    // public async Task InitializeIndexMarkedField_Test()
-    // {
-    //     await _elasticIndexService.InitializeCollectionRouteKeyCacheAsync(typeof(BlockIndex));
-    //     var cacheName = _elasticIndexService.GetCollectionRouteKeyCacheName(typeof(BlockIndex));
-    //     var collectionMarkFieldList = await _indexMarkFieldCache.GetAsync(cacheName);
-    //     collectionMarkFieldList.ShouldNotBeNull();
-    //     collectionMarkFieldList.Count.ShouldBeGreaterThan(1);
-    // }
 }
diff --git a/test/AElf.EntityMapping.Elasticsearch.Tests/Entities/BlockBase.cs b/test/AElf.EntityMapping.Elasticsearch.Tests/Entities/BlockBase.cs
@@ -11,7 +11,6 @@ public class BlockBase : AElfIndexerEntity<string>, IBlockchainData
     [ShardPropertyAttributes("ChainId", 1)]
     public string ChainId { get; set; }
 
-    // [CollectionRouteKey] 
     [Keyword] public string BlockHash { get; set; }
 
     [ShardPropertyAttributes("BlockHeight", 3)]