Skip to content

Turn on expand identifier in SqlValidator config #11457

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

Merged
Jackie-Jiang merged 1 commit into from
Aug 30, 2023
+38 −6
Merged

Turn on expand identifier in SqlValidator config #11457

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
22 changes: 22 additions & 0 deletions ...sts/src/test/java/org/apache/pinot/integration/tests/MultiStageEngineIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,6 +529,28 @@ public void testBase64Func()
assertEquals(encoded, toBase64(toUtf8(original)));
assertEquals(decoded, fromUtf8(fromBase64(toBase64(toUtf8(original)))));
}

// Test select with group by order by limit
sqlQuery = "SELECT toBase64(toUtf8(AirlineID)) "
+ "FROM mytable "
+ "GROUP BY toBase64(toUtf8(AirlineID)) "
+ "ORDER BY toBase64(toUtf8(AirlineID)) DESC "
+ "LIMIT 10";
Comment on lines +533 to +538
Copy link
Contributor

@walterddr walterddr Sep 20, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there's a problem with this.

SELECT toBase64(toUtf8(AirlineID)) AS AirlineID
FROM mytable
GROUP BY toBase64(toUtf8(AirlineID))
ORDER BY toBase64(toUtf8(AirlineID)) DESC 
LIMIT 10

will failed b/c of the reference to AirlineID is both in the function toBase64 and AS aliasing
did this query ever succeed before the expand identifier?

response = postQuery(sqlQuery);
resultTable = response.get("resultTable");
dataSchema = resultTable.get("dataSchema");
assertEquals(dataSchema.get("columnDataTypes").toString(), "[\"STRING\"]");
rows = response.get("resultTable").get("rows");
assertEquals(rows.get(0).get(0).asText(), "MjExNzE=");
assertEquals(rows.get(1).get(0).asText(), "MjAzOTg=");
assertEquals(rows.get(2).get(0).asText(), "MjAzNjY=");
assertEquals(rows.get(3).get(0).asText(), "MjAzNTU=");
assertEquals(rows.get(4).get(0).asText(), "MjAzMDQ=");
assertEquals(rows.get(5).get(0).asText(), "MjA0Mzc=");
assertEquals(rows.get(6).get(0).asText(), "MjA0MzY=");
assertEquals(rows.get(7).get(0).asText(), "MjA0MDk=");
assertEquals(rows.get(8).get(0).asText(), "MTkzOTM=");
assertEquals(rows.get(9).get(0).asText(), "MTk5Nzc=");
}

@Test
Expand Down
3 changes: 2 additions & 1 deletion pinot-query-planner/src/main/java/org/apache/pinot/query/validate/Validator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ public class Validator extends SqlValidatorImpl {

public Validator(SqlOperatorTable opTab, SqlValidatorCatalogReader catalogReader, RelDataTypeFactory typeFactory) {
// TODO: support BABEL validator. Currently parser conformance is set to use BABEL.
super(opTab, catalogReader, typeFactory, Config.DEFAULT.withSqlConformance(SqlConformanceEnum.LENIENT));
super(opTab, catalogReader, typeFactory,
Config.DEFAULT.withSqlConformance(SqlConformanceEnum.LENIENT).withIdentifierExpansion(true));
}

/**
Expand Down
5 changes: 0 additions & 5 deletions pinot-query-planner/src/test/java/org/apache/pinot/query/QueryCompilationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,11 +407,6 @@ private Object[][] provideQueriesWithException() {
new Object[]{"SELECT a.col1 FROM a WHERE a.col1 IN ()", "Encountered \"\" at line"},
// AT TIME ZONE should fail
new Object[]{"SELECT a.col1 AT TIME ZONE 'PST' FROM a", "No match found for function signature AT_TIME_ZONE"},
// CASE WHEN with non-consolidated result type at compile time.
new Object[]{
"SELECT SUM(CASE WHEN col3 > 10 THEN 1 WHEN col3 > 20 THEN 2 WHEN col3 > 30 THEN 3 "
+ "WHEN col3 > 40 THEN 4 WHEN col3 > 50 THEN '5' ELSE 0 END) FROM a", "while converting CASE WHEN"
},
};
}

Expand Down
14 changes: 14 additions & 0 deletions pinot-query-planner/src/test/resources/queries/BasicQueryPlans.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,20 @@
"\n LogicalTableScan(table=[[a]])",
"\n"
]
},
{
"description": "",
"sql": "EXPLAIN PLAN FOR SELECT SUM(CASE WHEN col3 > 10 THEN 1 WHEN col3 > 20 THEN 2 WHEN col3 > 30 THEN 3 WHEN col3 > 40 THEN 4 WHEN col3 > 50 THEN '5' ELSE 0 END) FROM a",
"output": [
"Execution Plan",
"\nLogicalProject(EXPR$0=[CASE(=($1, 0), null:DECIMAL(1000, 500), $0)])",
"\n LogicalAggregate(group=[{}], agg#0=[$SUM0($0)], agg#1=[COUNT($1)])",
"\n PinotLogicalExchange(distribution=[hash])",
"\n LogicalAggregate(group=[{}], agg#0=[$SUM0($0)], agg#1=[COUNT()])",
"\n LogicalProject($f0=[CAST(CASE(>($2, 10), '1':VARCHAR, >($2, 20), '2':VARCHAR, >($2, 30), '3':VARCHAR, >($2, 40), '4':VARCHAR, >($2, 50), '5':VARCHAR, '0':VARCHAR)):DECIMAL(1000, 500) NOT NULL])",
"\n LogicalTableScan(table=[[a]])",
"\n"
]
}
]
}
Expand Down