Speed up loading keyword fields with index sorts

Author: dnhatn

server/src/main/java/org/elasticsearch/index/codec/tsdb/es819/ES819TSDBDocValuesProducer.java

@@ -54,6 +54,7 @@
 final class ES819TSDBDocValuesProducer extends DocValuesProducer {
     final IntObjectHashMap<NumericEntry> numerics;
     private int primarySortFieldNumber = -1;
+    private boolean primarySortFieldReversed = false;
     final IntObjectHashMap<BinaryEntry> binaries;
     final IntObjectHashMap<SortedEntry> sorted;
     final IntObjectHashMap<SortedSetEntry> sortedSets;
@@ -93,9 +94,13 @@ final class ES819TSDBDocValuesProducer extends DocValuesProducer {
 
                 readFields(in, state.fieldInfos);
                 final var indexSort = state.segmentInfo.getIndexSort();
-                if (indexSort != null) {
-                    var primaryField = indexSort.getSort()[0];
-                    primarySortFieldNumber = state.fieldInfos.fieldInfo(primaryField.getField()).number;
+                if (indexSort != null && indexSort.getSort().length > 0) {
+                    var primarySortField = indexSort.getSort()[0];
+                    var sortField = state.fieldInfos.fieldInfo(primarySortField.getField());
+                    if (sortField != null) {
+                        primarySortFieldNumber = sortField.number;
+                        primarySortFieldReversed = primarySortField.getReverse();
+                    }
                 }
             } catch (Throwable exception) {
                 priorE = exception;

server/src/test/java/org/elasticsearch/index/codec/tsdb/es819/ES819TSDBDocValuesFormatTests.java

@@ -754,7 +754,7 @@ public void testBulkLoading() throws Exception {
                         {
                             // bulk loading timestamp:
                             var block = (TestBlock) timestampDV.tryRead(factory, docs, 0);
-                            assertNull(block);
+                            assertNotNull(block);
                             assertEquals(size, block.size());
                             for (int j = 0; j < block.size(); j++) {
                                 long actualTimestamp = (long) block.get(j);
@@ -766,7 +766,7 @@ public void testBulkLoading() throws Exception {
                         {
                             // bulk loading counter field:
                             var block = (TestBlock) counterDV.tryRead(factory, docs, 0);
-                            assertNull(block);
+                            assertNotNull(block);
                             assertEquals(size, block.size());
                             for (int j = 0; j < block.size(); j++) {
                                 long actualCounter = (long) block.get(j);
@@ -778,7 +778,7 @@ public void testBulkLoading() throws Exception {
                         {
                             // bulk loading gauge field:
                             var block = (TestBlock) gaugeDV.tryRead(factory, docs, 0);
-                            assertNull(block);
+                            assertNotNull(block);
                             assertEquals(size, block.size());
                             for (int j = 0; j < block.size(); j++) {
                                 long actualGauge = (long) block.get(j);
@@ -815,7 +815,7 @@ public void testBulkLoading() throws Exception {
                 {
                     // bulk loading timestamp:
                     var block = (TestBlock) timestampDV.tryRead(blockFactory, docs, randomOffset);
-                    assertNull(block);
+                    assertNotNull(block);
                     assertEquals(size, block.size());
                     for (int j = 0; j < block.size(); j++) {
                         long actualTimestamp = (long) block.get(j);
@@ -827,7 +827,7 @@ public void testBulkLoading() throws Exception {
                 {
                     // bulk loading counter field:
                     var block = (TestBlock) counterDV.tryRead(factory, docs, randomOffset);
-                    assertNull(block);
+                    assertNotNull(block);
                     assertEquals(size, block.size());
                     for (int j = 0; j < block.size(); j++) {
                         long actualCounter = (long) block.get(j);
@@ -839,7 +839,7 @@ public void testBulkLoading() throws Exception {
                 {
                     // bulk loading gauge field:
                     var block = (TestBlock) gaugeDV.tryRead(factory, docs, randomOffset);
-                    assertNull(block);
+                    assertNotNull(block);
                     assertEquals(size, block.size());
                     for (int j = 0; j < block.size(); j++) {
                         long actualGauge = (long) block.get(j);
@@ -863,7 +863,7 @@ public void testBulkLoading() throws Exception {
                 {
                     // bulk loading counter field:
                     var block = (TestBlock) counterDV.tryRead(factory, docs, 0);
-                    assertNull(block);
+                    assertNotNull(block);
                     assertEquals(size, block.size());
                     for (int j = 0; j < block.size(); j++) {
                         long actualCounter = (long) block.get(j);
@@ -947,7 +947,7 @@ public void testBulkLoadingWithSparseDocs() throws Exception {
                     {
                         timestampDV = getColumnAtTimeReader(leafReader, timestampField);
                         var block = (TestBlock) timestampDV.tryRead(factory, docs, 0);
-                        assertNull(block);
+                        assertNotNull(block);
                         assertEquals(numDocsPerQValue, block.size());
                         for (int j = 0; j < block.size(); j++) {
                             long actualTimestamp = (long) block.get(j);
@@ -958,7 +958,7 @@ public void testBulkLoadingWithSparseDocs() throws Exception {
                     {
                         counterDV = getColumnAtTimeReader(leafReader, counterField);
                         var block = (TestBlock) counterDV.tryRead(factory, docs, 0);
-                        assertNull(block);
+                        assertNotNull(block);
                         assertEquals(numDocsPerQValue, block.size());
                         for (int j = 0; j < block.size(); j++) {
                             long actualCounter = (long) block.get(j);