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/10 01:13:41 UTC
svn commit: r1371528 - in
/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison:
ValueEqComparisonOperation.java ValueLtComparisonOperation.java
Author: prestonc
Date: Thu Aug 9 23:13:40 2012
New Revision: 1371528
URL: http://svn.apache.org/viewvc?rev=1371528&view=rev
Log:
Updated the Array Backed Value Store to not overwrite its self.
Modified:
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
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=1371528&r1=1371527&r2=1371528&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 Thu Aug 9 23:13:40 2012
@@ -24,8 +24,10 @@ import edu.uci.ics.hyracks.data.std.prim
import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
public class ValueEqComparisonOperation extends AbstractValueComparisonOperation {
- protected final ArrayBackedValueStorage abvs = new ArrayBackedValueStorage();
- protected final DataOutput dOut = abvs.getDataOutput();
+ protected final ArrayBackedValueStorage abvs1 = new ArrayBackedValueStorage();
+ protected final DataOutput dOut1 = abvs1.getDataOutput();
+ protected final ArrayBackedValueStorage abvs2 = new ArrayBackedValueStorage();
+ protected final DataOutput dOut2 = abvs1.getDataOutput();
@Override
public boolean operateAnyURIAnyURI(UTF8StringPointable stringp1, UTF8StringPointable stringp2)
@@ -48,13 +50,13 @@ public class ValueEqComparisonOperation
@Override
public boolean operateDateDate(XSDatePointable datep1, XSDatePointable datep2, DynamicContext dCtx)
throws SystemException, IOException {
- abvs.reset();
- DateTime.getTimezoneDateTime(datep1, dCtx, dOut);
- byte[] bytes1 = abvs.getByteArray();
-
- abvs.reset();
- DateTime.getTimezoneDateTime(datep2, dCtx, dOut);
- byte[] bytes2 = abvs.getByteArray();
+ abvs1.reset();
+ DateTime.getTimezoneDateTime(datep1, dCtx, dOut1);
+ byte[] bytes1 = abvs1.getByteArray();
+
+ abvs2.reset();
+ DateTime.getTimezoneDateTime(datep2, dCtx, dOut2);
+ byte[] bytes2 = abvs2.getByteArray();
if (XSDateTimePointable.getYearMonth(bytes1, 0) == XSDateTimePointable.getYearMonth(bytes2, 0)
&& XSDateTimePointable.getDayTime(bytes1, 0) == XSDateTimePointable.getDayTime(bytes2, 0)) {
@@ -66,13 +68,13 @@ public class ValueEqComparisonOperation
@Override
public boolean operateDatetimeDatetime(XSDateTimePointable datetimep1, XSDateTimePointable datetimep2,
DynamicContext dCtx) throws SystemException, IOException {
- abvs.reset();
- DateTime.getTimezoneDateTime(datetimep1, dCtx, dOut);
- byte[] bytes1 = abvs.getByteArray();
-
- abvs.reset();
- DateTime.getTimezoneDateTime(datetimep2, dCtx, dOut);
- byte[] bytes2 = abvs.getByteArray();
+ abvs1.reset();
+ DateTime.getTimezoneDateTime(datetimep1, dCtx, dOut1);
+ byte[] bytes1 = abvs1.getByteArray();
+
+ abvs2.reset();
+ DateTime.getTimezoneDateTime(datetimep2, dCtx, dOut2);
+ byte[] bytes2 = abvs2.getByteArray();
if (XSDateTimePointable.getYearMonth(bytes1, 0) == XSDateTimePointable.getYearMonth(bytes2, 0)
&& XSDateTimePointable.getDayTime(bytes1, 0) == XSDateTimePointable.getDayTime(bytes2, 0)) {
@@ -270,13 +272,13 @@ public class ValueEqComparisonOperation
@Override
public boolean operateTimeTime(XSTimePointable timep1, XSTimePointable timep2, DynamicContext dCtx)
throws SystemException, IOException {
- abvs.reset();
- DateTime.getTimezoneDateTime(timep1, dCtx, dOut);
- byte[] bytes1 = abvs.getByteArray();
-
- abvs.reset();
- DateTime.getTimezoneDateTime(timep2, dCtx, dOut);
- byte[] bytes2 = abvs.getByteArray();
+ abvs1.reset();
+ DateTime.getTimezoneDateTime(timep1, dCtx, dOut1);
+ byte[] bytes1 = abvs1.getByteArray();
+
+ abvs2.reset();
+ DateTime.getTimezoneDateTime(timep2, dCtx, dOut2);
+ byte[] bytes2 = abvs2.getByteArray();
return XSDateTimePointable.getDayTime(bytes1, 0) == XSDateTimePointable.getDayTime(bytes2, 0);
}
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=1371528&r1=1371527&r2=1371528&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 Thu Aug 9 23:13:40 2012
@@ -23,8 +23,10 @@ import edu.uci.ics.hyracks.data.std.prim
import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
public class ValueLtComparisonOperation extends AbstractValueComparisonOperation {
- protected final ArrayBackedValueStorage abvs = new ArrayBackedValueStorage();
- protected final DataOutput dOut = abvs.getDataOutput();
+ protected final ArrayBackedValueStorage abvs1 = new ArrayBackedValueStorage();
+ protected final DataOutput dOut1 = abvs1.getDataOutput();
+ protected final ArrayBackedValueStorage abvs2 = new ArrayBackedValueStorage();
+ protected final DataOutput dOut2 = abvs2.getDataOutput();
@Override
public boolean operateAnyURIAnyURI(UTF8StringPointable stringp1, UTF8StringPointable stringp2)
@@ -47,13 +49,13 @@ public class ValueLtComparisonOperation
@Override
public boolean operateDateDate(XSDatePointable datep1, XSDatePointable datep2, DynamicContext dCtx)
throws SystemException, IOException {
- abvs.reset();
- DateTime.getTimezoneDateTime(datep1, dCtx, dOut);
- byte[] bytes1 = abvs.getByteArray();
-
- abvs.reset();
- DateTime.getTimezoneDateTime(datep2, dCtx, dOut);
- byte[] bytes2 = abvs.getByteArray();
+ abvs1.reset();
+ DateTime.getTimezoneDateTime(datep1, dCtx, dOut1);
+ byte[] bytes1 = abvs1.getByteArray();
+
+ abvs2.reset();
+ DateTime.getTimezoneDateTime(datep2, dCtx, dOut2);
+ byte[] bytes2 = abvs2.getByteArray();
if (XSDateTimePointable.getYearMonth(bytes1, 0) < XSDateTimePointable.getYearMonth(bytes2, 0)
&& XSDateTimePointable.getDayTime(bytes1, 0) < XSDateTimePointable.getDayTime(bytes2, 0)) {
@@ -65,13 +67,13 @@ public class ValueLtComparisonOperation
@Override
public boolean operateDatetimeDatetime(XSDateTimePointable datetimep1, XSDateTimePointable datetimep2,
DynamicContext dCtx) throws SystemException, IOException {
- abvs.reset();
- DateTime.getTimezoneDateTime(datetimep1, dCtx, dOut);
- byte[] bytes1 = abvs.getByteArray();
-
- abvs.reset();
- DateTime.getTimezoneDateTime(datetimep2, dCtx, dOut);
- byte[] bytes2 = abvs.getByteArray();
+ abvs1.reset();
+ DateTime.getTimezoneDateTime(datetimep1, dCtx, dOut1);
+ byte[] bytes1 = abvs1.getByteArray();
+
+ abvs2.reset();
+ DateTime.getTimezoneDateTime(datetimep2, dCtx, dOut2);
+ byte[] bytes2 = abvs2.getByteArray();
if (XSDateTimePointable.getYearMonth(bytes1, 0) < XSDateTimePointable.getYearMonth(bytes2, 0)
&& XSDateTimePointable.getDayTime(bytes1, 0) < XSDateTimePointable.getDayTime(bytes2, 0)) {
@@ -269,13 +271,13 @@ public class ValueLtComparisonOperation
@Override
public boolean operateTimeTime(XSTimePointable timep1, XSTimePointable timep2, DynamicContext dCtx)
throws SystemException, IOException {
- abvs.reset();
- DateTime.getTimezoneDateTime(timep1, dCtx, dOut);
- byte[] bytes1 = abvs.getByteArray();
-
- abvs.reset();
- DateTime.getTimezoneDateTime(timep2, dCtx, dOut);
- byte[] bytes2 = abvs.getByteArray();
+ abvs1.reset();
+ DateTime.getTimezoneDateTime(timep1, dCtx, dOut1);
+ byte[] bytes1 = abvs1.getByteArray();
+
+ abvs2.reset();
+ DateTime.getTimezoneDateTime(timep2, dCtx, dOut2);
+ byte[] bytes2 = abvs2.getByteArray();
return XSDateTimePointable.getDayTime(bytes1, 0) < XSDateTimePointable.getDayTime(bytes2, 0);
}