Skip to content

HIVE-29457: HiveSortExchangePullUpConstantsRule doesn't remove consta… #6316

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

Open
soumyakanti3578 wants to merge 1 commit into
base: master
Choose a base branch
from
+43 −3
Open

HIVE-29457: HiveSortExchangePullUpConstantsRule doesn't remove consta… #6316

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
9 changes: 6 additions & 3 deletions ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/HiveRelDistribution.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import java.util.List;
import java.util.Map;

import java.util.Objects;
import org.apache.calcite.plan.RelMultipleTrait;
import org.apache.calcite.plan.RelOptPlanner;
import org.apache.calcite.plan.RelTrait;
Expand Down Expand Up @@ -95,9 +96,11 @@ public RelDistribution apply(TargetMapping mapping) {
tmp.put(aMapping.source, aMapping.target);
}

for (Integer key : keys) {
newKeys.add(tmp.get(key));
}
keys.stream()
.map(tmp::get)
.filter(Objects::nonNull)
.forEach(newKeys::add);

return new HiveRelDistribution(type, newKeys);
}

Expand Down
7 changes: 7 additions & 0 deletions ql/src/test/queries/clientpositive/distribution_key_constant_value.q
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
CREATE TABLE test (col1 string, col2 string);

EXPLAIN CBO
SELECT col1 FROM test
WHERE col2 = 'a'
DISTRIBUTE BY col1, col2
SORT BY col1, col2;
30 changes: 30 additions & 0 deletions ql/src/test/results/clientpositive/llap/distribution_key_constant_value.q.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
PREHOOK: query: CREATE TABLE test (col1 string, col2 string)
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@test
POSTHOOK: query: CREATE TABLE test (col1 string, col2 string)
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@test
PREHOOK: query: EXPLAIN CBO
SELECT col1 FROM test
WHERE col2 = 'a'
DISTRIBUTE BY col1, col2
SORT BY col1, col2
PREHOOK: type: QUERY
PREHOOK: Input: default@test
#### A masked pattern was here ####
POSTHOOK: query: EXPLAIN CBO
SELECT col1 FROM test
WHERE col2 = 'a'
DISTRIBUTE BY col1, col2
SORT BY col1, col2
POSTHOOK: type: QUERY
POSTHOOK: Input: default@test
#### A masked pattern was here ####
CBO PLAN:
HiveSortExchange(distribution=[hash[0]], collation=[[0]])
HiveProject(col1=[$0])
HiveFilter(condition=[=($1, _UTF-16LE'a')])
HiveTableScan(table=[[default, test]], table:alias=[test])