Skip to content

PHOENIX-7937 Trim whitespace in EXPLAIN FORMAT JSON scan attributes #2546

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
apurtell wants to merge 1 commit into
base: PHOENIX-7876-feature
Choose a base branch
from
+8 −7
Open

PHOENIX-7937 Trim whitespace in EXPLAIN FORMAT JSON scan attributes #2546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions phoenix-core-client/src/main/java/org/apache/phoenix/iterate/ExplainTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,10 +344,10 @@ protected void explain(String prefix, List<String> planSteps,
if (OrderBy.REV_ROW_KEY_ORDER_BY.equals(orderBy)) {
explainPlanAttributesBuilder.setClientSortedBy("REVERSE");
}
explainPlanAttributesBuilder.setExplainScanType(scanTypeDetails);
explainPlanAttributesBuilder.setExplainScanType(scanTypeDetails.trim());
explainPlanAttributesBuilder.setTableName(tableName);
if (!scanRanges.isPointLookup()) {
explainPlanAttributesBuilder.setKeyRanges(appendKeyRanges());
explainPlanAttributesBuilder.setKeyRanges(appendKeyRanges().trim());
}
Comment on lines 344 to 351
}

Expand Down Expand Up @@ -662,7 +662,8 @@ public static void overrideMutationProject(List<String> planSteps,
if (countProject == null || countProject.isEmpty()) {
return;
}
// Only override the internal COUNT(*)/COUNT(1) aggregate projection used for mutation row counts.
// Only override the internal COUNT(*)/COUNT(1) aggregate projection used for mutation row
// counts.
if (countProject.size() != 1 || !countProject.get(0).startsWith("COUNT(")) {
return;
}
Expand Down
8 changes: 4 additions & 4 deletions phoenix-core/src/test/java/org/apache/phoenix/query/explain/ExplainPlanTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -874,9 +874,9 @@ public void testMultiTenantView() throws Exception {
" REGIONS PLANNED <N>", " SERVER 1 ROW LIMIT", "CLIENT 1 ROW LIMIT"),
attrs().put("tenantId", TENANT_ID).put("viewName", MT_VIEW).put("viewBaseName", MT_BASE)
.put("iteratorTypeAndScanSize", "SERIAL <N>-WAY").put("consistency", "STRONG")
.put("explainScanType", "RANGE SCAN ").put("tableName", "EO_MT_BASE")
.put("explainScanType", "RANGE SCAN").put("tableName", "EO_MT_BASE")
.put("indexName", "EO_MT_VIEW").put("indexRule", "data table")
.put("keyRanges", " ['tenant42']").put("serverRowLimit", 1).put("clientRowLimit", 1)
.put("keyRanges", "['tenant42']").put("serverRowLimit", 1).put("clientRowLimit", 1)
.set("clientSteps", clientSteps("CLIENT 1 ROW LIMIT")));
}

Expand Down Expand Up @@ -1894,7 +1894,7 @@ private static ObjectNode scanAttrs(String scanType, String table, String keys)
ObjectNode n = defaultAttrs();
n.put("iteratorTypeAndScanSize", "PARALLEL <N>-WAY");
n.put("consistency", "STRONG");
n.put("explainScanType", scanType);
n.put("explainScanType", scanType.trim());
n.put("tableName", table);
// For a data table scan the per scan INDEX line names the same entity as tableName. View and
// index scans that diverge override indexName on the returned node.
Expand All @@ -1903,7 +1903,7 @@ private static ObjectNode scanAttrs(String scanType, String table, String keys)
// A point lookup short-circuits to the point lookup rule. Index targets set their own rule.
n.put("indexRule", scanType.trim().startsWith("POINT LOOKUP") ? "point lookup" : "data table");
if (keys != null) {
n.put("keyRanges", keys);
n.put("keyRanges", keys.trim());
}
return n;
}
Expand Down