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/07/25 20:15:53 UTC
svn commit: r1365684 -
/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/
Author: prestonc
Date: Wed Jul 25 18:15:53 2012
New Revision: 1365684
URL: http://svn.apache.org/viewvc?rev=1365684&view=rev
Log:
Updated the exceptions thrown by comparison functions and fixed the decimal comparisons. Also ran the eclipse auto formating on each file.
Modified:
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/ValueGeComparisonOperation.java
incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueGtComparisonOperation.java
incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueLeComparisonOperation.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/runtime/functions/comparison/ValueNeComparisonOperation.java
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=1365684&r1=1365683&r2=1365684&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 Jul 25 18:15:53 2012
@@ -1,5 +1,7 @@
package org.apache.vxquery.runtime.functions.comparison;
+import java.io.IOException;
+
import org.apache.vxquery.context.DynamicContext;
import org.apache.vxquery.datamodel.accessors.atomic.XSBinaryPointable;
import org.apache.vxquery.datamodel.accessors.atomic.XSDatePointable;
@@ -8,6 +10,7 @@ import org.apache.vxquery.datamodel.acce
import org.apache.vxquery.datamodel.accessors.atomic.XSDurationPointable;
import org.apache.vxquery.datamodel.accessors.atomic.XSQNamePointable;
import org.apache.vxquery.datamodel.accessors.atomic.XSTimePointable;
+import org.apache.vxquery.exceptions.SystemException;
import edu.uci.ics.hyracks.data.std.primitive.BooleanPointable;
import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
@@ -25,179 +28,212 @@ public abstract class AbstractDisjunctiv
protected abstract AbstractValueComparisonOperation createBaseComparisonOperation2();
@Override
- public boolean operateAnyURIAnyURI(UTF8StringPointable stringp1, UTF8StringPointable stringp2) throws Exception {
+ public boolean operateAnyURIAnyURI(UTF8StringPointable stringp1, UTF8StringPointable stringp2)
+ throws SystemException, IOException {
return (aOp1.operateAnyURIAnyURI(stringp1, stringp2) || aOp2.operateAnyURIAnyURI(stringp1, stringp2));
}
@Override
public boolean operateBase64BinaryBase64Binary(XSBinaryPointable binaryp1, XSBinaryPointable binaryp2)
- throws Exception {
+ throws SystemException, IOException {
return (aOp1.operateBase64BinaryBase64Binary(binaryp1, binaryp2) || aOp2.operateBase64BinaryBase64Binary(
binaryp1, binaryp2));
}
@Override
- public boolean operateBooleanBoolean(BooleanPointable boolp1, BooleanPointable boolp2) throws Exception {
+ public boolean operateBooleanBoolean(BooleanPointable boolp1, BooleanPointable boolp2) throws SystemException,
+ IOException {
return (aOp1.operateBooleanBoolean(boolp1, boolp2) || aOp2.operateBooleanBoolean(boolp1, boolp2));
}
@Override
- public boolean operateDateDate(XSDatePointable datep1, XSDatePointable datep2, DynamicContext dCtx) throws Exception {
+ public boolean operateDateDate(XSDatePointable datep1, XSDatePointable datep2, DynamicContext dCtx)
+ throws SystemException, IOException {
return (aOp1.operateDateDate(datep1, datep2, dCtx) || aOp2.operateDateDate(datep1, datep2, dCtx));
}
@Override
- public boolean operateDatetimeDatetime(XSDateTimePointable datetimep1, XSDateTimePointable datetimep2, DynamicContext dCtx)
- throws Exception {
+ public boolean operateDatetimeDatetime(XSDateTimePointable datetimep1, XSDateTimePointable datetimep2,
+ DynamicContext dCtx) throws SystemException, IOException {
return (aOp1.operateDatetimeDatetime(datetimep1, datetimep2, dCtx) || aOp2.operateDatetimeDatetime(datetimep1,
datetimep2, dCtx));
}
@Override
- public boolean operateDecimalDecimal(XSDecimalPointable decp1, XSDecimalPointable decp2) throws Exception {
+ public boolean operateDecimalDecimal(XSDecimalPointable decp1, XSDecimalPointable decp2) throws SystemException,
+ IOException {
return (aOp1.operateDecimalDecimal(decp1, decp2) || aOp2.operateDecimalDecimal(decp1, decp2));
}
@Override
- public boolean operateDecimalDouble(XSDecimalPointable decp1, DoublePointable doublep2) throws Exception {
+ public boolean operateDecimalDouble(XSDecimalPointable decp1, DoublePointable doublep2) throws SystemException,
+ IOException {
return (aOp1.operateDecimalDouble(decp1, doublep2) || aOp2.operateDecimalDouble(decp1, doublep2));
}
@Override
- public boolean operateDecimalFloat(XSDecimalPointable decp1, FloatPointable floatp2) throws Exception {
+ public boolean operateDecimalFloat(XSDecimalPointable decp1, FloatPointable floatp2) throws SystemException,
+ IOException {
return (aOp1.operateDecimalFloat(decp1, floatp2) || aOp2.operateDecimalFloat(decp1, floatp2));
}
@Override
- public boolean operateDecimalInteger(XSDecimalPointable decp1, LongPointable longp2) throws Exception {
+ public boolean operateDecimalInteger(XSDecimalPointable decp1, LongPointable longp2) throws SystemException,
+ IOException {
return (aOp1.operateDecimalInteger(decp1, longp2) || aOp2.operateDecimalInteger(decp1, longp2));
}
@Override
- public boolean operateDoubleDecimal(DoublePointable doublep1, XSDecimalPointable decp2) throws Exception {
+ public boolean operateDoubleDecimal(DoublePointable doublep1, XSDecimalPointable decp2) throws SystemException,
+ IOException {
return (aOp1.operateDoubleDecimal(doublep1, decp2) || aOp2.operateDoubleDecimal(doublep1, decp2));
}
@Override
- public boolean operateDoubleDouble(DoublePointable doublep1, DoublePointable doublep2) throws Exception {
+ public boolean operateDoubleDouble(DoublePointable doublep1, DoublePointable doublep2) throws SystemException,
+ IOException {
return (aOp1.operateDoubleDouble(doublep1, doublep2) || aOp2.operateDoubleDouble(doublep1, doublep2));
}
@Override
- public boolean operateDoubleFloat(DoublePointable doublep1, FloatPointable floatp2) throws Exception {
+ public boolean operateDoubleFloat(DoublePointable doublep1, FloatPointable floatp2) throws SystemException,
+ IOException {
return (aOp1.operateDoubleFloat(doublep1, floatp2) || aOp2.operateDoubleFloat(doublep1, floatp2));
}
@Override
- public boolean operateDoubleInteger(DoublePointable doublep1, LongPointable longp2) throws Exception {
+ public boolean operateDoubleInteger(DoublePointable doublep1, LongPointable longp2) throws SystemException,
+ IOException {
return (aOp1.operateDoubleInteger(doublep1, longp2) || aOp2.operateDoubleInteger(doublep1, longp2));
}
@Override
- public boolean operateDTDurationDTDuration(IntegerPointable intp1, IntegerPointable intp2) throws Exception {
+ public boolean operateDTDurationDTDuration(IntegerPointable intp1, IntegerPointable intp2) throws SystemException,
+ IOException {
return (aOp1.operateDTDurationDTDuration(intp1, intp2) || aOp2.operateDTDurationDTDuration(intp1, intp2));
}
@Override
public boolean operateDurationDuration(XSDurationPointable durationp1, XSDurationPointable durationp2)
- throws Exception {
+ throws SystemException, IOException {
return (aOp1.operateDurationDuration(durationp1, durationp2) || aOp2.operateDurationDuration(durationp1,
durationp2));
}
@Override
- public boolean operateFloatDecimal(FloatPointable floatp1, XSDecimalPointable decp2) throws Exception {
+ public boolean operateFloatDecimal(FloatPointable floatp1, XSDecimalPointable decp2) throws SystemException,
+ IOException {
return (aOp1.operateFloatDecimal(floatp1, decp2) || aOp2.operateFloatDecimal(floatp1, decp2));
}
@Override
- public boolean operateFloatDouble(FloatPointable floatp1, DoublePointable doublep2) throws Exception {
+ public boolean operateFloatDouble(FloatPointable floatp1, DoublePointable doublep2) throws SystemException,
+ IOException {
return (aOp1.operateFloatDouble(floatp1, doublep2) || aOp2.operateFloatDouble(floatp1, doublep2));
}
@Override
- public boolean operateFloatFloat(FloatPointable floatp1, FloatPointable floatp2) throws Exception {
+ public boolean operateFloatFloat(FloatPointable floatp1, FloatPointable floatp2) throws SystemException,
+ IOException {
return (aOp1.operateFloatFloat(floatp1, floatp2) || aOp2.operateFloatFloat(floatp1, floatp2));
}
@Override
- public boolean operateFloatInteger(FloatPointable floatp1, LongPointable longp2) throws Exception {
+ public boolean operateFloatInteger(FloatPointable floatp1, LongPointable longp2) throws SystemException,
+ IOException {
return (aOp1.operateFloatInteger(floatp1, longp2) || aOp2.operateFloatInteger(floatp1, longp2));
}
@Override
- public boolean operateGDayGDay(XSDatePointable datep1, XSDatePointable datep2, DynamicContext dCtx) throws Exception {
+ public boolean operateGDayGDay(XSDatePointable datep1, XSDatePointable datep2, DynamicContext dCtx)
+ throws SystemException, IOException {
return (aOp1.operateGDayGDay(datep1, datep2, dCtx) || aOp2.operateGDayGDay(datep1, datep2, dCtx));
}
@Override
- public boolean operateGMonthDayGMonthDay(XSDatePointable datep1, XSDatePointable datep2, DynamicContext dCtx) throws Exception {
- return (aOp1.operateGMonthDayGMonthDay(datep1, datep2, dCtx) || aOp2.operateGMonthDayGMonthDay(datep1, datep2, dCtx));
+ public boolean operateGMonthDayGMonthDay(XSDatePointable datep1, XSDatePointable datep2, DynamicContext dCtx)
+ throws SystemException, IOException {
+ return (aOp1.operateGMonthDayGMonthDay(datep1, datep2, dCtx) || aOp2.operateGMonthDayGMonthDay(datep1, datep2,
+ dCtx));
}
@Override
- public boolean operateGMonthGMonth(XSDatePointable datep1, XSDatePointable datep2, DynamicContext dCtx) throws Exception {
+ public boolean operateGMonthGMonth(XSDatePointable datep1, XSDatePointable datep2, DynamicContext dCtx)
+ throws SystemException, IOException {
return (aOp1.operateGMonthGMonth(datep1, datep2, dCtx) || aOp2.operateGMonthGMonth(datep1, datep2, dCtx));
}
@Override
- public boolean operateGYearGYear(XSDatePointable datep1, XSDatePointable datep2, DynamicContext dCtx) throws Exception {
+ public boolean operateGYearGYear(XSDatePointable datep1, XSDatePointable datep2, DynamicContext dCtx)
+ throws SystemException, IOException {
return (aOp1.operateGYearGYear(datep1, datep2, dCtx) || aOp2.operateGYearGYear(datep1, datep2, dCtx));
}
@Override
- public boolean operateGYearMonthGYearMonth(XSDatePointable datep1, XSDatePointable datep2, DynamicContext dCtx) throws Exception {
- return (aOp1.operateGYearMonthGYearMonth(datep1, datep2, dCtx) || aOp2.operateGYearMonthGYearMonth(datep1, datep2, dCtx));
+ public boolean operateGYearMonthGYearMonth(XSDatePointable datep1, XSDatePointable datep2, DynamicContext dCtx)
+ throws SystemException, IOException {
+ return (aOp1.operateGYearMonthGYearMonth(datep1, datep2, dCtx) || aOp2.operateGYearMonthGYearMonth(datep1,
+ datep2, dCtx));
}
@Override
- public boolean operateHexBinaryHexBinary(XSBinaryPointable binaryp1, XSBinaryPointable binaryp2) throws Exception {
+ public boolean operateHexBinaryHexBinary(XSBinaryPointable binaryp1, XSBinaryPointable binaryp2)
+ throws SystemException, IOException {
return (aOp1.operateHexBinaryHexBinary(binaryp1, binaryp2) || aOp2
.operateHexBinaryHexBinary(binaryp1, binaryp2));
}
@Override
- public boolean operateIntegerDecimal(LongPointable longp1, XSDecimalPointable decp2) throws Exception {
+ public boolean operateIntegerDecimal(LongPointable longp1, XSDecimalPointable decp2) throws SystemException,
+ IOException {
return (aOp1.operateIntegerDecimal(longp1, decp2) || aOp2.operateIntegerDecimal(longp1, decp2));
}
@Override
- public boolean operateIntegerDouble(LongPointable longp1, DoublePointable doublep2) throws Exception {
+ public boolean operateIntegerDouble(LongPointable longp1, DoublePointable doublep2) throws SystemException,
+ IOException {
return (aOp1.operateIntegerDouble(longp1, doublep2) || aOp2.operateIntegerDouble(longp1, doublep2));
}
@Override
- public boolean operateIntegerFloat(LongPointable longp1, FloatPointable floatp2) throws Exception {
+ public boolean operateIntegerFloat(LongPointable longp1, FloatPointable floatp2) throws SystemException,
+ IOException {
return (aOp1.operateIntegerFloat(longp1, floatp2) || aOp2.operateIntegerFloat(longp1, floatp2));
}
@Override
- public boolean operateIntegerInteger(LongPointable longp1, LongPointable longp2) throws Exception {
+ public boolean operateIntegerInteger(LongPointable longp1, LongPointable longp2) throws SystemException,
+ IOException {
return (aOp1.operateIntegerInteger(longp1, longp2) || aOp2.operateIntegerInteger(longp1, longp2));
}
@Override
- public boolean operateNotationNotation(UTF8StringPointable stringp1, UTF8StringPointable stringp2) throws Exception {
+ public boolean operateNotationNotation(UTF8StringPointable stringp1, UTF8StringPointable stringp2)
+ throws SystemException, IOException {
return (aOp1.operateNotationNotation(stringp1, stringp2) || aOp2.operateNotationNotation(stringp1, stringp2));
}
@Override
- public boolean operateQNameQName(XSQNamePointable qnamep1, XSQNamePointable qnamep2) throws Exception {
+ public boolean operateQNameQName(XSQNamePointable qnamep1, XSQNamePointable qnamep2) throws SystemException,
+ IOException {
return (aOp1.operateQNameQName(qnamep1, qnamep2) || aOp2.operateQNameQName(qnamep1, qnamep2));
}
@Override
- public boolean operateStringString(UTF8StringPointable stringp1, UTF8StringPointable stringp2) throws Exception {
+ public boolean operateStringString(UTF8StringPointable stringp1, UTF8StringPointable stringp2)
+ throws SystemException, IOException {
return (aOp1.operateStringString(stringp1, stringp2) || aOp2.operateStringString(stringp1, stringp2));
}
@Override
- public boolean operateTimeTime(XSTimePointable timep1, XSTimePointable timep2, DynamicContext dCtx) throws Exception {
+ public boolean operateTimeTime(XSTimePointable timep1, XSTimePointable timep2, DynamicContext dCtx)
+ throws SystemException, IOException {
return (aOp1.operateTimeTime(timep1, timep2, dCtx) || aOp2.operateTimeTime(timep1, timep2, dCtx));
}
@Override
- public boolean operateYMDurationYMDuration(IntegerPointable intp1, IntegerPointable intp2) throws Exception {
+ public boolean operateYMDurationYMDuration(IntegerPointable intp1, IntegerPointable intp2) throws SystemException,
+ IOException {
return (aOp1.operateYMDurationYMDuration(intp1, intp2) || aOp2.operateYMDurationYMDuration(intp1, intp2));
}
}
\ No newline at end of file
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=1365684&r1=1365683&r2=1365684&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 Jul 25 18:15:53 2012
@@ -1,5 +1,7 @@
package org.apache.vxquery.runtime.functions.comparison;
+import java.io.IOException;
+
import org.apache.vxquery.context.DynamicContext;
import org.apache.vxquery.datamodel.accessors.atomic.XSBinaryPointable;
import org.apache.vxquery.datamodel.accessors.atomic.XSDatePointable;
@@ -8,6 +10,7 @@ import org.apache.vxquery.datamodel.acce
import org.apache.vxquery.datamodel.accessors.atomic.XSDurationPointable;
import org.apache.vxquery.datamodel.accessors.atomic.XSQNamePointable;
import org.apache.vxquery.datamodel.accessors.atomic.XSTimePointable;
+import org.apache.vxquery.exceptions.SystemException;
import edu.uci.ics.hyracks.data.std.primitive.BooleanPointable;
import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
@@ -22,175 +25,206 @@ public abstract class AbstractNegatingCo
protected abstract AbstractValueComparisonOperation createBaseComparisonOperation();
@Override
- public boolean operateAnyURIAnyURI(UTF8StringPointable stringp1, UTF8StringPointable stringp2) throws Exception {
+ public boolean operateAnyURIAnyURI(UTF8StringPointable stringp1, UTF8StringPointable stringp2)
+ throws SystemException, IOException {
return !aOp.operateAnyURIAnyURI(stringp1, stringp2);
}
@Override
public boolean operateBase64BinaryBase64Binary(XSBinaryPointable binaryp1, XSBinaryPointable binaryp2)
- throws Exception {
+ throws SystemException, IOException {
return !aOp.operateBase64BinaryBase64Binary(binaryp1, binaryp2);
}
@Override
- public boolean operateBooleanBoolean(BooleanPointable boolp1, BooleanPointable boolp2) throws Exception {
+ public boolean operateBooleanBoolean(BooleanPointable boolp1, BooleanPointable boolp2) throws SystemException,
+ IOException {
return !aOp.operateBooleanBoolean(boolp1, boolp2);
}
@Override
- public boolean operateDateDate(XSDatePointable datep1, XSDatePointable datep2, DynamicContext dCtx) throws Exception {
+ public boolean operateDateDate(XSDatePointable datep1, XSDatePointable datep2, DynamicContext dCtx)
+ throws SystemException, IOException {
return !aOp.operateDateDate(datep1, datep2, dCtx);
}
@Override
- public boolean operateDatetimeDatetime(XSDateTimePointable datetimep1, XSDateTimePointable datetimep2, DynamicContext dCtx)
- throws Exception {
+ public boolean operateDatetimeDatetime(XSDateTimePointable datetimep1, XSDateTimePointable datetimep2,
+ DynamicContext dCtx) throws SystemException, IOException {
return !aOp.operateDatetimeDatetime(datetimep1, datetimep2, dCtx);
}
@Override
- public boolean operateDecimalDecimal(XSDecimalPointable decp1, XSDecimalPointable decp2) throws Exception {
+ public boolean operateDecimalDecimal(XSDecimalPointable decp1, XSDecimalPointable decp2) throws SystemException,
+ IOException {
return !aOp.operateDecimalDecimal(decp1, decp2);
}
@Override
- public boolean operateDecimalDouble(XSDecimalPointable decp1, DoublePointable doublep2) throws Exception {
+ public boolean operateDecimalDouble(XSDecimalPointable decp1, DoublePointable doublep2) throws SystemException,
+ IOException {
return !aOp.operateDecimalDouble(decp1, doublep2);
}
@Override
- public boolean operateDecimalFloat(XSDecimalPointable decp1, FloatPointable floatp2) throws Exception {
+ public boolean operateDecimalFloat(XSDecimalPointable decp1, FloatPointable floatp2) throws SystemException,
+ IOException {
return !aOp.operateDecimalFloat(decp1, floatp2);
}
@Override
- public boolean operateDecimalInteger(XSDecimalPointable decp1, LongPointable longp2) throws Exception {
+ public boolean operateDecimalInteger(XSDecimalPointable decp1, LongPointable longp2) throws SystemException,
+ IOException {
return !aOp.operateDecimalInteger(decp1, longp2);
}
@Override
- public boolean operateDoubleDecimal(DoublePointable doublep1, XSDecimalPointable decp2) throws Exception {
+ public boolean operateDoubleDecimal(DoublePointable doublep1, XSDecimalPointable decp2) throws SystemException,
+ IOException {
return !aOp.operateDoubleDecimal(doublep1, decp2);
}
@Override
- public boolean operateDoubleDouble(DoublePointable doublep1, DoublePointable doublep2) throws Exception {
+ public boolean operateDoubleDouble(DoublePointable doublep1, DoublePointable doublep2) throws SystemException,
+ IOException {
return !aOp.operateDoubleDouble(doublep1, doublep2);
}
@Override
- public boolean operateDoubleFloat(DoublePointable doublep1, FloatPointable floatp2) throws Exception {
+ public boolean operateDoubleFloat(DoublePointable doublep1, FloatPointable floatp2) throws SystemException,
+ IOException {
return !aOp.operateDoubleFloat(doublep1, floatp2);
}
@Override
- public boolean operateDoubleInteger(DoublePointable doublep1, LongPointable longp2) throws Exception {
+ public boolean operateDoubleInteger(DoublePointable doublep1, LongPointable longp2) throws SystemException,
+ IOException {
return !aOp.operateDoubleInteger(doublep1, longp2);
}
@Override
- public boolean operateDTDurationDTDuration(IntegerPointable intp1, IntegerPointable intp2) throws Exception {
+ public boolean operateDTDurationDTDuration(IntegerPointable intp1, IntegerPointable intp2) throws SystemException,
+ IOException {
return !aOp.operateDTDurationDTDuration(intp1, intp2);
}
@Override
public boolean operateDurationDuration(XSDurationPointable durationp1, XSDurationPointable durationp2)
- throws Exception {
+ throws SystemException, IOException {
return !aOp.operateDurationDuration(durationp1, durationp2);
}
@Override
- public boolean operateFloatDecimal(FloatPointable floatp1, XSDecimalPointable decp2) throws Exception {
+ public boolean operateFloatDecimal(FloatPointable floatp1, XSDecimalPointable decp2) throws SystemException,
+ IOException {
return !aOp.operateFloatDecimal(floatp1, decp2);
}
@Override
- public boolean operateFloatDouble(FloatPointable floatp1, DoublePointable doublep2) throws Exception {
+ public boolean operateFloatDouble(FloatPointable floatp1, DoublePointable doublep2) throws SystemException,
+ IOException {
return !aOp.operateFloatDouble(floatp1, doublep2);
}
@Override
- public boolean operateFloatFloat(FloatPointable floatp1, FloatPointable floatp2) throws Exception {
+ public boolean operateFloatFloat(FloatPointable floatp1, FloatPointable floatp2) throws SystemException,
+ IOException {
return !aOp.operateFloatFloat(floatp1, floatp2);
}
@Override
- public boolean operateFloatInteger(FloatPointable floatp1, LongPointable longp2) throws Exception {
+ public boolean operateFloatInteger(FloatPointable floatp1, LongPointable longp2) throws SystemException,
+ IOException {
return !aOp.operateFloatInteger(floatp1, longp2);
}
@Override
- public boolean operateGDayGDay(XSDatePointable datep1, XSDatePointable datep2, DynamicContext dCtx) throws Exception {
+ public boolean operateGDayGDay(XSDatePointable datep1, XSDatePointable datep2, DynamicContext dCtx)
+ throws SystemException, IOException {
return !aOp.operateGDayGDay(datep1, datep2, dCtx);
}
@Override
- public boolean operateGMonthDayGMonthDay(XSDatePointable datep1, XSDatePointable datep2, DynamicContext dCtx) throws Exception {
+ public boolean operateGMonthDayGMonthDay(XSDatePointable datep1, XSDatePointable datep2, DynamicContext dCtx)
+ throws SystemException, IOException {
return !aOp.operateGMonthDayGMonthDay(datep1, datep2, dCtx);
}
@Override
- public boolean operateGMonthGMonth(XSDatePointable datep1, XSDatePointable datep2, DynamicContext dCtx) throws Exception {
+ public boolean operateGMonthGMonth(XSDatePointable datep1, XSDatePointable datep2, DynamicContext dCtx)
+ throws SystemException, IOException {
return !aOp.operateGMonthGMonth(datep1, datep2, dCtx);
}
@Override
- public boolean operateGYearGYear(XSDatePointable datep1, XSDatePointable datep2, DynamicContext dCtx) throws Exception {
+ public boolean operateGYearGYear(XSDatePointable datep1, XSDatePointable datep2, DynamicContext dCtx)
+ throws SystemException, IOException {
return !aOp.operateGYearGYear(datep1, datep2, dCtx);
}
@Override
- public boolean operateGYearMonthGYearMonth(XSDatePointable datep1, XSDatePointable datep2, DynamicContext dCtx) throws Exception {
+ public boolean operateGYearMonthGYearMonth(XSDatePointable datep1, XSDatePointable datep2, DynamicContext dCtx)
+ throws SystemException, IOException {
return !aOp.operateGYearMonthGYearMonth(datep1, datep2, dCtx);
}
@Override
- public boolean operateHexBinaryHexBinary(XSBinaryPointable binaryp1, XSBinaryPointable binaryp2) throws Exception {
+ public boolean operateHexBinaryHexBinary(XSBinaryPointable binaryp1, XSBinaryPointable binaryp2)
+ throws SystemException, IOException {
return !aOp.operateHexBinaryHexBinary(binaryp1, binaryp2);
}
@Override
- public boolean operateIntegerDecimal(LongPointable longp1, XSDecimalPointable decp2) throws Exception {
+ public boolean operateIntegerDecimal(LongPointable longp1, XSDecimalPointable decp2) throws SystemException,
+ IOException {
return !aOp.operateIntegerDecimal(longp1, decp2);
}
@Override
- public boolean operateIntegerDouble(LongPointable longp1, DoublePointable doublep2) throws Exception {
+ public boolean operateIntegerDouble(LongPointable longp1, DoublePointable doublep2) throws SystemException,
+ IOException {
return !aOp.operateIntegerDouble(longp1, doublep2);
}
@Override
- public boolean operateIntegerFloat(LongPointable longp1, FloatPointable floatp2) throws Exception {
+ public boolean operateIntegerFloat(LongPointable longp1, FloatPointable floatp2) throws SystemException,
+ IOException {
return !aOp.operateIntegerFloat(longp1, floatp2);
}
@Override
- public boolean operateIntegerInteger(LongPointable longp1, LongPointable longp2) throws Exception {
+ public boolean operateIntegerInteger(LongPointable longp1, LongPointable longp2) throws SystemException,
+ IOException {
return !aOp.operateIntegerInteger(longp1, longp2);
}
@Override
- public boolean operateNotationNotation(UTF8StringPointable stringp1, UTF8StringPointable stringp2) throws Exception {
+ public boolean operateNotationNotation(UTF8StringPointable stringp1, UTF8StringPointable stringp2)
+ throws SystemException, IOException {
return !aOp.operateNotationNotation(stringp1, stringp2);
}
@Override
- public boolean operateQNameQName(XSQNamePointable qnamep1, XSQNamePointable qnamep2) throws Exception {
+ public boolean operateQNameQName(XSQNamePointable qnamep1, XSQNamePointable qnamep2) throws SystemException,
+ IOException {
return !aOp.operateQNameQName(qnamep1, qnamep2);
}
@Override
- public boolean operateStringString(UTF8StringPointable stringp1, UTF8StringPointable stringp2) throws Exception {
+ public boolean operateStringString(UTF8StringPointable stringp1, UTF8StringPointable stringp2)
+ throws SystemException, IOException {
return !aOp.operateStringString(stringp1, stringp2);
}
@Override
- public boolean operateTimeTime(XSTimePointable timep1, XSTimePointable timep2, DynamicContext dCtx) throws Exception {
+ public boolean operateTimeTime(XSTimePointable timep1, XSTimePointable timep2, DynamicContext dCtx)
+ throws SystemException, IOException {
return !aOp.operateTimeTime(timep1, timep2, dCtx);
}
@Override
- public boolean operateYMDurationYMDuration(IntegerPointable intp1, IntegerPointable intp2) throws Exception {
+ public boolean operateYMDurationYMDuration(IntegerPointable intp1, IntegerPointable intp2) throws SystemException,
+ IOException {
return !aOp.operateYMDurationYMDuration(intp1, intp2);
}
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=1365684&r1=1365683&r2=1365684&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 Jul 25 18:15:53 2012
@@ -1,5 +1,7 @@
package org.apache.vxquery.runtime.functions.comparison;
+import java.io.IOException;
+
import org.apache.vxquery.context.DynamicContext;
import org.apache.vxquery.datamodel.accessors.atomic.XSBinaryPointable;
import org.apache.vxquery.datamodel.accessors.atomic.XSDatePointable;
@@ -8,6 +10,7 @@ import org.apache.vxquery.datamodel.acce
import org.apache.vxquery.datamodel.accessors.atomic.XSDurationPointable;
import org.apache.vxquery.datamodel.accessors.atomic.XSQNamePointable;
import org.apache.vxquery.datamodel.accessors.atomic.XSTimePointable;
+import org.apache.vxquery.exceptions.SystemException;
import edu.uci.ics.hyracks.data.std.primitive.BooleanPointable;
import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
@@ -18,86 +21,104 @@ import edu.uci.ics.hyracks.data.std.prim
public abstract class AbstractValueComparisonOperation {
public abstract boolean operateAnyURIAnyURI(UTF8StringPointable stringp, UTF8StringPointable stringp2)
- throws Exception;
+ throws SystemException, IOException;
public abstract boolean operateBase64BinaryBase64Binary(XSBinaryPointable binaryp1, XSBinaryPointable binaryp2)
- throws Exception;
+ throws SystemException, IOException;
- public abstract boolean operateBooleanBoolean(BooleanPointable boolp1, BooleanPointable boolp2) throws Exception;
+ public abstract boolean operateBooleanBoolean(BooleanPointable boolp1, BooleanPointable boolp2)
+ throws SystemException, IOException;
public abstract boolean operateDateDate(XSDatePointable datep1, XSDatePointable datep2, DynamicContext dCtx)
- throws Exception;
+ throws SystemException, IOException;
public abstract boolean operateDatetimeDatetime(XSDateTimePointable datetimep1, XSDateTimePointable datetimep2,
- DynamicContext dCtx) throws Exception;
+ DynamicContext dCtx) throws SystemException, IOException;
- public abstract boolean operateDecimalDecimal(XSDecimalPointable decp1, XSDecimalPointable decp2) throws Exception;
+ public abstract boolean operateDecimalDecimal(XSDecimalPointable decp1, XSDecimalPointable decp2)
+ throws SystemException, IOException;
- public abstract boolean operateDecimalDouble(XSDecimalPointable decp1, DoublePointable doublep2) throws Exception;
+ public abstract boolean operateDecimalDouble(XSDecimalPointable decp1, DoublePointable doublep2)
+ throws SystemException, IOException;
- public abstract boolean operateDecimalFloat(XSDecimalPointable decp1, FloatPointable floatp2) throws Exception;
+ public abstract boolean operateDecimalFloat(XSDecimalPointable decp1, FloatPointable floatp2)
+ throws SystemException, IOException;
- public abstract boolean operateDecimalInteger(XSDecimalPointable decp1, LongPointable longp2) throws Exception;
+ public abstract boolean operateDecimalInteger(XSDecimalPointable decp1, LongPointable longp2)
+ throws SystemException, IOException;
- public abstract boolean operateDoubleDecimal(DoublePointable doublep1, XSDecimalPointable decp2) throws Exception;
+ public abstract boolean operateDoubleDecimal(DoublePointable doublep1, XSDecimalPointable decp2)
+ throws SystemException, IOException;
- public abstract boolean operateDoubleDouble(DoublePointable doublep1, DoublePointable doublep2) throws Exception;
+ public abstract boolean operateDoubleDouble(DoublePointable doublep1, DoublePointable doublep2)
+ throws SystemException, IOException;
- public abstract boolean operateDoubleFloat(DoublePointable doublep1, FloatPointable floatp2) throws Exception;
+ public abstract boolean operateDoubleFloat(DoublePointable doublep1, FloatPointable floatp2)
+ throws SystemException, IOException;
- public abstract boolean operateDoubleInteger(DoublePointable doublep1, LongPointable longp2) throws Exception;
+ public abstract boolean operateDoubleInteger(DoublePointable doublep1, LongPointable longp2)
+ throws SystemException, IOException;
public abstract boolean operateDTDurationDTDuration(IntegerPointable intp1, IntegerPointable intp2)
- throws Exception;
+ throws SystemException, IOException;
public abstract boolean operateDurationDuration(XSDurationPointable durationp1, XSDurationPointable durationp2)
- throws Exception;
+ throws SystemException, IOException;
- public abstract boolean operateFloatDecimal(FloatPointable floatp1, XSDecimalPointable decp2) throws Exception;
+ public abstract boolean operateFloatDecimal(FloatPointable floatp1, XSDecimalPointable decp2)
+ throws SystemException, IOException;
- public abstract boolean operateFloatDouble(FloatPointable floatp1, DoublePointable doublep2) throws Exception;
+ public abstract boolean operateFloatDouble(FloatPointable floatp1, DoublePointable doublep2)
+ throws SystemException, IOException;
- public abstract boolean operateFloatFloat(FloatPointable floatp1, FloatPointable floatp2) throws Exception;
+ public abstract boolean operateFloatFloat(FloatPointable floatp1, FloatPointable floatp2) throws SystemException,
+ IOException;
- public abstract boolean operateFloatInteger(FloatPointable floatp1, LongPointable longp2) throws Exception;
+ public abstract boolean operateFloatInteger(FloatPointable floatp1, LongPointable longp2) throws SystemException,
+ IOException;
public abstract boolean operateGDayGDay(XSDatePointable datep1, XSDatePointable datep2, DynamicContext dCtx)
- throws Exception;
+ throws SystemException, IOException;
public abstract boolean operateGMonthDayGMonthDay(XSDatePointable datep1, XSDatePointable datep2,
- DynamicContext dCtx) throws Exception;
+ DynamicContext dCtx) throws SystemException, IOException;
public abstract boolean operateGMonthGMonth(XSDatePointable datep1, XSDatePointable datep2, DynamicContext dCtx)
- throws Exception;
+ throws SystemException, IOException;
public abstract boolean operateGYearGYear(XSDatePointable datep1, XSDatePointable datep2, DynamicContext dCtx)
- throws Exception;
+ throws SystemException, IOException;
public abstract boolean operateGYearMonthGYearMonth(XSDatePointable datep1, XSDatePointable datep2,
- DynamicContext dCtx) throws Exception;
+ DynamicContext dCtx) throws SystemException, IOException;
public abstract boolean operateHexBinaryHexBinary(XSBinaryPointable binaryp1, XSBinaryPointable binaryp2)
- throws Exception;
+ throws SystemException, IOException;
- public abstract boolean operateIntegerDecimal(LongPointable longp1, XSDecimalPointable decp2) throws Exception;
+ public abstract boolean operateIntegerDecimal(LongPointable longp1, XSDecimalPointable decp2)
+ throws SystemException, IOException;
- public abstract boolean operateIntegerDouble(LongPointable longp1, DoublePointable doublep2) throws Exception;
+ public abstract boolean operateIntegerDouble(LongPointable longp1, DoublePointable doublep2)
+ throws SystemException, IOException;
- public abstract boolean operateIntegerFloat(LongPointable longp1, FloatPointable floatp2) throws Exception;
+ public abstract boolean operateIntegerFloat(LongPointable longp1, FloatPointable floatp2) throws SystemException,
+ IOException;
- public abstract boolean operateIntegerInteger(LongPointable longp1, LongPointable longp2) throws Exception;
+ public abstract boolean operateIntegerInteger(LongPointable longp1, LongPointable longp2) throws SystemException,
+ IOException;
public abstract boolean operateNotationNotation(UTF8StringPointable stringp1, UTF8StringPointable stringp2)
- throws Exception;
+ throws SystemException, IOException;
- public abstract boolean operateQNameQName(XSQNamePointable qnamep1, XSQNamePointable qnamep2) throws Exception;
+ public abstract boolean operateQNameQName(XSQNamePointable qnamep1, XSQNamePointable qnamep2)
+ throws SystemException, IOException;
public abstract boolean operateStringString(UTF8StringPointable stringp1, UTF8StringPointable stringp2)
- throws Exception;
+ throws SystemException, IOException;
public abstract boolean operateTimeTime(XSTimePointable timep1, XSTimePointable timep2, DynamicContext dCtx)
- throws Exception;
+ throws SystemException, IOException;
public abstract boolean operateYMDurationYMDuration(IntegerPointable intp1, IntegerPointable intp2)
- throws Exception;
+ throws SystemException, IOException;
}
\ No newline at end of file
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=1365684&r1=1365683&r2=1365684&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 Jul 25 18:15:53 2012
@@ -38,12 +38,10 @@ import edu.uci.ics.hyracks.algebricks.ru
import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
import edu.uci.ics.hyracks.data.std.api.IPointable;
import edu.uci.ics.hyracks.data.std.primitive.BooleanPointable;
-import edu.uci.ics.hyracks.data.std.primitive.BytePointable;
import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
import edu.uci.ics.hyracks.data.std.primitive.FloatPointable;
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.ShortPointable;
import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
public abstract class AbstractValueComparisonScalarEvaluatorFactory extends
@@ -61,7 +59,7 @@ public abstract class AbstractValueCompa
final TypedPointables tp1 = new TypedPointables();
final TypedPointables tp2 = new TypedPointables();
final DynamicContext dCtx = (DynamicContext) ctx.getJobletContext().getGlobalJobData();
-
+
return new AbstractTaggedValueArgumentScalarEvaluator(args) {
@Override
protected void evaluate(TaggedValuePointable[] args, IPointable result) throws SystemException {
@@ -413,8 +411,6 @@ public abstract class AbstractValueCompa
private static class TypedPointables {
BooleanPointable boolp = (BooleanPointable) BooleanPointable.FACTORY.createPointable();
- BytePointable bytep = (BytePointable) BytePointable.FACTORY.createPointable();
- ShortPointable shortp = (ShortPointable) ShortPointable.FACTORY.createPointable();
IntegerPointable intp = (IntegerPointable) IntegerPointable.FACTORY.createPointable();
LongPointable longp = (LongPointable) LongPointable.FACTORY.createPointable();
FloatPointable floatp = (FloatPointable) FloatPointable.FACTORY.createPointable();
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=1365684&r1=1365683&r2=1365684&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 Jul 25 18:15:53 2012
@@ -1,6 +1,7 @@
package org.apache.vxquery.runtime.functions.comparison;
import java.io.DataOutput;
+import java.io.IOException;
import java.util.Arrays;
import org.apache.vxquery.context.DynamicContext;
@@ -12,6 +13,7 @@ import org.apache.vxquery.datamodel.acce
import org.apache.vxquery.datamodel.accessors.atomic.XSQNamePointable;
import org.apache.vxquery.datamodel.accessors.atomic.XSTimePointable;
import org.apache.vxquery.datamodel.util.DateTime;
+import org.apache.vxquery.exceptions.SystemException;
import edu.uci.ics.hyracks.data.std.primitive.BooleanPointable;
import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
@@ -26,24 +28,26 @@ public class ValueEqComparisonOperation
protected final DataOutput dOut = abvs.getDataOutput();
@Override
- public boolean operateAnyURIAnyURI(UTF8StringPointable stringp1, UTF8StringPointable stringp2) throws Exception {
+ public boolean operateAnyURIAnyURI(UTF8StringPointable stringp1, UTF8StringPointable stringp2)
+ throws SystemException, IOException {
return (stringp1.compareTo(stringp2) == 0);
}
@Override
public boolean operateBase64BinaryBase64Binary(XSBinaryPointable binaryp1, XSBinaryPointable binaryp2)
- throws Exception {
+ throws SystemException, IOException {
return Arrays.equals(binaryp1.getByteArray(), binaryp2.getByteArray());
}
@Override
- public boolean operateBooleanBoolean(BooleanPointable boolp1, BooleanPointable boolp2) throws Exception {
+ public boolean operateBooleanBoolean(BooleanPointable boolp1, BooleanPointable boolp2) throws SystemException,
+ IOException {
return (boolp1.compareTo(boolp2) == 0);
}
@Override
public boolean operateDateDate(XSDatePointable datep1, XSDatePointable datep2, DynamicContext dCtx)
- throws Exception {
+ throws SystemException, IOException {
abvs.reset();
DateTime.getTimezoneDateTime(datep1, dCtx, dOut);
byte[] bytes1 = abvs.getByteArray();
@@ -61,7 +65,7 @@ public class ValueEqComparisonOperation
@Override
public boolean operateDatetimeDatetime(XSDateTimePointable datetimep1, XSDateTimePointable datetimep2,
- DynamicContext dCtx) throws Exception {
+ DynamicContext dCtx) throws SystemException, IOException {
abvs.reset();
DateTime.getTimezoneDateTime(datetimep1, dCtx, dOut);
byte[] bytes1 = abvs.getByteArray();
@@ -78,89 +82,102 @@ public class ValueEqComparisonOperation
}
@Override
- public boolean operateDecimalDecimal(XSDecimalPointable decp1, XSDecimalPointable decp2) throws Exception {
+ public boolean operateDecimalDecimal(XSDecimalPointable decp1, XSDecimalPointable decp2) throws SystemException,
+ IOException {
return (decp1.compareTo(decp2) == 0);
}
@Override
- public boolean operateDecimalDouble(XSDecimalPointable decp1, DoublePointable doublep2) throws Exception {
- XSDecimalPointable decp2 = new XSDecimalPointable();
- decp2.setDecimal(doublep2.doubleValue());
- return (decp1.compareTo(decp2) == 0);
+ public boolean operateDecimalDouble(XSDecimalPointable decp1, DoublePointable doublep2) throws SystemException,
+ IOException {
+ double double1 = decp1.doubleValue();
+ double double2 = doublep2.doubleValue();
+ return (double1 == double2);
}
@Override
- public boolean operateDecimalFloat(XSDecimalPointable decp1, FloatPointable floatp2) throws Exception {
- XSDecimalPointable decp2 = new XSDecimalPointable();
- decp2.setDecimal(floatp2.doubleValue());
- return (decp1.compareTo(decp2) == 0);
+ public boolean operateDecimalFloat(XSDecimalPointable decp1, FloatPointable floatp2) throws SystemException,
+ IOException {
+ float float1 = decp1.floatValue();
+ float float2 = floatp2.floatValue();
+ return (float1 == float2);
}
@Override
- public boolean operateDecimalInteger(XSDecimalPointable decp1, LongPointable longp2) throws Exception {
+ public boolean operateDecimalInteger(XSDecimalPointable decp1, LongPointable longp2) throws SystemException,
+ IOException {
XSDecimalPointable decp2 = new XSDecimalPointable();
decp2.setDecimal(longp2.getLong(), (byte) 0);
return (decp1.compareTo(decp2) == 0);
}
@Override
- public boolean operateDoubleDecimal(DoublePointable doublep1, XSDecimalPointable decp2) throws Exception {
+ public boolean operateDoubleDecimal(DoublePointable doublep1, XSDecimalPointable decp2) throws SystemException,
+ IOException {
double double1 = doublep1.doubleValue();
double double2 = decp2.doubleValue();
return (double1 == double2);
}
@Override
- public boolean operateDoubleDouble(DoublePointable doublep1, DoublePointable doublep2) throws Exception {
+ public boolean operateDoubleDouble(DoublePointable doublep1, DoublePointable doublep2) throws SystemException,
+ IOException {
return (doublep1.compareTo(doublep2) == 0);
}
@Override
- public boolean operateDoubleFloat(DoublePointable doublep1, FloatPointable floatp2) throws Exception {
+ public boolean operateDoubleFloat(DoublePointable doublep1, FloatPointable floatp2) throws SystemException,
+ IOException {
double double1 = doublep1.doubleValue();
double double2 = floatp2.doubleValue();
return (double1 == double2);
}
@Override
- public boolean operateDoubleInteger(DoublePointable doublep1, LongPointable longp2) throws Exception {
+ public boolean operateDoubleInteger(DoublePointable doublep1, LongPointable longp2) throws SystemException,
+ IOException {
double double1 = doublep1.doubleValue();
double double2 = longp2.doubleValue();
return (double1 == double2);
}
@Override
- public boolean operateDTDurationDTDuration(IntegerPointable intp1, IntegerPointable intp2) throws Exception {
+ public boolean operateDTDurationDTDuration(IntegerPointable intp1, IntegerPointable intp2) throws SystemException,
+ IOException {
return (intp1.compareTo(intp2) == 0);
}
@Override
public boolean operateDurationDuration(XSDurationPointable durationp1, XSDurationPointable durationp2)
- throws Exception {
+ throws SystemException, IOException {
return Arrays.equals(durationp1.getByteArray(), durationp2.getByteArray());
}
@Override
- public boolean operateFloatDecimal(FloatPointable floatp1, XSDecimalPointable decp2) throws Exception {
- XSDecimalPointable decp1 = new XSDecimalPointable();
- decp1.setDecimal(floatp1.doubleValue());
- return (decp1.compareTo(decp2) == 0);
+ public boolean operateFloatDecimal(FloatPointable floatp1, XSDecimalPointable decp2) throws SystemException,
+ IOException {
+ float float1 = floatp1.floatValue();
+ float float2 = decp2.floatValue();
+ return (float1 == float2);
}
@Override
- public boolean operateFloatDouble(FloatPointable floatp1, DoublePointable doublep2) throws Exception {
+ public boolean operateFloatDouble(FloatPointable floatp1, DoublePointable doublep2) throws SystemException,
+ IOException {
double double1 = floatp1.doubleValue();
double double2 = doublep2.doubleValue();
return (double1 == double2);
}
@Override
- public boolean operateFloatFloat(FloatPointable floatp1, FloatPointable floatp2) throws Exception {
+ public boolean operateFloatFloat(FloatPointable floatp1, FloatPointable floatp2) throws SystemException,
+ IOException {
return (floatp1.compareTo(floatp2) == 0);
}
@Override
- public boolean operateFloatInteger(FloatPointable floatp1, LongPointable longp2) throws Exception {
+ public boolean operateFloatInteger(FloatPointable floatp1, LongPointable longp2) throws SystemException,
+ IOException {
float float1 = floatp1.floatValue();
float float2 = longp2.floatValue();
return (float1 == float2);
@@ -168,83 +185,91 @@ public class ValueEqComparisonOperation
@Override
public boolean operateGDayGDay(XSDatePointable datep1, XSDatePointable datep2, DynamicContext dCtx)
- throws Exception {
+ throws SystemException, IOException {
return operateDateDate(datep1, datep2, dCtx);
}
@Override
public boolean operateGMonthDayGMonthDay(XSDatePointable datep1, XSDatePointable datep2, DynamicContext dCtx)
- throws Exception {
+ throws SystemException, IOException {
return operateDateDate(datep1, datep2, dCtx);
}
@Override
public boolean operateGMonthGMonth(XSDatePointable datep1, XSDatePointable datep2, DynamicContext dCtx)
- throws Exception {
+ throws SystemException, IOException {
return operateDateDate(datep1, datep2, dCtx);
}
@Override
public boolean operateGYearGYear(XSDatePointable datep1, XSDatePointable datep2, DynamicContext dCtx)
- throws Exception {
+ throws SystemException, IOException {
return operateDateDate(datep1, datep2, dCtx);
}
@Override
public boolean operateGYearMonthGYearMonth(XSDatePointable datep1, XSDatePointable datep2, DynamicContext dCtx)
- throws Exception {
+ throws SystemException, IOException {
return operateDateDate(datep1, datep2, dCtx);
}
@Override
- public boolean operateHexBinaryHexBinary(XSBinaryPointable binaryp1, XSBinaryPointable binaryp2) throws Exception {
+ public boolean operateHexBinaryHexBinary(XSBinaryPointable binaryp1, XSBinaryPointable binaryp2)
+ throws SystemException, IOException {
return Arrays.equals(binaryp1.getByteArray(), binaryp2.getByteArray());
}
@Override
- public boolean operateIntegerDecimal(LongPointable longp1, XSDecimalPointable decp2) throws Exception {
+ public boolean operateIntegerDecimal(LongPointable longp1, XSDecimalPointable decp2) throws SystemException,
+ IOException {
XSDecimalPointable decp1 = new XSDecimalPointable();
decp1.setDecimal(longp1.getLong(), (byte) 0);
return (decp1.compareTo(decp2) == 0);
}
@Override
- public boolean operateIntegerDouble(LongPointable longp1, DoublePointable doublep2) throws Exception {
+ public boolean operateIntegerDouble(LongPointable longp1, DoublePointable doublep2) throws SystemException,
+ IOException {
double double1 = longp1.doubleValue();
double double2 = doublep2.doubleValue();
return (double1 == double2);
}
@Override
- public boolean operateIntegerFloat(LongPointable longp1, FloatPointable floatp2) throws Exception {
+ public boolean operateIntegerFloat(LongPointable longp1, FloatPointable floatp2) throws SystemException,
+ IOException {
float float1 = longp1.floatValue();
float float2 = floatp2.floatValue();
return (float1 == float2);
}
@Override
- public boolean operateIntegerInteger(LongPointable longp1, LongPointable longp2) throws Exception {
+ public boolean operateIntegerInteger(LongPointable longp1, LongPointable longp2) throws SystemException,
+ IOException {
return (longp1.compareTo(longp2) == 0);
}
@Override
- public boolean operateNotationNotation(UTF8StringPointable stringp1, UTF8StringPointable stringp2) throws Exception {
+ public boolean operateNotationNotation(UTF8StringPointable stringp1, UTF8StringPointable stringp2)
+ throws SystemException, IOException {
return (stringp1.compareTo(stringp2) == 0);
}
@Override
- public boolean operateQNameQName(XSQNamePointable qnamep1, XSQNamePointable qnamep2) throws Exception {
+ public boolean operateQNameQName(XSQNamePointable qnamep1, XSQNamePointable qnamep2) throws SystemException,
+ IOException {
return Arrays.equals(qnamep1.getByteArray(), qnamep2.getByteArray());
}
@Override
- public boolean operateStringString(UTF8StringPointable stringp1, UTF8StringPointable stringp2) throws Exception {
+ public boolean operateStringString(UTF8StringPointable stringp1, UTF8StringPointable stringp2)
+ throws SystemException, IOException {
return (stringp1.compareTo(stringp2) == 0);
}
@Override
public boolean operateTimeTime(XSTimePointable timep1, XSTimePointable timep2, DynamicContext dCtx)
- throws Exception {
+ throws SystemException, IOException {
abvs.reset();
DateTime.getTimezoneDateTime(timep1, dCtx, dOut);
byte[] bytes1 = abvs.getByteArray();
@@ -257,7 +282,8 @@ public class ValueEqComparisonOperation
}
@Override
- public boolean operateYMDurationYMDuration(IntegerPointable intp1, IntegerPointable intp2) throws Exception {
+ public boolean operateYMDurationYMDuration(IntegerPointable intp1, IntegerPointable intp2) throws SystemException,
+ IOException {
return (intp1.compareTo(intp2) == 0);
}
Modified: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueGeComparisonOperation.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueGeComparisonOperation.java?rev=1365684&r1=1365683&r2=1365684&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueGeComparisonOperation.java (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueGeComparisonOperation.java Wed Jul 25 18:15:53 2012
@@ -1,8 +1,7 @@
package org.apache.vxquery.runtime.functions.comparison;
-
public class ValueGeComparisonOperation extends AbstractNegatingComparisonOperation {
-
+
@Override
protected AbstractValueComparisonOperation createBaseComparisonOperation() {
return new ValueLtComparisonOperation();
Modified: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueGtComparisonOperation.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueGtComparisonOperation.java?rev=1365684&r1=1365683&r2=1365684&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueGtComparisonOperation.java (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueGtComparisonOperation.java Wed Jul 25 18:15:53 2012
@@ -1,8 +1,7 @@
package org.apache.vxquery.runtime.functions.comparison;
-
public class ValueGtComparisonOperation extends AbstractNegatingComparisonOperation {
-
+
@Override
protected AbstractValueComparisonOperation createBaseComparisonOperation() {
return new ValueLeComparisonOperation();
Modified: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueLeComparisonOperation.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueLeComparisonOperation.java?rev=1365684&r1=1365683&r2=1365684&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueLeComparisonOperation.java (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueLeComparisonOperation.java Wed Jul 25 18:15:53 2012
@@ -1,6 +1,5 @@
package org.apache.vxquery.runtime.functions.comparison;
-
public class ValueLeComparisonOperation extends AbstractDisjunctiveComparisonOperation {
@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=1365684&r1=1365683&r2=1365684&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 Jul 25 18:15:53 2012
@@ -1,6 +1,7 @@
package org.apache.vxquery.runtime.functions.comparison;
import java.io.DataOutput;
+import java.io.IOException;
import org.apache.vxquery.context.DynamicContext;
import org.apache.vxquery.datamodel.accessors.atomic.XSBinaryPointable;
@@ -11,6 +12,7 @@ import org.apache.vxquery.datamodel.acce
import org.apache.vxquery.datamodel.accessors.atomic.XSQNamePointable;
import org.apache.vxquery.datamodel.accessors.atomic.XSTimePointable;
import org.apache.vxquery.datamodel.util.DateTime;
+import org.apache.vxquery.exceptions.SystemException;
import edu.uci.ics.hyracks.data.std.primitive.BooleanPointable;
import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
@@ -25,24 +27,26 @@ public class ValueLtComparisonOperation
protected final DataOutput dOut = abvs.getDataOutput();
@Override
- public boolean operateAnyURIAnyURI(UTF8StringPointable stringp1, UTF8StringPointable stringp2) throws Exception {
+ public boolean operateAnyURIAnyURI(UTF8StringPointable stringp1, UTF8StringPointable stringp2)
+ throws SystemException, IOException {
return (stringp1.compareTo(stringp2) == -1);
}
@Override
public boolean operateBase64BinaryBase64Binary(XSBinaryPointable binaryp1, XSBinaryPointable binaryp2)
- throws Exception {
+ throws SystemException, IOException {
throw new UnsupportedOperationException();
}
@Override
- public boolean operateBooleanBoolean(BooleanPointable boolp1, BooleanPointable boolp2) throws Exception {
+ public boolean operateBooleanBoolean(BooleanPointable boolp1, BooleanPointable boolp2) throws SystemException,
+ IOException {
return (boolp1.compareTo(boolp2) == -1);
}
@Override
public boolean operateDateDate(XSDatePointable datep1, XSDatePointable datep2, DynamicContext dCtx)
- throws Exception {
+ throws SystemException, IOException {
abvs.reset();
DateTime.getTimezoneDateTime(datep1, dCtx, dOut);
byte[] bytes1 = abvs.getByteArray();
@@ -60,7 +64,7 @@ public class ValueLtComparisonOperation
@Override
public boolean operateDatetimeDatetime(XSDateTimePointable datetimep1, XSDateTimePointable datetimep2,
- DynamicContext dCtx) throws Exception {
+ DynamicContext dCtx) throws SystemException, IOException {
abvs.reset();
DateTime.getTimezoneDateTime(datetimep1, dCtx, dOut);
byte[] bytes1 = abvs.getByteArray();
@@ -77,89 +81,102 @@ public class ValueLtComparisonOperation
}
@Override
- public boolean operateDecimalDecimal(XSDecimalPointable decp1, XSDecimalPointable decp2) throws Exception {
+ public boolean operateDecimalDecimal(XSDecimalPointable decp1, XSDecimalPointable decp2) throws SystemException,
+ IOException {
return (decp1.compareTo(decp2) == -1);
}
@Override
- public boolean operateDecimalDouble(XSDecimalPointable decp1, DoublePointable doublep2) throws Exception {
- XSDecimalPointable decp2 = new XSDecimalPointable();
- decp2.setDecimal(doublep2.doubleValue());
- return (decp1.compareTo(decp2) == -1);
+ public boolean operateDecimalDouble(XSDecimalPointable decp1, DoublePointable doublep2) throws SystemException,
+ IOException {
+ double double1 = decp1.doubleValue();
+ double double2 = doublep2.doubleValue();
+ return (double1 < double2);
}
@Override
- public boolean operateDecimalFloat(XSDecimalPointable decp1, FloatPointable floatp2) throws Exception {
- XSDecimalPointable decp2 = new XSDecimalPointable();
- decp2.setDecimal(floatp2.doubleValue());
- return (decp1.compareTo(decp2) == -1);
+ public boolean operateDecimalFloat(XSDecimalPointable decp1, FloatPointable floatp2) throws SystemException,
+ IOException {
+ float float1 = decp1.floatValue();
+ float float2 = floatp2.floatValue();
+ return (float1 < float2);
}
@Override
- public boolean operateDecimalInteger(XSDecimalPointable decp1, LongPointable longp2) throws Exception {
+ public boolean operateDecimalInteger(XSDecimalPointable decp1, LongPointable longp2) throws SystemException,
+ IOException {
XSDecimalPointable decp2 = new XSDecimalPointable();
decp2.setDecimal(longp2.getLong(), (byte) 0);
return (decp1.compareTo(decp2) == -1);
}
@Override
- public boolean operateDoubleDecimal(DoublePointable doublep1, XSDecimalPointable decp2) throws Exception {
+ public boolean operateDoubleDecimal(DoublePointable doublep1, XSDecimalPointable decp2) throws SystemException,
+ IOException {
double double1 = doublep1.doubleValue();
double double2 = decp2.doubleValue();
return (double1 < double2);
}
@Override
- public boolean operateDoubleDouble(DoublePointable doublep1, DoublePointable doublep2) throws Exception {
+ public boolean operateDoubleDouble(DoublePointable doublep1, DoublePointable doublep2) throws SystemException,
+ IOException {
return (doublep1.compareTo(doublep2) == -1);
}
@Override
- public boolean operateDoubleFloat(DoublePointable doublep1, FloatPointable floatp2) throws Exception {
+ public boolean operateDoubleFloat(DoublePointable doublep1, FloatPointable floatp2) throws SystemException,
+ IOException {
double double1 = doublep1.doubleValue();
double double2 = floatp2.doubleValue();
return (double1 < double2);
}
@Override
- public boolean operateDoubleInteger(DoublePointable doublep1, LongPointable longp2) throws Exception {
+ public boolean operateDoubleInteger(DoublePointable doublep1, LongPointable longp2) throws SystemException,
+ IOException {
double double1 = doublep1.doubleValue();
double double2 = longp2.doubleValue();
return (double1 < double2);
}
@Override
- public boolean operateDTDurationDTDuration(IntegerPointable intp1, IntegerPointable intp2) throws Exception {
+ public boolean operateDTDurationDTDuration(IntegerPointable intp1, IntegerPointable intp2) throws SystemException,
+ IOException {
return (intp1.compareTo(intp2) == -1);
}
@Override
public boolean operateDurationDuration(XSDurationPointable durationp1, XSDurationPointable durationp2)
- throws Exception {
+ throws SystemException, IOException {
throw new UnsupportedOperationException();
}
@Override
- public boolean operateFloatDecimal(FloatPointable floatp1, XSDecimalPointable decp2) throws Exception {
- XSDecimalPointable decp1 = new XSDecimalPointable();
- decp1.setDecimal(floatp1.doubleValue());
- return (decp1.compareTo(decp2) == -1);
+ public boolean operateFloatDecimal(FloatPointable floatp1, XSDecimalPointable decp2) throws SystemException,
+ IOException {
+ float float1 = floatp1.floatValue();
+ float float2 = decp2.floatValue();
+ return (float1 < float2);
}
@Override
- public boolean operateFloatDouble(FloatPointable floatp1, DoublePointable doublep2) throws Exception {
+ public boolean operateFloatDouble(FloatPointable floatp1, DoublePointable doublep2) throws SystemException,
+ IOException {
double double1 = floatp1.doubleValue();
double double2 = doublep2.doubleValue();
return (double1 < double2);
}
@Override
- public boolean operateFloatFloat(FloatPointable floatp1, FloatPointable floatp2) throws Exception {
+ public boolean operateFloatFloat(FloatPointable floatp1, FloatPointable floatp2) throws SystemException,
+ IOException {
return (floatp1.compareTo(floatp2) == -1);
}
@Override
- public boolean operateFloatInteger(FloatPointable floatp1, LongPointable longp2) throws Exception {
+ public boolean operateFloatInteger(FloatPointable floatp1, LongPointable longp2) throws SystemException,
+ IOException {
float float1 = floatp1.floatValue();
float float2 = longp2.floatValue();
return (float1 < float2);
@@ -167,83 +184,91 @@ public class ValueLtComparisonOperation
@Override
public boolean operateGDayGDay(XSDatePointable datep1, XSDatePointable datep2, DynamicContext dCtx)
- throws Exception {
+ throws SystemException, IOException {
throw new UnsupportedOperationException();
}
@Override
public boolean operateGMonthDayGMonthDay(XSDatePointable datep1, XSDatePointable datep2, DynamicContext dCtx)
- throws Exception {
+ throws SystemException, IOException {
throw new UnsupportedOperationException();
}
@Override
public boolean operateGMonthGMonth(XSDatePointable datep1, XSDatePointable datep2, DynamicContext dCtx)
- throws Exception {
+ throws SystemException, IOException {
throw new UnsupportedOperationException();
}
@Override
public boolean operateGYearGYear(XSDatePointable datep1, XSDatePointable datep2, DynamicContext dCtx)
- throws Exception {
+ throws SystemException, IOException {
throw new UnsupportedOperationException();
}
@Override
public boolean operateGYearMonthGYearMonth(XSDatePointable datep1, XSDatePointable datep2, DynamicContext dCtx)
- throws Exception {
+ throws SystemException, IOException {
throw new UnsupportedOperationException();
}
@Override
- public boolean operateHexBinaryHexBinary(XSBinaryPointable binaryp1, XSBinaryPointable binaryp2) throws Exception {
+ public boolean operateHexBinaryHexBinary(XSBinaryPointable binaryp1, XSBinaryPointable binaryp2)
+ throws SystemException, IOException {
throw new UnsupportedOperationException();
}
@Override
- public boolean operateIntegerDecimal(LongPointable longp1, XSDecimalPointable decp2) throws Exception {
+ public boolean operateIntegerDecimal(LongPointable longp1, XSDecimalPointable decp2) throws SystemException,
+ IOException {
XSDecimalPointable decp1 = new XSDecimalPointable();
decp1.setDecimal(longp1.getLong(), (byte) 0);
return (decp1.compareTo(decp2) == -1);
}
@Override
- public boolean operateIntegerDouble(LongPointable longp1, DoublePointable doublep2) throws Exception {
+ public boolean operateIntegerDouble(LongPointable longp1, DoublePointable doublep2) throws SystemException,
+ IOException {
double double1 = longp1.doubleValue();
double double2 = doublep2.doubleValue();
return (double1 < double2);
}
@Override
- public boolean operateIntegerFloat(LongPointable longp1, FloatPointable floatp2) throws Exception {
+ public boolean operateIntegerFloat(LongPointable longp1, FloatPointable floatp2) throws SystemException,
+ IOException {
float float1 = longp1.floatValue();
float float2 = floatp2.floatValue();
return (float1 < float2);
}
@Override
- public boolean operateIntegerInteger(LongPointable longp1, LongPointable longp2) throws Exception {
+ public boolean operateIntegerInteger(LongPointable longp1, LongPointable longp2) throws SystemException,
+ IOException {
return (longp1.compareTo(longp2) == -1);
}
@Override
- public boolean operateNotationNotation(UTF8StringPointable stringp1, UTF8StringPointable stringp2) throws Exception {
+ public boolean operateNotationNotation(UTF8StringPointable stringp1, UTF8StringPointable stringp2)
+ throws SystemException, IOException {
throw new UnsupportedOperationException();
}
@Override
- public boolean operateQNameQName(XSQNamePointable qnamep1, XSQNamePointable qnamep2) throws Exception {
+ public boolean operateQNameQName(XSQNamePointable qnamep1, XSQNamePointable qnamep2) throws SystemException,
+ IOException {
throw new UnsupportedOperationException();
}
@Override
- public boolean operateStringString(UTF8StringPointable stringp1, UTF8StringPointable stringp2) throws Exception {
+ public boolean operateStringString(UTF8StringPointable stringp1, UTF8StringPointable stringp2)
+ throws SystemException, IOException {
return (stringp1.compareTo(stringp2) == -1);
}
@Override
public boolean operateTimeTime(XSTimePointable timep1, XSTimePointable timep2, DynamicContext dCtx)
- throws Exception {
+ throws SystemException, IOException {
abvs.reset();
DateTime.getTimezoneDateTime(timep1, dCtx, dOut);
byte[] bytes1 = abvs.getByteArray();
@@ -256,7 +281,8 @@ public class ValueLtComparisonOperation
}
@Override
- public boolean operateYMDurationYMDuration(IntegerPointable intp1, IntegerPointable intp2) throws Exception {
+ public boolean operateYMDurationYMDuration(IntegerPointable intp1, IntegerPointable intp2) throws SystemException,
+ IOException {
return (intp1.compareTo(intp2) == -1);
}
Modified: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueNeComparisonOperation.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueNeComparisonOperation.java?rev=1365684&r1=1365683&r2=1365684&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueNeComparisonOperation.java (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueNeComparisonOperation.java Wed Jul 25 18:15:53 2012
@@ -1,8 +1,7 @@
package org.apache.vxquery.runtime.functions.comparison;
-
public class ValueNeComparisonOperation extends AbstractNegatingComparisonOperation {
-
+
@Override
protected AbstractValueComparisonOperation createBaseComparisonOperation() {
return new ValueEqComparisonOperation();