[Rename] modules/parent-join (#216)

Refactor parent-join module as part of the Elasticsearch to OpenSearch renaming effort. Signed-off-by: Rabi Panda <adnapibar@gmail.com>
opensearch-project · Mar 22, 2021 · 0e25c23 · 0e25c23
1 parent 4d7727b
commit 0e25c23
Show file tree

Hide file tree

Showing 50 changed files with 109 additions and 109 deletions.
diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/RestHighLevelClientTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/RestHighLevelClientTests.java
@@ -63,7 +63,7 @@
 import org.opensearch.index.rankeval.MetricDetail;
 import org.opensearch.index.rankeval.PrecisionAtK;
 import org.opensearch.index.rankeval.RecallAtK;
-import org.elasticsearch.join.aggregations.ChildrenAggregationBuilder;
+import org.opensearch.join.aggregations.ChildrenAggregationBuilder;
 import org.elasticsearch.rest.RestStatus;
 import org.elasticsearch.search.SearchHits;
 import org.elasticsearch.search.aggregations.Aggregation;

diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/SearchIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/SearchIT.java
@@ -48,8 +48,8 @@
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.index.query.ScriptQueryBuilder;
 import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.join.aggregations.Children;
-import org.elasticsearch.join.aggregations.ChildrenAggregationBuilder;
+import org.opensearch.join.aggregations.Children;
+import org.opensearch.join.aggregations.ChildrenAggregationBuilder;
 import org.elasticsearch.rest.RestStatus;
 import org.elasticsearch.rest.action.document.RestIndexAction;
 import org.elasticsearch.script.Script;

diff --git a/...evel/src/test/java/org/elasticsearch/client/documentation/QueryDSLDocumentationTests.java b/...evel/src/test/java/org/elasticsearch/client/documentation/QueryDSLDocumentationTests.java
@@ -28,7 +28,7 @@
 import org.elasticsearch.index.query.GeoShapeQueryBuilder;
 import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
 import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
-import org.elasticsearch.join.query.JoinQueryBuilders;
+import org.opensearch.join.query.JoinQueryBuilders;
 import org.elasticsearch.index.query.RankFeatureQueryBuilders;
 import org.elasticsearch.script.Script;
 import org.elasticsearch.script.ScriptType;

diff --git a/...t/transport/src/main/java/org/elasticsearch/transport/client/PreBuiltTransportClient.java b/...t/transport/src/main/java/org/elasticsearch/transport/client/PreBuiltTransportClient.java
@@ -27,8 +27,8 @@
 import org.elasticsearch.common.network.NetworkModule;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.index.reindex.ReindexPlugin;
-import org.elasticsearch.join.ParentJoinPlugin;
-import org.opensearch.percolator.PercolatorPlugin;
+import org.opensearch.join.ParentJoinPlugin;
+import org.elasticsearch.percolator.PercolatorPlugin;
 import org.elasticsearch.plugins.Plugin;
 import org.opensearch.script.mustache.MustachePlugin;
 import org.opensearch.transport.Netty4Plugin;

diff --git a/...nsport/src/test/java/org/elasticsearch/transport/client/PreBuiltTransportClientTests.java b/...nsport/src/test/java/org/elasticsearch/transport/client/PreBuiltTransportClientTests.java
@@ -24,8 +24,8 @@
 import org.elasticsearch.common.network.NetworkModule;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.index.reindex.ReindexPlugin;
-import org.elasticsearch.join.ParentJoinPlugin;
-import org.opensearch.percolator.PercolatorPlugin;
+import org.opensearch.join.ParentJoinPlugin;
+import org.elasticsearch.percolator.PercolatorPlugin;
 import org.elasticsearch.plugins.Plugin;
 import org.opensearch.script.mustache.MustachePlugin;
 import org.opensearch.transport.Netty4Plugin;

diff --git a/modules/parent-join/build.gradle b/modules/parent-join/build.gradle
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-apply plugin: 'elasticsearch.yaml-rest-test'
-apply plugin: 'elasticsearch.internal-cluster-test'
+apply plugin: 'opensearch.yaml-rest-test'
+apply plugin: 'opensearch.internal-cluster-test'
 
 esplugin {
   description 'This module adds the support parent-child queries and aggregations'
-  classname 'org.elasticsearch.join.ParentJoinPlugin'
+  classname 'org.opensearch.join.ParentJoinPlugin'
   hasClientJar = true
 }
 

diff --git a/...egations/AbstractParentChildTestCase.java → ...egations/AbstractParentChildTestCase.java b/...egations/AbstractParentChildTestCase.java → ...egations/AbstractParentChildTestCase.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.join.aggregations;
+package org.opensearch.join.aggregations;
 
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
 
@@ -29,7 +29,7 @@
 import java.util.Set;
 
 import org.elasticsearch.action.index.IndexRequestBuilder;
-import org.elasticsearch.join.query.ParentChildTestCase;
+import org.opensearch.join.query.ParentChildTestCase;
 import org.junit.Before;
 
 /**

diff --git a/...csearch/join/aggregations/ChildrenIT.java → ...nsearch/join/aggregations/ChildrenIT.java b/...csearch/join/aggregations/ChildrenIT.java → ...nsearch/join/aggregations/ChildrenIT.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.elasticsearch.join.aggregations;
+package org.opensearch.join.aggregations;
 
 import org.apache.lucene.search.join.ScoreMode;
 import org.elasticsearch.action.index.IndexRequestBuilder;
@@ -40,8 +40,8 @@
 
 import static org.elasticsearch.index.query.QueryBuilders.matchQuery;
 import static org.elasticsearch.index.query.QueryBuilders.termQuery;
-import static org.elasticsearch.join.aggregations.JoinAggregationBuilders.children;
-import static org.elasticsearch.join.query.JoinQueryBuilders.hasChildQuery;
+import static org.opensearch.join.aggregations.JoinAggregationBuilders.children;
+import static org.opensearch.join.query.JoinQueryBuilders.hasChildQuery;
 import static org.elasticsearch.search.aggregations.AggregationBuilders.sum;
 import static org.elasticsearch.search.aggregations.AggregationBuilders.terms;
 import static org.elasticsearch.search.aggregations.AggregationBuilders.topHits;

diff --git a/...ticsearch/join/aggregations/ParentIT.java → ...pensearch/join/aggregations/ParentIT.java b/...ticsearch/join/aggregations/ParentIT.java → ...pensearch/join/aggregations/ParentIT.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.join.aggregations;
+package org.opensearch.join.aggregations;
 
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.action.search.SearchResponse;
@@ -35,7 +35,7 @@
 import java.util.stream.Stream;
 
 import static org.elasticsearch.index.query.QueryBuilders.matchQuery;
-import static org.elasticsearch.join.aggregations.JoinAggregationBuilders.parent;
+import static org.opensearch.join.aggregations.JoinAggregationBuilders.parent;
 import static org.elasticsearch.search.aggregations.AggregationBuilders.terms;
 import static org.elasticsearch.search.aggregations.AggregationBuilders.topHits;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchResponse;

diff --git a/...search/join/query/ChildQuerySearchIT.java → ...search/join/query/ChildQuerySearchIT.java b/...search/join/query/ChildQuerySearchIT.java → ...search/join/query/ChildQuerySearchIT.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.elasticsearch.join.query;
+package org.opensearch.join.query;
 
 import org.apache.lucene.search.join.ScoreMode;
 import org.elasticsearch.action.explain.ExplainResponse;
@@ -71,9 +71,9 @@
 import static org.elasticsearch.index.query.QueryBuilders.termQuery;
 import static org.elasticsearch.index.query.functionscore.ScoreFunctionBuilders.fieldValueFactorFunction;
 import static org.elasticsearch.index.query.functionscore.ScoreFunctionBuilders.weightFactorFunction;
-import static org.elasticsearch.join.query.JoinQueryBuilders.hasChildQuery;
-import static org.elasticsearch.join.query.JoinQueryBuilders.hasParentQuery;
-import static org.elasticsearch.join.query.JoinQueryBuilders.parentId;
+import static org.opensearch.join.query.JoinQueryBuilders.hasChildQuery;
+import static org.opensearch.join.query.JoinQueryBuilders.hasParentQuery;
+import static org.opensearch.join.query.JoinQueryBuilders.parentId;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures;

diff --git a/...elasticsearch/join/query/InnerHitsIT.java → ...rg/opensearch/join/query/InnerHitsIT.java b/...elasticsearch/join/query/InnerHitsIT.java → ...rg/opensearch/join/query/InnerHitsIT.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.join.query;
+package org.opensearch.join.query;
 
 import org.apache.lucene.search.join.ScoreMode;
 import org.apache.lucene.util.ArrayUtil;
@@ -58,8 +58,8 @@
 import static org.elasticsearch.index.query.QueryBuilders.termQuery;
 import static org.elasticsearch.index.seqno.SequenceNumbers.UNASSIGNED_PRIMARY_TERM;
 import static org.elasticsearch.index.seqno.SequenceNumbers.UNASSIGNED_SEQ_NO;
-import static org.elasticsearch.join.query.JoinQueryBuilders.hasChildQuery;
-import static org.elasticsearch.join.query.JoinQueryBuilders.hasParentQuery;
+import static org.opensearch.join.query.JoinQueryBuilders.hasChildQuery;
+import static org.opensearch.join.query.JoinQueryBuilders.hasParentQuery;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures;

diff --git a/...earch/join/query/ParentChildTestCase.java → ...earch/join/query/ParentChildTestCase.java b/...earch/join/query/ParentChildTestCase.java → ...earch/join/query/ParentChildTestCase.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.elasticsearch.join.query;
+package org.opensearch.join.query;
 
 import org.elasticsearch.action.index.IndexRequestBuilder;
 import org.elasticsearch.common.Strings;
@@ -25,7 +25,7 @@
 import org.elasticsearch.common.xcontent.XContentHelper;
 import org.elasticsearch.common.xcontent.json.JsonXContent;
 import org.elasticsearch.index.IndexModule;
-import org.elasticsearch.join.ParentJoinPlugin;
+import org.opensearch.join.ParentJoinPlugin;
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.test.ESIntegTestCase;
 import org.elasticsearch.test.InternalSettingsPlugin;

diff --git a/.../elasticsearch/join/ParentJoinPlugin.java → ...org/opensearch/join/ParentJoinPlugin.java b/.../elasticsearch/join/ParentJoinPlugin.java → ...org/opensearch/join/ParentJoinPlugin.java
@@ -17,17 +17,17 @@
  * under the License.
  */
 
-package org.elasticsearch.join;
+package org.opensearch.join;
 
 import org.elasticsearch.index.mapper.Mapper;
-import org.elasticsearch.join.aggregations.ChildrenAggregationBuilder;
-import org.elasticsearch.join.aggregations.InternalChildren;
-import org.elasticsearch.join.aggregations.InternalParent;
-import org.elasticsearch.join.aggregations.ParentAggregationBuilder;
-import org.elasticsearch.join.mapper.ParentJoinFieldMapper;
-import org.elasticsearch.join.query.HasChildQueryBuilder;
-import org.elasticsearch.join.query.HasParentQueryBuilder;
-import org.elasticsearch.join.query.ParentIdQueryBuilder;
+import org.opensearch.join.aggregations.ChildrenAggregationBuilder;
+import org.opensearch.join.aggregations.InternalChildren;
+import org.opensearch.join.aggregations.InternalParent;
+import org.opensearch.join.aggregations.ParentAggregationBuilder;
+import org.opensearch.join.mapper.ParentJoinFieldMapper;
+import org.opensearch.join.query.HasChildQueryBuilder;
+import org.opensearch.join.query.HasParentQueryBuilder;
+import org.opensearch.join.query.ParentIdQueryBuilder;
 import org.elasticsearch.plugins.MapperPlugin;
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.plugins.SearchPlugin;

diff --git a/...ticsearch/join/aggregations/Children.java → ...pensearch/join/aggregations/Children.java b/...ticsearch/join/aggregations/Children.java → ...pensearch/join/aggregations/Children.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.join.aggregations;
+package org.opensearch.join.aggregations;
 
 import org.elasticsearch.search.aggregations.bucket.SingleBucketAggregation;
 

diff --git a/...regations/ChildrenAggregationBuilder.java → ...regations/ChildrenAggregationBuilder.java b/...regations/ChildrenAggregationBuilder.java → ...regations/ChildrenAggregationBuilder.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.join.aggregations;
+package org.opensearch.join.aggregations;
 
 import org.apache.lucene.search.Query;
 import org.elasticsearch.common.ParsingException;
@@ -27,8 +27,8 @@
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.query.QueryShardContext;
-import org.elasticsearch.join.mapper.ParentIdFieldMapper;
-import org.elasticsearch.join.mapper.ParentJoinFieldMapper;
+import org.opensearch.join.mapper.ParentIdFieldMapper;
+import org.opensearch.join.mapper.ParentJoinFieldMapper;
 import org.elasticsearch.search.aggregations.AggregationBuilder;
 import org.elasticsearch.search.aggregations.AggregatorFactories.Builder;
 import org.elasticsearch.search.aggregations.AggregatorFactory;

diff --git a/...gregations/ChildrenAggregatorFactory.java → ...gregations/ChildrenAggregatorFactory.java b/...gregations/ChildrenAggregatorFactory.java → ...gregations/ChildrenAggregatorFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.join.aggregations;
+package org.opensearch.join.aggregations;
 
 import org.apache.lucene.search.Query;
 import org.elasticsearch.index.query.QueryShardContext;

diff --git a/...regations/ChildrenToParentAggregator.java → ...regations/ChildrenToParentAggregator.java b/...regations/ChildrenToParentAggregator.java → ...regations/ChildrenToParentAggregator.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.elasticsearch.join.aggregations;
+package org.opensearch.join.aggregations;
 
 import org.apache.lucene.search.Query;
 import org.elasticsearch.common.ParseField;

diff --git a/...h/join/aggregations/InternalChildren.java → ...h/join/aggregations/InternalChildren.java b/...h/join/aggregations/InternalChildren.java → ...h/join/aggregations/InternalChildren.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.join.aggregations;
+package org.opensearch.join.aggregations;
 
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.search.aggregations.InternalAggregations;

diff --git a/...rch/join/aggregations/InternalParent.java → ...rch/join/aggregations/InternalParent.java b/...rch/join/aggregations/InternalParent.java → ...rch/join/aggregations/InternalParent.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.join.aggregations;
+package org.opensearch.join.aggregations;
 
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.search.aggregations.InternalAggregations;

diff --git a/...aggregations/JoinAggregationBuilders.java → ...aggregations/JoinAggregationBuilders.java b/...aggregations/JoinAggregationBuilders.java → ...aggregations/JoinAggregationBuilders.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.join.aggregations;
+package org.opensearch.join.aggregations;
 
 public abstract class JoinAggregationBuilders {
     /**

diff --git a/...ions/JoinAggregationInspectionHelper.java → ...ions/JoinAggregationInspectionHelper.java b/...ions/JoinAggregationInspectionHelper.java → ...ions/JoinAggregationInspectionHelper.java
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.elasticsearch.join.aggregations;
+package org.opensearch.join.aggregations;
 
 /**
- * Counterpart to {@link org.elasticsearch.search.aggregations.support.AggregationInspectionHelper}, providing
+ * Counterpart to {@link org.opensearch.search.aggregations.support.AggregationInspectionHelper}, providing
  * helpers for some aggs in the Join package
  */
 public class JoinAggregationInspectionHelper {

diff --git a/...asticsearch/join/aggregations/Parent.java → .../opensearch/join/aggregations/Parent.java b/...asticsearch/join/aggregations/Parent.java → .../opensearch/join/aggregations/Parent.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.join.aggregations;
+package org.opensearch.join.aggregations;
 
 import org.elasticsearch.search.aggregations.bucket.SingleBucketAggregation;
 

diff --git a/...ggregations/ParentAggregationBuilder.java → ...ggregations/ParentAggregationBuilder.java b/...ggregations/ParentAggregationBuilder.java → ...ggregations/ParentAggregationBuilder.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.join.aggregations;
+package org.opensearch.join.aggregations;
 
 import org.apache.lucene.search.Query;
 import org.elasticsearch.common.ParsingException;
@@ -27,8 +27,8 @@
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.query.QueryShardContext;
-import org.elasticsearch.join.mapper.ParentIdFieldMapper;
-import org.elasticsearch.join.mapper.ParentJoinFieldMapper;
+import org.opensearch.join.mapper.ParentIdFieldMapper;
+import org.opensearch.join.mapper.ParentJoinFieldMapper;
 import org.elasticsearch.search.aggregations.AggregationBuilder;
 import org.elasticsearch.search.aggregations.AggregatorFactories.Builder;
 import org.elasticsearch.search.aggregations.AggregatorFactory;

diff --git a/...aggregations/ParentAggregatorFactory.java → ...aggregations/ParentAggregatorFactory.java b/...aggregations/ParentAggregatorFactory.java → ...aggregations/ParentAggregatorFactory.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.join.aggregations;
+package org.opensearch.join.aggregations;
 
 import org.apache.lucene.search.Query;
 import org.elasticsearch.index.query.QueryShardContext;

diff --git a/...in/aggregations/ParentJoinAggregator.java → ...in/aggregations/ParentJoinAggregator.java b/...in/aggregations/ParentJoinAggregator.java → ...in/aggregations/ParentJoinAggregator.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.elasticsearch.join.aggregations;
+package org.opensearch.join.aggregations;
 
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.LeafReaderContext;
@@ -158,7 +158,7 @@ public int docID() {
                  * faster to replay all the matching ordinals and filter them down
                  * to just those listed in ordsToCollect, but we don't have a data
                  * structure that maps a primitive long to a list of primitive
-                 * longs. 
+                 * longs.
                  */
                 for (long owningBucketOrd: ordsToCollect) {
                     if (collectionStrategy.exists(owningBucketOrd, globalOrdinal)) {

diff --git a/...regations/ParentToChildrenAggregator.java → ...regations/ParentToChildrenAggregator.java b/...regations/ParentToChildrenAggregator.java → ...regations/ParentToChildrenAggregator.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.elasticsearch.join.aggregations;
+package org.opensearch.join.aggregations;
 
 import org.apache.lucene.search.Query;
 import org.elasticsearch.common.ParseField;

diff --git a/...rch/join/aggregations/ParsedChildren.java → ...rch/join/aggregations/ParsedChildren.java b/...rch/join/aggregations/ParsedChildren.java → ...rch/join/aggregations/ParsedChildren.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.elasticsearch.join.aggregations;
+package org.opensearch.join.aggregations;
 
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.search.aggregations.bucket.ParsedSingleBucketAggregation;

diff --git a/...earch/join/aggregations/ParsedParent.java → ...earch/join/aggregations/ParsedParent.java b/...earch/join/aggregations/ParsedParent.java → ...earch/join/aggregations/ParsedParent.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.elasticsearch.join.aggregations;
+package org.opensearch.join.aggregations;
 
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.search.aggregations.bucket.ParsedSingleBucketAggregation;

diff --git a/...arch/join/mapper/MetaJoinFieldMapper.java → ...arch/join/mapper/MetaJoinFieldMapper.java b/...arch/join/mapper/MetaJoinFieldMapper.java → ...arch/join/mapper/MetaJoinFieldMapper.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.join.mapper;
+package org.opensearch.join.mapper;
 
 import org.apache.lucene.document.FieldType;
 import org.apache.lucene.index.IndexOptions;

diff --git a/...arch/join/mapper/ParentIdFieldMapper.java → ...arch/join/mapper/ParentIdFieldMapper.java b/...arch/join/mapper/ParentIdFieldMapper.java → ...arch/join/mapper/ParentIdFieldMapper.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.join.mapper;
+package org.opensearch.join.mapper;
 
 import org.apache.lucene.document.Field;
 import org.apache.lucene.document.FieldType;