diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorMapJoinOperator.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorMapJoinOperator.java index 15c747e..e9bd44a 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorMapJoinOperator.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorMapJoinOperator.java @@ -101,15 +101,19 @@ public VectorMapJoinOperator (VectorizationContext vContext, OperatorDesc conf) @Override public Collection> initializeOp(Configuration hconf) throws HiveException { + // Use a final variable to properly parameterize the processVectorInspector closure. + // Using a member variable in the closure will not do the right thing... + final int parameterizePosBigTable = conf.getPosBigTable(); + // Code borrowed from VectorReduceSinkOperator.initializeOp VectorExpressionWriterFactory.processVectorInspector( - (StructObjectInspector) inputObjInspectors[0], + (StructObjectInspector) inputObjInspectors[parameterizePosBigTable], new VectorExpressionWriterFactory.SingleOIDClosure() { @Override public void assign(VectorExpressionWriter[] writers, ObjectInspector objectInspector) { rowWriters = writers; - inputObjInspectors[0] = objectInspector; + inputObjInspectors[parameterizePosBigTable] = objectInspector; } }); singleRow = new Object[rowWriters.length]; diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorMapJoinOuterFilteredOperator.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorMapJoinOuterFilteredOperator.java index 5aecfcc..a96816f 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorMapJoinOuterFilteredOperator.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorMapJoinOuterFilteredOperator.java @@ -62,10 +62,12 @@ public VectorMapJoinOuterFilteredOperator(VectorizationContext vContext, Operato @Override public Collection> initializeOp(Configuration hconf) throws HiveException { + final int posBigTable = conf.getPosBigTable(); + // We need a input object inspector that is for the row we will extract out of the // vectorized row batch, not for example, an original inspector for an ORC table, etc. - inputObjInspectors[0] = - VectorizedBatchUtil.convertToStandardStructObjectInspector((StructObjectInspector) inputObjInspectors[0]); + inputObjInspectors[posBigTable] = + VectorizedBatchUtil.convertToStandardStructObjectInspector((StructObjectInspector) inputObjInspectors[posBigTable]); // Call super VectorMapJoinOuterFilteredOperator, which calls super MapJoinOperator with // new input inspector.