Skip to content

Apache Lucene open-source search software

Use getAndSet, getAndClear instead split operations. (#13507)

zhouhui057cbf3c8665
diff --git a/lucene/core/src/java/org/apache/lucene/index/FreqProxTermsWriter.java b/lucene/core/src/java/org/apache/lucene/index/FreqProxTermsWriter.java
index f04096c78cf..5f6abd69c29 100644
--- a/lucene/core/src/java/org/apache/lucene/index/FreqProxTermsWriter.java
+++ b/lucene/core/src/java/org/apache/lucene/index/FreqProxTermsWriter.java
@@ -70,9 +70,8 @@ final class FreqProxTermsWriter extends TermsHash {
state.liveDocs = new FixedBitSet(state.segmentInfo.maxDoc());
state.liveDocs.set(0, state.segmentInfo.maxDoc());
}
- if (state.liveDocs.get(doc)) {
+ if (state.liveDocs.getAndClear(doc)) {
state.delCountOnFlush++;
- state.liveDocs.clear(doc);
}
}
}
diff --git a/lucene/core/src/java/org/apache/lucene/index/PendingDeletes.java b/lucene/core/src/java/org/apache/lucene/index/PendingDeletes.java
index 513f897d725..4be3e41ad19 100644
--- a/lucene/core/src/java/org/apache/lucene/index/PendingDeletes.java
+++ b/lucene/core/src/java/org/apache/lucene/index/PendingDeletes.java
@@ -97,9 +97,8 @@ class PendingDeletes {
+ info.info.name
+ " maxDoc="
+ info.info.maxDoc();
- final boolean didDelete = mutableBits.get(docID);
+ final boolean didDelete = mutableBits.getAndClear(docID);
if (didDelete) {
- mutableBits.clear(docID);
pendingDeleteCount++;
}
return didDelete;
diff --git a/lucene/core/src/java/org/apache/lucene/index/PendingSoftDeletes.java b/lucene/core/src/java/org/apache/lucene/index/PendingSoftDeletes.java
index accdb57d1ba..557d31ad441 100644
--- a/lucene/core/src/java/org/apache/lucene/index/PendingSoftDeletes.java
+++ b/lucene/core/src/java/org/apache/lucene/index/PendingSoftDeletes.java
@@ -53,8 +53,7 @@ final class PendingSoftDeletes extends PendingDeletes {
FixedBitSet mutableBits = getMutableBits();
// hardDeletes
if (hardDeletes.delete(docID)) {
- if (mutableBits.get(docID)) { // delete it here too!
- mutableBits.clear(docID);
+ if (mutableBits.getAndClear(docID)) { // delete it here too!
assert hardDeletes.delete(docID) == false;
} else {
// if it was deleted subtract the delCount
@@ -135,16 +134,14 @@ final class PendingSoftDeletes extends PendingDeletes {
: null;
while ((docID = iterator.nextDoc()) != DocIdSetIterator.NO_MORE_DOCS) {
if (hasValue == null || hasValue.hasValue()) {
- if (bits.get(docID)) { // doc is live - clear it
- bits.clear(docID);
+ if (bits.getAndClear(docID)) { // doc is live - clear it
newDeletes++;
// now that we know we deleted it and we fully control the hard deletes we can do correct
// accounting
// below.
}
} else {
- if (bits.get(docID) == false) {
- bits.set(docID);
+ if (bits.getAndSet(docID) == false) {
newDeletes--;
}
}
diff --git a/lucene/join/src/java/org/apache/lucene/search/join/PointInSetIncludingScoreQuery.java b/lucene/join/src/java/org/apache/lucene/search/join/PointInSetIncludingScoreQuery.java
index 1ece42078cf..717acc22800 100644
--- a/lucene/join/src/java/org/apache/lucene/search/join/PointInSetIncludingScoreQuery.java
+++ b/lucene/join/src/java/org/apache/lucene/search/join/PointInSetIncludingScoreQuery.java
@@ -276,8 +276,7 @@ abstract class PointInSetIncludingScoreQuery extends Query implements Accountabl
if (cmp == 0) {
// Query point equals index point, so collect and return
if (multipleValuesPerDocument) {
- if (result.get(docID) == false) {
- result.set(docID);
+ if (result.getAndSet(docID) == false) {
scores[docID] = nextScore;
}
} else {
diff --git a/lucene/join/src/java/org/apache/lucene/search/join/TermsIncludingScoreQuery.java b/lucene/join/src/java/org/apache/lucene/search/join/TermsIncludingScoreQuery.java
index a3fa1685844..c132c9f1a56 100644
--- a/lucene/join/src/java/org/apache/lucene/search/join/TermsIncludingScoreQuery.java
+++ b/lucene/join/src/java/org/apache/lucene/search/join/TermsIncludingScoreQuery.java
@@ -281,9 +281,8 @@ class TermsIncludingScoreQuery extends Query implements Accountable {
matchingDocs.set(doc);
}*/
// But this behaves the same as MVInnerScorer and only then the tests will pass:
- if (!matchingDocs.get(doc)) {
+ if (!matchingDocs.getAndSet(doc)) {
scores[doc] = score;
- matchingDocs.set(doc);
}
}
}