addressing comments

Signed-off-by: bharath-techie <[email protected]>
bharath-techie · Nov 7, 2024 · df6a3a7 · df6a3a7
1 parent 63e90b0
commit df6a3a7
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 8 deletions.
diff --git a/...n/java/org/opensearch/index/codec/composite/composite912/Composite912DocValuesWriter.java b/...n/java/org/opensearch/index/codec/composite/composite912/Composite912DocValuesWriter.java
@@ -30,7 +30,6 @@
 import org.opensearch.index.codec.composite.CompositeIndexFieldInfo;
 import org.opensearch.index.codec.composite.CompositeIndexReader;
 import org.opensearch.index.codec.composite.LuceneDocValuesConsumerFactory;
-import org.opensearch.index.compositeindex.datacube.startree.StarTreeField;
 import org.opensearch.index.compositeindex.datacube.startree.builder.StarTreesBuilder;
 import org.opensearch.index.compositeindex.datacube.startree.index.CompositeIndexValues;
 import org.opensearch.index.compositeindex.datacube.startree.index.StarTreeValues;
@@ -263,7 +262,9 @@ public SortedSetDocValues getSortedSet(FieldInfo field) {
                         return DocValues.emptySortedSet();
                     }
                 });
-            } else {
+            }
+            // TODO : change this logic to evaluate for sortedNumericField specifically
+            else {
                 fieldProducerMap.put(compositeField, new EmptyDocValuesProducer() {
                     @Override
                     public SortedNumericDocValues getSortedNumeric(FieldInfo field) {
@@ -302,7 +303,6 @@ private void mergeCompositeFields(MergeState mergeState) throws IOException {
      */
     private void mergeStarTreeFields(MergeState mergeState) throws IOException {
         Map<String, List<StarTreeValues>> starTreeSubsPerField = new HashMap<>();
-        StarTreeField starTreeField = null;
         for (int i = 0; i < mergeState.docValuesProducers.length; i++) {
             CompositeIndexReader reader = null;
             if (mergeState.docValuesProducers[i] == null) {

diff --git a/...g/opensearch/index/codec/composite912/datacube/startree/StarTreeDocValuesFormatTests.java b/...g/opensearch/index/codec/composite912/datacube/startree/StarTreeDocValuesFormatTests.java
@@ -10,6 +10,7 @@
 
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field;
+import org.apache.lucene.document.NumericDocValuesField;
 import org.apache.lucene.document.SortedNumericDocValuesField;
 import org.apache.lucene.document.StringField;
 import org.apache.lucene.index.DirectoryReader;
@@ -150,8 +151,9 @@ public void testStarTreeDocValuesWithDeletions() throws IOException {
         Directory directory = newDirectory();
         IndexWriterConfig conf = newIndexWriterConfig(null);
         conf.setMergePolicy(newLogMergePolicy());
+        conf.setSoftDeletesField(Lucene.SOFT_DELETES_FIELD);
+        conf.setOpenMode(IndexWriterConfig.OpenMode.CREATE);
         RandomIndexWriter iw = new RandomIndexWriter(random(), directory, conf);
-
         int iterations = 3;
         Map<String, Integer> map = new HashMap<>();
         List<String> allIds = new ArrayList<>();
@@ -172,17 +174,25 @@ public void testStarTreeDocValuesWithDeletions() throws IOException {
 
                 doc.add(new SortedNumericDocValuesField("dv", dvValue));
                 map.put(sndvValue + "-" + dvValue, fieldValue + map.getOrDefault(sndvValue + "-" + dvValue, 0));
+                doc.add(new NumericDocValuesField("field-ndv", fieldValue));
+
                 iw.addDocument(doc);
             }
             iw.flush();
         }
         iw.commit();
-        // Delete random number of documents
+        // Update random number of documents
         int docsToDelete = random().nextInt(9); // Delete up to 9 documents
         for (int i = 0; i < docsToDelete; i++) {
             if (!allIds.isEmpty()) {
                 String idToDelete = allIds.remove(random().nextInt(allIds.size() - 1));
-                iw.deleteDocuments(new Term("_id", idToDelete));
+                Document doc = new Document();
+                doc.add(new NumericDocValuesField("field-ndv", 1L));
+                iw.w.softUpdateDocuments(
+                    new Term("_id", idToDelete),
+                    List.of(doc),
+                    new NumericDocValuesField(Lucene.SOFT_DELETES_FIELD, 1)
+                );
                 allIds.remove(idToDelete);
             }
         }

diff --git a/...earch/index/codec/composite912/datacube/startree/StarTreeKeywordDocValuesFormatTests.java b/...earch/index/codec/composite912/datacube/startree/StarTreeKeywordDocValuesFormatTests.java
@@ -10,6 +10,7 @@
 
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field;
+import org.apache.lucene.document.NumericDocValuesField;
 import org.apache.lucene.document.SortedNumericDocValuesField;
 import org.apache.lucene.document.SortedSetDocValuesField;
 import org.apache.lucene.document.StringField;
@@ -171,12 +172,18 @@ public void testStarTreeKeywordDocValuesWithDeletions() throws IOException {
 
             iw.flush();
 
-            // Delete random number of documents
+            // Update random number of documents
             int docsToDelete = random().nextInt(5); // Delete up to 5 documents
             for (int i = 0; i < docsToDelete; i++) {
                 if (!allIds.isEmpty()) {
                     String idToDelete = allIds.iterator().next();
-                    iw.deleteDocuments(new Term("_id", idToDelete));
+                    Document doc = new Document();
+                    doc.add(new NumericDocValuesField("field-ndv", 1L));
+                    iw.w.softUpdateDocuments(
+                        new Term("_id", idToDelete),
+                        List.of(doc),
+                        new NumericDocValuesField(Lucene.SOFT_DELETES_FIELD, 1)
+                    );
                     allIds.remove(idToDelete);
                     documents.remove(idToDelete);
                 }