Streamline and optimize check to use decode or decode ordinals. (#133047)

martijnvg · javanna · commit 8d9abb14b11d · 2025-08-18T09:37:31.000+02:00
Comparing bitsPerOrd == -1 should be a little bit more optimal compared to maxOrd &gt;= 0 (int vs long comparison).
diff --git a/server/src/main/java/org/elasticsearch/index/codec/tsdb/es819/ES819TSDBDocValuesProducer.java b/server/src/main/java/org/elasticsearch/index/codec/tsdb/es819/ES819TSDBDocValuesProducer.java
@@ -1276,10 +1276,10 @@ public long longValue() throws IOException {
                         valuesData.seek(indexReader.get(blockIndex));
                     }
                     currentBlockIndex = blockIndex;
-                    if (maxOrd >= 0) {
-                        decoder.decodeOrdinals(valuesData, currentBlock, bitsPerOrd);
-                    } else {
+                    if (bitsPerOrd == -1) {
                         decoder.decode(valuesData, currentBlock);
+                    } else {
+                        decoder.decodeOrdinals(valuesData, currentBlock, bitsPerOrd);
                     }
                     return currentBlock[blockInIndex];
                 }
@@ -1347,7 +1347,7 @@ long lookAheadValueAt(int targetDoc) throws IOException {
                         if (lookaheadBlockIndex + 1 != blockIndex) {
                             lookaheadData.seek(indexReader.get(blockIndex));
                         }
-                        if (maxOrd == -1L) {
+                        if (bitsPerOrd == -1) {
                             decoder.decode(lookaheadData, lookaheadBlock);
                         } else {
                             decoder.decodeOrdinals(lookaheadData, lookaheadBlock, bitsPerOrd);
@@ -1417,10 +1417,10 @@ public long longValue() throws IOException {
                             valuesData.seek(indexReader.get(blockIndex));
                         }
                         currentBlockIndex = blockIndex;
-                        if (maxOrd >= 0) {
-                            decoder.decodeOrdinals(valuesData, currentBlock, bitsPerOrd);
-                        } else {
+                        if (bitsPerOrd == -1) {
                             decoder.decode(valuesData, currentBlock);
+                        } else {
+                            decoder.decodeOrdinals(valuesData, currentBlock, bitsPerOrd);
                         }
                     }
                     return currentBlock[blockInIndex];
@@ -1452,10 +1452,10 @@ long advance(long index) throws IOException {
                         valuesData.seek(indexReader.get(blockIndex));
                     }
                     currentBlockIndex = blockIndex;
-                    if (bitsPerOrd >= 0) {
-                        decoder.decodeOrdinals(valuesData, currentBlock, bitsPerOrd);
-                    } else {
+                    if (bitsPerOrd == -1) {
                         decoder.decode(valuesData, currentBlock);
+                    } else {
+                        decoder.decodeOrdinals(valuesData, currentBlock, bitsPerOrd);
                     }
                 }
                 return currentBlock[blockInIndex];

Original file line number	Diff line number	Diff line change
`@@ -1276,10 +1276,10 @@ public long longValue() throws IOException {`
`1276`	`1276`	`valuesData.seek(indexReader.get(blockIndex));`
`1277`	`1277`	`}`
`1278`	`1278`	`currentBlockIndex = blockIndex;`
`1279`		`- if (maxOrd >= 0) {`
`1280`		`- decoder.decodeOrdinals(valuesData, currentBlock, bitsPerOrd);`
`1281`		`- } else {`
	`1279`	`+ if (bitsPerOrd == -1) {`
`1282`	`1280`	`decoder.decode(valuesData, currentBlock);`
	`1281`	`+ } else {`
	`1282`	`+ decoder.decodeOrdinals(valuesData, currentBlock, bitsPerOrd);`
`1283`	`1283`	`}`
`1284`	`1284`	`return currentBlock[blockInIndex];`
`1285`	`1285`	`}`
`@@ -1347,7 +1347,7 @@ long lookAheadValueAt(int targetDoc) throws IOException {`
`1347`	`1347`	`if (lookaheadBlockIndex + 1 != blockIndex) {`
`1348`	`1348`	`lookaheadData.seek(indexReader.get(blockIndex));`
`1349`	`1349`	`}`
`1350`		`- if (maxOrd == -1L) {`
	`1350`	`+ if (bitsPerOrd == -1) {`
`1351`	`1351`	`decoder.decode(lookaheadData, lookaheadBlock);`
`1352`	`1352`	`} else {`
`1353`	`1353`	`decoder.decodeOrdinals(lookaheadData, lookaheadBlock, bitsPerOrd);`
`@@ -1417,10 +1417,10 @@ public long longValue() throws IOException {`
`1417`	`1417`	`valuesData.seek(indexReader.get(blockIndex));`
`1418`	`1418`	`}`
`1419`	`1419`	`currentBlockIndex = blockIndex;`
`1420`		`- if (maxOrd >= 0) {`
`1421`		`- decoder.decodeOrdinals(valuesData, currentBlock, bitsPerOrd);`
`1422`		`- } else {`
	`1420`	`+ if (bitsPerOrd == -1) {`
`1423`	`1421`	`decoder.decode(valuesData, currentBlock);`
	`1422`	`+ } else {`
	`1423`	`+ decoder.decodeOrdinals(valuesData, currentBlock, bitsPerOrd);`
`1424`	`1424`	`}`
`1425`	`1425`	`}`
`1426`	`1426`	`return currentBlock[blockInIndex];`
`@@ -1452,10 +1452,10 @@ long advance(long index) throws IOException {`
`1452`	`1452`	`valuesData.seek(indexReader.get(blockIndex));`
`1453`	`1453`	`}`
`1454`	`1454`	`currentBlockIndex = blockIndex;`
`1455`		`- if (bitsPerOrd >= 0) {`
`1456`		`- decoder.decodeOrdinals(valuesData, currentBlock, bitsPerOrd);`
`1457`		`- } else {`
	`1455`	`+ if (bitsPerOrd == -1) {`
`1458`	`1456`	`decoder.decode(valuesData, currentBlock);`
	`1457`	`+ } else {`
	`1458`	`+ decoder.decodeOrdinals(valuesData, currentBlock, bitsPerOrd);`
`1459`	`1459`	`}`
`1460`	`1460`	`}`
`1461`	`1461`	`return currentBlock[blockInIndex];`