PHOENIX-7497 ExplainPlanV2 regionserver location is not updated for l…

…ess than max regions (#2050)
apache · Jan 3, 2025 · 91cae25 · 91cae25
1 parent 3d06b7a
commit 91cae25
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/phoenix-core-client/src/main/java/org/apache/phoenix/iterate/ExplainTable.java b/phoenix-core-client/src/main/java/org/apache/phoenix/iterate/ExplainTable.java
@@ -378,6 +378,10 @@ private String getRegionLocationsForExplainPlan(
                 buf.append(originalSize);
             } else {
                 buf.append(regionLocations);
+                if (explainPlanAttributesBuilder != null) {
+                    explainPlanAttributesBuilder.setRegionLocations(
+                        Collections.unmodifiableList(regionLocations));
+                }
             }
             buf.append(") ");
             return buf.toString();

diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseAggregateIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseAggregateIT.java
@@ -440,6 +440,8 @@ public void testGroupByOrderPreservingDescSort() throws Exception {
             explainPlanAttributes.getServerWhereFilter());
         assertEquals("SERVER AGGREGATE INTO ORDERED DISTINCT ROWS BY [K1]",
             explainPlanAttributes.getServerAggregate());
+        assertFalse("Explain plan regionLocation attribute should not be empty",
+            explainPlanAttributes.getRegionLocations().isEmpty());
     }
 
     @Test
@@ -501,6 +503,8 @@ public void testSumGroupByOrderPreservingDesc() throws Exception {
             explainPlanAttributes.getServerWhereFilter());
         assertEquals("SERVER AGGREGATE INTO ORDERED DISTINCT ROWS BY [K1]",
             explainPlanAttributes.getServerAggregate());
+        assertFalse("Explain plan regionLocation attribute should not be empty",
+            explainPlanAttributes.getRegionLocations().isEmpty());
     }
 
     @Test
@@ -572,6 +576,8 @@ protected void testAvgGroupByOrderPreserving(Connection conn, String tableName,
         List<KeyRange> splits = TestUtil.getAllSplits(conn, tableName);
         // nGuideposts when stats are enabled, 4 when disabled
         assertEquals(4, splits.size());
+        assertFalse("Explain plan regionLocation attribute should not be empty",
+            explainPlanAttributes.getRegionLocations().isEmpty());
     }
 
     @Test

diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/BaseIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/BaseIndexIT.java
@@ -184,6 +184,8 @@ public void testIndexWithNullableFixedWithCols() throws Exception {
                 assertEquals("FULL SCAN ",
                     explainPlanAttributes.getExplainScanType());
             }
+            assertFalse("Explain plan regionLocation attribute should not be empty",
+                explainPlanAttributes.getRegionLocations().isEmpty());
 
             ResultSet rs = conn.createStatement().executeQuery(query);
             assertTrue(rs.next());
@@ -613,6 +615,8 @@ public void testIndexWithNullableDateCol() throws Exception {
                     explainPlanAttributes.getTableName());
                 assertNull(explainPlanAttributes.getClientSortAlgo());
             }
+            assertFalse("Explain plan regionLocation attribute should not be empty",
+                explainPlanAttributes.getRegionLocations().isEmpty());
 
             ResultSet rs = conn.createStatement().executeQuery(query);
             assertTrue(rs.next());
@@ -720,6 +724,8 @@ public void testSelectAllAndAliasWithIndex() throws Exception {
                     explainPlanAttributes.getTableName());
                 assertNull(explainPlanAttributes.getClientSortAlgo());
             }
+            assertFalse("Explain plan regionLocation attribute should not be empty",
+                explainPlanAttributes.getRegionLocations().isEmpty());
 
             rs = conn.createStatement().executeQuery(query);
             assertTrue(rs.next());