Skip to content
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

Jump to bottom

feat: Arrays should be indexable from the end too #3004

Merged
merged 11 commits into from
Jul 11, 2019
Merged

feat: Arrays should be indexable from the end too #3004

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3872065
Fixes #2974 Arrays should be indexable from the end too
ouertani Jun 21, 2019
ef7a82a
fixes #2974 Arrays should be indexable from the end too
ouertani Jun 28, 2019
b735630
Merge branch 'master' into KSQL-2974
big-andy-coates Jun 28, 2019
63a3ebd
Fix indentation
big-andy-coates Jun 28, 2019
2da5e36
Fix my merge error
big-andy-coates Jun 28, 2019
ef7406f
Fix indentation, add test cases to cover out of bounds
big-andy-coates Jun 28, 2019
7069f36
Fixes #2974 remove complication from test
ouertani Jun 29, 2019
6fc2aff
Merge branch 'KSQL-2974' of https://github.com/ouertani/ksql into KSQ…
ouertani Jun 29, 2019
8becd5b
docs: documentation updated
ouertani Jul 3, 2019
88f4f1b
Update docs/developer-guide/query-with-arrays-and-maps.rst
ouertani Jul 4, 2019
756ec09
Update docs/developer-guide/query-with-arrays-and-maps.rst
ouertani Jul 4, 2019
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
33 changes: 24 additions & 9 deletions ksql-engine/src/main/java/io/confluent/ksql/codegen/SqlToJavaVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -633,15 +633,30 @@ protected Pair<String, Schema> visitSubscriptExpression(
SchemaUtil.getJavaType(internalSchema).getCanonicalName();
switch (internalSchema.type()) {
case ARRAY:
return new Pair<>(
String.format("((%s) ((%s)%s).get((int)(%s)))",
SchemaUtil.getJavaType(internalSchema.valueSchema()).getSimpleName(),
internalSchemaJavaType,
process(node.getBase(), context).getLeft(),
process(node.getIndex(), context).getLeft()
),
internalSchema.valueSchema()
);
final String listName = process(node.getBase(), context).getLeft();
if (node.getIndex().toString().startsWith("-")) {
ouertani marked this conversation as resolved.
Show resolved Hide resolved
return new Pair<>(
String.format("((%s) ((%s)%s).get((int)((%s)%s).size()%s))",
SchemaUtil.getJavaType(internalSchema.valueSchema()).getSimpleName(),
internalSchemaJavaType,
listName,
internalSchemaJavaType,
listName,
process(node.getIndex(), context).getLeft()
),
internalSchema.valueSchema()
);
} else {
return new Pair<>(
String.format("((%s) ((%s)%s).get((int)(%s)))",
SchemaUtil.getJavaType(internalSchema.valueSchema()).getSimpleName(),
internalSchemaJavaType,
listName,
process(node.getIndex(), context).getLeft()
),
internalSchema.valueSchema()
);
}
case MAP:
return new Pair<>(
String.format("((%s) ((%s)%s).get(%s))",
Expand Down
12 changes: 12 additions & 0 deletions ksql-engine/src/test/java/io/confluent/ksql/codegen/SqlToJavaVisitorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,18 @@ public void shouldProcessArrayExpressionCorrectly() {
equalTo("((Double) ((java.util.List)TEST1_COL4).get((int)(Integer.parseInt(\"0\"))))"));
}

@Test
public void shouldProcessArrayNegativeIndexExpressionCorrectly() {
final String simpleQuery = "SELECT col4[-1] FROM test1 WHERE col0 > 100;";
ouertani marked this conversation as resolved.
Show resolved Hide resolved
final Analysis analysis = analyzeQuery(simpleQuery, metaStore);

final String javaExpression = sqlToJavaVisitor
.process(analysis.getSelectExpressions().get(0));

assertThat(javaExpression,
equalTo("((Double) ((java.util.List)TEST1_COL4).get((int)((java.util.List)TEST1_COL4).size()-Integer.parseInt(\"1\")))"));
}

@Test
public void shouldProcessMapExpressionCorrectly() {
final String simpleQuery = "SELECT col5['key1'] FROM test1 WHERE col0 > 100;";
Expand Down