Skip to content

Avoid pushdown of negative position for element_at as subfield pruning for array #23479

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
jp-sivaprasad merged 1 commit into from
Aug 23, 2024
Merged

Avoid pushdown of negative position for element_at as subfield pruning for array #23479

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
57 changes: 57 additions & 0 deletions presto-hive/src/test/java/com/facebook/presto/hive/TestHivePushdownFilterQueries.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;

import static com.facebook.presto.SystemSessionProperties.PUSHDOWN_SUBFIELDS_ENABLED;
import static com.facebook.presto.common.type.StandardTypes.BIGINT;
import static com.facebook.presto.common.type.StandardTypes.BOOLEAN;
import static com.facebook.presto.common.type.StandardTypes.DATE;
Expand Down Expand Up @@ -1131,6 +1132,54 @@ public void testOptimizeWithWarningMessage()
ImmutableSet.of(HIVE_TABLESCAN_CONVERTED_TO_VALUESNODE.toWarningCode()));
}

Comment thread
jp-sivaprasad marked this conversation as resolved.
//Test for issue https://github.com/prestodb/presto/issues/22690
//Avoid negative index pushdown
@Test
public void testArraySubscriptPushdown()
{
Session session = enablePushdownFilterAndSubfield(getQueryRunner().getDefaultSession());
getQueryRunner().execute(session,
"CREATE TABLE test_neg_array_sub_pushdown AS \n" +
"select ARRAY[10,20,30,40] numbers");

try {
assertQuery("select element_at(numbers,1) as number from test_neg_array_sub_pushdown", "SELECT 10");
assertQuery("select element_at(numbers,2) as number from test_neg_array_sub_pushdown", "SELECT 20");
assertQuery("select element_at(numbers,3) as number from test_neg_array_sub_pushdown", "SELECT 30");
assertQuery("select element_at(numbers,-1) as number from test_neg_array_sub_pushdown", "SELECT 40");
assertQuery("select element_at(numbers,-2) as number from test_neg_array_sub_pushdown", "SELECT 30");
assertQuery("select element_at(numbers,-3) as number from test_neg_array_sub_pushdown", "SELECT 20");
assertQueryFails("select element_at(numbers,0) as number from test_neg_array_sub_pushdown", "SQL array indices start at 1");

assertQuery("select numbers[1] as number from test_neg_array_sub_pushdown", "SELECT 10");
assertQuery("select numbers[2] as number from test_neg_array_sub_pushdown", "SELECT 20");
assertQuery("select numbers[3 ] as number from test_neg_array_sub_pushdown", "SELECT 30");
assertQueryFails("select numbers[-1] as number from test_neg_array_sub_pushdown", "Array subscript is negative");
assertQueryFails("select numbers[-2] as number from test_neg_array_sub_pushdown", "Array subscript is negative");
assertQueryFails("select numbers[0] as number from test_neg_array_sub_pushdown", "SQL array indices start at 1");
}
finally {
getQueryRunner().execute("DROP TABLE test_neg_array_sub_pushdown");
}
}

@Test
public void testArraySubscriptPushdownEmptyArray()
{
Session session = enablePushdownFilterAndSubfield(getQueryRunner().getDefaultSession());
getQueryRunner().execute(session,
"CREATE TABLE test_neg_array_sub_pushdown ( numbers array(integer))");
assertUpdate("INSERT into test_neg_array_sub_pushdown (numbers) values (ARRAY[])", 1);

try {
assertQuery("select element_at(numbers,1) as number from test_neg_array_sub_pushdown", "SELECT NULL");
assertQuery("select element_at(numbers,-2) as number from test_neg_array_sub_pushdown", "SELECT NULL");
}
finally {
getQueryRunner().execute("DROP TABLE test_neg_array_sub_pushdown");
}
}

private Path getPartitionDirectory(String tableName, String partitionClause)
{
String filePath = ((String) computeActual(noPushdownFilter(getSession()), format("SELECT \"$path\" FROM %s WHERE %s LIMIT 1", tableName, partitionClause)).getOnlyValue())
Expand Down Expand Up @@ -1218,4 +1267,12 @@ private static Session noPartialAggregationPushdown(Session session)
.setCatalogSessionProperty(HIVE_CATALOG, PARTIAL_AGGREGATION_PUSHDOWN_ENABLED, "false")
.build();
}

private static Session enablePushdownFilterAndSubfield(Session session)
{
return Session.builder(session)
.setCatalogSessionProperty(HIVE_CATALOG, PUSHDOWN_FILTER_ENABLED, "true")
.setSystemProperty(PUSHDOWN_SUBFIELDS_ENABLED, "true")
.build();
}
}
6 changes: 6 additions & 0 deletions ...o-main/src/main/java/com/facebook/presto/sql/planner/optimizations/PushdownSubfields.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -609,6 +609,12 @@ private static Optional<Subfield> toSubfield(
return Optional.empty();
}
if (index instanceof Number) {
//Fix for issue https://github.com/prestodb/presto/issues/22690
//Avoid negative index pushdown
if (((Number) index).longValue() < 0) {
return Optional.empty();
}

elements.add(new Subfield.LongSubscript(((Number) index).longValue()));
expression = arguments.get(0);
continue;
Expand Down