[4/5] incubator-quickstep git commit: Allow collector to take an explicit probe tuple ID

[na...@apache.org]

Allow collector to take an explicit probe tuple ID


Project: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/commit/fa815ff7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/fa815ff7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/fa815ff7

Branch: refs/heads/expt_bloom_filter_hash_fn
Commit: fa815ff7589bcc1d40f38a6fec8ad93ffe43e086
Parents: dd4bfd6
Author: Navneet Potti <na...@gmail.com>
Authored: Tue Jul 12 23:48:13 2016 -0500
Committer: Navneet Potti <na...@gmail.com>
Committed: Tue Jul 12 23:48:13 2016 -0500

----------------------------------------------------------------------
 relational_operators/HashJoinOperator.cpp | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/fa815ff7/relational_operators/HashJoinOperator.cpp
----------------------------------------------------------------------
diff --git a/relational_operators/HashJoinOperator.cpp b/relational_operators/HashJoinOperator.cpp
index 667df1e..6248a67 100644
--- a/relational_operators/HashJoinOperator.cpp
+++ b/relational_operators/HashJoinOperator.cpp
@@ -75,6 +75,11 @@ class MapBasedJoinedTupleCollector {
     joined_tuples_[tref.block].emplace_back(tref.tuple, accessor.getCurrentPosition());
   }
 
+  inline void operator()(const tuple_id probe_tid,
+                         const TupleReference &build_tref) {
+    joined_tuples_[build_tref.block].emplace_back(build_tref.tuple, probe_tid);
+  }
+
   // Get a mutable pointer to the collected map of joined tuple ID pairs. The
   // key is inner block_id, values are vectors of joined tuple ID pairs with
   // tuple ID from the inner block on the left and the outer block on the