You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@vxquery.apache.org by vi...@apache.org on 2012/06/20 10:15:20 UTC

svn commit: r1351983 - /incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryExpressionRuntimeProvider.java

Author: vinayakb
Date: Wed Jun 20 08:15:20 2012
New Revision: 1351983

URL: http://svn.apache.org/viewvc?rev=1351983&view=rev
Log:
Fixed bug in assignment of tuple field index for variables

Modified:
    incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryExpressionRuntimeProvider.java

Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryExpressionRuntimeProvider.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryExpressionRuntimeProvider.java?rev=1351983&r1=1351982&r2=1351983&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryExpressionRuntimeProvider.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryExpressionRuntimeProvider.java Wed Jun 20 08:15:20 2012
@@ -20,8 +20,8 @@ import edu.uci.ics.hyracks.algebricks.co
 import edu.uci.ics.hyracks.algebricks.core.jobgen.impl.JobGenContext;
 import edu.uci.ics.hyracks.algebricks.runtime.base.IAggregateEvaluatorFactory;
 import edu.uci.ics.hyracks.algebricks.runtime.base.ICopySerializableAggregateFunctionFactory;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
 import edu.uci.ics.hyracks.algebricks.runtime.base.IRunningAggregateEvaluatorFactory;
+import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
 import edu.uci.ics.hyracks.algebricks.runtime.base.IUnnestingEvaluatorFactory;
 import edu.uci.ics.hyracks.algebricks.runtime.evaluators.ConstantEvaluatorFactory;
 import edu.uci.ics.hyracks.algebricks.runtime.evaluators.TupleFieldEvaluatorFactory;
@@ -37,7 +37,8 @@ public class VXQueryExpressionRuntimePro
 
             case VARIABLE:
                 VariableReferenceExpression vrExpr = (VariableReferenceExpression) expr;
-                return new TupleFieldEvaluatorFactory(vrExpr.getTupleRef());
+                int tupleFieldIndex = inputSchemas[0].findVariable(vrExpr.getVariableReference());
+                return new TupleFieldEvaluatorFactory(tupleFieldIndex);
 
             case FUNCTION_CALL:
                 ScalarFunctionCallExpression fcExpr = (ScalarFunctionCallExpression) expr;