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

make inclause behaviour consistent between mongo and postgres #186

Merged
merged 10 commits into from
Dec 15, 2023
Merged

make inclause behaviour consistent between mongo and postgres #186

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
07326ef
make inclause behaviour consistent between mongo and postgres
Nov 30, 2023
7838431
spotless
Nov 30, 2023
7d61dff
remove
Nov 30, 2023
830914a
fix
Dec 6, 2023
7b4f834
fix new flow
Dec 8, 2023
629662c
remove old code flow changes
Dec 11, 2023
a039f9d
Merge branch 'main' into in-clause-consistency
Dec 13, 2023
d1d4ac7
address review comments
Dec 15, 2023
dcba041
address review comments
Dec 15, 2023
e689291
address review comments
Dec 15, 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
62 changes: 55 additions & 7 deletions ...t-store/src/main/java/org/hypertrace/core/documentstore/postgres/utils/PostgresUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,10 @@ public static String prepareFieldDataAccessorExpr(String fieldName, String colum
return fieldPrefix.toString();
}

private static boolean isFirstClassColumn(String fieldName) {
return OUTER_COLUMNS.contains(fieldName) || DOCUMENT_COLUMN.equals(fieldName);
}

public static Type getType(Object value) {
boolean isArrayType = false;
Type type = Type.STRING;
Expand Down Expand Up @@ -182,10 +186,28 @@ public static String parseNonCompositeFilterWithCasting(
String fieldName, String columnName, String op, Object value, Builder paramsBuilder) {
String parsedExpression =
prepareCast(prepareFieldDataAccessorExpr(fieldName, columnName), value);
if (isInOp(op)) {
if (isFirstClassColumn(parsedExpression)) {
parsedExpression = "to_jsonb(" + parsedExpression + ")";
SrikarMannepalli marked this conversation as resolved.
Show resolved Hide resolved
} else {
parsedExpression = parsedExpression.replace("->>", "->");
SrikarMannepalli marked this conversation as resolved.
Show resolved Hide resolved
}
}
return parseNonCompositeFilter(
fieldName, parsedExpression, columnName, op, value, paramsBuilder);
}

private static boolean isInOp(String op) {
switch (op) {
case "IN":
case "NOT_IN":
case "NOT IN":
return true;
default:
return false;
}
}

@SuppressWarnings("unchecked")
public static String parseNonCompositeFilter(
String fieldName,
Expand All @@ -198,6 +220,7 @@ public static String parseNonCompositeFilter(
String sqlOperator;
boolean isMultiValued = false;
boolean isContainsOp = false;
boolean isInOP = false;
switch (op) {
case "EQ":
case "=":
Expand Down Expand Up @@ -250,18 +273,24 @@ public static String parseNonCompositeFilter(
// so, we need - "document->key IS NULL OR document->key->> NOT IN (v1, v2)"
StringBuilder notInFilterString = prepareFieldAccessorExpr(fieldName, columnName);
if (!OUTER_COLUMNS.contains(fieldName)) {
filterString = notInFilterString.append(" IS NULL OR ").append(parsedExpression);
filterString = notInFilterString.append(" IS NULL OR");
}
sqlOperator = " NOT IN ";
isMultiValued = true;
value = prepareParameterizedStringForList((Iterable<Object>) value, paramsBuilder);
isInOP = true;
filterString
.append(" NOT ")
.append(
prepareFilterStringForInOperator(
parsedExpression, (Iterable<Object>) value, paramsBuilder));
break;
case "IN":
// NOTE: both NOT_IN and IN filter currently limited to non-array field
// - https://github.com/hypertrace/document-store/issues/32#issuecomment-781411676
sqlOperator = " IN ";
isMultiValued = true;
value = prepareParameterizedStringForList((Iterable<Object>) value, paramsBuilder);
isInOP = true;
filterString =
prepareFilterStringForInOperator(
parsedExpression, (Iterable<Object>) value, paramsBuilder);
break;
case "NOT_EXISTS":
case "NOT EXISTS":
Expand Down Expand Up @@ -336,8 +365,10 @@ public static String parseNonCompositeFilter(
throw new UnsupportedOperationException(UNSUPPORTED_QUERY_OPERATION);
}

filterString.append(sqlOperator);
if (value != null) {
if (!isInOP) {
SrikarMannepalli marked this conversation as resolved.
Show resolved Hide resolved
filterString.append(sqlOperator);
}
if (value != null && !isInOP) {
if (isMultiValued) {
filterString.append(value);
} else if (isContainsOp) {
Expand All @@ -352,6 +383,23 @@ public static String parseNonCompositeFilter(
return filterString.toString();
}

private static StringBuilder prepareFilterStringForInOperator(
final String parsedExpression, final Iterable<Object> values, final Builder paramsBuilder) {
final StringBuilder filterStringBuilder = new StringBuilder();
SrikarMannepalli marked this conversation as resolved.
Show resolved Hide resolved
filterStringBuilder.append("(");
final String collect =
StreamSupport.stream(values.spliterator(), false)
.map(
val -> {
paramsBuilder.addObjectParam(val);
return parsedExpression + " ?? ?";
SrikarMannepalli marked this conversation as resolved.
Show resolved Hide resolved
})
.collect(Collectors.joining(" OR "));
filterStringBuilder.append(collect);
filterStringBuilder.append(")");
return filterStringBuilder;
}

private static Object prepareJsonValueForContainsOp(final Object value) {
if (value instanceof Document) {
try {
Expand Down
32 changes: 29 additions & 3 deletions ...ore/src/test/java/org/hypertrace/core/documentstore/postgres/PostgresQueryParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,19 @@ void testParseNonCompositeFilter() {
filter.getOp().toString(),
filter.getValue(),
initParams());
Assertions.assertEquals(ID + " IN (?, ?)", query);
Assertions.assertEquals("(to_jsonb(" + ID + ") ?? ? OR to_jsonb(" + ID + ") ?? ?)", query);
}

{
Filter filter = new Filter(Filter.Op.IN, ID, List.of("abc"));
String query =
PostgresUtils.parseNonCompositeFilterWithCasting(
filter.getFieldName(),
PostgresUtils.DOCUMENT_COLUMN,
filter.getOp().toString(),
filter.getValue(),
initParams());
Assertions.assertEquals("(to_jsonb(" + ID + ") ?? ?)", query);
}
}

Expand Down Expand Up @@ -158,16 +170,30 @@ void testParseNonCompositeFilterForJsonField() {
Assertions.assertEquals("document->>'key1' ~* ?", query);
}

{
Filter filter = new Filter(Filter.Op.IN, "key1", List.of("abc"));
String query = PostgresQueryParser.parseFilter(filter, initParams());
Assertions.assertEquals("(document->'key1' ?? ?)", query);
}

{
Filter filter = new Filter(Filter.Op.IN, "key1", List.of("abc", "xyz"));
String query = PostgresQueryParser.parseFilter(filter, initParams());
Assertions.assertEquals("document->>'key1' IN (?, ?)", query);
Assertions.assertEquals("(document->'key1' ?? ? OR document->'key1' ?? ?)", query);
}

{
Filter filter = new Filter(Op.NOT_IN, "key1", List.of("abc"));
String query = PostgresQueryParser.parseFilter(filter, initParams());
Assertions.assertEquals("document->'key1' IS NULL OR NOT (document->'key1' ?? ?)", query);
}

{
Filter filter = new Filter(Op.NOT_IN, "key1", List.of("abc", "xyz"));
String query = PostgresQueryParser.parseFilter(filter, initParams());
Assertions.assertEquals("document->'key1' IS NULL OR document->>'key1' NOT IN (?, ?)", query);
Assertions.assertEquals(
SrikarMannepalli marked this conversation as resolved.
Show resolved Hide resolved
"document->'key1' IS NULL OR NOT (document->'key1' ?? ? OR document->'key1' ?? ?)",
query);
}

{
Expand Down
Loading