iter

Author: martijnvg

x-pack/plugin/downsample/src/main/java/org/elasticsearch/xpack/downsample/DimensionFieldProducer.java

@@ -56,13 +56,16 @@ void collectOnce(final Object value) {
          * This is an expensive check, that slows down downsampling significantly.
          * Given that index is sorted by tsid as primary key, this shouldn't really happen.
          */
-        boolean validate(FormattedDocValues docValues, int docId) throws IOException {
-            if (docValues.advanceExact(docId)) {
-                int docValueCount = docValues.docValueCount();
-                for (int i = 0; i < docValueCount; i++) {
-                    var value = docValues.nextValue();
-                    if (value.equals(this.value) == false) {
-                        assert false : "Dimension value changed without tsid change [" + value + "] != [" + this.value + "]";
+        boolean validate(FormattedDocValues docValues, IntArrayList buffer) throws IOException {
+            for (int i = 0; i < buffer.size(); i++) {
+                int docId = buffer.get(i);
+                if (docValues.advanceExact(docId)) {
+                    int docValueCount = docValues.docValueCount();
+                    for (int j = 0; j < docValueCount; j++) {
+                        var value = docValues.nextValue();
+                        if (value.equals(this.value) == false) {
+                            assert false : "Dimension value changed without tsid change [" + value + "] != [" + this.value + "]";
+                        }
                     }
                 }
             }
@@ -84,6 +87,7 @@ public boolean isEmpty() {
     @Override
     public void collect(FormattedDocValues docValues, IntArrayList buffer) throws IOException {
         if (dimension.isEmpty == false) {
+            assert dimension.validate(docValues, buffer);
             return;
         }
 

x-pack/plugin/downsample/src/main/java/org/elasticsearch/xpack/downsample/DownsampleShardIndexer.java

@@ -433,11 +433,10 @@ public void collect(int docId, long owningBucketOrd) throws IOException {
                         }
                         bucketsCreated++;
                     }
+                    buffer.buffer[buffer.elementsCount++] = docId;
                     if (buffer.size() == DOCID_BUFFER_SIZE) {
                         bulkCollection();
                     }
-
-                    buffer.buffer[buffer.elementsCount++] = docId;
                 }
 
                 @Override
@@ -456,9 +455,9 @@ void bulkCollection() throws IOException {
 
                     downsampleBucketBuilder.collectDocCount(buffer, docCountProvider);
                     // Iterate over all field values and collect the doc_values for this docId
-                    for (int j = 0; j < fieldProducers.length; j++) {
-                        AbstractDownsampleFieldProducer fieldProducer = fieldProducers[j];
-                        FormattedDocValues docValues = formattedDocValues[j];
+                    for (int i = 0; i < fieldProducers.length; i++) {
+                        AbstractDownsampleFieldProducer fieldProducer = fieldProducers[i];
+                        FormattedDocValues docValues = formattedDocValues[i];
                         fieldProducer.collect(docValues, buffer);
                     }