From 5964ffe7df684196ccc1a3dc64dfa4c1fea4ab1a Mon Sep 17 00:00:00 2001 From: Chris Hegarty <62058229+ChrisHegarty@users.noreply.github.com> Date: Wed, 22 Sep 2021 21:18:58 +0100 Subject: [PATCH] Initial move commit, CombinedBitSet (#78189) Co-authored-by: Elastic Machine --- server/build.gradle | 1 - .../{apache => elasticsearch}/lucene/util/CombinedBitSet.java | 4 +++- .../elasticsearch/search/internal/ContextIndexSearcher.java | 2 +- .../org/elasticsearch/lucene/util/CombinedBitSetTests.java | 1 - .../search/internal/ContextIndexSearcherTests.java | 2 +- .../security/authz/accesscontrol/DocumentSubsetReader.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) rename server/src/main/java/org/{apache => elasticsearch}/lucene/util/CombinedBitSet.java (96%) diff --git a/server/build.gradle b/server/build.gradle index 7a1d4254a23a1..34d920b5cf5d5 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -283,7 +283,6 @@ tasks.named('splitPackagesAudit').configure { 'org.apache.lucene.search.grouping.CollapseTopFieldDocs', 'org.apache.lucene.search.grouping.CollapsingDocValuesSource', 'org.apache.lucene.search.grouping.CollapsingTopDocsCollector', - 'org.apache.lucene.util.CombinedBitSet', 'org.apache.lucene.search.vectorhighlight.CustomFieldQuery', // These are tricky because Lucene itself splits the index package, diff --git a/server/src/main/java/org/apache/lucene/util/CombinedBitSet.java b/server/src/main/java/org/elasticsearch/lucene/util/CombinedBitSet.java similarity index 96% rename from server/src/main/java/org/apache/lucene/util/CombinedBitSet.java rename to server/src/main/java/org/elasticsearch/lucene/util/CombinedBitSet.java index 4944682303cc2..247554e1298f7 100644 --- a/server/src/main/java/org/apache/lucene/util/CombinedBitSet.java +++ b/server/src/main/java/org/elasticsearch/lucene/util/CombinedBitSet.java @@ -6,9 +6,11 @@ * Side Public License, v 1. */ -package org.apache.lucene.util; +package org.elasticsearch.lucene.util; import org.apache.lucene.search.DocIdSetIterator; +import org.apache.lucene.util.BitSet; +import org.apache.lucene.util.Bits; /** * A {@link BitSet} implementation that combines two instances of {@link BitSet} and {@link Bits} diff --git a/server/src/main/java/org/elasticsearch/search/internal/ContextIndexSearcher.java b/server/src/main/java/org/elasticsearch/search/internal/ContextIndexSearcher.java index 14d6f4afcc209..3d62890ab0985 100644 --- a/server/src/main/java/org/elasticsearch/search/internal/ContextIndexSearcher.java +++ b/server/src/main/java/org/elasticsearch/search/internal/ContextIndexSearcher.java @@ -32,7 +32,7 @@ import org.apache.lucene.util.BitSet; import org.apache.lucene.util.BitSetIterator; import org.apache.lucene.util.Bits; -import org.apache.lucene.util.CombinedBitSet; +import org.elasticsearch.lucene.util.CombinedBitSet; import org.apache.lucene.util.SparseFixedBitSet; import org.elasticsearch.core.Releasable; import org.elasticsearch.search.dfs.AggregatedDfs; diff --git a/server/src/test/java/org/elasticsearch/lucene/util/CombinedBitSetTests.java b/server/src/test/java/org/elasticsearch/lucene/util/CombinedBitSetTests.java index ad3a94d70c9e1..9bcce4a239d00 100644 --- a/server/src/test/java/org/elasticsearch/lucene/util/CombinedBitSetTests.java +++ b/server/src/test/java/org/elasticsearch/lucene/util/CombinedBitSetTests.java @@ -10,7 +10,6 @@ import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.util.BitSet; -import org.apache.lucene.util.CombinedBitSet; import org.apache.lucene.util.FixedBitSet; import org.apache.lucene.util.SparseFixedBitSet; import org.elasticsearch.test.ESTestCase; diff --git a/server/src/test/java/org/elasticsearch/search/internal/ContextIndexSearcherTests.java b/server/src/test/java/org/elasticsearch/search/internal/ContextIndexSearcherTests.java index f563f1eae9927..235ef39ddd203 100644 --- a/server/src/test/java/org/elasticsearch/search/internal/ContextIndexSearcherTests.java +++ b/server/src/test/java/org/elasticsearch/search/internal/ContextIndexSearcherTests.java @@ -46,7 +46,7 @@ import org.apache.lucene.util.BitSet; import org.apache.lucene.util.BitSetIterator; import org.apache.lucene.util.Bits; -import org.apache.lucene.util.CombinedBitSet; +import org.elasticsearch.lucene.util.CombinedBitSet; import org.apache.lucene.util.FixedBitSet; import org.apache.lucene.util.SparseFixedBitSet; import org.elasticsearch.ExceptionsHelper; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/accesscontrol/DocumentSubsetReader.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/accesscontrol/DocumentSubsetReader.java index 579d927c61eec..ad5b91a5f128a 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/accesscontrol/DocumentSubsetReader.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/accesscontrol/DocumentSubsetReader.java @@ -17,7 +17,7 @@ import org.apache.lucene.util.BitSet; import org.apache.lucene.util.BitSetIterator; import org.apache.lucene.util.Bits; -import org.apache.lucene.util.CombinedBitSet; +import org.elasticsearch.lucene.util.CombinedBitSet; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.common.cache.Cache;