diff --git a/server/src/main/java/org/opensearch/index/codec/CodecService.java b/server/src/main/java/org/opensearch/index/codec/CodecService.java index 3cd12e1fb4c14..2632bc4ae7c8a 100644 --- a/server/src/main/java/org/opensearch/index/codec/CodecService.java +++ b/server/src/main/java/org/opensearch/index/codec/CodecService.java @@ -39,7 +39,7 @@ import org.opensearch.common.Nullable; import org.opensearch.common.collect.MapBuilder; import org.opensearch.index.IndexSettings; -import org.opensearch.index.codec.freshstartree.codec.StarTreeCodec; +import org.opensearch.index.codec.startree.codec.StarTreeCodec; import org.opensearch.index.mapper.MapperService; import java.util.Map; diff --git a/server/src/main/java/org/opensearch/index/codec/PerFieldMappingPostingFormatCodec.java b/server/src/main/java/org/opensearch/index/codec/PerFieldMappingPostingFormatCodec.java index 088838ad20c2a..fbc349bbade5e 100644 --- a/server/src/main/java/org/opensearch/index/codec/PerFieldMappingPostingFormatCodec.java +++ b/server/src/main/java/org/opensearch/index/codec/PerFieldMappingPostingFormatCodec.java @@ -38,8 +38,8 @@ import org.apache.lucene.codecs.PostingsFormat; import org.apache.lucene.codecs.lucene95.Lucene95Codec; import org.opensearch.common.lucene.Lucene; -import org.opensearch.index.codec.freshstartree.codec.StarTreeCodec; -import org.opensearch.index.codec.freshstartree.codec.StarTreeDocValuesFormat; +import org.opensearch.index.codec.startree.codec.StarTreeCodec; +import org.opensearch.index.codec.startree.codec.StarTreeDocValuesFormat; import org.opensearch.index.mapper.CompletionFieldMapper; import org.opensearch.index.mapper.MappedFieldType; import org.opensearch.index.mapper.MapperService; diff --git a/server/src/main/java/org/opensearch/index/codec/freshstartree/aggregator/AggregationFunctionColumnPair.java b/server/src/main/java/org/opensearch/index/codec/startree/aggregator/AggregationFunctionColumnPair.java similarity index 98% rename from server/src/main/java/org/opensearch/index/codec/freshstartree/aggregator/AggregationFunctionColumnPair.java rename to server/src/main/java/org/opensearch/index/codec/startree/aggregator/AggregationFunctionColumnPair.java index 44915ab46cc44..8afabc3b6f660 100644 --- a/server/src/main/java/org/opensearch/index/codec/freshstartree/aggregator/AggregationFunctionColumnPair.java +++ b/server/src/main/java/org/opensearch/index/codec/startree/aggregator/AggregationFunctionColumnPair.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.opensearch.index.codec.freshstartree.aggregator; +package org.opensearch.index.codec.startree.aggregator; import java.util.Comparator; diff --git a/server/src/main/java/org/opensearch/index/codec/freshstartree/aggregator/AggregationFunctionType.java b/server/src/main/java/org/opensearch/index/codec/startree/aggregator/AggregationFunctionType.java similarity index 95% rename from server/src/main/java/org/opensearch/index/codec/freshstartree/aggregator/AggregationFunctionType.java rename to server/src/main/java/org/opensearch/index/codec/startree/aggregator/AggregationFunctionType.java index 8c528106d68c2..f679fd94d259f 100644 --- a/server/src/main/java/org/opensearch/index/codec/freshstartree/aggregator/AggregationFunctionType.java +++ b/server/src/main/java/org/opensearch/index/codec/startree/aggregator/AggregationFunctionType.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.opensearch.index.codec.freshstartree.aggregator; +package org.opensearch.index.codec.startree.aggregator; /** Aggregated function type */ public enum AggregationFunctionType { diff --git a/server/src/main/java/org/opensearch/index/codec/freshstartree/aggregator/CountValueAggregator.java b/server/src/main/java/org/opensearch/index/codec/startree/aggregator/CountValueAggregator.java similarity index 97% rename from server/src/main/java/org/opensearch/index/codec/freshstartree/aggregator/CountValueAggregator.java rename to server/src/main/java/org/opensearch/index/codec/startree/aggregator/CountValueAggregator.java index 97836196d83e6..93210310fd99f 100644 --- a/server/src/main/java/org/opensearch/index/codec/freshstartree/aggregator/CountValueAggregator.java +++ b/server/src/main/java/org/opensearch/index/codec/startree/aggregator/CountValueAggregator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.opensearch.index.codec.freshstartree.aggregator; +package org.opensearch.index.codec.startree.aggregator; /** Count value aggregator */ public class CountValueAggregator implements ValueAggregator { diff --git a/server/src/main/java/org/opensearch/index/codec/freshstartree/aggregator/DataType.java b/server/src/main/java/org/opensearch/index/codec/startree/aggregator/DataType.java similarity index 97% rename from server/src/main/java/org/opensearch/index/codec/freshstartree/aggregator/DataType.java rename to server/src/main/java/org/opensearch/index/codec/startree/aggregator/DataType.java index 9ebc1d896a9fa..48779171ded7a 100644 --- a/server/src/main/java/org/opensearch/index/codec/freshstartree/aggregator/DataType.java +++ b/server/src/main/java/org/opensearch/index/codec/startree/aggregator/DataType.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.opensearch.index.codec.freshstartree.aggregator; +package org.opensearch.index.codec.startree.aggregator; /** Data type of doc values */ public enum DataType { diff --git a/server/src/main/java/org/opensearch/index/codec/freshstartree/aggregator/SumValueAggregator.java b/server/src/main/java/org/opensearch/index/codec/startree/aggregator/SumValueAggregator.java similarity index 97% rename from server/src/main/java/org/opensearch/index/codec/freshstartree/aggregator/SumValueAggregator.java rename to server/src/main/java/org/opensearch/index/codec/startree/aggregator/SumValueAggregator.java index 3572643588648..9117a0d568273 100644 --- a/server/src/main/java/org/opensearch/index/codec/freshstartree/aggregator/SumValueAggregator.java +++ b/server/src/main/java/org/opensearch/index/codec/startree/aggregator/SumValueAggregator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.opensearch.index.codec.freshstartree.aggregator; +package org.opensearch.index.codec.startree.aggregator; /** Sum value aggregator */ public class SumValueAggregator implements ValueAggregator { diff --git a/server/src/main/java/org/opensearch/index/codec/freshstartree/aggregator/ValueAggregator.java b/server/src/main/java/org/opensearch/index/codec/startree/aggregator/ValueAggregator.java similarity index 97% rename from server/src/main/java/org/opensearch/index/codec/freshstartree/aggregator/ValueAggregator.java rename to server/src/main/java/org/opensearch/index/codec/startree/aggregator/ValueAggregator.java index a292aa7d7ba0b..d6b24928df8d6 100644 --- a/server/src/main/java/org/opensearch/index/codec/freshstartree/aggregator/ValueAggregator.java +++ b/server/src/main/java/org/opensearch/index/codec/startree/aggregator/ValueAggregator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.opensearch.index.codec.freshstartree.aggregator; +package org.opensearch.index.codec.startree.aggregator; /** * A value aggregator that pre-aggregates on the input values for a specific type of aggregation. diff --git a/server/src/main/java/org/opensearch/index/codec/freshstartree/aggregator/ValueAggregatorFactory.java b/server/src/main/java/org/opensearch/index/codec/startree/aggregator/ValueAggregatorFactory.java similarity index 97% rename from server/src/main/java/org/opensearch/index/codec/freshstartree/aggregator/ValueAggregatorFactory.java rename to server/src/main/java/org/opensearch/index/codec/startree/aggregator/ValueAggregatorFactory.java index 4fe01e484bcc9..2988a7229a91c 100644 --- a/server/src/main/java/org/opensearch/index/codec/freshstartree/aggregator/ValueAggregatorFactory.java +++ b/server/src/main/java/org/opensearch/index/codec/startree/aggregator/ValueAggregatorFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.opensearch.index.codec.freshstartree.aggregator; +package org.opensearch.index.codec.startree.aggregator; /** Value aggregator factory for a given aggregation type */ public class ValueAggregatorFactory { diff --git a/server/src/main/java/org/opensearch/index/codec/freshstartree/aggregator/package-info.java b/server/src/main/java/org/opensearch/index/codec/startree/aggregator/package-info.java similarity index 93% rename from server/src/main/java/org/opensearch/index/codec/freshstartree/aggregator/package-info.java rename to server/src/main/java/org/opensearch/index/codec/startree/aggregator/package-info.java index d05d4fd5cb5cf..dd3be024439cf 100644 --- a/server/src/main/java/org/opensearch/index/codec/freshstartree/aggregator/package-info.java +++ b/server/src/main/java/org/opensearch/index/codec/startree/aggregator/package-info.java @@ -15,4 +15,4 @@ * limitations under the License. */ /** Aggregator classes for star tree */ -package org.opensearch.index.codec.freshstartree.aggregator; +package org.opensearch.index.codec.startree.aggregator; diff --git a/server/src/main/java/org/opensearch/index/codec/freshstartree/builder/BaseSingleTreeBuilder.java b/server/src/main/java/org/opensearch/index/codec/startree/builder/BaseSingleTreeBuilder.java similarity index 97% rename from server/src/main/java/org/opensearch/index/codec/freshstartree/builder/BaseSingleTreeBuilder.java rename to server/src/main/java/org/opensearch/index/codec/startree/builder/BaseSingleTreeBuilder.java index e62a69ccf803a..6d1fff81f649f 100644 --- a/server/src/main/java/org/opensearch/index/codec/freshstartree/builder/BaseSingleTreeBuilder.java +++ b/server/src/main/java/org/opensearch/index/codec/startree/builder/BaseSingleTreeBuilder.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.opensearch.index.codec.freshstartree.builder; +package org.opensearch.index.codec.startree.builder; import java.time.temporal.ChronoField; import org.apache.logging.log4j.LogManager; @@ -29,26 +29,24 @@ import org.apache.lucene.index.FieldInfo; import org.apache.lucene.index.IndexFileNames; import org.apache.lucene.index.IndexOptions; -import org.apache.lucene.index.NumericDocValues; import org.apache.lucene.index.SegmentWriteState; import org.apache.lucene.index.SortedNumericDocValues; import org.apache.lucene.index.VectorEncoding; import org.apache.lucene.index.VectorSimilarityFunction; import org.apache.lucene.store.IndexOutput; -import org.apache.lucene.util.ArrayUtil; import org.apache.lucene.util.Counter; import org.apache.lucene.util.IOUtils; import org.apache.lucene.util.packed.PackedInts; import org.apache.lucene.util.packed.PackedLongValues; import org.opensearch.common.time.DateUtils; -import org.opensearch.index.codec.freshstartree.aggregator.AggregationFunctionColumnPair; -import org.opensearch.index.codec.freshstartree.aggregator.AggregationFunctionType; -import org.opensearch.index.codec.freshstartree.aggregator.ValueAggregator; -import org.opensearch.index.codec.freshstartree.aggregator.ValueAggregatorFactory; -import org.opensearch.index.codec.freshstartree.codec.SortedNumericDocValuesWriter; -import org.opensearch.index.codec.freshstartree.codec.StarTreeAggregatedValues; -import org.opensearch.index.codec.freshstartree.node.StarTreeNode; -import org.opensearch.index.codec.freshstartree.util.BufferedAggregatedDocValues; +import org.opensearch.index.codec.startree.aggregator.AggregationFunctionColumnPair; +import org.opensearch.index.codec.startree.aggregator.AggregationFunctionType; +import org.opensearch.index.codec.startree.aggregator.ValueAggregator; +import org.opensearch.index.codec.startree.aggregator.ValueAggregatorFactory; +import org.opensearch.index.codec.startree.codec.SortedNumericDocValuesWriter; +import org.opensearch.index.codec.startree.codec.StarTreeAggregatedValues; +import org.opensearch.index.codec.startree.node.StarTreeNode; +import org.opensearch.index.codec.startree.util.BufferedAggregatedDocValues; import java.io.IOException; import java.util.ArrayList; diff --git a/server/src/main/java/org/opensearch/index/codec/freshstartree/builder/OffHeapBufferedSingleTreeBuilder.java b/server/src/main/java/org/opensearch/index/codec/startree/builder/OffHeapBufferedSingleTreeBuilder.java similarity index 98% rename from server/src/main/java/org/opensearch/index/codec/freshstartree/builder/OffHeapBufferedSingleTreeBuilder.java rename to server/src/main/java/org/opensearch/index/codec/startree/builder/OffHeapBufferedSingleTreeBuilder.java index af142ee7cbea8..84c963e8647b7 100644 --- a/server/src/main/java/org/opensearch/index/codec/freshstartree/builder/OffHeapBufferedSingleTreeBuilder.java +++ b/server/src/main/java/org/opensearch/index/codec/startree/builder/OffHeapBufferedSingleTreeBuilder.java @@ -14,13 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.opensearch.index.codec.freshstartree.builder; +package org.opensearch.index.codec.startree.builder; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.lucene.codecs.DocValuesConsumer; import org.apache.lucene.index.IndexFileNames; -import org.apache.lucene.index.NumericDocValues; import org.apache.lucene.index.SegmentWriteState; import org.apache.lucene.index.SortedNumericDocValues; import org.apache.lucene.search.DocIdSetIterator; @@ -28,8 +27,8 @@ import org.apache.lucene.store.IndexOutput; import org.apache.lucene.store.RandomAccessInput; import org.apache.lucene.util.IOUtils; -import org.opensearch.index.codec.freshstartree.codec.StarTreeAggregatedValues; -import org.opensearch.index.codec.freshstartree.util.QuickSorter; +import org.opensearch.index.codec.startree.codec.StarTreeAggregatedValues; +import org.opensearch.index.codec.startree.util.QuickSorter; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/server/src/main/java/org/opensearch/index/codec/freshstartree/builder/OnHeapSingleTreeBuilder.java b/server/src/main/java/org/opensearch/index/codec/startree/builder/OnHeapSingleTreeBuilder.java similarity index 97% rename from server/src/main/java/org/opensearch/index/codec/freshstartree/builder/OnHeapSingleTreeBuilder.java rename to server/src/main/java/org/opensearch/index/codec/startree/builder/OnHeapSingleTreeBuilder.java index 97bfdd5207816..f991f4d95f3ae 100644 --- a/server/src/main/java/org/opensearch/index/codec/freshstartree/builder/OnHeapSingleTreeBuilder.java +++ b/server/src/main/java/org/opensearch/index/codec/startree/builder/OnHeapSingleTreeBuilder.java @@ -14,15 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.opensearch.index.codec.freshstartree.builder; +package org.opensearch.index.codec.startree.builder; import org.apache.lucene.codecs.DocValuesConsumer; -import org.apache.lucene.index.NumericDocValues; import org.apache.lucene.index.SegmentWriteState; import org.apache.lucene.index.SortedNumericDocValues; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.IndexOutput; -import org.opensearch.index.codec.freshstartree.codec.StarTreeAggregatedValues; +import org.opensearch.index.codec.startree.codec.StarTreeAggregatedValues; import java.io.IOException; import java.util.ArrayList; diff --git a/server/src/main/java/org/opensearch/index/codec/freshstartree/builder/Record.java b/server/src/main/java/org/opensearch/index/codec/startree/builder/Record.java similarity index 96% rename from server/src/main/java/org/opensearch/index/codec/freshstartree/builder/Record.java rename to server/src/main/java/org/opensearch/index/codec/startree/builder/Record.java index 43650d98c0871..8ff12372e93e7 100644 --- a/server/src/main/java/org/opensearch/index/codec/freshstartree/builder/Record.java +++ b/server/src/main/java/org/opensearch/index/codec/startree/builder/Record.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.opensearch.index.codec.freshstartree.builder; +package org.opensearch.index.codec.startree.builder; /** Class representing a star tree record */ public class Record { diff --git a/server/src/main/java/org/opensearch/index/codec/freshstartree/builder/StarTreeBuilderUtils.java b/server/src/main/java/org/opensearch/index/codec/startree/builder/StarTreeBuilderUtils.java similarity index 96% rename from server/src/main/java/org/opensearch/index/codec/freshstartree/builder/StarTreeBuilderUtils.java rename to server/src/main/java/org/opensearch/index/codec/startree/builder/StarTreeBuilderUtils.java index f86468299d02f..4bd9e136ef322 100644 --- a/server/src/main/java/org/opensearch/index/codec/freshstartree/builder/StarTreeBuilderUtils.java +++ b/server/src/main/java/org/opensearch/index/codec/startree/builder/StarTreeBuilderUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.opensearch.index.codec.freshstartree.builder; +package org.opensearch.index.codec.startree.builder; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -28,7 +28,7 @@ import java.util.Queue; import static java.nio.charset.StandardCharsets.UTF_8; -import static org.opensearch.index.codec.freshstartree.node.OffHeapStarTreeNode.SERIALIZABLE_SIZE_IN_BYTES; +import static org.opensearch.index.codec.startree.node.OffHeapStarTreeNode.SERIALIZABLE_SIZE_IN_BYTES; /** Util class for building star tree */ public class StarTreeBuilderUtils { diff --git a/server/src/main/java/org/opensearch/index/codec/freshstartree/builder/package-info.java b/server/src/main/java/org/opensearch/index/codec/startree/builder/package-info.java similarity index 93% rename from server/src/main/java/org/opensearch/index/codec/freshstartree/builder/package-info.java rename to server/src/main/java/org/opensearch/index/codec/startree/builder/package-info.java index 298febc36487b..ccee510fdab6a 100644 --- a/server/src/main/java/org/opensearch/index/codec/freshstartree/builder/package-info.java +++ b/server/src/main/java/org/opensearch/index/codec/startree/builder/package-info.java @@ -15,4 +15,4 @@ * limitations under the License. */ /** Builder classes for star tree */ -package org.opensearch.index.codec.freshstartree.builder; +package org.opensearch.index.codec.startree.builder; diff --git a/server/src/main/java/org/opensearch/index/codec/freshstartree/codec/Lucene90DocValuesConsumerCopy.java b/server/src/main/java/org/opensearch/index/codec/startree/codec/Lucene90DocValuesConsumerCopy.java similarity index 99% rename from server/src/main/java/org/opensearch/index/codec/freshstartree/codec/Lucene90DocValuesConsumerCopy.java rename to server/src/main/java/org/opensearch/index/codec/startree/codec/Lucene90DocValuesConsumerCopy.java index b02ceb8825597..6d4ab4ba91bce 100644 --- a/server/src/main/java/org/opensearch/index/codec/freshstartree/codec/Lucene90DocValuesConsumerCopy.java +++ b/server/src/main/java/org/opensearch/index/codec/startree/codec/Lucene90DocValuesConsumerCopy.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.opensearch.index.codec.freshstartree.codec; +package org.opensearch.index.codec.startree.codec; import org.apache.lucene.codecs.CodecUtil; import org.apache.lucene.codecs.DocValuesConsumer; diff --git a/server/src/main/java/org/opensearch/index/codec/freshstartree/codec/Lucene90DocValuesProducerCopy.java b/server/src/main/java/org/opensearch/index/codec/startree/codec/Lucene90DocValuesProducerCopy.java similarity index 99% rename from server/src/main/java/org/opensearch/index/codec/freshstartree/codec/Lucene90DocValuesProducerCopy.java rename to server/src/main/java/org/opensearch/index/codec/startree/codec/Lucene90DocValuesProducerCopy.java index 3a1eb8eafd533..f9f2ff799b4b8 100644 --- a/server/src/main/java/org/opensearch/index/codec/freshstartree/codec/Lucene90DocValuesProducerCopy.java +++ b/server/src/main/java/org/opensearch/index/codec/startree/codec/Lucene90DocValuesProducerCopy.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.opensearch.index.codec.freshstartree.codec; +package org.opensearch.index.codec.startree.codec; import org.apache.lucene.codecs.CodecUtil; import org.apache.lucene.codecs.DocValuesProducer; diff --git a/server/src/main/java/org/opensearch/index/codec/freshstartree/codec/SortedNumericDocValuesWriter.java b/server/src/main/java/org/opensearch/index/codec/startree/codec/SortedNumericDocValuesWriter.java similarity index 97% rename from server/src/main/java/org/opensearch/index/codec/freshstartree/codec/SortedNumericDocValuesWriter.java rename to server/src/main/java/org/opensearch/index/codec/startree/codec/SortedNumericDocValuesWriter.java index ce2dd81125f46..ece5963b17f82 100644 --- a/server/src/main/java/org/opensearch/index/codec/freshstartree/codec/SortedNumericDocValuesWriter.java +++ b/server/src/main/java/org/opensearch/index/codec/startree/codec/SortedNumericDocValuesWriter.java @@ -6,18 +6,14 @@ * compatible open source license. */ -package org.opensearch.index.codec.freshstartree.codec; +package org.opensearch.index.codec.startree.codec; import java.io.IOException; import java.util.Arrays; -import org.apache.lucene.codecs.DocValuesConsumer; -import org.apache.lucene.codecs.DocValuesProducer; import org.apache.lucene.index.DocValues; import org.apache.lucene.index.DocsWithFieldSet; -import org.apache.lucene.index.EmptyDocValuesProducer; import org.apache.lucene.index.FieldInfo; import org.apache.lucene.index.NumericDocValues; -import org.apache.lucene.index.SegmentWriteState; import org.apache.lucene.index.SortedNumericDocValues; import org.apache.lucene.index.Sorter; import org.apache.lucene.search.DocIdSetIterator; diff --git a/server/src/main/java/org/opensearch/index/codec/freshstartree/codec/StarTreeAggregatedValues.java b/server/src/main/java/org/opensearch/index/codec/startree/codec/StarTreeAggregatedValues.java similarity index 90% rename from server/src/main/java/org/opensearch/index/codec/freshstartree/codec/StarTreeAggregatedValues.java rename to server/src/main/java/org/opensearch/index/codec/startree/codec/StarTreeAggregatedValues.java index ec971b90ec624..bf6583f8b379e 100644 --- a/server/src/main/java/org/opensearch/index/codec/freshstartree/codec/StarTreeAggregatedValues.java +++ b/server/src/main/java/org/opensearch/index/codec/startree/codec/StarTreeAggregatedValues.java @@ -14,11 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.opensearch.index.codec.freshstartree.codec; +package org.opensearch.index.codec.startree.codec; -import org.apache.lucene.index.NumericDocValues; import org.apache.lucene.index.SortedNumericDocValues; -import org.opensearch.index.codec.freshstartree.node.StarTree; +import org.opensearch.index.codec.startree.node.StarTree; import java.util.Map; diff --git a/server/src/main/java/org/opensearch/index/codec/freshstartree/codec/StarTreeCodec.java b/server/src/main/java/org/opensearch/index/codec/startree/codec/StarTreeCodec.java similarity index 98% rename from server/src/main/java/org/opensearch/index/codec/freshstartree/codec/StarTreeCodec.java rename to server/src/main/java/org/opensearch/index/codec/startree/codec/StarTreeCodec.java index e20deea192733..b73ee8b32c25e 100644 --- a/server/src/main/java/org/opensearch/index/codec/freshstartree/codec/StarTreeCodec.java +++ b/server/src/main/java/org/opensearch/index/codec/startree/codec/StarTreeCodec.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.opensearch.index.codec.freshstartree.codec; +package org.opensearch.index.codec.startree.codec; import org.apache.lucene.codecs.Codec; import org.apache.lucene.codecs.CompoundFormat; diff --git a/server/src/main/java/org/opensearch/index/codec/freshstartree/codec/StarTreeDocValuesFormat.java b/server/src/main/java/org/opensearch/index/codec/startree/codec/StarTreeDocValuesFormat.java similarity index 97% rename from server/src/main/java/org/opensearch/index/codec/freshstartree/codec/StarTreeDocValuesFormat.java rename to server/src/main/java/org/opensearch/index/codec/startree/codec/StarTreeDocValuesFormat.java index 7963cb4473d40..6e97cbc54eeba 100644 --- a/server/src/main/java/org/opensearch/index/codec/freshstartree/codec/StarTreeDocValuesFormat.java +++ b/server/src/main/java/org/opensearch/index/codec/startree/codec/StarTreeDocValuesFormat.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.opensearch.index.codec.freshstartree.codec; +package org.opensearch.index.codec.startree.codec; import org.apache.lucene.codecs.DocValuesConsumer; import org.apache.lucene.codecs.DocValuesFormat; diff --git a/server/src/main/java/org/opensearch/index/codec/freshstartree/codec/StarTreeDocValuesReader.java b/server/src/main/java/org/opensearch/index/codec/startree/codec/StarTreeDocValuesReader.java similarity index 95% rename from server/src/main/java/org/opensearch/index/codec/freshstartree/codec/StarTreeDocValuesReader.java rename to server/src/main/java/org/opensearch/index/codec/startree/codec/StarTreeDocValuesReader.java index 8494188c1771e..2d19c80865451 100644 --- a/server/src/main/java/org/opensearch/index/codec/freshstartree/codec/StarTreeDocValuesReader.java +++ b/server/src/main/java/org/opensearch/index/codec/startree/codec/StarTreeDocValuesReader.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.opensearch.index.codec.freshstartree.codec; +package org.opensearch.index.codec.startree.codec; import java.util.LinkedHashMap; import org.apache.lucene.codecs.CodecUtil; @@ -28,8 +28,8 @@ import org.apache.lucene.index.SortedNumericDocValues; import org.apache.lucene.index.SortedSetDocValues; import org.apache.lucene.store.IndexInput; -import org.opensearch.index.codec.freshstartree.node.OffHeapStarTree; -import org.opensearch.index.codec.freshstartree.node.StarTree; +import org.opensearch.index.codec.startree.node.OffHeapStarTree; +import org.opensearch.index.codec.startree.node.StarTree; import java.io.IOException; import java.util.HashMap; diff --git a/server/src/main/java/org/opensearch/index/codec/freshstartree/codec/StarTreeDocValuesWriter.java b/server/src/main/java/org/opensearch/index/codec/startree/codec/StarTreeDocValuesWriter.java similarity index 96% rename from server/src/main/java/org/opensearch/index/codec/freshstartree/codec/StarTreeDocValuesWriter.java rename to server/src/main/java/org/opensearch/index/codec/startree/codec/StarTreeDocValuesWriter.java index cf393c146fcb3..a4b7510501fd5 100644 --- a/server/src/main/java/org/opensearch/index/codec/freshstartree/codec/StarTreeDocValuesWriter.java +++ b/server/src/main/java/org/opensearch/index/codec/startree/codec/StarTreeDocValuesWriter.java @@ -14,9 +14,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.opensearch.index.codec.freshstartree.codec; +package org.opensearch.index.codec.startree.codec; -import java.util.Collection; import java.util.stream.Collectors; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -27,8 +26,8 @@ import org.apache.lucene.index.SegmentWriteState; import org.apache.lucene.index.SortedNumericDocValues; import org.apache.lucene.store.IndexOutput; -import org.opensearch.index.codec.freshstartree.builder.BaseSingleTreeBuilder; -import org.opensearch.index.codec.freshstartree.builder.OffHeapBufferedSingleTreeBuilder; +import org.opensearch.index.codec.startree.builder.BaseSingleTreeBuilder; +import org.opensearch.index.codec.startree.builder.OffHeapBufferedSingleTreeBuilder; import java.io.IOException; import java.util.ArrayList; diff --git a/server/src/main/java/org/opensearch/index/codec/freshstartree/codec/package-info.java b/server/src/main/java/org/opensearch/index/codec/startree/codec/package-info.java similarity index 93% rename from server/src/main/java/org/opensearch/index/codec/freshstartree/codec/package-info.java rename to server/src/main/java/org/opensearch/index/codec/startree/codec/package-info.java index beea4beb3ddff..05f38a8fb5263 100644 --- a/server/src/main/java/org/opensearch/index/codec/freshstartree/codec/package-info.java +++ b/server/src/main/java/org/opensearch/index/codec/startree/codec/package-info.java @@ -15,4 +15,4 @@ * limitations under the License. */ /** Codec for performing aggregation during indexing */ -package org.opensearch.index.codec.freshstartree.codec; +package org.opensearch.index.codec.startree.codec; diff --git a/server/src/main/java/org/opensearch/index/codec/freshstartree/node/OffHeapStarTree.java b/server/src/main/java/org/opensearch/index/codec/startree/node/OffHeapStarTree.java similarity index 98% rename from server/src/main/java/org/opensearch/index/codec/freshstartree/node/OffHeapStarTree.java rename to server/src/main/java/org/opensearch/index/codec/startree/node/OffHeapStarTree.java index 093c4503debf8..de386eb17c488 100644 --- a/server/src/main/java/org/opensearch/index/codec/freshstartree/node/OffHeapStarTree.java +++ b/server/src/main/java/org/opensearch/index/codec/startree/node/OffHeapStarTree.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.opensearch.index.codec.freshstartree.node; +package org.opensearch.index.codec.startree.node; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/server/src/main/java/org/opensearch/index/codec/freshstartree/node/OffHeapStarTreeNode.java b/server/src/main/java/org/opensearch/index/codec/startree/node/OffHeapStarTreeNode.java similarity index 99% rename from server/src/main/java/org/opensearch/index/codec/freshstartree/node/OffHeapStarTreeNode.java rename to server/src/main/java/org/opensearch/index/codec/startree/node/OffHeapStarTreeNode.java index 3a5b1b55ea9da..87bf130173919 100644 --- a/server/src/main/java/org/opensearch/index/codec/freshstartree/node/OffHeapStarTreeNode.java +++ b/server/src/main/java/org/opensearch/index/codec/startree/node/OffHeapStarTreeNode.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.opensearch.index.codec.freshstartree.node; +package org.opensearch.index.codec.startree.node; import org.apache.lucene.store.RandomAccessInput; diff --git a/server/src/main/java/org/opensearch/index/codec/freshstartree/node/StarTree.java b/server/src/main/java/org/opensearch/index/codec/startree/node/StarTree.java similarity index 95% rename from server/src/main/java/org/opensearch/index/codec/freshstartree/node/StarTree.java rename to server/src/main/java/org/opensearch/index/codec/startree/node/StarTree.java index d1892cd564e15..80cdaefb5e3bb 100644 --- a/server/src/main/java/org/opensearch/index/codec/freshstartree/node/StarTree.java +++ b/server/src/main/java/org/opensearch/index/codec/startree/node/StarTree.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.opensearch.index.codec.freshstartree.node; +package org.opensearch.index.codec.startree.node; import java.io.IOException; import java.util.List; diff --git a/server/src/main/java/org/opensearch/index/codec/freshstartree/node/StarTreeNode.java b/server/src/main/java/org/opensearch/index/codec/startree/node/StarTreeNode.java similarity index 97% rename from server/src/main/java/org/opensearch/index/codec/freshstartree/node/StarTreeNode.java rename to server/src/main/java/org/opensearch/index/codec/startree/node/StarTreeNode.java index cf58d4904cdee..17996b233d1c4 100644 --- a/server/src/main/java/org/opensearch/index/codec/freshstartree/node/StarTreeNode.java +++ b/server/src/main/java/org/opensearch/index/codec/startree/node/StarTreeNode.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.opensearch.index.codec.freshstartree.node; +package org.opensearch.index.codec.startree.node; import java.io.IOException; import java.util.Iterator; diff --git a/server/src/main/java/org/opensearch/index/codec/freshstartree/node/package-info.java b/server/src/main/java/org/opensearch/index/codec/startree/node/package-info.java similarity index 93% rename from server/src/main/java/org/opensearch/index/codec/freshstartree/node/package-info.java rename to server/src/main/java/org/opensearch/index/codec/startree/node/package-info.java index dbd8287650abe..0d81ff3c2ad49 100644 --- a/server/src/main/java/org/opensearch/index/codec/freshstartree/node/package-info.java +++ b/server/src/main/java/org/opensearch/index/codec/startree/node/package-info.java @@ -16,4 +16,4 @@ */ /** node package */ -package org.opensearch.index.codec.freshstartree.node; +package org.opensearch.index.codec.startree.node; diff --git a/server/src/main/java/org/opensearch/index/codec/freshstartree/query/StarTreeFilter.java b/server/src/main/java/org/opensearch/index/codec/startree/query/StarTreeFilter.java similarity index 98% rename from server/src/main/java/org/opensearch/index/codec/freshstartree/query/StarTreeFilter.java rename to server/src/main/java/org/opensearch/index/codec/startree/query/StarTreeFilter.java index 71b6b4947321d..0aa25aae60fc3 100644 --- a/server/src/main/java/org/opensearch/index/codec/freshstartree/query/StarTreeFilter.java +++ b/server/src/main/java/org/opensearch/index/codec/startree/query/StarTreeFilter.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.opensearch.index.codec.freshstartree.query; +package org.opensearch.index.codec.startree.query; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.lucene.index.SortedNumericDocValues; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.util.DocIdSetBuilder; -import org.opensearch.index.codec.freshstartree.codec.StarTreeAggregatedValues; -import org.opensearch.index.codec.freshstartree.node.StarTree; -import org.opensearch.index.codec.freshstartree.node.StarTreeNode; +import org.opensearch.index.codec.startree.codec.StarTreeAggregatedValues; +import org.opensearch.index.codec.startree.node.StarTree; +import org.opensearch.index.codec.startree.node.StarTreeNode; import java.io.IOException; import java.util.ArrayDeque; diff --git a/server/src/main/java/org/opensearch/index/codec/freshstartree/query/StarTreeQuery.java b/server/src/main/java/org/opensearch/index/codec/startree/query/StarTreeQuery.java similarity index 95% rename from server/src/main/java/org/opensearch/index/codec/freshstartree/query/StarTreeQuery.java rename to server/src/main/java/org/opensearch/index/codec/startree/query/StarTreeQuery.java index 6bef4545291ef..8a1025f59142c 100644 --- a/server/src/main/java/org/opensearch/index/codec/freshstartree/query/StarTreeQuery.java +++ b/server/src/main/java/org/opensearch/index/codec/startree/query/StarTreeQuery.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.opensearch.index.codec.freshstartree.query; +package org.opensearch.index.codec.startree.query; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.search.ConstantScoreScorer; @@ -27,7 +27,7 @@ import org.apache.lucene.search.Scorer; import org.apache.lucene.search.Weight; import org.apache.lucene.util.Accountable; -import org.opensearch.index.codec.freshstartree.codec.StarTreeAggregatedValues; +import org.opensearch.index.codec.startree.codec.StarTreeAggregatedValues; import java.io.IOException; import java.util.List; diff --git a/server/src/main/java/org/opensearch/index/codec/freshstartree/query/StarTreeQueryBuilder.java b/server/src/main/java/org/opensearch/index/codec/startree/query/StarTreeQueryBuilder.java similarity index 97% rename from server/src/main/java/org/opensearch/index/codec/freshstartree/query/StarTreeQueryBuilder.java rename to server/src/main/java/org/opensearch/index/codec/startree/query/StarTreeQueryBuilder.java index fc2c019557d6f..7f3f519be3227 100644 --- a/server/src/main/java/org/opensearch/index/codec/freshstartree/query/StarTreeQueryBuilder.java +++ b/server/src/main/java/org/opensearch/index/codec/startree/query/StarTreeQueryBuilder.java @@ -6,7 +6,7 @@ * compatible open source license. */ -package org.opensearch.index.codec.freshstartree.query; +package org.opensearch.index.codec.startree.query; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -18,7 +18,6 @@ import org.opensearch.core.xcontent.ObjectParser; import org.opensearch.core.xcontent.XContentBuilder; import org.opensearch.core.xcontent.XContentParser; -import org.opensearch.index.codec.freshstartree.builder.BaseSingleTreeBuilder; import org.opensearch.index.query.AbstractQueryBuilder; import org.opensearch.index.query.BoolQueryBuilder; import org.opensearch.index.query.QueryBuilder; diff --git a/server/src/main/java/org/opensearch/index/codec/freshstartree/query/package-info.java b/server/src/main/java/org/opensearch/index/codec/startree/query/package-info.java similarity index 94% rename from server/src/main/java/org/opensearch/index/codec/freshstartree/query/package-info.java rename to server/src/main/java/org/opensearch/index/codec/startree/query/package-info.java index 8b04706698952..f019226645d73 100644 --- a/server/src/main/java/org/opensearch/index/codec/freshstartree/query/package-info.java +++ b/server/src/main/java/org/opensearch/index/codec/startree/query/package-info.java @@ -16,4 +16,4 @@ */ /** query package - Todo : move it under main dir - keeping it here for readability */ -package org.opensearch.index.codec.freshstartree.query; +package org.opensearch.index.codec.startree.query; diff --git a/server/src/main/java/org/opensearch/index/codec/freshstartree/util/BufferedAggregatedDocValues.java b/server/src/main/java/org/opensearch/index/codec/startree/util/BufferedAggregatedDocValues.java similarity index 97% rename from server/src/main/java/org/opensearch/index/codec/freshstartree/util/BufferedAggregatedDocValues.java rename to server/src/main/java/org/opensearch/index/codec/startree/util/BufferedAggregatedDocValues.java index d3708a1ae8860..92b1d9edf7935 100644 --- a/server/src/main/java/org/opensearch/index/codec/freshstartree/util/BufferedAggregatedDocValues.java +++ b/server/src/main/java/org/opensearch/index/codec/startree/util/BufferedAggregatedDocValues.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.opensearch.index.codec.freshstartree.util; +package org.opensearch.index.codec.startree.util; import org.apache.lucene.index.NumericDocValues; import org.apache.lucene.search.DocIdSetIterator; diff --git a/server/src/main/java/org/opensearch/index/codec/freshstartree/util/IntComparator.java b/server/src/main/java/org/opensearch/index/codec/startree/util/IntComparator.java similarity index 95% rename from server/src/main/java/org/opensearch/index/codec/freshstartree/util/IntComparator.java rename to server/src/main/java/org/opensearch/index/codec/startree/util/IntComparator.java index 884a4401ade00..9a69963481a7f 100644 --- a/server/src/main/java/org/opensearch/index/codec/freshstartree/util/IntComparator.java +++ b/server/src/main/java/org/opensearch/index/codec/startree/util/IntComparator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.opensearch.index.codec.freshstartree.util; +package org.opensearch.index.codec.startree.util; import java.util.Comparator; diff --git a/server/src/main/java/org/opensearch/index/codec/freshstartree/util/QuickSorter.java b/server/src/main/java/org/opensearch/index/codec/startree/util/QuickSorter.java similarity index 98% rename from server/src/main/java/org/opensearch/index/codec/freshstartree/util/QuickSorter.java rename to server/src/main/java/org/opensearch/index/codec/startree/util/QuickSorter.java index 2e5e33adc06b3..6a9b947204ec7 100644 --- a/server/src/main/java/org/opensearch/index/codec/freshstartree/util/QuickSorter.java +++ b/server/src/main/java/org/opensearch/index/codec/startree/util/QuickSorter.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.opensearch.index.codec.freshstartree.util; +package org.opensearch.index.codec.startree.util; /** copy of it.unimi.dsi.fastutil.Arrays.quickSort */ public class QuickSorter { diff --git a/server/src/main/java/org/opensearch/index/codec/freshstartree/util/Swapper.java b/server/src/main/java/org/opensearch/index/codec/startree/util/Swapper.java similarity index 94% rename from server/src/main/java/org/opensearch/index/codec/freshstartree/util/Swapper.java rename to server/src/main/java/org/opensearch/index/codec/startree/util/Swapper.java index 1df6a7e270698..cc1a4f3f8e721 100644 --- a/server/src/main/java/org/opensearch/index/codec/freshstartree/util/Swapper.java +++ b/server/src/main/java/org/opensearch/index/codec/startree/util/Swapper.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.opensearch.index.codec.freshstartree.util; +package org.opensearch.index.codec.startree.util; /** Functional interface for swapper */ @FunctionalInterface diff --git a/server/src/main/java/org/opensearch/index/codec/freshstartree/util/package-info.java b/server/src/main/java/org/opensearch/index/codec/startree/util/package-info.java similarity index 94% rename from server/src/main/java/org/opensearch/index/codec/freshstartree/util/package-info.java rename to server/src/main/java/org/opensearch/index/codec/startree/util/package-info.java index 8ad0be6ce1848..4a62aea47bc1b 100644 --- a/server/src/main/java/org/opensearch/index/codec/freshstartree/util/package-info.java +++ b/server/src/main/java/org/opensearch/index/codec/startree/util/package-info.java @@ -16,4 +16,4 @@ */ /** Util package todo: remove this, kept it temporarily for readibility */ -package org.opensearch.index.codec.freshstartree.util; +package org.opensearch.index.codec.startree.util; diff --git a/server/src/main/java/org/opensearch/search/SearchModule.java b/server/src/main/java/org/opensearch/search/SearchModule.java index 29950871b162b..1b26d079164b2 100644 --- a/server/src/main/java/org/opensearch/search/SearchModule.java +++ b/server/src/main/java/org/opensearch/search/SearchModule.java @@ -47,7 +47,7 @@ import org.opensearch.core.common.io.stream.Writeable; import org.opensearch.core.xcontent.NamedXContentRegistry; import org.opensearch.core.xcontent.XContentParser; -import org.opensearch.index.codec.freshstartree.query.StarTreeQueryBuilder; +import org.opensearch.index.codec.startree.query.StarTreeQueryBuilder; import org.opensearch.index.query.BoolQueryBuilder; import org.opensearch.index.query.BoostingQueryBuilder; import org.opensearch.index.query.CommonTermsQueryBuilder; diff --git a/server/src/main/java/org/opensearch/search/aggregations/bucket/startree/StarTreeAggregator.java b/server/src/main/java/org/opensearch/search/aggregations/bucket/startree/StarTreeAggregator.java index f2fd5a45799e2..cfcf2b95cbc47 100644 --- a/server/src/main/java/org/opensearch/search/aggregations/bucket/startree/StarTreeAggregator.java +++ b/server/src/main/java/org/opensearch/search/aggregations/bucket/startree/StarTreeAggregator.java @@ -8,13 +8,10 @@ package org.opensearch.search.aggregations.bucket.startree; -import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; -import java.util.function.Predicate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.lucene.index.LeafReaderContext; -import org.apache.lucene.index.NumericDocValues; import org.apache.lucene.index.SortedNumericDocValues; import org.opensearch.core.ParseField; import org.opensearch.core.common.io.stream.StreamInput; @@ -24,7 +21,7 @@ import org.opensearch.core.xcontent.ObjectParser; import org.opensearch.core.xcontent.ToXContentObject; import org.opensearch.core.xcontent.XContentBuilder; -import org.opensearch.index.codec.freshstartree.codec.StarTreeAggregatedValues; +import org.opensearch.index.codec.startree.codec.StarTreeAggregatedValues; import org.opensearch.search.aggregations.Aggregator; import org.opensearch.search.aggregations.AggregatorFactories; import org.opensearch.search.aggregations.CardinalityUpperBound; diff --git a/server/src/main/resources/META-INF/services/org.apache.lucene.codecs.Codec b/server/src/main/resources/META-INF/services/org.apache.lucene.codecs.Codec index 25df72954122b..3057c566b4658 100644 --- a/server/src/main/resources/META-INF/services/org.apache.lucene.codecs.Codec +++ b/server/src/main/resources/META-INF/services/org.apache.lucene.codecs.Codec @@ -6,4 +6,4 @@ # compatible open source license. # -org.opensearch.index.codec.freshstartree.codec.StarTreeCodec +org.opensearch.index.codec.startree.codec.StarTreeCodec