Index calculation improvements (#7)

* Cleanup * Mongodb tests update
unidev-polydata · Apr 30, 2023 · 2c216b7 · 2c216b7
1 parent 3bd62a9
commit 2c216b7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 14 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,3 +1,4 @@
 env.RUN_TEST = '1'
 env.RUN_ITEST = '1'
+env.MARK_ALWAYS_RUN_ITEST
 buildPublicArtifacts()
diff --git a/polydata-mongodb/src/main/java/com/unidev/polydata4/mongodb/PolydataMongodb.java b/polydata-mongodb/src/main/java/com/unidev/polydata4/mongodb/PolydataMongodb.java
@@ -8,6 +8,7 @@
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.MongoCursor;
 import com.mongodb.client.model.*;
+import com.mongodb.client.result.UpdateResult;
 import com.unidev.polydata4.api.AbstractPolydata;
 import com.unidev.polydata4.domain.*;
 import lombok.Getter;
@@ -261,7 +262,7 @@ public BasicPolyList remove(String dataset, Set<String> ids) {
             Cache cacheInstance = cache.get();
             Set<String> keysToRemove = new HashSet<>();
             for (BasicPoly data : list.list()) {
-                keysToRemove.add(poly + "-read-" + data._id());
+                keysToRemove.add(dataset + "-read-" + data._id());
             }
             cacheInstance.removeAll(keysToRemove);
         }
@@ -466,21 +467,15 @@ private void recalculateIndex(String dataset) {
 
         try (MongoCursor<Document> iterator = documents.iterator()) {
             BasicPoly indexes = BasicPoly.newPoly(dataset);
-            UpdateOptions opt = new UpdateOptions().upsert(true);
             while (iterator.hasNext()) {
                 Document next = iterator.next();
                 String index = next.getString(_ID);
-                Long count = Long.parseLong(next.get("count") + "");
+                Long count = Long.parseLong(String.valueOf(next.get("count")));
                 indexes.put(index, count);
             }
             Document indexDocument = toDocument(indexes);
-            Bson update = new Document("$set", indexDocument);
             Bson filter = Filters.eq(_ID, dataset);
-            BulkWriteResult bulkWriteResult = indexCollection(dataset).bulkWrite(List.of(new UpdateOneModel<>(filter, update, opt)));
-
-            log.debug("Index write result getInsertedCount {} getModifiedCount {} getMatchedCount {}",
-                    bulkWriteResult.getInsertedCount(), bulkWriteResult.getModifiedCount(),
-                    bulkWriteResult.getMatchedCount());
+            indexCollection(dataset).replaceOne(filter, indexDocument, new ReplaceOptions().upsert(true));
         }
     }
 

diff --git a/polydata-mongodb/src/test/java/com/unidev/polydata4/mongodb/PolydataMongodbTests.java b/polydata-mongodb/src/test/java/com/unidev/polydata4/mongodb/PolydataMongodbTests.java
@@ -107,10 +107,7 @@ void insert() {
 
     @Test
     void indexUpdate() {
-        BasicPoly index = polydata.index(polyId).get();
-        assertThat(index).isNotNull();
-        assertThat(index.data().isEmpty()).isTrue();
-
+        assertThat(polydata.index(polyId).isPresent()).isFalse();
         for (int i = 0; i < 100; i++) {
             polydata.insert(polyId, Collections.singletonList(
                     InsertRequest.builder()
@@ -120,7 +117,7 @@ void indexUpdate() {
             );
         }
 
-        index = polydata.index(polyId).get();
+        BasicPoly index = polydata.index(polyId).get();
         assertThat(index).isNotNull();
         assertThat(index.data().isEmpty()).isFalse();