PHOENIX-7599: Fix count of rows scanned metric for uncovered indexes (#2139)

Co-authored-by: Palash Chauhan <[email protected]>

Author: palashc

phoenix-core-server/src/main/java/org/apache/phoenix/coprocessor/UncoveredIndexRegionScanner.java

@@ -220,11 +220,14 @@ protected Scan prepareDataTableScan(Collection<byte[]> dataRowKeys,
     protected boolean scanIndexTableRows(List<Cell> result,
                                          final long startTime,
                                          final byte[] actualStartKey,
-                                         final int offset) throws IOException {
+                                         final int offset,
+                                         ScannerContext scannerContext) throws IOException {
         boolean hasMore = false;
         if (actualStartKey != null) {
             do {
-                hasMore = innerScanner.nextRaw(result);
+                hasMore = scannerContext != null
+                        ? innerScanner.nextRaw(result, scannerContext)
+                        : innerScanner.nextRaw(result);
                 if (result.isEmpty()) {
                     return hasMore;
                 }
@@ -249,7 +252,9 @@ protected boolean scanIndexTableRows(List<Cell> result,
         do {
             List<Cell> row = new ArrayList<Cell>();
             if (result.isEmpty()) {
-                hasMore = innerScanner.nextRaw(row);
+                hasMore = scannerContext != null
+                        ? innerScanner.nextRaw(row, scannerContext)
+                        : innerScanner.nextRaw(row);
             } else {
                 row.addAll(result);
                 result.clear();
@@ -289,8 +294,9 @@ protected boolean scanIndexTableRows(List<Cell> result,
     }
 
     protected boolean scanIndexTableRows(List<Cell> result,
-                                         final long startTime) throws IOException {
-        return scanIndexTableRows(result, startTime, null, 0);
+                                         final long startTime,
+                                         ScannerContext scannerContext) throws IOException {
+        return scanIndexTableRows(result, startTime, null, 0, scannerContext);
     }
 
     private boolean verifyIndexRowAndRepairIfNecessary(Result dataRow, byte[] indexRowKey,
@@ -381,8 +387,8 @@ protected boolean getNextCoveredIndexRow(List<Cell> result) throws IOException {
         }
     }
 
-    public boolean next(List<Cell> result, ScannerContext scannerContext) throws IOException {
-        return next(result);
+    public boolean next(List<Cell> result) throws IOException {
+        return next(result, null);
     }
 
     /**
@@ -399,7 +405,7 @@ public boolean next(List<Cell> result, ScannerContext scannerContext) throws IOE
      * @throws IOException
      */
     @Override
-    public boolean next(List<Cell> result) throws IOException {
+    public boolean next(List<Cell> result, ScannerContext scannerContext) throws IOException {
         long startTime = EnvironmentEdgeManager.currentTimeMillis();
         boolean hasMore;
         region.startRegionOperation();
@@ -416,7 +422,7 @@ public boolean next(List<Cell> result) throws IOException {
                     state = State.SCANNING_INDEX;
                 }
                 if (state == State.SCANNING_INDEX) {
-                    hasMore = scanIndexTableRows(result, startTime);
+                    hasMore = scanIndexTableRows(result, startTime, scannerContext);
                     if (isDummy(result)) {
                         updateDummyWithPrevRowKey(result, initStartRowKey, includeInitStartRowKey,
                                 scan);

phoenix-core-server/src/main/java/org/apache/phoenix/coprocessor/UncoveredLocalIndexRegionScanner.java

@@ -120,18 +120,19 @@ protected void scanDataTableRows(long startTime)
 
     @Override
     protected boolean scanIndexTableRows(List<Cell> result,
-                                         final long startTime) throws IOException {
-        return scanIndexTableRows(result, startTime, actualStartKey, offset);
+                                         final long startTime,
+                                         ScannerContext scannerContext) throws IOException {
+        return scanIndexTableRows(result, startTime, actualStartKey, offset, scannerContext);
     }
 
     @Override
-    public boolean next(List<Cell> result) throws IOException {
-        boolean hasMore = super.next(result);
+    public boolean next(List<Cell> result, ScannerContext scannerContext) throws IOException {
+        boolean hasMore = super.next(result, scannerContext);
         ServerIndexUtil.wrapResultUsingOffset(result, offset);
         return hasMore;
     }
 
-    public boolean next(List<Cell> result, ScannerContext scannerContext) throws IOException {
-        return next(result);
+    public boolean next(List<Cell> result) throws IOException {
+        return next(result, null);
     }
 }

phoenix-core/src/it/java/org/apache/phoenix/monitoring/CountRowsScannedIT.java

@@ -215,6 +215,26 @@ public void testQueryIndex() throws Exception {
         Assert.assertEquals(indexName, stmt.getQueryPlan().getTableRef().getTable().getTableName().toString());
     }
 
+    @Test
+    public void testQueryUncoveredIndex() throws Exception {
+        Connection conn = DriverManager.getConnection(getUrl());
+        String tableName = generateUniqueName();
+        String indexName = generateUniqueName();
+        PhoenixStatement stmt = conn.createStatement().unwrap(PhoenixStatement.class);
+        stmt.execute("CREATE TABLE " + tableName
+                + " (A UNSIGNED_LONG NOT NULL PRIMARY KEY, Z UNSIGNED_LONG)");
+        stmt.execute("CREATE UNCOVERED INDEX " + indexName + " ON " + tableName + "(Z)");
+        for (int i = 1; i <= 100; i++) {
+            String sql = String.format("UPSERT INTO %s VALUES (%d, %d)", tableName, i, i);
+            stmt.execute(sql);
+        }
+        conn.commit();
+        String selectQuery = "SELECT A FROM " + tableName + " WHERE Z > 34 AND Z < 63";
+        long count = countRowsScannedFromSql(stmt, selectQuery);
+        assertEquals(28, count);
+        Assert.assertEquals(indexName, stmt.getQueryPlan().getTableRef().getTable().getTableName().toString());
+    }
+
     @Test
     public void testJoin() throws Exception {
         Connection conn = DriverManager.getConnection(getUrl());