Parcourir la source

Initial move commit, CombinedBitSet (#78189)

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
Chris Hegarty il y a 4 ans
Parent
commit
5964ffe7df

+ 0 - 1
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,

+ 3 - 1
server/src/main/java/org/apache/lucene/util/CombinedBitSet.java → 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}

+ 1 - 1
server/src/main/java/org/elasticsearch/search/internal/ContextIndexSearcher.java

@@ -32,7 +32,7 @@ import org.apache.lucene.search.similarities.Similarity;
 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;

+ 0 - 1
server/src/test/java/org/elasticsearch/lucene/util/CombinedBitSetTests.java

@@ -10,7 +10,6 @@ package org.elasticsearch.lucene.util;
 
 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;

+ 1 - 1
server/src/test/java/org/elasticsearch/search/internal/ContextIndexSearcherTests.java

@@ -46,7 +46,7 @@ import org.apache.lucene.util.Accountable;
 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;

+ 1 - 1
x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/accesscontrol/DocumentSubsetReader.java

@@ -17,7 +17,7 @@ import org.apache.lucene.store.AlreadyClosedException;
 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;