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 [1/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/ ...
Author: prestonc
Date: Wed Aug 22 00:37:39 2012
New Revision: 1375866
URL: http://svn.apache.org/viewvc?rev=1375866&view=rev
Log:
VXQUERY-57 Changed all the references for Day Time Duration to long instead of int.
Modified:
incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDurationPointable.java
incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AbstractArithmeticOperation.java
incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AbstractArithmeticScalarEvaluatorFactory.java
incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AddOperation.java
incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/DivideOperation.java
incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/IntegerDivideOperation.java
incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/ModOperation.java
incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/MultiplyOperation.java
incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/SubtractOperation.java
incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/AbstractCastToOperation.java
incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastScalarEvaluatorFactory.java
incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToDTDurationOperation.java
incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToDurationOperation.java
incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToStringOperation.java
incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToYMDurationOperation.java
incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/AbstractCastableAsOperation.java
incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsDTDurationOperation.java
incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsDurationOperation.java
incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsNotationOperation.java
incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsStringOperation.java
incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsYMDurationOperation.java
incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableScalarEvaluatorFactory.java
incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/AbstractDisjunctiveComparisonOperation.java
incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/AbstractNegatingComparisonOperation.java
incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/AbstractValueComparisonOperation.java
incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/AbstractValueComparisonScalarEvaluatorFactory.java
incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueEqComparisonOperation.java
incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueLtComparisonOperation.java
incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/serializer/XMLSerializer.java
Modified: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDurationPointable.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDurationPointable.java?rev=1375866&r1=1375865&r2=1375866&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDurationPointable.java (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDurationPointable.java Wed Aug 22 00:37:39 2012
@@ -5,6 +5,7 @@ import edu.uci.ics.hyracks.data.std.api.
import edu.uci.ics.hyracks.data.std.api.IPointable;
import edu.uci.ics.hyracks.data.std.api.IPointableFactory;
import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
+import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
public class XSDurationPointable extends AbstractPointable {
private final static int YEAR_MONTH_OFFSET = 0;
@@ -20,7 +21,7 @@ public class XSDurationPointable extends
@Override
public int getFixedLength() {
- return 8;
+ return 12;
}
};
@@ -46,11 +47,11 @@ public class XSDurationPointable extends
return getYearMonth(bytes, start);
}
- public static int getDayTime(byte[] bytes, int start) {
- return IntegerPointable.getInteger(bytes, start + DAY_TIME_OFFSET);
+ public static long getDayTime(byte[] bytes, int start) {
+ return LongPointable.getLong(bytes, start + DAY_TIME_OFFSET);
}
- public int getDayTime() {
+ public long getDayTime() {
return getDayTime(bytes, start);
}
@@ -62,11 +63,11 @@ public class XSDurationPointable extends
setYearMonth(bytes, start, value);
}
- public static void setDayTime(byte[] bytes, int start, int value) {
- IntegerPointable.setInteger(bytes, start + DAY_TIME_OFFSET, value);
+ public static void setDayTime(byte[] bytes, int start, long value) {
+ LongPointable.setLong(bytes, start + DAY_TIME_OFFSET, value);
}
- public void setDayTime(int value) {
+ public void setDayTime(long value) {
setDayTime(bytes, start, value);
}
}
\ No newline at end of file
Modified: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AbstractArithmeticOperation.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AbstractArithmeticOperation.java?rev=1375866&r1=1375865&r2=1375866&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AbstractArithmeticOperation.java (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AbstractArithmeticOperation.java Wed Aug 22 00:37:39 2012
@@ -19,13 +19,13 @@ public abstract class AbstractArithmetic
public abstract void operateDateDate(XSDatePointable datep1, XSDatePointable datep2, DynamicContext dCtx,
DataOutput dOut) throws SystemException, IOException;
- public abstract void operateDateDTDuration(XSDatePointable datep1, IntegerPointable intp2, DataOutput dOut)
+ public abstract void operateDateDTDuration(XSDatePointable datep1, LongPointable longp2, DataOutput dOut)
throws SystemException, IOException;
public abstract void operateDatetimeDatetime(XSDateTimePointable datetimep1, XSDateTimePointable datetimep2,
DynamicContext dCtx, DataOutput dOut) throws SystemException, IOException;
- public abstract void operateDatetimeDTDuration(XSDateTimePointable datetimep1, IntegerPointable intp2, DataOutput dOut)
+ public abstract void operateDatetimeDTDuration(XSDateTimePointable datetimep1, LongPointable longp2, DataOutput dOut)
throws SystemException, IOException;
public abstract void operateDatetimeYMDuration(XSDateTimePointable datetimep1, IntegerPointable intp2, DataOutput dOut)
@@ -40,7 +40,7 @@ public abstract class AbstractArithmetic
public abstract void operateDecimalDouble(XSDecimalPointable decp1, DoublePointable doublep2, DataOutput dOut)
throws SystemException, IOException;
- public abstract void operateDecimalDTDuration(XSDecimalPointable decp1, IntegerPointable intp2, DataOutput dOut)
+ public abstract void operateDecimalDTDuration(XSDecimalPointable decp1, LongPointable longp2, DataOutput dOut)
throws SystemException, IOException;
public abstract void operateDecimalFloat(XSDecimalPointable decp1, FloatPointable floatp2, DataOutput dOut)
@@ -58,7 +58,7 @@ public abstract class AbstractArithmetic
public abstract void operateDoubleDouble(DoublePointable doublep1, DoublePointable doublep2, DataOutput dOut)
throws SystemException, IOException;
- public abstract void operateDoubleDTDuration(DoublePointable doublep1, IntegerPointable intp2, DataOutput dOut)
+ public abstract void operateDoubleDTDuration(DoublePointable doublep1, LongPointable longp2, DataOutput dOut)
throws SystemException, IOException;
public abstract void operateDoubleFloat(DoublePointable doublep1, FloatPointable floatp2, DataOutput dOut)
@@ -70,28 +70,28 @@ public abstract class AbstractArithmetic
public abstract void operateDoubleYMDuration(DoublePointable doublep1, IntegerPointable intp2, DataOutput dOut)
throws SystemException, IOException;
- public abstract void operateDTDurationDate(IntegerPointable intp1, XSDatePointable datep2, DataOutput dOut)
+ public abstract void operateDTDurationDate(LongPointable longp1, XSDatePointable datep2, DataOutput dOut)
throws SystemException, IOException;
- public abstract void operateDTDurationDatetime(IntegerPointable intp1, XSDateTimePointable datetimep2, DataOutput dOut)
+ public abstract void operateDTDurationDatetime(LongPointable longp1, XSDateTimePointable datetimep2, DataOutput dOut)
throws SystemException, IOException;
- public abstract void operateDTDurationDecimal(IntegerPointable intp1, XSDecimalPointable decp2, DataOutput dOut)
+ public abstract void operateDTDurationDecimal(LongPointable longp1, XSDecimalPointable decp2, DataOutput dOut)
throws SystemException, IOException;
- public abstract void operateDTDurationDouble(IntegerPointable intp1, DoublePointable doublep2, DataOutput dOut)
+ public abstract void operateDTDurationDouble(LongPointable longp1, DoublePointable doublep2, DataOutput dOut)
throws SystemException, IOException;
- public abstract void operateDTDurationDTDuration(IntegerPointable intp1, IntegerPointable intp2, DataOutput dOut)
+ public abstract void operateDTDurationDTDuration(LongPointable longp1, LongPointable longp2, DataOutput dOut)
throws SystemException, IOException;
- public abstract void operateDTDurationFloat(IntegerPointable intp1, FloatPointable floatp2, DataOutput dOut)
+ public abstract void operateDTDurationFloat(LongPointable longp1, FloatPointable floatp2, DataOutput dOut)
throws SystemException, IOException;
- public abstract void operateDTDurationInteger(IntegerPointable intp1, LongPointable longp2, DataOutput dOut)
+ public abstract void operateDTDurationInteger(LongPointable longp1, LongPointable longp2, DataOutput dOut)
throws SystemException, IOException;
- public abstract void operateDTDurationTime(IntegerPointable intp1, XSTimePointable timep2, DataOutput dOut)
+ public abstract void operateDTDurationTime(LongPointable longp1, XSTimePointable timep2, DataOutput dOut)
throws SystemException, IOException;
public abstract void operateFloatDecimal(FloatPointable floatp1, XSDecimalPointable decp2, DataOutput dOut)
@@ -100,7 +100,7 @@ public abstract class AbstractArithmetic
public abstract void operateFloatDouble(FloatPointable floatp1, DoublePointable doublep2, DataOutput dOut)
throws SystemException, IOException;
- public abstract void operateFloatDTDuration(FloatPointable floatp1, IntegerPointable intp2, DataOutput dOut)
+ public abstract void operateFloatDTDuration(FloatPointable floatp1, LongPointable longp2, DataOutput dOut)
throws SystemException, IOException;
public abstract void operateFloatFloat(FloatPointable floatp1, FloatPointable floatp2, DataOutput dOut)
@@ -118,7 +118,7 @@ public abstract class AbstractArithmetic
public abstract void operateIntegerDouble(LongPointable longp1, DoublePointable doublep2, DataOutput dOut)
throws SystemException, IOException;
- public abstract void operateIntegerDTDuration(LongPointable longp1, IntegerPointable intp2, DataOutput dOut)
+ public abstract void operateIntegerDTDuration(LongPointable longp1, LongPointable longp2, DataOutput dOut)
throws SystemException, IOException;
public abstract void operateIntegerFloat(LongPointable longp1, FloatPointable floatp2, DataOutput dOut)
@@ -130,7 +130,7 @@ public abstract class AbstractArithmetic
public abstract void operateIntegerYMDuration(LongPointable longp1, IntegerPointable intp2, DataOutput dOut)
throws SystemException, IOException;
- public abstract void operateTimeDTDuration(XSTimePointable timep1, IntegerPointable intp2, DataOutput dOut)
+ public abstract void operateTimeDTDuration(XSTimePointable timep1, LongPointable longp2, DataOutput dOut)
throws SystemException, IOException;
public abstract void operateTimeTime(XSTimePointable timep1, XSTimePointable timep2, DynamicContext dCtx,
Modified: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AbstractArithmeticScalarEvaluatorFactory.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AbstractArithmeticScalarEvaluatorFactory.java?rev=1375866&r1=1375865&r2=1375866&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AbstractArithmeticScalarEvaluatorFactory.java (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AbstractArithmeticScalarEvaluatorFactory.java Wed Aug 22 00:37:39 2012
@@ -173,8 +173,8 @@ public abstract class AbstractArithmetic
return;
case ValueTag.XS_DAY_TIME_DURATION_TAG:
- tvp2.getValue(tp2.intp);
- aOp.operateDecimalDTDuration(tp1.decp, tp2.intp, dOut);
+ tvp2.getValue(tp2.longp);
+ aOp.operateDecimalDTDuration(tp1.decp, tp2.longp, dOut);
result.set(abvs);
return;
@@ -212,8 +212,8 @@ public abstract class AbstractArithmetic
return;
case ValueTag.XS_DAY_TIME_DURATION_TAG:
- tvp2.getValue(tp2.intp);
- aOp.operateIntegerDTDuration(longp1, tp2.intp, dOut);
+ tvp2.getValue(tp2.longp);
+ aOp.operateIntegerDTDuration(longp1, tp2.longp, dOut);
result.set(abvs);
return;
@@ -252,8 +252,8 @@ public abstract class AbstractArithmetic
return;
case ValueTag.XS_DAY_TIME_DURATION_TAG:
- tvp2.getValue(tp2.intp);
- aOp.operateFloatDTDuration(tp1.floatp, tp2.intp, dOut);
+ tvp2.getValue(tp2.longp);
+ aOp.operateFloatDTDuration(tp1.floatp, tp2.longp, dOut);
result.set(abvs);
return;
@@ -292,8 +292,8 @@ public abstract class AbstractArithmetic
return;
case ValueTag.XS_DAY_TIME_DURATION_TAG:
- tvp2.getValue(tp2.intp);
- aOp.operateDoubleDTDuration(tp1.doublep, tp2.intp, dOut);
+ tvp2.getValue(tp2.longp);
+ aOp.operateDoubleDTDuration(tp1.doublep, tp2.longp, dOut);
result.set(abvs);
return;
@@ -315,8 +315,8 @@ public abstract class AbstractArithmetic
return;
case ValueTag.XS_DAY_TIME_DURATION_TAG:
- tvp2.getValue(tp2.intp);
- aOp.operateDateDTDuration(tp1.datep, tp2.intp, dOut);
+ tvp2.getValue(tp2.longp);
+ aOp.operateDateDTDuration(tp1.datep, tp2.longp, dOut);
result.set(abvs);
return;
@@ -338,8 +338,8 @@ public abstract class AbstractArithmetic
return;
case ValueTag.XS_DAY_TIME_DURATION_TAG:
- tvp2.getValue(tp2.intp);
- aOp.operateDatetimeDTDuration(tp1.datetimep, tp2.intp, dOut);
+ tvp2.getValue(tp2.longp);
+ aOp.operateDatetimeDTDuration(tp1.datetimep, tp2.longp, dOut);
result.set(abvs);
return;
@@ -361,8 +361,8 @@ public abstract class AbstractArithmetic
return;
case ValueTag.XS_DAY_TIME_DURATION_TAG:
- tvp2.getValue(tp2.intp);
- aOp.operateTimeDTDuration(tp1.timep, tp2.intp, dOut);
+ tvp2.getValue(tp2.longp);
+ aOp.operateTimeDTDuration(tp1.timep, tp2.longp, dOut);
result.set(abvs);
return;
@@ -370,52 +370,52 @@ public abstract class AbstractArithmetic
break;
case ValueTag.XS_DAY_TIME_DURATION_TAG:
- tvp1.getValue(tp1.intp);
+ tvp1.getValue(tp1.longp);
switch (tid2) {
case ValueTag.XS_DECIMAL_TAG:
tvp2.getValue(tp2.decp);
- aOp.operateDTDurationDecimal(tp1.intp, tp2.decp, dOut);
+ aOp.operateDTDurationDecimal(tp1.longp, tp2.decp, dOut);
result.set(abvs);
return;
case ValueTag.XS_INTEGER_TAG:
- aOp.operateDTDurationInteger(tp1.intp, longp2, dOut);
+ aOp.operateDTDurationInteger(tp1.longp, longp2, dOut);
result.set(abvs);
return;
case ValueTag.XS_FLOAT_TAG:
tvp2.getValue(tp2.floatp);
- aOp.operateDTDurationFloat(tp1.intp, tp2.floatp, dOut);
+ aOp.operateDTDurationFloat(tp1.longp, tp2.floatp, dOut);
result.set(abvs);
return;
case ValueTag.XS_DOUBLE_TAG:
tvp2.getValue(tp2.doublep);
- aOp.operateDTDurationDouble(tp1.intp, tp2.doublep, dOut);
+ aOp.operateDTDurationDouble(tp1.longp, tp2.doublep, dOut);
result.set(abvs);
return;
case ValueTag.XS_DATE_TAG:
tvp2.getValue(tp2.datep);
- aOp.operateDTDurationDate(tp1.intp, tp2.datep, dOut);
+ aOp.operateDTDurationDate(tp1.longp, tp2.datep, dOut);
result.set(abvs);
return;
case ValueTag.XS_TIME_TAG:
tvp2.getValue(tp2.timep);
- aOp.operateDTDurationTime(tp1.intp, tp2.timep, dOut);
+ aOp.operateDTDurationTime(tp1.longp, tp2.timep, dOut);
result.set(abvs);
return;
case ValueTag.XS_DATETIME_TAG:
tvp2.getValue(tp2.datetimep);
- aOp.operateDTDurationDatetime(tp1.intp, tp2.datetimep, dOut);
+ aOp.operateDTDurationDatetime(tp1.longp, tp2.datetimep, dOut);
result.set(abvs);
return;
case ValueTag.XS_DAY_TIME_DURATION_TAG:
- tvp2.getValue(tp2.intp);
- aOp.operateDTDurationDTDuration(tp1.intp, tp2.intp, dOut);
+ tvp2.getValue(tp2.longp);
+ aOp.operateDTDurationDTDuration(tp1.longp, tp2.longp, dOut);
result.set(abvs);
return;
}
Modified: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AddOperation.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AddOperation.java?rev=1375866&r1=1375865&r2=1375866&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AddOperation.java (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AddOperation.java Wed Aug 22 00:37:39 2012
@@ -30,11 +30,11 @@ public class AddOperation extends Abstra
}
@Override
- public void operateDateDTDuration(XSDatePointable datep, IntegerPointable intp, DataOutput dOut)
+ public void operateDateDTDuration(XSDatePointable datep1, LongPointable longp2, DataOutput dOut)
throws SystemException, IOException {
abvsInner.reset();
// Add duration.
- DateTime.normalizeDateTime(datep.getYearMonth(), datep.getDayTime() + intp.getInteger(), dOutInner);
+ DateTime.normalizeDateTime(datep1.getYearMonth(), datep1.getDayTime() + longp2.getLong(), dOutInner);
byte[] bytes = abvsInner.getByteArray();
// Convert to date.
bytes[XSDatePointable.TIMEZONE_HOUR_OFFSET] = bytes[XSDateTimePointable.TIMEZONE_HOUR_OFFSET];
@@ -50,11 +50,11 @@ public class AddOperation extends Abstra
}
@Override
- public void operateDatetimeDTDuration(XSDateTimePointable datetimep, IntegerPointable intp, DataOutput dOut)
+ public void operateDatetimeDTDuration(XSDateTimePointable datetimep1, LongPointable longp2, DataOutput dOut)
throws SystemException, IOException {
// Add duration.
abvsInner.reset();
- DateTime.normalizeDateTime(datetimep.getYearMonth(), datetimep.getDayTime() + intp.getInteger(), dOutInner);
+ DateTime.normalizeDateTime(datetimep1.getYearMonth(), datetimep1.getDayTime() + longp2.getLong(), dOutInner);
dOut.write(ValueTag.XS_DATETIME_TAG);
dOut.write(abvsInner.getByteArray());
}
@@ -126,11 +126,11 @@ public class AddOperation extends Abstra
}
@Override
- public void operateDecimalDTDuration(XSDecimalPointable decp, IntegerPointable intp, DataOutput dOut)
+ public void operateDecimalDTDuration(XSDecimalPointable decp, LongPointable longp, DataOutput dOut)
throws SystemException, IOException {
- int value = operateIntDecimal(intp.intValue(), decp);
+ long value = operateLongDecimal(longp.longValue(), decp);
dOut.write(ValueTag.XS_DAY_TIME_DURATION_TAG);
- dOut.writeInt(value);
+ dOut.writeLong(value);
}
@Override
@@ -155,7 +155,7 @@ public class AddOperation extends Abstra
@Override
public void operateDecimalYMDuration(XSDecimalPointable decp, IntegerPointable intp, DataOutput dOut)
throws SystemException, IOException {
- int value = operateIntDecimal(intp.intValue(), decp);
+ int value = (int) operateLongDecimal(intp.intValue(), decp);
dOut.write(ValueTag.XS_YEAR_MONTH_DURATION_TAG);
dOut.writeInt(value);
}
@@ -176,9 +176,9 @@ public class AddOperation extends Abstra
}
@Override
- public void operateDoubleDTDuration(DoublePointable doublep1, IntegerPointable intp2, DataOutput dOut)
+ public void operateDoubleDTDuration(DoublePointable doublep1, LongPointable longp2, DataOutput dOut)
throws SystemException, IOException {
- operateDTDurationDouble(intp2, doublep1, dOut);
+ operateDTDurationDouble(longp2, doublep1, dOut);
}
@Override
@@ -209,65 +209,65 @@ public class AddOperation extends Abstra
}
@Override
- public void operateDTDurationDate(IntegerPointable intp, XSDatePointable datep, DataOutput dOut)
+ public void operateDTDurationDate(LongPointable longp, XSDatePointable datep, DataOutput dOut)
throws SystemException, IOException {
- operateDateDTDuration(datep, intp, dOut);
+ operateDateDTDuration(datep, longp, dOut);
}
@Override
- public void operateDTDurationDatetime(IntegerPointable intp, XSDateTimePointable datetimep, DataOutput dOut)
+ public void operateDTDurationDatetime(LongPointable longp, XSDateTimePointable datetimep, DataOutput dOut)
throws SystemException, IOException {
- operateDatetimeDTDuration(datetimep, intp, dOut);
+ operateDatetimeDTDuration(datetimep, longp, dOut);
}
@Override
- public void operateDTDurationDecimal(IntegerPointable intp, XSDecimalPointable decp, DataOutput dOut)
+ public void operateDTDurationDecimal(LongPointable longp, XSDecimalPointable decp, DataOutput dOut)
throws SystemException, IOException {
- operateDecimalDTDuration(decp, intp, dOut);
+ operateDecimalDTDuration(decp, longp, dOut);
}
@Override
- public void operateDTDurationDouble(IntegerPointable intp, DoublePointable doublep, DataOutput dOut)
+ public void operateDTDurationDouble(LongPointable longp, DoublePointable doublep, DataOutput dOut)
throws SystemException, IOException {
- int value = intp.intValue();
- value += doublep.intValue();
+ long value = longp.longValue();
+ value += doublep.longValue();
dOut.write(ValueTag.XS_DAY_TIME_DURATION_TAG);
- dOut.writeInt(value);
+ dOut.writeLong(value);
}
@Override
- public void operateDTDurationDTDuration(IntegerPointable intp, IntegerPointable intp2, DataOutput dOut)
+ public void operateDTDurationDTDuration(LongPointable longp1, LongPointable longp2, DataOutput dOut)
throws SystemException, IOException {
- int value = intp.intValue();
- value += intp2.intValue();
+ long value = longp1.longValue();
+ value += longp2.longValue();
dOut.write(ValueTag.XS_DAY_TIME_DURATION_TAG);
- dOut.writeInt(value);
+ dOut.writeLong(value);
}
@Override
- public void operateDTDurationFloat(IntegerPointable intp, FloatPointable floatp, DataOutput dOut)
+ public void operateDTDurationFloat(LongPointable longp1, FloatPointable floatp2, DataOutput dOut)
throws SystemException, IOException {
- int value = intp.intValue();
- value += floatp.intValue();
+ long value = longp1.longValue();
+ value += floatp2.longValue();
dOut.write(ValueTag.XS_DAY_TIME_DURATION_TAG);
- dOut.writeInt(value);
+ dOut.writeLong(value);
}
@Override
- public void operateDTDurationInteger(IntegerPointable intp, LongPointable longp, DataOutput dOut)
+ public void operateDTDurationInteger(LongPointable longp1, LongPointable longp2, DataOutput dOut)
throws SystemException, IOException {
- int value = intp.intValue();
- value += longp.intValue();
+ long value = longp1.longValue();
+ value += longp2.longValue();
dOut.write(ValueTag.XS_DAY_TIME_DURATION_TAG);
- dOut.writeInt(value);
+ dOut.writeLong(value);
}
@Override
- public void operateDTDurationTime(IntegerPointable intp1, XSTimePointable timep2, DataOutput dOut)
+ public void operateDTDurationTime(LongPointable longp1, XSTimePointable timep2, DataOutput dOut)
throws SystemException, IOException {
abvsInner.reset();
// Add duration.
- DateTime.normalizeDateTime(timep2.getYearMonth(), timep2.getDayTime() + intp1.getInteger(), dOutInner);
+ DateTime.normalizeDateTime(timep2.getYearMonth(), timep2.getDayTime() + longp1.getLong(), dOutInner);
byte[] bytes = abvsInner.getByteArray();
// Convert to time.
bytes[XSTimePointable.HOUR_OFFSET] = bytes[XSDateTimePointable.HOUR_OFFSET];
@@ -292,9 +292,9 @@ public class AddOperation extends Abstra
}
@Override
- public void operateFloatDTDuration(FloatPointable floatp, IntegerPointable intp, DataOutput dOut)
+ public void operateFloatDTDuration(FloatPointable floatp, LongPointable longp, DataOutput dOut)
throws SystemException, IOException {
- operateDTDurationFloat(intp, floatp, dOut);
+ operateDTDurationFloat(longp, floatp, dOut);
}
@Override
@@ -334,9 +334,9 @@ public class AddOperation extends Abstra
}
@Override
- public void operateIntegerDTDuration(LongPointable longp, IntegerPointable intp, DataOutput dOut)
+ public void operateIntegerDTDuration(LongPointable longp1, LongPointable longp2, DataOutput dOut)
throws SystemException, IOException {
- operateDTDurationInteger(intp, longp, dOut);
+ operateDTDurationInteger(longp2, longp1, dOut);
}
@Override
@@ -364,9 +364,9 @@ public class AddOperation extends Abstra
}
@Override
- public void operateTimeDTDuration(XSTimePointable timep, IntegerPointable intp, DataOutput dOut)
+ public void operateTimeDTDuration(XSTimePointable timep1, LongPointable longp2, DataOutput dOut)
throws SystemException, IOException {
- operateDTDurationTime(intp, timep, dOut);
+ operateDTDurationTime(longp2, timep1, dOut);
}
@Override
@@ -420,11 +420,11 @@ public class AddOperation extends Abstra
dOut.writeInt(value);
}
- public int operateIntDecimal(int intValue, XSDecimalPointable decp2) throws SystemException, IOException {
+ public long operateLongDecimal(long longValue, XSDecimalPointable decp2) throws SystemException, IOException {
abvsInner.reset();
XSDecimalPointable decp1 = new XSDecimalPointable();
decp1.set(abvsInner.getByteArray(), abvsInner.getStartOffset(), XSDecimalPointable.TYPE_TRAITS.getFixedLength());
- decp1.setDecimal(intValue, (byte) 0);
+ decp1.setDecimal(longValue, (byte) 0);
// Prepare
long value1 = decp1.getDecimalValue();
long value2 = decp2.getDecimalValue();
@@ -450,6 +450,6 @@ public class AddOperation extends Abstra
value1 += value2;
// Save
decp2.setDecimal(value1, place1);
- return decp2.intValue();
+ return decp2.longValue();
}
}
\ No newline at end of file
Modified: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/DivideOperation.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/DivideOperation.java?rev=1375866&r1=1375865&r2=1375866&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/DivideOperation.java (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/DivideOperation.java Wed Aug 22 00:37:39 2012
@@ -29,7 +29,7 @@ public class DivideOperation extends Abs
}
@Override
- public void operateDateDTDuration(XSDatePointable datep, IntegerPointable intp, DataOutput dOut)
+ public void operateDateDTDuration(XSDatePointable datep, LongPointable longp, DataOutput dOut)
throws SystemException, IOException {
throw new UnsupportedOperationException();
}
@@ -41,7 +41,7 @@ public class DivideOperation extends Abs
}
@Override
- public void operateDatetimeDTDuration(XSDateTimePointable datetimep, IntegerPointable intp, DataOutput dOut)
+ public void operateDatetimeDTDuration(XSDateTimePointable datetimep, LongPointable longp, DataOutput dOut)
throws SystemException, IOException {
throw new UnsupportedOperationException();
}
@@ -88,7 +88,7 @@ public class DivideOperation extends Abs
}
@Override
- public void operateDecimalDTDuration(XSDecimalPointable decp1, IntegerPointable intp2, DataOutput dOut)
+ public void operateDecimalDTDuration(XSDecimalPointable decp1, LongPointable longp2, DataOutput dOut)
throws SystemException, IOException {
throw new UnsupportedOperationException();
}
@@ -146,7 +146,7 @@ public class DivideOperation extends Abs
}
@Override
- public void operateDoubleDTDuration(DoublePointable doublep, IntegerPointable intp, DataOutput dOut)
+ public void operateDoubleDTDuration(DoublePointable doublep, LongPointable longp, DataOutput dOut)
throws SystemException, IOException {
throw new UnsupportedOperationException();
}
@@ -179,43 +179,43 @@ public class DivideOperation extends Abs
}
@Override
- public void operateDTDurationDate(IntegerPointable intp, XSDatePointable datep, DataOutput dOut)
+ public void operateDTDurationDate(LongPointable longp, XSDatePointable datep, DataOutput dOut)
throws SystemException, IOException {
throw new UnsupportedOperationException();
}
@Override
- public void operateDTDurationDatetime(IntegerPointable intp, XSDateTimePointable datetimep, DataOutput dOut)
+ public void operateDTDurationDatetime(LongPointable longp, XSDateTimePointable datetimep, DataOutput dOut)
throws SystemException, IOException {
throw new UnsupportedOperationException();
}
@Override
- public void operateDTDurationDecimal(IntegerPointable intp, XSDecimalPointable decp, DataOutput dOut)
+ public void operateDTDurationDecimal(LongPointable longp, XSDecimalPointable decp, DataOutput dOut)
throws SystemException, IOException {
if (decp.getDecimalValue() == 0) {
throw new SystemException(ErrorCode.FOAR0001);
}
- int value = intp.intValue();
- value /= decp.intValue();
+ long value = longp.longValue();
+ value /= decp.longValue();
dOut.write(ValueTag.XS_DAY_TIME_DURATION_TAG);
- dOut.writeInt(value);
+ dOut.writeLong(value);
}
@Override
- public void operateDTDurationDouble(IntegerPointable intp, DoublePointable doublep, DataOutput dOut)
+ public void operateDTDurationDouble(LongPointable longp, DoublePointable doublep, DataOutput dOut)
throws SystemException, IOException {
- int value = intp.intValue();
- value /= doublep.intValue();
+ double value = longp.doubleValue();
+ value /= doublep.doubleValue();
dOut.write(ValueTag.XS_DAY_TIME_DURATION_TAG);
- dOut.writeInt(value);
+ dOut.writeLong((long) value);
}
@Override
- public void operateDTDurationDTDuration(IntegerPointable intp, IntegerPointable intp2, DataOutput dOut)
+ public void operateDTDurationDTDuration(LongPointable longp1, LongPointable longp2, DataOutput dOut)
throws SystemException, IOException {
- double value = intp.intValue();
- value /= intp2.intValue();
+ double value = longp1.longValue();
+ value /= longp2.longValue();
abvsInner.reset();
DoublePointable doublep = new DoublePointable();
@@ -226,28 +226,28 @@ public class DivideOperation extends Abs
}
@Override
- public void operateDTDurationFloat(IntegerPointable intp, FloatPointable floatp, DataOutput dOut)
+ public void operateDTDurationFloat(LongPointable longp, FloatPointable floatp, DataOutput dOut)
throws SystemException, IOException {
- float value = intp.floatValue();
+ float value = longp.floatValue();
value /= floatp.intValue();
dOut.write(ValueTag.XS_DAY_TIME_DURATION_TAG);
- dOut.writeInt((int) value);
+ dOut.writeLong((long) value);
}
@Override
- public void operateDTDurationInteger(IntegerPointable intp, LongPointable longp, DataOutput dOut)
+ public void operateDTDurationInteger(LongPointable longp1, LongPointable longp2, DataOutput dOut)
throws SystemException, IOException {
- if (longp.getLong() == 0) {
+ if (longp2.getLong() == 0) {
throw new SystemException(ErrorCode.FOAR0001);
}
- int value = intp.intValue();
- value /= longp.intValue();
+ long value = longp1.longValue();
+ value /= longp2.longValue();
dOut.write(ValueTag.XS_DAY_TIME_DURATION_TAG);
- dOut.writeInt(value);
+ dOut.writeLong(value);
}
@Override
- public void operateDTDurationTime(IntegerPointable intp, XSTimePointable timep, DataOutput dOut)
+ public void operateDTDurationTime(LongPointable longp, XSTimePointable timep, DataOutput dOut)
throws SystemException, IOException {
throw new UnsupportedOperationException();
}
@@ -274,7 +274,7 @@ public class DivideOperation extends Abs
}
@Override
- public void operateFloatDTDuration(FloatPointable floatp1, IntegerPointable intp2, DataOutput dOut)
+ public void operateFloatDTDuration(FloatPointable floatp1, LongPointable longp2, DataOutput dOut)
throws SystemException, IOException {
throw new UnsupportedOperationException();
}
@@ -329,7 +329,7 @@ public class DivideOperation extends Abs
}
@Override
- public void operateIntegerDTDuration(LongPointable longp, IntegerPointable intp, DataOutput dOut)
+ public void operateIntegerDTDuration(LongPointable longp1, LongPointable longp2, DataOutput dOut)
throws SystemException, IOException {
throw new UnsupportedOperationException();
}
@@ -368,7 +368,7 @@ public class DivideOperation extends Abs
}
@Override
- public void operateTimeDTDuration(XSTimePointable timep, IntegerPointable intp, DataOutput dOut)
+ public void operateTimeDTDuration(XSTimePointable timep, LongPointable longp, DataOutput dOut)
throws SystemException, IOException {
throw new UnsupportedOperationException();
}
Modified: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/IntegerDivideOperation.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/IntegerDivideOperation.java?rev=1375866&r1=1375865&r2=1375866&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/IntegerDivideOperation.java (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/IntegerDivideOperation.java Wed Aug 22 00:37:39 2012
@@ -28,7 +28,7 @@ public class IntegerDivideOperation exte
}
@Override
- public void operateDateDTDuration(XSDatePointable datep, IntegerPointable intp, DataOutput dOut)
+ public void operateDateDTDuration(XSDatePointable datep, LongPointable longp, DataOutput dOut)
throws SystemException, IOException {
throw new UnsupportedOperationException();
}
@@ -40,7 +40,7 @@ public class IntegerDivideOperation exte
}
@Override
- public void operateDatetimeDTDuration(XSDateTimePointable datetimep, IntegerPointable intp, DataOutput dOut)
+ public void operateDatetimeDTDuration(XSDateTimePointable datetimep, LongPointable longp, DataOutput dOut)
throws SystemException, IOException {
throw new UnsupportedOperationException();
}
@@ -105,7 +105,7 @@ public class IntegerDivideOperation exte
}
@Override
- public void operateDecimalDTDuration(XSDecimalPointable decp, IntegerPointable intp, DataOutput dOut)
+ public void operateDecimalDTDuration(XSDecimalPointable decp, LongPointable longp, DataOutput dOut)
throws SystemException, IOException {
throw new UnsupportedOperationException();
}
@@ -170,7 +170,7 @@ public class IntegerDivideOperation exte
}
@Override
- public void operateDoubleDTDuration(DoublePointable doublep1, IntegerPointable intp2, DataOutput dOut)
+ public void operateDoubleDTDuration(DoublePointable doublep1, LongPointable longp2, DataOutput dOut)
throws SystemException, IOException {
throw new UnsupportedOperationException();
}
@@ -210,49 +210,49 @@ public class IntegerDivideOperation exte
}
@Override
- public void operateDTDurationDate(IntegerPointable intp, XSDatePointable datep, DataOutput dOut)
+ public void operateDTDurationDate(LongPointable longp, XSDatePointable datep, DataOutput dOut)
throws SystemException, IOException {
throw new UnsupportedOperationException();
}
@Override
- public void operateDTDurationDatetime(IntegerPointable intp, XSDateTimePointable datetimep, DataOutput dOut)
+ public void operateDTDurationDatetime(LongPointable longp, XSDateTimePointable datetimep, DataOutput dOut)
throws SystemException, IOException {
throw new UnsupportedOperationException();
}
@Override
- public void operateDTDurationDecimal(IntegerPointable intp, XSDecimalPointable decp, DataOutput dOut)
+ public void operateDTDurationDecimal(LongPointable longp, XSDecimalPointable decp, DataOutput dOut)
throws SystemException, IOException {
throw new UnsupportedOperationException();
}
@Override
- public void operateDTDurationDouble(IntegerPointable intp, DoublePointable doublep, DataOutput dOut)
+ public void operateDTDurationDouble(LongPointable longp, DoublePointable doublep, DataOutput dOut)
throws SystemException, IOException {
throw new UnsupportedOperationException();
}
@Override
- public void operateDTDurationDTDuration(IntegerPointable intp, IntegerPointable intp2, DataOutput dOut)
+ public void operateDTDurationDTDuration(LongPointable longp, LongPointable longp2, DataOutput dOut)
throws SystemException, IOException {
throw new UnsupportedOperationException();
}
@Override
- public void operateDTDurationFloat(IntegerPointable intp, FloatPointable floatp, DataOutput dOut)
+ public void operateDTDurationFloat(LongPointable longp, FloatPointable floatp, DataOutput dOut)
throws SystemException, IOException {
throw new UnsupportedOperationException();
}
@Override
- public void operateDTDurationInteger(IntegerPointable intp, LongPointable longp, DataOutput dOut)
+ public void operateDTDurationInteger(LongPointable longp1, LongPointable longp2, DataOutput dOut)
throws SystemException, IOException {
throw new UnsupportedOperationException();
}
@Override
- public void operateDTDurationTime(IntegerPointable intp1, XSTimePointable timep2, DataOutput dOut)
+ public void operateDTDurationTime(LongPointable longp1, XSTimePointable timep2, DataOutput dOut)
throws SystemException, IOException {
throw new UnsupportedOperationException();
}
@@ -285,7 +285,7 @@ public class IntegerDivideOperation exte
}
@Override
- public void operateFloatDTDuration(FloatPointable floatp, IntegerPointable intp, DataOutput dOut)
+ public void operateFloatDTDuration(FloatPointable floatp, LongPointable longp, DataOutput dOut)
throws SystemException, IOException {
throw new UnsupportedOperationException();
}
@@ -349,7 +349,7 @@ public class IntegerDivideOperation exte
}
@Override
- public void operateIntegerDTDuration(LongPointable longp, IntegerPointable intp, DataOutput dOut)
+ public void operateIntegerDTDuration(LongPointable longp1, LongPointable longp2, DataOutput dOut)
throws SystemException, IOException {
throw new UnsupportedOperationException();
}
@@ -385,7 +385,7 @@ public class IntegerDivideOperation exte
}
@Override
- public void operateTimeDTDuration(XSTimePointable timep, IntegerPointable intp, DataOutput dOut)
+ public void operateTimeDTDuration(XSTimePointable timep, LongPointable longp, DataOutput dOut)
throws SystemException, IOException {
throw new UnsupportedOperationException();
}
Modified: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/ModOperation.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/ModOperation.java?rev=1375866&r1=1375865&r2=1375866&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/ModOperation.java (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/ModOperation.java Wed Aug 22 00:37:39 2012
@@ -28,7 +28,7 @@ public class ModOperation extends Abstra
}
@Override
- public void operateDateDTDuration(XSDatePointable datep, IntegerPointable intp, DataOutput dOut)
+ public void operateDateDTDuration(XSDatePointable datep, LongPointable longp, DataOutput dOut)
throws SystemException, IOException {
throw new UnsupportedOperationException();
}
@@ -40,7 +40,7 @@ public class ModOperation extends Abstra
}
@Override
- public void operateDatetimeDTDuration(XSDateTimePointable datetimep, IntegerPointable intp, DataOutput dOut)
+ public void operateDatetimeDTDuration(XSDateTimePointable datetimep, LongPointable longp, DataOutput dOut)
throws SystemException, IOException {
throw new UnsupportedOperationException();
}
@@ -100,7 +100,7 @@ public class ModOperation extends Abstra
}
@Override
- public void operateDecimalDTDuration(XSDecimalPointable decp, IntegerPointable intp, DataOutput dOut)
+ public void operateDecimalDTDuration(XSDecimalPointable decp, LongPointable longp, DataOutput dOut)
throws SystemException, IOException {
throw new UnsupportedOperationException();
}
@@ -149,7 +149,7 @@ public class ModOperation extends Abstra
}
@Override
- public void operateDoubleDTDuration(DoublePointable doublep1, IntegerPointable intp2, DataOutput dOut)
+ public void operateDoubleDTDuration(DoublePointable doublep1, LongPointable longp2, DataOutput dOut)
throws SystemException, IOException {
throw new UnsupportedOperationException();
}
@@ -179,49 +179,49 @@ public class ModOperation extends Abstra
}
@Override
- public void operateDTDurationDate(IntegerPointable intp, XSDatePointable datep, DataOutput dOut)
+ public void operateDTDurationDate(LongPointable longp, XSDatePointable datep, DataOutput dOut)
throws SystemException, IOException {
throw new UnsupportedOperationException();
}
@Override
- public void operateDTDurationDatetime(IntegerPointable intp, XSDateTimePointable datetimep, DataOutput dOut)
+ public void operateDTDurationDatetime(LongPointable longp, XSDateTimePointable datetimep, DataOutput dOut)
throws SystemException, IOException {
throw new UnsupportedOperationException();
}
@Override
- public void operateDTDurationDecimal(IntegerPointable intp, XSDecimalPointable decp, DataOutput dOut)
+ public void operateDTDurationDecimal(LongPointable longp, XSDecimalPointable decp, DataOutput dOut)
throws SystemException, IOException {
throw new UnsupportedOperationException();
}
@Override
- public void operateDTDurationDouble(IntegerPointable intp, DoublePointable doublep, DataOutput dOut)
+ public void operateDTDurationDouble(LongPointable longp, DoublePointable doublep, DataOutput dOut)
throws SystemException, IOException {
throw new UnsupportedOperationException();
}
@Override
- public void operateDTDurationDTDuration(IntegerPointable intp, IntegerPointable intp2, DataOutput dOut)
+ public void operateDTDurationDTDuration(LongPointable longp, LongPointable longp2, DataOutput dOut)
throws SystemException, IOException {
throw new UnsupportedOperationException();
}
@Override
- public void operateDTDurationFloat(IntegerPointable intp, FloatPointable floatp, DataOutput dOut)
+ public void operateDTDurationFloat(LongPointable longp, FloatPointable floatp, DataOutput dOut)
throws SystemException, IOException {
throw new UnsupportedOperationException();
}
@Override
- public void operateDTDurationInteger(IntegerPointable intp, LongPointable longp, DataOutput dOut)
+ public void operateDTDurationInteger(LongPointable longp1, LongPointable longp2, DataOutput dOut)
throws SystemException, IOException {
throw new UnsupportedOperationException();
}
@Override
- public void operateDTDurationTime(IntegerPointable intp1, XSTimePointable timep2, DataOutput dOut)
+ public void operateDTDurationTime(LongPointable longp1, XSTimePointable timep2, DataOutput dOut)
throws SystemException, IOException {
throw new UnsupportedOperationException();
}
@@ -245,7 +245,7 @@ public class ModOperation extends Abstra
}
@Override
- public void operateFloatDTDuration(FloatPointable floatp, IntegerPointable intp, DataOutput dOut)
+ public void operateFloatDTDuration(FloatPointable floatp, LongPointable longp, DataOutput dOut)
throws SystemException, IOException {
throw new UnsupportedOperationException();
}
@@ -294,7 +294,7 @@ public class ModOperation extends Abstra
}
@Override
- public void operateIntegerDTDuration(LongPointable longp, IntegerPointable intp, DataOutput dOut)
+ public void operateIntegerDTDuration(LongPointable longp1, LongPointable longp2, DataOutput dOut)
throws SystemException, IOException {
throw new UnsupportedOperationException();
}
@@ -324,7 +324,7 @@ public class ModOperation extends Abstra
}
@Override
- public void operateTimeDTDuration(XSTimePointable timep, IntegerPointable intp, DataOutput dOut)
+ public void operateTimeDTDuration(XSTimePointable timep, LongPointable longp, DataOutput dOut)
throws SystemException, IOException {
throw new UnsupportedOperationException();
}
Modified: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/MultiplyOperation.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/MultiplyOperation.java?rev=1375866&r1=1375865&r2=1375866&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/MultiplyOperation.java (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/MultiplyOperation.java Wed Aug 22 00:37:39 2012
@@ -28,7 +28,7 @@ public class MultiplyOperation extends A
}
@Override
- public void operateDateDTDuration(XSDatePointable datep, IntegerPointable intp, DataOutput dOut)
+ public void operateDateDTDuration(XSDatePointable datep, LongPointable longp, DataOutput dOut)
throws SystemException, IOException {
throw new UnsupportedOperationException();
}
@@ -40,7 +40,7 @@ public class MultiplyOperation extends A
}
@Override
- public void operateDatetimeDTDuration(XSDateTimePointable datetimep, IntegerPointable intp, DataOutput dOut)
+ public void operateDatetimeDTDuration(XSDateTimePointable datetimep, LongPointable longp, DataOutput dOut)
throws SystemException, IOException {
throw new UnsupportedOperationException();
}
@@ -84,11 +84,11 @@ public class MultiplyOperation extends A
}
@Override
- public void operateDecimalDTDuration(XSDecimalPointable decp, IntegerPointable intp, DataOutput dOut)
+ public void operateDecimalDTDuration(XSDecimalPointable decp, LongPointable longp, DataOutput dOut)
throws SystemException, IOException {
- int value = operateIntDecimal(intp.intValue(), decp);
+ long value = operateLongDecimal(longp.longValue(), decp);
dOut.write(ValueTag.XS_DAY_TIME_DURATION_TAG);
- dOut.writeInt(value);
+ dOut.writeLong(value);
}
@Override
@@ -113,7 +113,7 @@ public class MultiplyOperation extends A
@Override
public void operateDecimalYMDuration(XSDecimalPointable decp1, IntegerPointable intp, DataOutput dOut)
throws SystemException, IOException {
- int value = operateIntDecimal(intp.intValue(), decp1);
+ int value = (int) operateLongDecimal(intp.intValue(), decp1);
dOut.write(ValueTag.XS_YEAR_MONTH_DURATION_TAG);
dOut.writeInt(value);
}
@@ -134,9 +134,9 @@ public class MultiplyOperation extends A
}
@Override
- public void operateDoubleDTDuration(DoublePointable doublep, IntegerPointable intp, DataOutput dOut)
+ public void operateDoubleDTDuration(DoublePointable doublep, LongPointable longp, DataOutput dOut)
throws SystemException, IOException {
- operateDTDurationDouble(intp, doublep, dOut);
+ operateDTDurationDouble(longp, doublep, dOut);
}
@Override
@@ -167,61 +167,61 @@ public class MultiplyOperation extends A
}
@Override
- public void operateDTDurationDate(IntegerPointable intp, XSDatePointable datep, DataOutput dOut)
+ public void operateDTDurationDate(LongPointable longp, XSDatePointable datep, DataOutput dOut)
throws SystemException, IOException {
throw new UnsupportedOperationException();
}
@Override
- public void operateDTDurationDatetime(IntegerPointable intp, XSDateTimePointable datetimep, DataOutput dOut)
+ public void operateDTDurationDatetime(LongPointable longp, XSDateTimePointable datetimep, DataOutput dOut)
throws SystemException, IOException {
throw new UnsupportedOperationException();
}
@Override
- public void operateDTDurationDecimal(IntegerPointable intp, XSDecimalPointable decp, DataOutput dOut)
+ public void operateDTDurationDecimal(LongPointable longp, XSDecimalPointable decp, DataOutput dOut)
throws SystemException, IOException {
- operateDecimalDTDuration(decp, intp, dOut);
+ operateDecimalDTDuration(decp, longp, dOut);
}
@Override
- public void operateDTDurationDouble(IntegerPointable intp, DoublePointable doublep, DataOutput dOut)
+ public void operateDTDurationDouble(LongPointable longp, DoublePointable doublep, DataOutput dOut)
throws SystemException, IOException {
- int value = intp.intValue();
- value *= doublep.intValue();
+ long value = longp.longValue();
+ value *= doublep.longValue();
dOut.write(ValueTag.XS_DAY_TIME_DURATION_TAG);
- dOut.writeInt(value);
+ dOut.writeLong(value);
}
@Override
- public void operateDTDurationDTDuration(IntegerPointable intp, IntegerPointable intp2, DataOutput dOut)
+ public void operateDTDurationDTDuration(LongPointable longp1, LongPointable longp2, DataOutput dOut)
throws SystemException, IOException {
- int value = intp.intValue();
- value *= intp2.intValue();
+ long value = longp1.longValue();
+ value *= longp2.longValue();
dOut.write(ValueTag.XS_DAY_TIME_DURATION_TAG);
- dOut.writeInt(value);
+ dOut.writeLong(value);
}
@Override
- public void operateDTDurationFloat(IntegerPointable intp, FloatPointable floatp, DataOutput dOut)
+ public void operateDTDurationFloat(LongPointable longp, FloatPointable floatp, DataOutput dOut)
throws SystemException, IOException {
- int value = intp.intValue();
- value *= floatp.intValue();
+ long value = longp.longValue();
+ value *= floatp.longValue();
dOut.write(ValueTag.XS_DAY_TIME_DURATION_TAG);
- dOut.writeInt(value);
+ dOut.writeLong(value);
}
@Override
- public void operateDTDurationInteger(IntegerPointable intp, LongPointable longp, DataOutput dOut)
+ public void operateDTDurationInteger(LongPointable longp1, LongPointable longp2, DataOutput dOut)
throws SystemException, IOException {
- int value = intp.intValue();
- value *= longp.intValue();
+ long value = longp1.longValue();
+ value *= longp2.longValue();
dOut.write(ValueTag.XS_DAY_TIME_DURATION_TAG);
- dOut.writeInt(value);
+ dOut.writeLong(value);
}
@Override
- public void operateDTDurationTime(IntegerPointable intp, XSTimePointable timep, DataOutput dOut)
+ public void operateDTDurationTime(LongPointable longp, XSTimePointable timep, DataOutput dOut)
throws SystemException, IOException {
throw new UnsupportedOperationException();
}
@@ -239,9 +239,9 @@ public class MultiplyOperation extends A
}
@Override
- public void operateFloatDTDuration(FloatPointable floatp, IntegerPointable intp, DataOutput dOut)
+ public void operateFloatDTDuration(FloatPointable floatp, LongPointable longp, DataOutput dOut)
throws SystemException, IOException {
- operateDTDurationFloat(intp, floatp, dOut);
+ operateDTDurationFloat(longp, floatp, dOut);
}
@Override
@@ -281,9 +281,9 @@ public class MultiplyOperation extends A
}
@Override
- public void operateIntegerDTDuration(LongPointable longp, IntegerPointable intp, DataOutput dOut)
+ public void operateIntegerDTDuration(LongPointable longp1, LongPointable longp2, DataOutput dOut)
throws SystemException, IOException {
- operateDTDurationInteger(intp, longp, dOut);
+ operateDTDurationInteger(longp2, longp1, dOut);
}
@Override
@@ -311,7 +311,7 @@ public class MultiplyOperation extends A
}
@Override
- public void operateTimeDTDuration(XSTimePointable timep, IntegerPointable intp, DataOutput dOut)
+ public void operateTimeDTDuration(XSTimePointable timep, LongPointable longp, DataOutput dOut)
throws SystemException, IOException {
throw new UnsupportedOperationException();
}
@@ -367,11 +367,11 @@ public class MultiplyOperation extends A
dOut.writeInt(value);
}
- public int operateIntDecimal(int intValue, XSDecimalPointable decp2) throws SystemException, IOException {
+ public long operateLongDecimal(long longValue, XSDecimalPointable decp2) throws SystemException, IOException {
abvsInner.reset();
XSDecimalPointable decp1 = new XSDecimalPointable();
decp1.set(abvsInner.getByteArray(), abvsInner.getStartOffset(), XSDecimalPointable.TYPE_TRAITS.getFixedLength());
- decp1.setDecimal(intValue, (byte) 0);
+ decp1.setDecimal(longValue, (byte) 0);
// Prepare
long value1 = decp1.getDecimalValue();
long value2 = decp2.getDecimalValue();
@@ -385,7 +385,7 @@ public class MultiplyOperation extends A
place1 += place2;
// Save
decp2.setDecimal(value1, place1);
- return decp2.intValue();
+ return decp2.longValue();
}
}
\ No newline at end of file
Modified: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/SubtractOperation.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/SubtractOperation.java?rev=1375866&r1=1375865&r2=1375866&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/SubtractOperation.java (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/SubtractOperation.java Wed Aug 22 00:37:39 2012
@@ -41,11 +41,11 @@ public class SubtractOperation extends A
}
@Override
- public void operateDateDTDuration(XSDatePointable datep1, IntegerPointable intp2, DataOutput dOut)
+ public void operateDateDTDuration(XSDatePointable datep1, LongPointable longp2, DataOutput dOut)
throws SystemException, IOException {
// Add duration.
abvsInner1.reset();
- DateTime.normalizeDateTime(datep1.getYearMonth(), datep1.getDayTime() - intp2.getInteger(), dOutInner1);
+ DateTime.normalizeDateTime(datep1.getYearMonth(), datep1.getDayTime() - longp2.getLong(), dOutInner1);
byte[] bytes = abvsInner1.getByteArray();
// Convert to date.
bytes[XSDatePointable.TIMEZONE_HOUR_OFFSET] = bytes[XSDateTimePointable.TIMEZONE_HOUR_OFFSET];
@@ -96,15 +96,15 @@ public class SubtractOperation extends A
}
// Save.
dOut.write(ValueTag.XS_DAY_TIME_DURATION_TAG);
- dOut.write((int) dayTime1);
+ dOut.writeLong(dayTime1);
}
@Override
- public void operateDatetimeDTDuration(XSDateTimePointable datetimep, IntegerPointable intp, DataOutput dOut)
+ public void operateDatetimeDTDuration(XSDateTimePointable datetimep, LongPointable longp, DataOutput dOut)
throws SystemException, IOException {
// Add duration.
abvsInner1.reset();
- DateTime.normalizeDateTime(datetimep.getYearMonth(), datetimep.getDayTime() - intp.getInteger(), dOutInner1);
+ DateTime.normalizeDateTime(datetimep.getYearMonth(), datetimep.getDayTime() - longp.getLong(), dOutInner1);
dOut.write(ValueTag.XS_DATETIME_TAG);
dOut.write(abvsInner1.getByteArray());
}
@@ -175,11 +175,11 @@ public class SubtractOperation extends A
}
@Override
- public void operateDecimalDTDuration(XSDecimalPointable decp, IntegerPointable intp, DataOutput dOut)
+ public void operateDecimalDTDuration(XSDecimalPointable decp, LongPointable longp, DataOutput dOut)
throws SystemException, IOException {
- int value = operateDecimalInt(decp, intp.intValue());
+ long value = operateDecimalInt(decp, longp.longValue());
dOut.write(ValueTag.XS_DAY_TIME_DURATION_TAG);
- dOut.writeInt(value);
+ dOut.writeLong(value);
}
@Override
@@ -196,7 +196,8 @@ public class SubtractOperation extends A
throws SystemException, IOException {
abvsInner1.reset();
XSDecimalPointable decp2 = new XSDecimalPointable();
- decp2.set(abvsInner1.getByteArray(), abvsInner1.getStartOffset(), XSDecimalPointable.TYPE_TRAITS.getFixedLength());
+ decp2.set(abvsInner1.getByteArray(), abvsInner1.getStartOffset(),
+ XSDecimalPointable.TYPE_TRAITS.getFixedLength());
decp2.setDecimal(longp2.longValue(), (byte) 0);
operateDecimalDecimal(decp1, decp2, dOut);
}
@@ -204,7 +205,7 @@ public class SubtractOperation extends A
@Override
public void operateDecimalYMDuration(XSDecimalPointable decp, IntegerPointable intp, DataOutput dOut)
throws SystemException, IOException {
- int value = operateDecimalInt(decp, intp.intValue());
+ int value = (int) operateDecimalInt(decp, intp.intValue());
dOut.write(ValueTag.XS_YEAR_MONTH_DURATION_TAG);
dOut.writeInt(value);
}
@@ -228,12 +229,12 @@ public class SubtractOperation extends A
}
@Override
- public void operateDoubleDTDuration(DoublePointable doublep, IntegerPointable intp, DataOutput dOut)
+ public void operateDoubleDTDuration(DoublePointable doublep, LongPointable longp, DataOutput dOut)
throws SystemException, IOException {
- int value = doublep.intValue();
- value -= intp.intValue();
+ long value = doublep.intValue();
+ value -= longp.intValue();
dOut.write(ValueTag.XS_DAY_TIME_DURATION_TAG);
- dOut.writeInt(value);
+ dOut.writeLong(value);
}
@Override
@@ -264,64 +265,64 @@ public class SubtractOperation extends A
}
@Override
- public void operateDTDurationDate(IntegerPointable intp, XSDatePointable datep, DataOutput dOut)
+ public void operateDTDurationDate(LongPointable longp, XSDatePointable datep, DataOutput dOut)
throws SystemException, IOException {
throw new UnsupportedOperationException();
}
@Override
- public void operateDTDurationDatetime(IntegerPointable intp, XSDateTimePointable datetimep, DataOutput dOut)
+ public void operateDTDurationDatetime(LongPointable longp, XSDateTimePointable datetimep, DataOutput dOut)
throws SystemException, IOException {
throw new UnsupportedOperationException();
}
@Override
- public void operateDTDurationDecimal(IntegerPointable intp, XSDecimalPointable decp, DataOutput dOut)
+ public void operateDTDurationDecimal(LongPointable longp, XSDecimalPointable decp, DataOutput dOut)
throws SystemException, IOException {
- int value = intp.intValue();
- value -= decp.intValue();
+ long value = longp.longValue();
+ value -= decp.longValue();
dOut.write(ValueTag.XS_DAY_TIME_DURATION_TAG);
- dOut.writeInt(value);
+ dOut.writeLong(value);
}
@Override
- public void operateDTDurationDouble(IntegerPointable intp, DoublePointable doublep, DataOutput dOut)
+ public void operateDTDurationDouble(LongPointable longp, DoublePointable doublep, DataOutput dOut)
throws SystemException, IOException {
- int value = intp.intValue();
- value -= doublep.intValue();
+ long value = longp.longValue();
+ value -= doublep.longValue();
dOut.write(ValueTag.XS_DAY_TIME_DURATION_TAG);
- dOut.writeInt(value);
+ dOut.writeLong(value);
}
@Override
- public void operateDTDurationDTDuration(IntegerPointable intp, IntegerPointable intp2, DataOutput dOut)
+ public void operateDTDurationDTDuration(LongPointable longp1, LongPointable longp2, DataOutput dOut)
throws SystemException, IOException {
- int value = intp.intValue();
- value -= intp2.intValue();
+ long value = longp1.longValue();
+ value -= longp2.longValue();
dOut.write(ValueTag.XS_DAY_TIME_DURATION_TAG);
- dOut.writeInt(value);
+ dOut.writeLong(value);
}
@Override
- public void operateDTDurationFloat(IntegerPointable intp, FloatPointable floatp, DataOutput dOut)
+ public void operateDTDurationFloat(LongPointable longp, FloatPointable floatp, DataOutput dOut)
throws SystemException, IOException {
- int value = intp.intValue();
- value -= floatp.intValue();
+ long value = longp.longValue();
+ value -= floatp.longValue();
dOut.write(ValueTag.XS_DAY_TIME_DURATION_TAG);
- dOut.writeInt(value);
+ dOut.writeLong(value);
}
@Override
- public void operateDTDurationInteger(IntegerPointable intp, LongPointable longp, DataOutput dOut)
+ public void operateDTDurationInteger(LongPointable longp1, LongPointable longp2, DataOutput dOut)
throws SystemException, IOException {
- int value = intp.intValue();
- value -= longp.intValue();
+ long value = longp1.longValue();
+ value -= longp2.longValue();
dOut.write(ValueTag.XS_DAY_TIME_DURATION_TAG);
- dOut.writeInt(value);
+ dOut.writeLong(value);
}
@Override
- public void operateDTDurationTime(IntegerPointable intp, XSTimePointable timep, DataOutput dOut)
+ public void operateDTDurationTime(LongPointable longp, XSTimePointable timep, DataOutput dOut)
throws SystemException, IOException {
throw new UnsupportedOperationException();
}
@@ -345,12 +346,12 @@ public class SubtractOperation extends A
}
@Override
- public void operateFloatDTDuration(FloatPointable floatp, IntegerPointable intp, DataOutput dOut)
+ public void operateFloatDTDuration(FloatPointable floatp, LongPointable longp, DataOutput dOut)
throws SystemException, IOException {
- int value = floatp.intValue();
- value -= intp.intValue();
+ long value = floatp.longValue();
+ value -= longp.longValue();
dOut.write(ValueTag.XS_DAY_TIME_DURATION_TAG);
- dOut.writeInt(value);
+ dOut.writeLong(value);
}
@Override
@@ -399,12 +400,12 @@ public class SubtractOperation extends A
}
@Override
- public void operateIntegerDTDuration(LongPointable longp, IntegerPointable intp, DataOutput dOut)
+ public void operateIntegerDTDuration(LongPointable longp1, LongPointable longp2, DataOutput dOut)
throws SystemException, IOException {
- int value = longp.intValue();
- value -= intp.intValue();
+ long value = longp1.longValue();
+ value -= longp2.longValue();
dOut.write(ValueTag.XS_DAY_TIME_DURATION_TAG);
- dOut.writeInt(value);
+ dOut.writeLong(value);
}
@Override
@@ -435,11 +436,11 @@ public class SubtractOperation extends A
}
@Override
- public void operateTimeDTDuration(XSTimePointable timep1, IntegerPointable intp2, DataOutput dOut)
+ public void operateTimeDTDuration(XSTimePointable timep1, LongPointable longp2, DataOutput dOut)
throws SystemException, IOException {
// Add duration.
abvsInner1.reset();
- DateTime.normalizeDateTime(0, timep1.getDayTime() - intp2.getInteger(), dOutInner1);
+ DateTime.normalizeDateTime(0, timep1.getDayTime() - longp2.getLong(), dOutInner1);
byte[] bytes = abvsInner1.getByteArray();
// Convert to date.
bytes[XSTimePointable.HOUR_OFFSET] = bytes[XSDateTimePointable.HOUR_OFFSET];
@@ -524,11 +525,12 @@ public class SubtractOperation extends A
dOut.writeInt(value);
}
- public int operateIntDecimal(int intValue, XSDecimalPointable decp2) throws SystemException, IOException {
+ public long operateIntDecimal(long longValue, XSDecimalPointable decp2) throws SystemException, IOException {
abvsInner1.reset();
XSDecimalPointable decp1 = new XSDecimalPointable();
- decp1.set(abvsInner1.getByteArray(), abvsInner1.getStartOffset(), XSDecimalPointable.TYPE_TRAITS.getFixedLength());
- decp1.setDecimal(intValue, (byte) 0);
+ decp1.set(abvsInner1.getByteArray(), abvsInner1.getStartOffset(),
+ XSDecimalPointable.TYPE_TRAITS.getFixedLength());
+ decp1.setDecimal(longValue, (byte) 0);
// Prepare
long value1 = decp1.getDecimalValue();
long value2 = decp2.getDecimalValue();
@@ -554,14 +556,15 @@ public class SubtractOperation extends A
value1 -= value2;
// Save
decp2.setDecimal(value1, place1);
- return decp2.intValue();
+ return decp2.longValue();
}
- public int operateDecimalInt(XSDecimalPointable decp1, int intValue) throws SystemException, IOException {
+ public long operateDecimalInt(XSDecimalPointable decp1, long longValue) throws SystemException, IOException {
abvsInner1.reset();
XSDecimalPointable decp2 = new XSDecimalPointable();
- decp2.set(abvsInner1.getByteArray(), abvsInner1.getStartOffset(), XSDecimalPointable.TYPE_TRAITS.getFixedLength());
- decp2.setDecimal(intValue, (byte) 0);
+ decp2.set(abvsInner1.getByteArray(), abvsInner1.getStartOffset(),
+ XSDecimalPointable.TYPE_TRAITS.getFixedLength());
+ decp2.setDecimal(longValue, (byte) 0);
// Prepare
long value1 = decp1.getDecimalValue();
long value2 = decp2.getDecimalValue();
@@ -587,7 +590,7 @@ public class SubtractOperation extends A
value1 -= value2;
// Save
decp2.setDecimal(value1, place1);
- return decp2.intValue();
+ return decp2.longValue();
}
}
\ No newline at end of file
Modified: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/AbstractCastToOperation.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/AbstractCastToOperation.java?rev=1375866&r1=1375865&r2=1375866&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/AbstractCastToOperation.java (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/AbstractCastToOperation.java Wed Aug 22 00:37:39 2012
@@ -55,7 +55,7 @@ public abstract class AbstractCastToOper
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/cast/CastScalarEvaluatorFactory.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastScalarEvaluatorFactory.java?rev=1375866&r1=1375865&r2=1375866&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastScalarEvaluatorFactory.java (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastScalarEvaluatorFactory.java Wed Aug 22 00:37:39 2012
@@ -110,8 +110,8 @@ public class CastScalarEvaluatorFactory
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/cast/CastToDTDurationOperation.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToDTDurationOperation.java?rev=1375866&r1=1375865&r2=1375866&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToDTDurationOperation.java (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToDTDurationOperation.java Wed Aug 22 00:37:39 2012
@@ -12,20 +12,21 @@ import org.apache.vxquery.runtime.functi
import org.apache.vxquery.runtime.functions.strings.UTF8StringCharacterIterator;
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;
public class CastToDTDurationOperation extends AbstractCastToOperation {
@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_DAY_TIME_DURATION_TAG);
- dOut.write(intp.getByteArray(), intp.getStartOffset(), intp.getLength());
+ dOut.write(longp.getByteArray(), longp.getStartOffset(), longp.getLength());
}
@Override
public void convertDuration(XSDurationPointable durationp, DataOutput dOut) throws SystemException, IOException {
dOut.write(ValueTag.XS_DAY_TIME_DURATION_TAG);
- dOut.writeInt(durationp.getDayTime());
+ dOut.writeLong(durationp.getDayTime());
}
@Override
@@ -85,13 +86,13 @@ public class CastToDTDurationOperation e
long dayTime = day * DateTime.CHRONON_OF_DAY + hour * DateTime.CHRONON_OF_HOUR + minute
* DateTime.CHRONON_OF_MINUTE + millisecond;
dOut.write(ValueTag.XS_DAY_TIME_DURATION_TAG);
- dOut.writeInt((int) (negativeResult * dayTime));
+ dOut.writeLong(negativeResult * dayTime);
}
@Override
public void convertYMDuration(IntegerPointable intp, DataOutput dOut) throws SystemException, IOException {
dOut.write(ValueTag.XS_DAY_TIME_DURATION_TAG);
- dOut.writeInt(0);
+ dOut.writeLong(0);
}
@Override
Modified: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToDurationOperation.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToDurationOperation.java?rev=1375866&r1=1375865&r2=1375866&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToDurationOperation.java (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToDurationOperation.java Wed Aug 22 00:37:39 2012
@@ -12,15 +12,16 @@ import org.apache.vxquery.runtime.functi
import org.apache.vxquery.runtime.functions.strings.UTF8StringCharacterIterator;
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;
public class CastToDurationOperation extends AbstractCastToOperation {
@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_DURATION_TAG);
dOut.writeInt(0);
- dOut.writeInt(intp.getInteger());
+ dOut.writeLong(longp.getLong());
}
@Override
@@ -97,14 +98,14 @@ public class CastToDurationOperation ext
* DateTime.CHRONON_OF_MINUTE + millisecond);
dOut.write(ValueTag.XS_DURATION_TAG);
dOut.writeInt((int) yearMonth);
- dOut.writeInt((int) dayTime);
+ dOut.writeLong(dayTime);
}
@Override
public void convertYMDuration(IntegerPointable intp, DataOutput dOut) throws SystemException, IOException {
dOut.write(ValueTag.XS_DURATION_TAG);
dOut.writeInt(intp.getInteger());
- dOut.writeInt(0);
+ dOut.writeLong(0);
}
@Override
Modified: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToStringOperation.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToStringOperation.java?rev=1375866&r1=1375865&r2=1375866&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToStringOperation.java (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToStringOperation.java Wed Aug 22 00:37:39 2012
@@ -285,9 +285,9 @@ public class CastToStringOperation exten
}
@Override
- public void convertDTDuration(IntegerPointable intp, DataOutput dOut) throws SystemException, IOException {
+ public void convertDTDuration(LongPointable longp, DataOutput dOut) throws SystemException, IOException {
abvsInner.reset();
- int dayTime = intp.getInteger();
+ long dayTime = longp.getLong();
if (dayTime == 0) {
writeCharSequence("PT0S", dOutInner);
@@ -340,7 +340,7 @@ public class CastToStringOperation exten
public void convertDuration(XSDurationPointable durationp, DataOutput dOut) throws SystemException, IOException {
abvsInner.reset();
int yearMonth = durationp.getYearMonth();
- int dayTime = durationp.getDayTime();
+ long dayTime = durationp.getDayTime();
if (yearMonth < 0 || dayTime < 0) {
writeChar('-', dOutInner);
Modified: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToYMDurationOperation.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToYMDurationOperation.java?rev=1375866&r1=1375865&r2=1375866&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToYMDurationOperation.java (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToYMDurationOperation.java Wed Aug 22 00:37:39 2012
@@ -11,12 +11,13 @@ import org.apache.vxquery.runtime.functi
import org.apache.vxquery.runtime.functions.strings.UTF8StringCharacterIterator;
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;
public class CastToYMDurationOperation extends AbstractCastToOperation {
@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_YEAR_MONTH_DURATION_TAG);
dOut.writeInt(0);
}
Modified: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/AbstractCastableAsOperation.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/AbstractCastableAsOperation.java?rev=1375866&r1=1375865&r2=1375866&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/AbstractCastableAsOperation.java (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/AbstractCastableAsOperation.java Wed Aug 22 00:37:39 2012
@@ -58,7 +58,7 @@ public abstract class AbstractCastableAs
dOut.write((byte) 0);
}
- 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) 0);
}
Modified: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsDTDurationOperation.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsDTDurationOperation.java?rev=1375866&r1=1375865&r2=1375866&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsDTDurationOperation.java (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsDTDurationOperation.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.CastToDTDurationOperation;
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 CastableAsDTDurationOperati
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);
}