cleanup missed Es classes, and syned with other PR

Signed-off-by: Nicholas Walter Knize <[email protected]>
opensearch-project · Mar 18, 2021 · 2444ace · 2444ace
1 parent 1e036c8
commit 2444ace
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/server/src/main/java/org/opensearch/indices/store/TransportNodesListShardStoreMetadata.java b/server/src/main/java/org/opensearch/indices/store/TransportNodesListShardStoreMetadata.java
@@ -148,7 +148,7 @@ private StoreFilesMetadata listStoreMetadata(NodeRequest request) throws IOExcep
             if (request.getCustomDataPath() != null) {
                 customDataPath = request.getCustomDataPath();
             } else {
-                // TODO: Fallback for BWC with older OpenSearch versions. Remove this once request.getCustomDataPath() always returns non-null
+                // TODO: Fallback for BWC with older predecessor (ES) versions. Remove this once request.getCustomDataPath() always returns non-null
                 if (indexService != null) {
                     customDataPath = indexService.getIndexSettings().customDataPath();
                 } else {

diff --git a/server/src/main/java/org/opensearch/repositories/blobstore/package-info.java b/server/src/main/java/org/opensearch/repositories/blobstore/package-info.java
@@ -59,7 +59,7 @@
  *      |  |             in the repository
  *      |  |- meta-20131010.dat - JSON Serialized {@link org.opensearch.cluster.metadata.IndexMetadata } for index "foo"
  *      |  |- 0/ - data for shard "0" of index "foo"
- *      |  |  |- __1                      \  (files with numeric names were created by older OpenSearch versions)
+ *      |  |  |- __1                      \  (files with numeric names were created by older preceding ES versions)
  *      |  |  |- __2                      |
  *      |  |  |- __VPO5oDMVT5y4Akv8T_AO_A |- files from different segments see snap-* for their mappings to real segment files
  *      |  |  |- __1gbJy18wS_2kv1qI7FgKuQ |

diff --git a/server/src/main/java/org/opensearch/search/aggregations/AggregationBuilders.java b/server/src/main/java/org/opensearch/search/aggregations/AggregationBuilders.java
@@ -32,7 +32,10 @@
 import org.opensearch.search.aggregations.bucket.filter.FiltersAggregator.KeyedFilter;
 import org.opensearch.search.aggregations.bucket.geogrid.GeoHashGridAggregationBuilder;
 import org.opensearch.search.aggregations.bucket.geogrid.GeoTileGridAggregationBuilder;
+<<<<<<< HEAD
 import org.opensearch.search.aggregations.bucket.geogrid.InternalGeoHashGrid;
+=======
+>>>>>>> cleanup missed Es classes, and syned with other PR
 import org.opensearch.search.aggregations.bucket.geogrid.InternalGeoTileGrid;
 import org.opensearch.search.aggregations.bucket.global.Global;
 import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;