You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@quickstep.apache.org by ji...@apache.org on 2016/08/19 02:18:19 UTC
[6/6] incubator-quickstep git commit: Merged with fuse-select-join
Merged with fuse-select-join
Project: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/commit/f4af5965
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/f4af5965
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/f4af5965
Branch: refs/heads/LIP-for-tpch-merged
Commit: f4af596523b17d1d5523e882f1b73e3d6c35d1b3
Parents: 2ea7a84
Author: Jianqiao Zhu <ji...@cs.wisc.edu>
Authored: Thu Aug 18 21:17:56 2016 -0500
Committer: Jianqiao Zhu <ji...@cs.wisc.edu>
Committed: Thu Aug 18 21:17:56 2016 -0500
----------------------------------------------------------------------
query_optimizer/physical/HashJoin.hpp | 4 ++--
relational_operators/HashJoinOperator.hpp | 8 ++++++++
2 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/f4af5965/query_optimizer/physical/HashJoin.hpp
----------------------------------------------------------------------
diff --git a/query_optimizer/physical/HashJoin.hpp b/query_optimizer/physical/HashJoin.hpp
index e24dbeb..32b4f21 100644
--- a/query_optimizer/physical/HashJoin.hpp
+++ b/query_optimizer/physical/HashJoin.hpp
@@ -121,8 +121,8 @@ class HashJoin : public BinaryJoin {
residual_predicate_,
project_expressions(),
join_type_,
- bloom_filter_config_,
- left_filter_predicate_);
+ left_filter_predicate_,
+ bloom_filter_config_);
}
std::vector<expressions::AttributeReferencePtr> getReferencedAttributes() const override;
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/f4af5965/relational_operators/HashJoinOperator.hpp
----------------------------------------------------------------------
diff --git a/relational_operators/HashJoinOperator.hpp b/relational_operators/HashJoinOperator.hpp
index 05e16a4..4f53daa 100644
--- a/relational_operators/HashJoinOperator.hpp
+++ b/relational_operators/HashJoinOperator.hpp
@@ -511,6 +511,10 @@ class HashSemiJoinWorkOrder : public WorkOrder {
void execute() override;
+ const Predicate *left_filter_predicate() const {
+ return left_filter_predicate_;
+ }
+
private:
void executeWithoutResidualPredicate();
@@ -645,6 +649,10 @@ class HashAntiJoinWorkOrder : public WorkOrder {
}
}
+ const Predicate *left_filter_predicate() const {
+ return left_filter_predicate_;
+ }
+
private:
void executeWithoutResidualPredicate();