Initial move commit, CombinedBitSet (#78189)

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
elastic · Sep 22, 2021 · 5964ffe · 5964ffe
1 parent fa94866
commit 5964ffe
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git 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/...rg/apache/lucene/util/CombinedBitSet.java → ...ticsearch/lucene/util/CombinedBitSet.java b/...rg/apache/lucene/util/CombinedBitSet.java → ...ticsearch/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
@@ -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
@@ -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
@@ -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/.../java/org/elasticsearch/xpack/core/security/authz/accesscontrol/DocumentSubsetReader.java b/.../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;