commit 444717affad2c08e9f43872fa73ac6679c69dc8b
author pouria.pirzadeh <pouria.pirzadeh@gmail.com> Sat Jun 01 11:55:21 2013 -0700
committer pouria.pirzadeh <pouria.pirzadeh@gmail.com> Sat Jun 01 11:55:21 2013 -0700
tree 60552b0b74c3258eae1b3521d1bc3d061d1b328a
parent 5de628e94e4a8bfc1dccffbf87540669c160d6fe

removing conflicts in inMemoryHashJoin.java

hyracks/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/join/InMemoryHashJoin.java

diff --git a/hyracks/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/join/InMemoryHashJoin.java b/hyracks/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/join/InMemoryHashJoin.java
index 2d49190..0f27aa7 100644
--- a/hyracks/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/join/InMemoryHashJoin.java
+++ b/hyracks/hyracks-dataflow-std/src/main/java/edu/uci/ics/hyracks/dataflow/std/join/InMemoryHashJoin.java
@@ -119,8 +119,11 @@
                     accessorBuild.reset(buffers.get(bIndex));
                     int c = tpComparator.compare(accessorProbe, i, accessorBuild, tIndex);
                     if (c == 0) {
-                        matchFound = true;
-                        appendToResult(i, tIndex, writer);
+                    	boolean predEval = ( (predEvaluator == null) || predEvaluator.evaluate(accessorProbe, i, accessorBuild, tIndex) );
+                    	if(predEval){
+                    		matchFound = true;
+                            appendToResult(i, tIndex, writer);
+                    	}
                     }
                 } while (true);
         	}