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/04/09 07:50:57 UTC
svn commit: r1465891 - in
/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery:
metadata/ runtime/functions/node/ xmlparser/
Author: prestonc
Date: Tue Apr 9 05:50:56 2013
New Revision: 1465891
URL: http://svn.apache.org/r1465891
Log:
Update for node tree id provider. Missing a few last minute changes that needed variable casting.
Modified:
incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryCollectionOperatorDescriptor.java
incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/FnCollectionScalarEvaluatorFactory.java
incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/FnDocScalarEvaluatorFactory.java
incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/TreeNodeIdProvider.java
Modified: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryCollectionOperatorDescriptor.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryCollectionOperatorDescriptor.java?rev=1465891&r1=1465890&r2=1465891&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryCollectionOperatorDescriptor.java (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryCollectionOperatorDescriptor.java Tue Apr 9 05:50:56 2013
@@ -62,7 +62,7 @@ public class VXQueryCollectionOperatorDe
final ArrayBackedValueStorage abvsFileNode = new ArrayBackedValueStorage();
final int partitionId = ctx.getTaskAttemptId().getTaskId().getPartition();
// TODO Add the data source scan id.
- final ITreeNodeIdProvider nodeIdProvider = new TreeNodeIdProvider(partitionId);
+ final ITreeNodeIdProvider nodeIdProvider = new TreeNodeIdProvider((short) partitionId);
return new AbstractUnaryInputUnaryOutputOperatorNodePushable() {
@Override
Modified: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/FnCollectionScalarEvaluatorFactory.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/FnCollectionScalarEvaluatorFactory.java?rev=1465891&r1=1465890&r2=1465891&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/FnCollectionScalarEvaluatorFactory.java (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/FnCollectionScalarEvaluatorFactory.java Tue Apr 9 05:50:56 2013
@@ -63,7 +63,7 @@ public class FnCollectionScalarEvaluator
final InputSource in = new InputSource();
final int partition = ctx.getTaskAttemptId().getTaskId().getPartition();
// TODO Add the data source scan id.
- final ITreeNodeIdProvider nodeIdProvider = new TreeNodeIdProvider(partition);
+ final ITreeNodeIdProvider nodeIdProvider = new TreeNodeIdProvider((short) partition);
return new AbstractTaggedValueArgumentScalarEvaluator(args) {
@Override
Modified: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/FnDocScalarEvaluatorFactory.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/FnDocScalarEvaluatorFactory.java?rev=1465891&r1=1465890&r2=1465891&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/FnDocScalarEvaluatorFactory.java (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/FnDocScalarEvaluatorFactory.java Tue Apr 9 05:50:56 2013
@@ -58,7 +58,7 @@ public class FnDocScalarEvaluatorFactory
final DataInputStream di = new DataInputStream(bbis);
final int partition = ctx.getTaskAttemptId().getTaskId().getPartition();
// TODO Add the data source scan id.
- final ITreeNodeIdProvider nodeIdProvider = new TreeNodeIdProvider(partition);
+ final ITreeNodeIdProvider nodeIdProvider = new TreeNodeIdProvider((short) partition);
return new AbstractTaggedValueArgumentScalarEvaluator(args) {
@Override
Modified: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/TreeNodeIdProvider.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/TreeNodeIdProvider.java?rev=1465891&r1=1465890&r2=1465891&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/TreeNodeIdProvider.java (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/TreeNodeIdProvider.java Tue Apr 9 05:50:56 2013
@@ -28,6 +28,7 @@ public class TreeNodeIdProvider implemen
currentId = 0;
}
+ // TODO Remove this operator once all calls have been migrated to dataSourceScanId.
public TreeNodeIdProvider(short partition) {
this.partitionDataSource = partition;
dataSouceScanId = 0;