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 2012/08/22 02:37:40 UTC
svn commit: r1375866 [2/2] - in
/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery:
datamodel/accessors/atomic/ runtime/functions/arithmetic/
runtime/functions/cast/ runtime/functions/castable/
runtime/functions/comparison/ ...
Modified: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsDurationOperation.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsDurationOperation.java?rev=1375866&r1=1375865&r2=1375866&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsDurationOperation.java (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsDurationOperation.java Wed Aug 22 00:37:39 2012
@@ -9,6 +9,7 @@ import org.apache.vxquery.exceptions.Sys
import org.apache.vxquery.runtime.functions.cast.CastToDurationOperation;
import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
+import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
@@ -17,7 +18,7 @@ public class CastableAsDurationOperation
private DataOutput dOutInner = abvsInner.getDataOutput();
@Override
- public void convertDTDuration(IntegerPointable intp, DataOutput dOut) throws SystemException, IOException {
+ public void convertDTDuration(LongPointable longp, DataOutput dOut) throws SystemException, IOException {
dOut.write(ValueTag.XS_BOOLEAN_TAG);
dOut.write((byte) 1);
}
Modified: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsNotationOperation.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsNotationOperation.java?rev=1375866&r1=1375865&r2=1375866&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsNotationOperation.java (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsNotationOperation.java Wed Aug 22 00:37:39 2012
@@ -49,7 +49,7 @@ public class CastableAsNotationOperation
throw new SystemException(ErrorCode.XPTY0004);
}
- public void convertDTDuration(IntegerPointable intp, DataOutput dOut) throws SystemException, IOException {
+ public void convertDTDuration(LongPointable longp, DataOutput dOut) throws SystemException, IOException {
throw new SystemException(ErrorCode.XPTY0004);
}
Modified: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsStringOperation.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsStringOperation.java?rev=1375866&r1=1375865&r2=1375866&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsStringOperation.java (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsStringOperation.java Wed Aug 22 00:37:39 2012
@@ -65,7 +65,7 @@ public class CastableAsStringOperation e
}
@Override
- public void convertDTDuration(IntegerPointable intp, DataOutput dOut) throws SystemException, IOException {
+ public void convertDTDuration(LongPointable longp, DataOutput dOut) throws SystemException, IOException {
dOut.write(ValueTag.XS_BOOLEAN_TAG);
dOut.write((byte) 1);
}
Modified: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsYMDurationOperation.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsYMDurationOperation.java?rev=1375866&r1=1375865&r2=1375866&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsYMDurationOperation.java (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsYMDurationOperation.java Wed Aug 22 00:37:39 2012
@@ -9,6 +9,7 @@ import org.apache.vxquery.exceptions.Sys
import org.apache.vxquery.runtime.functions.cast.CastToYMDurationOperation;
import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
+import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
@@ -17,7 +18,7 @@ public class CastableAsYMDurationOperati
private DataOutput dOutInner = abvsInner.getDataOutput();
@Override
- public void convertDTDuration(IntegerPointable intp, DataOutput dOut) throws SystemException, IOException {
+ public void convertDTDuration(LongPointable longp, DataOutput dOut) throws SystemException, IOException {
dOut.write(ValueTag.XS_BOOLEAN_TAG);
dOut.write((byte) 1);
}
Modified: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableScalarEvaluatorFactory.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableScalarEvaluatorFactory.java?rev=1375866&r1=1375865&r2=1375866&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableScalarEvaluatorFactory.java (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableScalarEvaluatorFactory.java Wed Aug 22 00:37:39 2012
@@ -105,8 +105,8 @@ public class CastableScalarEvaluatorFact
return;
case ValueTag.XS_DAY_TIME_DURATION_TAG:
- tvp.getValue(tp.intp);
- aOp.convertDTDuration(tp.intp, dOut);
+ tvp.getValue(tp.longp);
+ aOp.convertDTDuration(tp.longp, dOut);
result.set(abvs);
return;
Modified: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/AbstractDisjunctiveComparisonOperation.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/AbstractDisjunctiveComparisonOperation.java?rev=1375866&r1=1375865&r2=1375866&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/AbstractDisjunctiveComparisonOperation.java (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/AbstractDisjunctiveComparisonOperation.java Wed Aug 22 00:37:39 2012
@@ -108,9 +108,9 @@ public abstract class AbstractDisjunctiv
}
@Override
- public boolean operateDTDurationDTDuration(IntegerPointable intp1, IntegerPointable intp2) throws SystemException,
+ public boolean operateDTDurationDTDuration(LongPointable longp1, LongPointable longp2) throws SystemException,
IOException {
- return (aOp1.operateDTDurationDTDuration(intp1, intp2) || aOp2.operateDTDurationDTDuration(intp1, intp2));
+ return (aOp1.operateDTDurationDTDuration(longp1, longp2) || aOp2.operateDTDurationDTDuration(longp1, longp2));
}
@Override
Modified: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/AbstractNegatingComparisonOperation.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/AbstractNegatingComparisonOperation.java?rev=1375866&r1=1375865&r2=1375866&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/AbstractNegatingComparisonOperation.java (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/AbstractNegatingComparisonOperation.java Wed Aug 22 00:37:39 2012
@@ -103,9 +103,9 @@ public abstract class AbstractNegatingCo
}
@Override
- public boolean operateDTDurationDTDuration(IntegerPointable intp1, IntegerPointable intp2) throws SystemException,
+ public boolean operateDTDurationDTDuration(LongPointable longp1, LongPointable longp2) throws SystemException,
IOException {
- return !aOp.operateDTDurationDTDuration(intp1, intp2);
+ return !aOp.operateDTDurationDTDuration(longp1, longp2);
}
@Override
Modified: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/AbstractValueComparisonOperation.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/AbstractValueComparisonOperation.java?rev=1375866&r1=1375865&r2=1375866&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/AbstractValueComparisonOperation.java (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/AbstractValueComparisonOperation.java Wed Aug 22 00:37:39 2012
@@ -59,7 +59,7 @@ public abstract class AbstractValueCompa
public abstract boolean operateDoubleInteger(DoublePointable doublep1, LongPointable longp2)
throws SystemException, IOException;
- public abstract boolean operateDTDurationDTDuration(IntegerPointable intp1, IntegerPointable intp2)
+ public abstract boolean operateDTDurationDTDuration(LongPointable longp1, LongPointable longp2)
throws SystemException, IOException;
public abstract boolean operateDurationDuration(XSDurationPointable durationp1, XSDurationPointable durationp2)
Modified: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/AbstractValueComparisonScalarEvaluatorFactory.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/AbstractValueComparisonScalarEvaluatorFactory.java?rev=1375866&r1=1375865&r2=1375866&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/AbstractValueComparisonScalarEvaluatorFactory.java (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/AbstractValueComparisonScalarEvaluatorFactory.java Wed Aug 22 00:37:39 2012
@@ -241,11 +241,11 @@ public abstract class AbstractValueCompa
break;
case ValueTag.XS_DAY_TIME_DURATION_TAG:
- tvp1.getValue(tp1.intp);
+ tvp1.getValue(tp1.longp);
switch (tid2) {
case ValueTag.XS_DAY_TIME_DURATION_TAG:
- tvp2.getValue(tp2.intp);
- booleanResult = aOp.operateDTDurationDTDuration(tp1.intp, tp2.intp);
+ tvp2.getValue(tp2.longp);
+ booleanResult = aOp.operateDTDurationDTDuration(tp1.longp, tp2.longp);
break;
}
break;
Modified: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueEqComparisonOperation.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueEqComparisonOperation.java?rev=1375866&r1=1375865&r2=1375866&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueEqComparisonOperation.java (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueEqComparisonOperation.java Wed Aug 22 00:37:39 2012
@@ -140,9 +140,9 @@ public class ValueEqComparisonOperation
}
@Override
- public boolean operateDTDurationDTDuration(IntegerPointable intp1, IntegerPointable intp2) throws SystemException,
+ public boolean operateDTDurationDTDuration(LongPointable longp1, LongPointable longp2) throws SystemException,
IOException {
- return (intp1.compareTo(intp2) == 0);
+ return (longp1.compareTo(longp2) == 0);
}
@Override
Modified: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueLtComparisonOperation.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueLtComparisonOperation.java?rev=1375866&r1=1375865&r2=1375866&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueLtComparisonOperation.java (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueLtComparisonOperation.java Wed Aug 22 00:37:39 2012
@@ -139,9 +139,9 @@ public class ValueLtComparisonOperation
}
@Override
- public boolean operateDTDurationDTDuration(IntegerPointable intp1, IntegerPointable intp2) throws SystemException,
+ public boolean operateDTDurationDTDuration(LongPointable longp1, LongPointable longp2) throws SystemException,
IOException {
- return (intp1.compareTo(intp2) == -1);
+ return (longp1.compareTo(longp2) == -1);
}
@Override
Modified: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/serializer/XMLSerializer.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/serializer/XMLSerializer.java?rev=1375866&r1=1375865&r2=1375866&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/serializer/XMLSerializer.java (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/serializer/XMLSerializer.java Wed Aug 22 00:37:39 2012
@@ -460,18 +460,18 @@ public class XMLSerializer implements IP
}
private void printDTDuration(PrintStream ps, TaggedValuePointable tvp) {
- IntegerPointable ip = pp.takeOne(IntegerPointable.class);
+ LongPointable lp = pp.takeOne(LongPointable.class);
try {
- tvp.getValue(ip);
+ tvp.getValue(lp);
abvs.reset();
- castToString.convertDTDuration(ip, dOut);
+ castToString.convertDTDuration(lp, dOut);
printStringAbvs(ps);
} catch (SystemException e) {
e.printStackTrace();
} catch (IOException e) {
e.printStackTrace();
} finally {
- pp.giveBack(ip);
+ pp.giveBack(lp);
}
}