Search update: Remove unused imports; remove errors from missed updat…

…e detection. Signed-off-by: Yufei Cai <yufei.cai@bosch.io>
eclipse-ditto · Jan 26, 2022 · ea12cb2 · ea12cb2
1 parent 5e4f79b
commit ea12cb2
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/...ava/org/eclipse/ditto/thingsearch/service/persistence/write/model/AbstractWriteModel.java b/...ava/org/eclipse/ditto/thingsearch/service/persistence/write/model/AbstractWriteModel.java
@@ -21,11 +21,9 @@
 import javax.annotation.Nullable;
 
 import org.bson.BsonDocument;
-import org.bson.BsonNull;
 import org.bson.BsonString;
 import org.bson.conversions.Bson;
 import org.eclipse.ditto.thingsearch.service.persistence.PersistenceConstants;
-import org.mongodb.scala.bson.BsonNumber;
 
 import com.mongodb.client.model.Filters;
 import com.mongodb.client.model.WriteModel;

diff --git a/...n/java/org/eclipse/ditto/thingsearch/service/persistence/write/model/ThingWriteModel.java b/...n/java/org/eclipse/ditto/thingsearch/service/persistence/write/model/ThingWriteModel.java
@@ -18,7 +18,6 @@
 import javax.annotation.concurrent.NotThreadSafe;
 
 import org.bson.BsonDocument;
-import org.bson.BsonNull;
 import org.bson.BsonString;
 import org.bson.conversions.Bson;
 import org.eclipse.ditto.thingsearch.service.persistence.PersistenceConstants;

diff --git a/...eclipse/ditto/thingsearch/service/persistence/write/streaming/BulkWriteResultAckFlow.java b/...eclipse/ditto/thingsearch/service/persistence/write/streaming/BulkWriteResultAckFlow.java
@@ -201,9 +201,8 @@ private static boolean areUpdatesMissing(final WriteResultAndErrors resultAndErr
         final var result = resultAndErrors.getBulkWriteResult();
         final int writeModelCount = resultAndErrors.getWriteModels().size();
         final int matchedCount = result.getMatchedCount();
-        final int upsertedCount = result.getUpserts().size();
-        final int errorCount = resultAndErrors.getBulkWriteErrors().size();
-        return matchedCount + upsertedCount + errorCount < writeModelCount;
+        final int upsertCount = result.getUpserts().size();
+        return matchedCount + upsertCount < writeModelCount;
     }
 
     private static boolean areAllIndexesWithinBounds(final Collection<BulkWriteError> bulkWriteErrors,