Skip to content

handle array columns in Trino handler #201

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
merged 14 commits into from
Oct 25, 2023
Merged

handle array columns in Trino handler #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
90c788e
ENG-35650: add support for map type in Trino handler
satish-mittal Oct 3, 2023
dae66fb
pinot-servicemanager use 0.6.6
satish-mittal Oct 4, 2023
e54a792
use hypertrace-view-generator:0.9.20 for integrationTest
satish-mittal Oct 4, 2023
d7fb9c1
use hypertrace-view-generator:0.9.21 for integrationTest
satish-mittal Oct 4, 2023
8f35ae1
fix typo
satish-mittal Oct 4, 2023
ef33caf
use hypertrace/hypertrace-view-generator:main in integrationTest
satish-mittal Oct 4, 2023
6374ab7
fix vulnerabilities
satish-mittal Oct 4, 2023
8224d1b
fix vulnerability
satish-mittal Oct 4, 2023
1904836
rename variable
satish-mittal Oct 5, 2023
7dcb200
add support for like and contains_key_like operator
satish-mittal Oct 5, 2023
6f9e949
Merge branch 'main' into trino_func_types
satish-mittal Oct 9, 2023
f2b6f9a
handle array columns in Trino handler
satish-mittal Oct 10, 2023
dc27836
Merge branch 'main' into trino_func_types
satish-mittal Oct 17, 2023
38cba44
fix vuln
satish-mittal Oct 17, 2023
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
3 changes: 3 additions & 0 deletions query-service-impl/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ dependencies {
implementation("org.apache.helix:helix-core:1.3.0") {
because("CVE-2022-47500")
}
implementation("org.apache.zookeeper:zookeeper:3.7.2") {
because("CVE-2023-44981")
}
implementation("org.webjars:swagger-ui:5.1.0") {
because("CVE-2019-16728,CVE-2020-26870")
}
Expand Down
69 changes: 46 additions & 23 deletions ...ava/org/hypertrace/core/query/service/trino/converters/DefaultColumnRequestConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,37 +243,60 @@ private void handleConversionForArrayColumnExpression(

if (handleConversionForNullOrEmptyArrayLiteral(lhs, operator, builder, value)) return;

// support only equals and IN operator
// both of them are handled as contains check to align with existing implementation
if (operator.equals("=")
|| operator.equals("IN")
|| operator.equals("!=")
|| operator.equals("NOT IN")) {
// add NOT operator to negate the match condition
if (operator.equals("!=") || operator.equals("NOT IN")) {
// Support only equals and IN operator
if (operator.equals("=") || operator.equals("!=")) {
// Equals (=): CONTAINS(ip_types, 'Bot')
Copy link
Contributor

Choose a reason for hiding this comment

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

Nit: changes looks fine. For readability, would it make sense to move to a function?

// Not equals (!=): NOT CONTAINS(ip_types, 'Bot')
if (operator.equals("!=")) {
builder.append("NOT ");
}
builder.append("CONTAINS(");
builder.append(lhs);
// overlap operator for array
builder.append(" && ");
builder.append(", ");
if (value.getValueType() == ValueType.STRING) {
builder.append(QUESTION_MARK);
paramsBuilder.addStringParam(value.getString());
} else {
throw new IllegalArgumentException(
String.format("Unsupported value {%s} for array column", value));
}
builder.append(")");
} else if (operator.equals("IN") || operator.equals("NOT IN")) {
// IN: CARDINALITY(ARRAY_INTERSECT(ip_types, ARRAY['Public Proxy', 'Bot'])) > 0
// NOT IN: CARDINALITY(ARRAY_INTERSECT(ip_types, ARRAY['Public Proxy', 'Bot'])) = 0
builder.append("CARDINALITY(");
Copy link
Contributor

Choose a reason for hiding this comment

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

Nit: changes looks fine. For readability, would it make sense to move to a function?

builder.append("ARRAY_INTERSECT(");
builder.append(lhs);
builder.append(", ARRAY[");
switch (value.getValueType()) {
case STRING:
builder.append(QUESTION_MARK);
paramsBuilder.addStringParam(value.getString());
break;
case STRING_ARRAY:
String delim = "";
for (String item : value.getStringArrayList()) {
builder.append(delim);
builder.append(QUESTION_MARK);
paramsBuilder.addStringParam(item);
delim = ", ";
}
break;
default:
throw new IllegalArgumentException(
String.format("Unsupported value {%s} for array column", value));
}
builder.append("]))");
if (operator.equals("IN")) {
builder.append(" > 0");
} else {
builder.append(" = 0");
}
} else {
throw new IllegalArgumentException(
String.format(
"Unsupported operator {%s} for array column with non-empty value", operator));
}
builder.append("?");
switch (value.getValueType()) {
case STRING:
paramsBuilder.addStringParam("{" + value.getString() + "}");
break;
case STRING_ARRAY:
paramsBuilder.addStringParam("{" + String.join(", ", value.getStringArrayList()) + "}");
break;
default:
throw new IllegalArgumentException(
String.format("Unsupported value {%s} for array column", value));
}
builder.append(QUESTION_MARK);
}

private boolean handleConversionForNullOrEmptyArrayLiteral(
Expand Down
Loading