Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-15676: UpdateLog.RecentUpdates.getDeleteByQuery to not return duplicate versions (#329)

Christine Poerschke3d9adf6b5f52
diff --git a/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java b/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java
index 80639685631..d965cb7cae1 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java
@@ -90,6 +90,7 @@ import org.apache.solr.update.PeerSync;
import org.apache.solr.update.PeerSyncWithLeader;
import org.apache.solr.update.UpdateLog;
import org.apache.solr.update.processor.AtomicUpdateDocumentMerger;
+import org.apache.solr.util.LongSet;
import org.apache.solr.util.RefCounted;
import org.apache.solr.util.TestInjection;
import org.slf4j.Logger;
@@ -1265,10 +1266,12 @@ public class RealTimeGetComponent extends SearchComponent
// TODO: get this from cache instead of rebuilding?
try (UpdateLog.RecentUpdates recentUpdates = ulog.getRecentUpdates()) {
+ LongSet updateVersions = new LongSet(versions.size());
for (Long version : versions) {
try {
Object o = recentUpdates.lookup(version);
if (o == null) continue;
+ updateVersions.add(version);
if (version > 0) {
minVersion = Math.min(minVersion, version);
@@ -1285,7 +1288,7 @@ public class RealTimeGetComponent extends SearchComponent
// Must return all delete-by-query commands that occur after the first add requested
// since they may apply.
if (params.getBool("skipDbq", false)) {
- updates.addAll(recentUpdates.getDeleteByQuery(minVersion));
+ updates.addAll(recentUpdates.getDeleteByQuery(minVersion, updateVersions));
}
rb.rsp.add("updates", updates);
diff --git a/solr/core/src/java/org/apache/solr/update/UpdateLog.java b/solr/core/src/java/org/apache/solr/update/UpdateLog.java
index 08b1f63a0ab..a51ba148a50 100644
--- a/solr/core/src/java/org/apache/solr/update/UpdateLog.java
+++ b/solr/core/src/java/org/apache/solr/update/UpdateLog.java
@@ -75,6 +75,7 @@ import org.apache.solr.update.processor.DistributedUpdateProcessor;
import org.apache.solr.update.processor.UpdateRequestProcessor;
import org.apache.solr.update.processor.UpdateRequestProcessorChain;
import org.apache.solr.common.util.SolrNamedThreadFactory;
+import org.apache.solr.util.LongSet;
import org.apache.solr.util.OrderedExecutor;
import org.apache.solr.util.RTimer;
import org.apache.solr.util.RefCounted;
@@ -1474,12 +1475,19 @@ public class UpdateLog implements PluginInfoInitialized, SolrMetricProducer {
}
/** Returns the list of deleteByQueries that happened after the given version */
- public List<Object> getDeleteByQuery(long afterVersion) {
+ public List<Object> getDeleteByQuery(long afterVersion, LongSet updateVersions) {
List<Object> result = new ArrayList<>(deleteByQueryList.size());
for (Update update : deleteByQueryList) {
if (Math.abs(update.version) > afterVersion) {
- Object dbq = update.log.lookup(update.pointer);
- result.add(dbq);
+ if (updateVersions.add(update.version)) {
+ Object dbq = update.log.lookup(update.pointer);
+ result.add(dbq);
+ } else {
+ if (debug) {
+ log.debug("UpdateLog.RecentUpdates.getDeleteByQuery(afterVersion={}) not returning duplicate version = {}",
+ afterVersion, update.version);
+ }
+ }
}
}
return result;
diff --git a/solr/core/src/test/org/apache/solr/handler/component/UpdateLogCloudTest.java b/solr/core/src/test/org/apache/solr/handler/component/UpdateLogCloudTest.java
index d7330141821..51bb0ca3eea 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/UpdateLogCloudTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/UpdateLogCloudTest.java
@@ -129,7 +129,7 @@ public class UpdateLogCloudTest extends SolrCloudTestCase {
final QueryRequest reqU = new QueryRequest(params("qt","/get", "getUpdates", minVersion + "..."+maxVersion, "skipDbq", Boolean.toString(skipDbq)));
final NamedList<?> rspU = solrClient.request(reqU, COLLECTION);
final List<?> updatesList = (List<?>)rspU.get("updates");
- assertEquals(updatesList.toString(), numExpected + (skipDbq ? 1 : 0), updatesList.size());
+ assertEquals(updatesList.toString(), numExpected, updatesList.size());
}
}