You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@vxquery.apache.org by pr...@apache.org on 2013/08/28 06:30:53 UTC

svn commit: r1518071 - in /incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step: AbstractPathStepScalarEvaluator.java AbstractSinglePathStepScalarEvaluator.java

Author: prestonc
Date: Wed Aug 28 04:30:52 2013
New Revision: 1518071

URL: http://svn.apache.org/r1518071
Log:
Moved the DynamicContext variable down one level to where it is actually used.

Modified:
    incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/AbstractPathStepScalarEvaluator.java
    incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/AbstractSinglePathStepScalarEvaluator.java

Modified: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/AbstractPathStepScalarEvaluator.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/AbstractPathStepScalarEvaluator.java?rev=1518071&r1=1518070&r2=1518071&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/AbstractPathStepScalarEvaluator.java (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/AbstractPathStepScalarEvaluator.java Wed Aug 28 04:30:52 2013
@@ -19,7 +19,6 @@ package org.apache.vxquery.runtime.funct
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.vxquery.context.DynamicContext;
 import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
 import org.apache.vxquery.datamodel.accessors.atomic.CodedQNamePointable;
 import org.apache.vxquery.datamodel.accessors.nodes.AttributeNodePointable;
@@ -43,8 +42,6 @@ import edu.uci.ics.hyracks.data.std.prim
 import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
 
 public abstract class AbstractPathStepScalarEvaluator extends AbstractTaggedValueArgumentScalarEvaluator {
-    protected final DynamicContext dCtx;
-
     protected final SequenceBuilder seqb;
 
     protected final NodeTreePointable ntp;
@@ -57,7 +54,6 @@ public abstract class AbstractPathStepSc
 
     public AbstractPathStepScalarEvaluator(IScalarEvaluator[] args, IHyracksTaskContext ctx) {
         super(args);
-        dCtx = (DynamicContext) ctx.getJobletContext().getGlobalJobData();
         ntp = (NodeTreePointable) NodeTreePointable.FACTORY.createPointable();
         seqb = new SequenceBuilder();
         nodeAbvs = new ArrayBackedValueStorage();

Modified: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/AbstractSinglePathStepScalarEvaluator.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/AbstractSinglePathStepScalarEvaluator.java?rev=1518071&r1=1518070&r2=1518071&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/AbstractSinglePathStepScalarEvaluator.java (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/AbstractSinglePathStepScalarEvaluator.java Wed Aug 28 04:30:52 2013
@@ -18,6 +18,7 @@ package org.apache.vxquery.runtime.funct
 
 import java.io.IOException;
 
+import org.apache.vxquery.context.DynamicContext;
 import org.apache.vxquery.datamodel.accessors.SequencePointable;
 import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
 import org.apache.vxquery.datamodel.accessors.nodes.NodeTreePointable;
@@ -33,6 +34,7 @@ import edu.uci.ics.hyracks.data.std.prim
 import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
 
 public abstract class AbstractSinglePathStepScalarEvaluator extends AbstractPathStepScalarEvaluator {
+    protected final DynamicContext dCtx;
 
     private final IntegerPointable ip;
 
@@ -44,6 +46,7 @@ public abstract class AbstractSinglePath
 
     public AbstractSinglePathStepScalarEvaluator(IScalarEvaluator[] args, IHyracksTaskContext ctx) {
         super(args, ctx);
+        dCtx = (DynamicContext) ctx.getJobletContext().getGlobalJobData();
         ip = (IntegerPointable) IntegerPointable.FACTORY.createPointable();
         seqp = (SequencePointable) SequencePointable.FACTORY.createPointable();
         seqAbvs = new ArrayBackedValueStorage();