You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@vxquery.apache.org by vi...@apache.org on 2012/06/20 10:16:13 UTC
svn commit: r1351984 [1/2] - in
/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery:
compiler/algebricks/ datamodel/values/ functions/
runtime/functions/arithmetic/ runtime/functions/bool/
runtime/functions/sequ...
Author: vinayakb
Date: Wed Jun 20 08:16:12 2012
New Revision: 1351984
URL: http://svn.apache.org/viewvc?rev=1351984&view=rev
Log:
Created new class for value tags. Added runtime for op:concatenate, fn:true, and fn:false
Added:
incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/datamodel/values/
incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/datamodel/values/ValueTag.java
incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/bool/
incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/bool/FnFalseScalarEvaluatorFactory.java
incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/bool/FnTrueScalarEvaluatorFactory.java
incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/
incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/sequence/ConcatenateScalarEvaluatorFactory.java
Modified:
incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryPrinterFactory.java
incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/functions/builtin-functions.xml
incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/functions/builtin-operators.xml
incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AbstractArithmeticScalarEvaluatorFactory.java
incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AddOperation.java
incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/DivideOperation.java
incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/MultiplyOperation.java
incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/SubtractOperation.java
incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/translator/XMLQueryTranslator.java
Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryPrinterFactory.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryPrinterFactory.java?rev=1351984&r1=1351983&r2=1351984&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryPrinterFactory.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryPrinterFactory.java Wed Jun 20 08:16:12 2012
@@ -2,8 +2,9 @@ package org.apache.vxquery.compiler.alge
import java.io.PrintStream;
+import org.apache.vxquery.datamodel.accessors.SequencePointable;
import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
-import org.apache.vxquery.types.BuiltinTypeConstants;
+import org.apache.vxquery.datamodel.values.ValueTag;
import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
import edu.uci.ics.hyracks.algebricks.data.IPrinter;
@@ -12,6 +13,7 @@ import edu.uci.ics.hyracks.data.std.prim
import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
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.primitive.VoidPointable;
public class VXQueryPrinterFactory implements IPrinterFactory {
private static final long serialVersionUID = 1L;
@@ -30,12 +32,16 @@ public class VXQueryPrinterFactory imple
private final BooleanPointable bp = (BooleanPointable) BooleanPointable.FACTORY.createPointable();
+ private final SequencePointable seqp = new SequencePointable();
+
+ private final VoidPointable vp = (VoidPointable) VoidPointable.FACTORY.createPointable();
+
@Override
public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
tvp.set(b, s, l);
byte tag = tvp.getTag();
switch ((int) tag) {
- case BuiltinTypeConstants.XS_STRING_TYPE_ID: {
+ case ValueTag.XS_STRING_TAG: {
tvp.getValue(utf8sp);
int utfLen = utf8sp.getUTFLen();
int offset = 2;
@@ -49,23 +55,35 @@ public class VXQueryPrinterFactory imple
break;
}
- case BuiltinTypeConstants.XS_INTEGER_TYPE_ID: {
+ case ValueTag.XS_INTEGER_TAG: {
tvp.getValue(lp);
ps.print(lp.longValue());
break;
}
- case BuiltinTypeConstants.XS_DOUBLE_TYPE_ID: {
+ case ValueTag.XS_DOUBLE_TAG: {
tvp.getValue(dp);
ps.print(dp.doubleValue());
break;
}
- case BuiltinTypeConstants.XS_BOOLEAN_TYPE_ID: {
+ case ValueTag.XS_BOOLEAN_TAG: {
tvp.getValue(bp);
ps.print(bp.getBoolean());
break;
}
+
+ case ValueTag.SEQUENCE_TAG: {
+ tvp.getValue(seqp);
+ int len = seqp.getEntryCount();
+ for (int i = 0; i < len; ++i) {
+ if (i > 0) {
+ ps.append(' ');
+ }
+ seqp.getEntry(i, vp);
+ print(vp.getByteArray(), vp.getStartOffset(), vp.getLength(), ps);
+ }
+ }
}
}
Added: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/datamodel/values/ValueTag.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/datamodel/values/ValueTag.java?rev=1351984&view=auto
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/datamodel/values/ValueTag.java (added)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/datamodel/values/ValueTag.java Wed Jun 20 08:16:12 2012
@@ -0,0 +1,68 @@
+package org.apache.vxquery.datamodel.values;
+
+import org.apache.vxquery.types.BuiltinTypeConstants;
+
+public class ValueTag {
+ public static final int XS_ANY_TAG = BuiltinTypeConstants.XS_ANY_TYPE_ID;
+ public static final int XS_ANY_SIMPLE_TAG = BuiltinTypeConstants.XS_ANY_SIMPLE_TYPE_ID;
+ public static final int XS_UNTYPED_TAG = BuiltinTypeConstants.XS_UNTYPED_TYPE_ID;
+
+ public static final int XS_ANY_ATOMIC_TAG = BuiltinTypeConstants.XS_ANY_ATOMIC_TYPE_ID;
+ public static final int XS_STRING_TAG = BuiltinTypeConstants.XS_STRING_TYPE_ID;
+ public static final int XS_NORMALIZED_STRING_TAG = BuiltinTypeConstants.XS_NORMALIZED_STRING_TYPE_ID;
+ public static final int XS_TOKEN_TAG = BuiltinTypeConstants.XS_TOKEN_TYPE_ID;
+ public static final int XS_LANGUAGE_TAG = BuiltinTypeConstants.XS_LANGUAGE_TYPE_ID;
+ public static final int XS_NMTOKEN_TAG = BuiltinTypeConstants.XS_NMTOKEN_TYPE_ID;
+ public static final int XS_NAME_TAG = BuiltinTypeConstants.XS_NAME_TYPE_ID;
+ public static final int XS_NCNAME_TAG = BuiltinTypeConstants.XS_NCNAME_TYPE_ID;
+ public static final int XS_ID_TAG = BuiltinTypeConstants.XS_ID_TYPE_ID;
+ public static final int XS_IDREF_TAG = BuiltinTypeConstants.XS_IDREF_TYPE_ID;
+ public static final int XS_ENTITY_TAG = BuiltinTypeConstants.XS_ENTITY_TYPE_ID;
+ public static final int XS_UNTYPED_ATOMIC_TAG = BuiltinTypeConstants.XS_UNTYPED_ATOMIC_TYPE_ID;
+ public static final int XS_DATETIME_TAG = BuiltinTypeConstants.XS_DATETIME_TYPE_ID;
+ public static final int XS_DATE_TAG = BuiltinTypeConstants.XS_DATE_TYPE_ID;
+ public static final int XS_TIME_TAG = BuiltinTypeConstants.XS_TIME_TYPE_ID;
+ public static final int XS_DURATION_TAG = BuiltinTypeConstants.XS_DURATION_TYPE_ID;
+ public static final int XS_YEAR_MONTH_DURATION_TAG = BuiltinTypeConstants.XS_YEAR_MONTH_DURATION_TYPE_ID;
+ public static final int XS_DAY_TIME_DURATION_TAG = BuiltinTypeConstants.XS_DAY_TIME_DURATION_TYPE_ID;
+ public static final int XSEXT_NUMERIC_TAG = BuiltinTypeConstants.XSEXT_NUMERIC_TYPE_ID;
+ public static final int XS_FLOAT_TAG = BuiltinTypeConstants.XS_FLOAT_TYPE_ID;
+ public static final int XS_DOUBLE_TAG = BuiltinTypeConstants.XS_DOUBLE_TYPE_ID;
+ public static final int XS_DECIMAL_TAG = BuiltinTypeConstants.XS_DECIMAL_TYPE_ID;
+ public static final int XS_INTEGER_TAG = BuiltinTypeConstants.XS_INTEGER_TYPE_ID;
+ public static final int XS_NON_POSITIVE_INTEGER_TAG = BuiltinTypeConstants.XS_NON_POSITIVE_INTEGER_TYPE_ID;
+ public static final int XS_NEGATIVE_INTEGER_TAG = BuiltinTypeConstants.XS_NEGATIVE_INTEGER_TYPE_ID;
+ public static final int XS_LONG_TAG = BuiltinTypeConstants.XS_LONG_TYPE_ID;
+ public static final int XS_INT_TAG = BuiltinTypeConstants.XS_INT_TYPE_ID;
+ public static final int XS_SHORT_TAG = BuiltinTypeConstants.XS_SHORT_TYPE_ID;
+ public static final int XS_BYTE_TAG = BuiltinTypeConstants.XS_BYTE_TYPE_ID;
+ public static final int XS_NON_NEGATIVE_INTEGER_TAG = BuiltinTypeConstants.XS_NON_NEGATIVE_INTEGER_TYPE_ID;
+ public static final int XS_UNSIGNED_LONG_TAG = BuiltinTypeConstants.XS_UNSIGNED_LONG_TYPE_ID;
+ public static final int XS_UNSIGNED_INT_TAG = BuiltinTypeConstants.XS_UNSIGNED_INT_TYPE_ID;
+ public static final int XS_UNSIGNED_SHORT_TAG = BuiltinTypeConstants.XS_UNSIGNED_SHORT_TYPE_ID;
+ public static final int XS_UNSIGNED_BYTE_TAG = BuiltinTypeConstants.XS_UNSIGNED_BYTE_TYPE_ID;
+ public static final int XS_POSITIVE_INTEGER_TAG = BuiltinTypeConstants.XS_POSITIVE_INTEGER_TYPE_ID;
+ public static final int XS_G_YEAR_MONTH_TAG = BuiltinTypeConstants.XS_G_YEAR_MONTH_TYPE_ID;
+ public static final int XS_G_YEAR_TAG = BuiltinTypeConstants.XS_G_YEAR_TYPE_ID;
+ public static final int XS_G_MONTH_DAY_TAG = BuiltinTypeConstants.XS_G_MONTH_DAY_TYPE_ID;
+ public static final int XS_G_DAY_TAG = BuiltinTypeConstants.XS_G_DAY_TYPE_ID;
+ public static final int XS_G_MONTH_TAG = BuiltinTypeConstants.XS_G_MONTH_TYPE_ID;
+ public static final int XS_BOOLEAN_TAG = BuiltinTypeConstants.XS_BOOLEAN_TYPE_ID;
+ public static final int XS_BASE64_BINARY_TAG = BuiltinTypeConstants.XS_BASE64_BINARY_TYPE_ID;
+ public static final int XS_HEX_BINARY_TAG = BuiltinTypeConstants.XS_HEX_BINARY_TYPE_ID;
+ public static final int XS_ANY_URI_TAG = BuiltinTypeConstants.XS_ANY_URI_TYPE_ID;
+ public static final int XS_QNAME_TAG = BuiltinTypeConstants.XS_QNAME_TYPE_ID;
+ public static final int XS_NOTATION_TAG = BuiltinTypeConstants.XS_NOTATION_TYPE_ID;
+
+ public static final int XS_IDREFS_TAG = BuiltinTypeConstants.XS_IDREFS_TYPE_ID;
+ public static final int XS_NMTOKENS_TAG = BuiltinTypeConstants.XS_NMTOKENS_TYPE_ID;
+ public static final int XS_ENTITIES_TAG = BuiltinTypeConstants.XS_ENTITIES_TYPE_ID;
+
+ public static final int SEQUENCE_TAG = 100;
+ public static final int DOCUMENT_NODE_TAG = 101;
+ public static final int ELEMENT_NODE_TAG = 102;
+ public static final int ATTRIBUTE_NODE_TAG = 103;
+ public static final int TEXT_NODE_TAG = 104;
+ public static final int COMMENT_NODE_TAG = 105;
+ public static final int PI_NODE_TAG = 106;
+}
\ No newline at end of file
Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/functions/builtin-functions.xml
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/functions/builtin-functions.xml?rev=1351984&r1=1351983&r2=1351984&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/functions/builtin-functions.xml (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/functions/builtin-functions.xml Wed Jun 20 08:16:12 2012
@@ -329,6 +329,7 @@
<!-- fn:false() as xs:boolean -->
<function name="fn:false">
<return type="xs:boolean"/>
+ <runtime type="scalar" class="org.apache.vxquery.runtime.functions.bool.FnFalseScalarEvaluatorFactory"/>
</function>
<!-- fn:floor($arg as numeric?) as numeric? -->
@@ -928,6 +929,7 @@
<!-- fn:true() as xs:boolean -->
<function name="fn:true">
<return type="xs:boolean"/>
+ <runtime type="scalar" class="org.apache.vxquery.runtime.functions.bool.FnTrueScalarEvaluatorFactory"/>
</function>
<!-- fn:unordered($sourceSeq as item()*) as item()* -->
Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/functions/builtin-operators.xml
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/functions/builtin-operators.xml?rev=1351984&r1=1351983&r2=1351984&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/functions/builtin-operators.xml (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/functions/builtin-operators.xml Wed Jun 20 08:16:12 2012
@@ -97,6 +97,7 @@
<operator name="op:concatenate" varargs="true">
<param name="arg" type="item()*"/>
<return type="item()*"/>
+ <runtime type="scalar" class="org.apache.vxquery.runtime.functions.sequence.ConcatenateScalarEvaluatorFactory"/>
</operator>
<!-- op:date-equal($arg1 as xs:date, $arg2 as xs:date) as xs:boolean -->
Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AbstractArithmeticScalarEvaluatorFactory.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AbstractArithmeticScalarEvaluatorFactory.java?rev=1351984&r1=1351983&r2=1351984&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AbstractArithmeticScalarEvaluatorFactory.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AbstractArithmeticScalarEvaluatorFactory.java Wed Jun 20 08:16:12 2012
@@ -24,11 +24,11 @@ import org.apache.vxquery.datamodel.acce
import org.apache.vxquery.datamodel.accessors.atomic.XSDecimalPointable;
import org.apache.vxquery.datamodel.accessors.atomic.XSDurationPointable;
import org.apache.vxquery.datamodel.accessors.atomic.XSTimePointable;
+import org.apache.vxquery.datamodel.values.ValueTag;
import org.apache.vxquery.exceptions.ErrorCode;
import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluator;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
-import org.apache.vxquery.types.BuiltinTypeConstants;
import org.apache.vxquery.types.BuiltinTypeRegistry;
import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
@@ -67,53 +67,53 @@ public abstract class AbstractArithmetic
TaggedValuePointable tvp2 = args[1];
int tid1 = getBaseTypeForArithmetics(tvp1.getTag());
int tid2 = getBaseTypeForArithmetics(tvp2.getTag());
- if (tid1 == BuiltinTypeConstants.XS_UNTYPED_ATOMIC_TYPE_ID) {
+ if (tid1 == ValueTag.XS_UNTYPED_ATOMIC_TAG) {
// TODO Convert to double
- tid1 = BuiltinTypeConstants.XS_DOUBLE_TYPE_ID;
+ tid1 = ValueTag.XS_DOUBLE_TAG;
throw new UnsupportedOperationException();
}
- if (tid2 == BuiltinTypeConstants.XS_UNTYPED_ATOMIC_TYPE_ID) {
+ if (tid2 == ValueTag.XS_UNTYPED_ATOMIC_TAG) {
// TODO Convert to double
- tid2 = BuiltinTypeConstants.XS_DOUBLE_TYPE_ID;
+ tid2 = ValueTag.XS_DOUBLE_TAG;
throw new UnsupportedOperationException();
}
abvs.reset();
try {
switch (tid1) {
- case BuiltinTypeConstants.XS_DECIMAL_TYPE_ID:
+ case ValueTag.XS_DECIMAL_TAG:
tvp1.getValue(tp1.decp);
switch (tid2) {
- case BuiltinTypeConstants.XS_DECIMAL_TYPE_ID:
+ case ValueTag.XS_DECIMAL_TAG:
tvp2.getValue(tp2.decp);
aOp.operateDecimalDecimal(tp1.decp, tp2.decp, dOut);
result.set(abvs);
return;
- case BuiltinTypeConstants.XS_INTEGER_TYPE_ID:
+ case ValueTag.XS_INTEGER_TAG:
tvp2.getValue(tp2.longp);
aOp.operateDecimalInteger(tp1.decp, tp2.longp, dOut);
result.set(abvs);
return;
- case BuiltinTypeConstants.XS_FLOAT_TYPE_ID:
+ case ValueTag.XS_FLOAT_TAG:
tvp2.getValue(tp2.floatp);
aOp.operateDecimalFloat(tp1.decp, tp2.floatp, dOut);
result.set(abvs);
return;
- case BuiltinTypeConstants.XS_DOUBLE_TYPE_ID:
+ case ValueTag.XS_DOUBLE_TAG:
tvp2.getValue(tp2.doublep);
aOp.operateDecimalDouble(tp1.decp, tp2.doublep, dOut);
result.set(abvs);
return;
- case BuiltinTypeConstants.XS_DAY_TIME_DURATION_TYPE_ID:
+ case ValueTag.XS_DAY_TIME_DURATION_TAG:
tvp2.getValue(tp2.intp);
aOp.operateDecimalDTDuration(tp1.decp, tp2.intp, dOut);
result.set(abvs);
return;
- case BuiltinTypeConstants.XS_YEAR_MONTH_DURATION_TYPE_ID:
+ case ValueTag.XS_YEAR_MONTH_DURATION_TAG:
tvp2.getValue(tp2.intp);
aOp.operateDecimalYMDuration(tp1.decp, tp2.intp, dOut);
result.set(abvs);
@@ -121,40 +121,40 @@ public abstract class AbstractArithmetic
}
break;
- case BuiltinTypeConstants.XS_INTEGER_TYPE_ID:
+ case ValueTag.XS_INTEGER_TAG:
tvp1.getValue(tp1.longp);
switch (tid2) {
- case BuiltinTypeConstants.XS_DECIMAL_TYPE_ID:
+ case ValueTag.XS_DECIMAL_TAG:
tvp2.getValue(tp2.decp);
aOp.operateIntegerDecimal(tp1.longp, tp2.decp, dOut);
result.set(abvs);
return;
- case BuiltinTypeConstants.XS_INTEGER_TYPE_ID:
+ case ValueTag.XS_INTEGER_TAG:
tvp2.getValue(tp2.longp);
aOp.operateIntegerInteger(tp1.longp, tp2.longp, dOut);
result.set(abvs);
return;
- case BuiltinTypeConstants.XS_FLOAT_TYPE_ID:
+ case ValueTag.XS_FLOAT_TAG:
tvp2.getValue(tp2.floatp);
aOp.operateIntegerFloat(tp1.longp, tp2.floatp, dOut);
result.set(abvs);
return;
- case BuiltinTypeConstants.XS_DOUBLE_TYPE_ID:
+ case ValueTag.XS_DOUBLE_TAG:
tvp2.getValue(tp2.doublep);
aOp.operateIntegerDouble(tp1.longp, tp2.doublep, dOut);
result.set(abvs);
return;
- case BuiltinTypeConstants.XS_DAY_TIME_DURATION_TYPE_ID:
+ case ValueTag.XS_DAY_TIME_DURATION_TAG:
tvp2.getValue(tp2.intp);
aOp.operateIntegerDTDuration(tp1.longp, tp2.intp, dOut);
result.set(abvs);
return;
- case BuiltinTypeConstants.XS_YEAR_MONTH_DURATION_TYPE_ID:
+ case ValueTag.XS_YEAR_MONTH_DURATION_TAG:
tvp2.getValue(tp2.intp);
aOp.operateIntegerYMDuration(tp1.longp, tp2.intp, dOut);
result.set(abvs);
@@ -162,40 +162,40 @@ public abstract class AbstractArithmetic
}
break;
- case BuiltinTypeConstants.XS_FLOAT_TYPE_ID:
+ case ValueTag.XS_FLOAT_TAG:
tvp1.getValue(tp1.floatp);
switch (tid2) {
- case BuiltinTypeConstants.XS_DECIMAL_TYPE_ID:
+ case ValueTag.XS_DECIMAL_TAG:
tvp2.getValue(tp2.decp);
aOp.operateFloatDecimal(tp1.floatp, tp2.decp, dOut);
result.set(abvs);
return;
- case BuiltinTypeConstants.XS_INTEGER_TYPE_ID:
+ case ValueTag.XS_INTEGER_TAG:
tvp2.getValue(tp2.longp);
aOp.operateFloatInteger(tp1.floatp, tp2.longp, dOut);
result.set(abvs);
return;
- case BuiltinTypeConstants.XS_FLOAT_TYPE_ID:
+ case ValueTag.XS_FLOAT_TAG:
tvp2.getValue(tp2.floatp);
aOp.operateFloatFloat(tp1.floatp, tp2.floatp, dOut);
result.set(abvs);
return;
- case BuiltinTypeConstants.XS_DOUBLE_TYPE_ID:
+ case ValueTag.XS_DOUBLE_TAG:
tvp2.getValue(tp2.doublep);
aOp.operateFloatDouble(tp1.floatp, tp2.doublep, dOut);
result.set(abvs);
return;
- case BuiltinTypeConstants.XS_DAY_TIME_DURATION_TYPE_ID:
+ case ValueTag.XS_DAY_TIME_DURATION_TAG:
tvp2.getValue(tp2.intp);
aOp.operateFloatDTDuration(tp1.floatp, tp2.intp, dOut);
result.set(abvs);
return;
- case BuiltinTypeConstants.XS_YEAR_MONTH_DURATION_TYPE_ID:
+ case ValueTag.XS_YEAR_MONTH_DURATION_TAG:
tvp2.getValue(tp2.intp);
aOp.operateFloatYMDuration(tp1.floatp, tp2.intp, dOut);
result.set(abvs);
@@ -203,40 +203,40 @@ public abstract class AbstractArithmetic
}
break;
- case BuiltinTypeConstants.XS_DOUBLE_TYPE_ID:
+ case ValueTag.XS_DOUBLE_TAG:
tvp1.getValue(tp1.doublep);
switch (tid2) {
- case BuiltinTypeConstants.XS_DECIMAL_TYPE_ID:
+ case ValueTag.XS_DECIMAL_TAG:
tvp2.getValue(tp2.decp);
aOp.operateDoubleDecimal(tp1.doublep, tp2.decp, dOut);
result.set(abvs);
return;
- case BuiltinTypeConstants.XS_INTEGER_TYPE_ID:
+ case ValueTag.XS_INTEGER_TAG:
tvp2.getValue(tp2.longp);
aOp.operateDoubleInteger(tp1.doublep, tp2.longp, dOut);
result.set(abvs);
return;
- case BuiltinTypeConstants.XS_FLOAT_TYPE_ID:
+ case ValueTag.XS_FLOAT_TAG:
tvp2.getValue(tp2.floatp);
aOp.operateDoubleFloat(tp1.doublep, tp2.floatp, dOut);
result.set(abvs);
return;
- case BuiltinTypeConstants.XS_DOUBLE_TYPE_ID:
+ case ValueTag.XS_DOUBLE_TAG:
tvp2.getValue(tp2.doublep);
aOp.operateDoubleDouble(tp1.doublep, tp2.doublep, dOut);
result.set(abvs);
return;
- case BuiltinTypeConstants.XS_DAY_TIME_DURATION_TYPE_ID:
+ case ValueTag.XS_DAY_TIME_DURATION_TAG:
tvp2.getValue(tp2.intp);
aOp.operateDoubleDTDuration(tp1.doublep, tp2.intp, dOut);
result.set(abvs);
return;
- case BuiltinTypeConstants.XS_YEAR_MONTH_DURATION_TYPE_ID:
+ case ValueTag.XS_YEAR_MONTH_DURATION_TAG:
tvp2.getValue(tp2.intp);
aOp.operateDoubleYMDuration(tp1.doublep, tp2.intp, dOut);
result.set(abvs);
@@ -244,22 +244,22 @@ public abstract class AbstractArithmetic
}
break;
- case BuiltinTypeConstants.XS_DATE_TYPE_ID:
+ case ValueTag.XS_DATE_TAG:
tvp1.getValue(tp1.datep);
switch (tid2) {
- case BuiltinTypeConstants.XS_DATE_TYPE_ID:
+ case ValueTag.XS_DATE_TAG:
tvp2.getValue(tp2.datep);
aOp.operateDateDate(tp1.datep, tp2.datep, dOut);
result.set(abvs);
return;
- case BuiltinTypeConstants.XS_DAY_TIME_DURATION_TYPE_ID:
+ case ValueTag.XS_DAY_TIME_DURATION_TAG:
tvp2.getValue(tp2.intp);
aOp.operateDateDTDuration(tp1.datep, tp2.intp, dOut);
result.set(abvs);
return;
- case BuiltinTypeConstants.XS_YEAR_MONTH_DURATION_TYPE_ID:
+ case ValueTag.XS_YEAR_MONTH_DURATION_TAG:
tvp2.getValue(tp2.intp);
aOp.operateDateYMDuration(tp1.datep, tp2.intp, dOut);
result.set(abvs);
@@ -267,22 +267,22 @@ public abstract class AbstractArithmetic
}
break;
- case BuiltinTypeConstants.XS_DATETIME_TYPE_ID:
+ case ValueTag.XS_DATETIME_TAG:
tvp1.getValue(tp1.datetimep);
switch (tid2) {
- case BuiltinTypeConstants.XS_DATETIME_TYPE_ID:
+ case ValueTag.XS_DATETIME_TAG:
tvp2.getValue(tp2.datetimep);
aOp.operateDatetimeDatetime(tp1.datetimep, tp2.datetimep, dOut);
result.set(abvs);
return;
- case BuiltinTypeConstants.XS_DAY_TIME_DURATION_TYPE_ID:
+ case ValueTag.XS_DAY_TIME_DURATION_TAG:
tvp2.getValue(tp2.intp);
aOp.operateDatetimeDTDuration(tp1.datetimep, tp2.intp, dOut);
result.set(abvs);
return;
- case BuiltinTypeConstants.XS_YEAR_MONTH_DURATION_TYPE_ID:
+ case ValueTag.XS_YEAR_MONTH_DURATION_TAG:
tvp2.getValue(tp2.intp);
aOp.operateDatetimeYMDuration(tp1.datetimep, tp2.intp, dOut);
result.set(abvs);
@@ -290,22 +290,22 @@ public abstract class AbstractArithmetic
}
break;
- case BuiltinTypeConstants.XS_TIME_TYPE_ID:
+ case ValueTag.XS_TIME_TAG:
tvp1.getValue(tp1.timep);
switch (tid2) {
- case BuiltinTypeConstants.XS_TIME_TYPE_ID:
+ case ValueTag.XS_TIME_TAG:
tvp2.getValue(tp2.timep);
aOp.operateTimeTime(tp1.timep, tp2.timep, dOut);
result.set(abvs);
return;
- case BuiltinTypeConstants.XS_DAY_TIME_DURATION_TYPE_ID:
+ case ValueTag.XS_DAY_TIME_DURATION_TAG:
tvp2.getValue(tp2.intp);
aOp.operateTimeDTDuration(tp1.timep, tp2.intp, dOut);
result.set(abvs);
return;
- case BuiltinTypeConstants.XS_YEAR_MONTH_DURATION_TYPE_ID:
+ case ValueTag.XS_YEAR_MONTH_DURATION_TAG:
tvp2.getValue(tp2.intp);
aOp.operateTimeYMDuration(tp1.timep, tp2.intp, dOut);
result.set(abvs);
@@ -313,52 +313,52 @@ public abstract class AbstractArithmetic
}
break;
- case BuiltinTypeConstants.XS_DAY_TIME_DURATION_TYPE_ID:
+ case ValueTag.XS_DAY_TIME_DURATION_TAG:
tvp1.getValue(tp1.intp);
switch (tid2) {
- case BuiltinTypeConstants.XS_DECIMAL_TYPE_ID:
+ case ValueTag.XS_DECIMAL_TAG:
tvp2.getValue(tp2.decp);
aOp.operateDTDurationDecimal(tp1.intp, tp2.decp, dOut);
result.set(abvs);
return;
- case BuiltinTypeConstants.XS_INTEGER_TYPE_ID:
+ case ValueTag.XS_INTEGER_TAG:
tvp2.getValue(tp2.longp);
aOp.operateDTDurationInteger(tp1.intp, tp2.longp, dOut);
result.set(abvs);
return;
- case BuiltinTypeConstants.XS_FLOAT_TYPE_ID:
+ case ValueTag.XS_FLOAT_TAG:
tvp2.getValue(tp2.floatp);
aOp.operateDTDurationFloat(tp1.intp, tp2.floatp, dOut);
result.set(abvs);
return;
- case BuiltinTypeConstants.XS_DOUBLE_TYPE_ID:
+ case ValueTag.XS_DOUBLE_TAG:
tvp2.getValue(tp2.doublep);
aOp.operateDTDurationDouble(tp1.intp, tp2.doublep, dOut);
result.set(abvs);
return;
- case BuiltinTypeConstants.XS_DATE_TYPE_ID:
+ case ValueTag.XS_DATE_TAG:
tvp2.getValue(tp2.datep);
aOp.operateDTDurationDate(tp1.intp, tp2.datep, dOut);
result.set(abvs);
return;
- case BuiltinTypeConstants.XS_TIME_TYPE_ID:
+ case ValueTag.XS_TIME_TAG:
tvp2.getValue(tp2.timep);
aOp.operateDTDurationTime(tp1.intp, tp2.timep, dOut);
result.set(abvs);
return;
- case BuiltinTypeConstants.XS_DATETIME_TYPE_ID:
+ case ValueTag.XS_DATETIME_TAG:
tvp2.getValue(tp2.datetimep);
aOp.operateDTDurationDatetime(tp1.intp, tp2.datetimep, dOut);
result.set(abvs);
return;
- case BuiltinTypeConstants.XS_DAY_TIME_DURATION_TYPE_ID:
+ case ValueTag.XS_DAY_TIME_DURATION_TAG:
tvp2.getValue(tp2.intp);
aOp.operateDTDurationDTDuration(tp1.intp, tp2.intp, dOut);
result.set(abvs);
@@ -366,52 +366,52 @@ public abstract class AbstractArithmetic
}
break;
- case BuiltinTypeConstants.XS_YEAR_MONTH_DURATION_TYPE_ID:
+ case ValueTag.XS_YEAR_MONTH_DURATION_TAG:
tvp1.getValue(tp1.intp);
switch (tid2) {
- case BuiltinTypeConstants.XS_DECIMAL_TYPE_ID:
+ case ValueTag.XS_DECIMAL_TAG:
tvp2.getValue(tp2.decp);
aOp.operateYMDurationDecimal(tp1.intp, tp2.decp, dOut);
result.set(abvs);
return;
- case BuiltinTypeConstants.XS_INTEGER_TYPE_ID:
+ case ValueTag.XS_INTEGER_TAG:
tvp2.getValue(tp2.longp);
aOp.operateYMDurationInteger(tp1.intp, tp2.longp, dOut);
result.set(abvs);
return;
- case BuiltinTypeConstants.XS_FLOAT_TYPE_ID:
+ case ValueTag.XS_FLOAT_TAG:
tvp2.getValue(tp2.floatp);
aOp.operateYMDurationFloat(tp1.intp, tp2.floatp, dOut);
result.set(abvs);
return;
- case BuiltinTypeConstants.XS_DOUBLE_TYPE_ID:
+ case ValueTag.XS_DOUBLE_TAG:
tvp2.getValue(tp2.doublep);
aOp.operateYMDurationDouble(tp1.intp, tp2.doublep, dOut);
result.set(abvs);
return;
- case BuiltinTypeConstants.XS_DATE_TYPE_ID:
+ case ValueTag.XS_DATE_TAG:
tvp2.getValue(tp2.datep);
aOp.operateYMDurationDate(tp1.intp, tp2.datep, dOut);
result.set(abvs);
return;
- case BuiltinTypeConstants.XS_TIME_TYPE_ID:
+ case ValueTag.XS_TIME_TAG:
tvp2.getValue(tp2.timep);
aOp.operateYMDurationTime(tp1.intp, tp2.timep, dOut);
result.set(abvs);
return;
- case BuiltinTypeConstants.XS_DATETIME_TYPE_ID:
+ case ValueTag.XS_DATETIME_TAG:
tvp2.getValue(tp2.datetimep);
aOp.operateYMDurationDatetime(tp1.intp, tp2.datetimep, dOut);
result.set(abvs);
return;
- case BuiltinTypeConstants.XS_YEAR_MONTH_DURATION_TYPE_ID:
+ case ValueTag.XS_YEAR_MONTH_DURATION_TAG:
tvp2.getValue(tp2.intp);
aOp.operateYMDurationYMDuration(tp1.intp, tp2.intp, dOut);
result.set(abvs);
@@ -430,30 +430,30 @@ public abstract class AbstractArithmetic
private int getBaseTypeForArithmetics(int tid) throws SystemException {
while (true) {
switch (tid) {
- case BuiltinTypeConstants.XS_STRING_TYPE_ID:
- case BuiltinTypeConstants.XS_DECIMAL_TYPE_ID:
- case BuiltinTypeConstants.XS_INTEGER_TYPE_ID:
- case BuiltinTypeConstants.XS_FLOAT_TYPE_ID:
- case BuiltinTypeConstants.XS_DOUBLE_TYPE_ID:
- case BuiltinTypeConstants.XS_ANY_URI_TYPE_ID:
- case BuiltinTypeConstants.XS_BOOLEAN_TYPE_ID:
- case BuiltinTypeConstants.XS_DATE_TYPE_ID:
- case BuiltinTypeConstants.XS_DATETIME_TYPE_ID:
- case BuiltinTypeConstants.XS_TIME_TYPE_ID:
- case BuiltinTypeConstants.XS_DAY_TIME_DURATION_TYPE_ID:
- case BuiltinTypeConstants.XS_YEAR_MONTH_DURATION_TYPE_ID:
- case BuiltinTypeConstants.XS_BASE64_BINARY_TYPE_ID:
- case BuiltinTypeConstants.XS_HEX_BINARY_TYPE_ID:
- case BuiltinTypeConstants.XS_QNAME_TYPE_ID:
- case BuiltinTypeConstants.XS_G_DAY_TYPE_ID:
- case BuiltinTypeConstants.XS_G_MONTH_DAY_TYPE_ID:
- case BuiltinTypeConstants.XS_G_MONTH_TYPE_ID:
- case BuiltinTypeConstants.XS_G_YEAR_MONTH_TYPE_ID:
- case BuiltinTypeConstants.XS_G_YEAR_TYPE_ID:
- case BuiltinTypeConstants.XS_UNTYPED_ATOMIC_TYPE_ID:
+ case ValueTag.XS_STRING_TAG:
+ case ValueTag.XS_DECIMAL_TAG:
+ case ValueTag.XS_INTEGER_TAG:
+ case ValueTag.XS_FLOAT_TAG:
+ case ValueTag.XS_DOUBLE_TAG:
+ case ValueTag.XS_ANY_URI_TAG:
+ case ValueTag.XS_BOOLEAN_TAG:
+ case ValueTag.XS_DATE_TAG:
+ case ValueTag.XS_DATETIME_TAG:
+ case ValueTag.XS_TIME_TAG:
+ case ValueTag.XS_DAY_TIME_DURATION_TAG:
+ case ValueTag.XS_YEAR_MONTH_DURATION_TAG:
+ case ValueTag.XS_BASE64_BINARY_TAG:
+ case ValueTag.XS_HEX_BINARY_TAG:
+ case ValueTag.XS_QNAME_TAG:
+ case ValueTag.XS_G_DAY_TAG:
+ case ValueTag.XS_G_MONTH_DAY_TAG:
+ case ValueTag.XS_G_MONTH_TAG:
+ case ValueTag.XS_G_YEAR_MONTH_TAG:
+ case ValueTag.XS_G_YEAR_TAG:
+ case ValueTag.XS_UNTYPED_ATOMIC_TAG:
return tid;
- case BuiltinTypeConstants.XS_ANY_ATOMIC_TYPE_ID:
+ case ValueTag.XS_ANY_ATOMIC_TAG:
throw new SystemException(ErrorCode.XPTY0004);
default:
Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AddOperation.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AddOperation.java?rev=1351984&r1=1351983&r2=1351984&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AddOperation.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AddOperation.java Wed Jun 20 08:16:12 2012
@@ -6,7 +6,7 @@ import org.apache.vxquery.datamodel.acce
import org.apache.vxquery.datamodel.accessors.atomic.XSDateTimePointable;
import org.apache.vxquery.datamodel.accessors.atomic.XSDecimalPointable;
import org.apache.vxquery.datamodel.accessors.atomic.XSTimePointable;
-import org.apache.vxquery.types.BuiltinTypeConstants;
+import org.apache.vxquery.datamodel.values.ValueTag;
import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
import edu.uci.ics.hyracks.data.std.primitive.FloatPointable;
@@ -19,7 +19,7 @@ public class AddOperation extends Abstra
throws Exception {
double value = decp1.doubleValue();
value += decp2.doubleValue();
- dOut.write(BuiltinTypeConstants.XS_DECIMAL_TYPE_ID);
+ dOut.write(ValueTag.XS_DECIMAL_TAG);
dOut.writeDouble(value);
}
@@ -27,7 +27,7 @@ public class AddOperation extends Abstra
public void operateDecimalInteger(XSDecimalPointable decp, LongPointable longp, DataOutput dOut) throws Exception {
double value = decp.doubleValue();
value += longp.doubleValue();
- dOut.write(BuiltinTypeConstants.XS_DECIMAL_TYPE_ID);
+ dOut.write(ValueTag.XS_DECIMAL_TAG);
dOut.writeDouble(value);
}
@@ -35,7 +35,7 @@ public class AddOperation extends Abstra
public void operateDecimalFloat(XSDecimalPointable decp, FloatPointable floatp, DataOutput dOut) throws Exception {
float value = decp.floatValue();
value += floatp.floatValue();
- dOut.write(BuiltinTypeConstants.XS_FLOAT_TYPE_ID);
+ dOut.write(ValueTag.XS_FLOAT_TAG);
dOut.writeFloat(value);
}
@@ -44,7 +44,7 @@ public class AddOperation extends Abstra
throws Exception {
double value = decp.doubleValue();
value += doublep.doubleValue();
- dOut.write(BuiltinTypeConstants.XS_DOUBLE_TYPE_ID);
+ dOut.write(ValueTag.XS_DOUBLE_TAG);
dOut.writeDouble(value);
}
@@ -53,7 +53,7 @@ public class AddOperation extends Abstra
throws Exception {
long value = decp.longValue();
value += intp.longValue();
- dOut.write(BuiltinTypeConstants.XS_DAY_TIME_DURATION_TYPE_ID);
+ dOut.write(ValueTag.XS_DAY_TIME_DURATION_TAG);
dOut.writeLong(value);
}
@@ -62,7 +62,7 @@ public class AddOperation extends Abstra
throws Exception {
long value = decp.longValue();
value += intp.longValue();
- dOut.write(BuiltinTypeConstants.XS_YEAR_MONTH_DURATION_TYPE_ID);
+ dOut.write(ValueTag.XS_YEAR_MONTH_DURATION_TAG);
dOut.writeLong(value);
}
@@ -75,7 +75,7 @@ public class AddOperation extends Abstra
public void operateIntegerInteger(LongPointable longp, LongPointable longp2, DataOutput dOut) throws Exception {
long value = longp.getLong();
value += longp2.getLong();
- dOut.write(BuiltinTypeConstants.XS_INTEGER_TYPE_ID);
+ dOut.write(ValueTag.XS_INTEGER_TAG);
dOut.writeLong(value);
}
@@ -98,7 +98,7 @@ public class AddOperation extends Abstra
public void operateIntegerYMDuration(LongPointable longp, IntegerPointable intp, DataOutput dOut) throws Exception {
long value = longp.longValue();
value += intp.longValue();
- dOut.write(BuiltinTypeConstants.XS_YEAR_MONTH_DURATION_TYPE_ID);
+ dOut.write(ValueTag.XS_YEAR_MONTH_DURATION_TAG);
dOut.writeLong(value);
}
@@ -111,7 +111,7 @@ public class AddOperation extends Abstra
public void operateFloatInteger(FloatPointable floatp, LongPointable longp, DataOutput dOut) throws Exception {
float value = floatp.floatValue();
value += longp.floatValue();
- dOut.write(BuiltinTypeConstants.XS_FLOAT_TYPE_ID);
+ dOut.write(ValueTag.XS_FLOAT_TAG);
dOut.writeFloat(value);
}
@@ -119,7 +119,7 @@ public class AddOperation extends Abstra
public void operateFloatFloat(FloatPointable floatp, FloatPointable floatp2, DataOutput dOut) throws Exception {
float value = floatp.floatValue();
value += floatp2.floatValue();
- dOut.write(BuiltinTypeConstants.XS_FLOAT_TYPE_ID);
+ dOut.write(ValueTag.XS_FLOAT_TAG);
dOut.writeFloat(value);
}
@@ -148,7 +148,7 @@ public class AddOperation extends Abstra
public void operateDoubleInteger(DoublePointable doublep, LongPointable longp, DataOutput dOut) throws Exception {
double value = doublep.doubleValue();
value += longp.doubleValue();
- dOut.write(BuiltinTypeConstants.XS_DOUBLE_TYPE_ID);
+ dOut.write(ValueTag.XS_DOUBLE_TAG);
dOut.writeDouble(value);
}
@@ -156,7 +156,7 @@ public class AddOperation extends Abstra
public void operateDoubleFloat(DoublePointable doublep, FloatPointable floatp, DataOutput dOut) throws Exception {
double value = doublep.doubleValue();
value += floatp.doubleValue();
- dOut.write(BuiltinTypeConstants.XS_DOUBLE_TYPE_ID);
+ dOut.write(ValueTag.XS_DOUBLE_TAG);
dOut.writeDouble(value);
}
@@ -165,7 +165,7 @@ public class AddOperation extends Abstra
throws Exception {
double value = doublep.doubleValue();
value += doublep2.doubleValue();
- dOut.write(BuiltinTypeConstants.XS_DOUBLE_TYPE_ID);
+ dOut.write(ValueTag.XS_DOUBLE_TAG);
dOut.writeDouble(value);
}
@@ -180,7 +180,7 @@ public class AddOperation extends Abstra
throws Exception {
long value = doublep.longValue();
value += intp.longValue();
- dOut.write(BuiltinTypeConstants.XS_YEAR_MONTH_DURATION_TYPE_ID);
+ dOut.write(ValueTag.XS_YEAR_MONTH_DURATION_TAG);
dOut.writeLong(value);
}
@@ -242,7 +242,7 @@ public class AddOperation extends Abstra
public void operateDTDurationInteger(IntegerPointable intp, LongPointable longp, DataOutput dOut) throws Exception {
long value = intp.longValue();
value += longp.longValue();
- dOut.write(BuiltinTypeConstants.XS_DAY_TIME_DURATION_TYPE_ID);
+ dOut.write(ValueTag.XS_DAY_TIME_DURATION_TAG);
dOut.writeLong(value);
}
@@ -250,7 +250,7 @@ public class AddOperation extends Abstra
public void operateDTDurationFloat(IntegerPointable intp, FloatPointable floatp, DataOutput dOut) throws Exception {
long value = intp.longValue();
value += floatp.longValue();
- dOut.write(BuiltinTypeConstants.XS_DAY_TIME_DURATION_TYPE_ID);
+ dOut.write(ValueTag.XS_DAY_TIME_DURATION_TAG);
dOut.writeLong(value);
}
@@ -259,7 +259,7 @@ public class AddOperation extends Abstra
throws Exception {
long value = intp.longValue();
value += doublep.longValue();
- dOut.write(BuiltinTypeConstants.XS_DAY_TIME_DURATION_TYPE_ID);
+ dOut.write(ValueTag.XS_DAY_TIME_DURATION_TAG);
dOut.writeLong(value);
}
@@ -284,7 +284,7 @@ public class AddOperation extends Abstra
throws Exception {
long value = intp.longValue();
value += intp2.longValue();
- dOut.write(BuiltinTypeConstants.XS_DAY_TIME_DURATION_TYPE_ID);
+ dOut.write(ValueTag.XS_DAY_TIME_DURATION_TAG);
dOut.writeLong(value);
}
@@ -331,7 +331,7 @@ public class AddOperation extends Abstra
throws Exception {
long value = intp.longValue();
value += intp2.longValue();
- dOut.write(BuiltinTypeConstants.XS_YEAR_MONTH_DURATION_TYPE_ID);
+ dOut.write(ValueTag.XS_YEAR_MONTH_DURATION_TAG);
dOut.writeLong(value);
}
}
\ No newline at end of file
Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/DivideOperation.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/DivideOperation.java?rev=1351984&r1=1351983&r2=1351984&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/DivideOperation.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/DivideOperation.java Wed Jun 20 08:16:12 2012
@@ -6,7 +6,7 @@ import org.apache.vxquery.datamodel.acce
import org.apache.vxquery.datamodel.accessors.atomic.XSDateTimePointable;
import org.apache.vxquery.datamodel.accessors.atomic.XSDecimalPointable;
import org.apache.vxquery.datamodel.accessors.atomic.XSTimePointable;
-import org.apache.vxquery.types.BuiltinTypeConstants;
+import org.apache.vxquery.datamodel.values.ValueTag;
import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
import edu.uci.ics.hyracks.data.std.primitive.FloatPointable;
@@ -19,7 +19,7 @@ public class DivideOperation extends Abs
throws Exception {
double value = decp1.doubleValue();
value /= decp2.doubleValue();
- dOut.write(BuiltinTypeConstants.XS_DECIMAL_TYPE_ID);
+ dOut.write(ValueTag.XS_DECIMAL_TAG);
dOut.writeDouble(value);
}
@@ -27,7 +27,7 @@ public class DivideOperation extends Abs
public void operateDecimalInteger(XSDecimalPointable decp, LongPointable longp, DataOutput dOut) throws Exception {
double value = decp.doubleValue();
value /= longp.doubleValue();
- dOut.write(BuiltinTypeConstants.XS_DECIMAL_TYPE_ID);
+ dOut.write(ValueTag.XS_DECIMAL_TAG);
dOut.writeDouble(value);
}
@@ -35,7 +35,7 @@ public class DivideOperation extends Abs
public void operateDecimalFloat(XSDecimalPointable decp, FloatPointable floatp, DataOutput dOut) throws Exception {
float value = decp.floatValue();
value /= floatp.floatValue();
- dOut.write(BuiltinTypeConstants.XS_FLOAT_TYPE_ID);
+ dOut.write(ValueTag.XS_FLOAT_TAG);
dOut.writeFloat(value);
}
@@ -44,7 +44,7 @@ public class DivideOperation extends Abs
throws Exception {
double value = decp.doubleValue();
value /= doublep.doubleValue();
- dOut.write(BuiltinTypeConstants.XS_DOUBLE_TYPE_ID);
+ dOut.write(ValueTag.XS_DOUBLE_TAG);
dOut.writeDouble(value);
}
@@ -53,7 +53,7 @@ public class DivideOperation extends Abs
throws Exception {
long value = decp.longValue();
value /= intp.longValue();
- dOut.write(BuiltinTypeConstants.XS_DAY_TIME_DURATION_TYPE_ID);
+ dOut.write(ValueTag.XS_DAY_TIME_DURATION_TAG);
dOut.writeLong(value);
}
@@ -62,7 +62,7 @@ public class DivideOperation extends Abs
throws Exception {
long value = decp.longValue();
value /= intp.longValue();
- dOut.write(BuiltinTypeConstants.XS_YEAR_MONTH_DURATION_TYPE_ID);
+ dOut.write(ValueTag.XS_YEAR_MONTH_DURATION_TAG);
dOut.writeLong(value);
}
@@ -70,7 +70,7 @@ public class DivideOperation extends Abs
public void operateIntegerDecimal(LongPointable longp, XSDecimalPointable decp, DataOutput dOut) throws Exception {
double value = longp.doubleValue();
value /= decp.doubleValue();
- dOut.write(BuiltinTypeConstants.XS_DECIMAL_TYPE_ID);
+ dOut.write(ValueTag.XS_DECIMAL_TAG);
dOut.writeDouble(value);
}
@@ -78,7 +78,7 @@ public class DivideOperation extends Abs
public void operateIntegerInteger(LongPointable longp, LongPointable longp2, DataOutput dOut) throws Exception {
long value = longp.getLong();
value /= longp2.getLong();
- dOut.write(BuiltinTypeConstants.XS_INTEGER_TYPE_ID);
+ dOut.write(ValueTag.XS_INTEGER_TAG);
dOut.writeLong(value);
}
@@ -86,7 +86,7 @@ public class DivideOperation extends Abs
public void operateIntegerFloat(LongPointable longp, FloatPointable floatp, DataOutput dOut) throws Exception {
float value = longp.floatValue();
value /= floatp.floatValue();
- dOut.write(BuiltinTypeConstants.XS_FLOAT_TYPE_ID);
+ dOut.write(ValueTag.XS_FLOAT_TAG);
dOut.writeFloat(value);
}
@@ -94,7 +94,7 @@ public class DivideOperation extends Abs
public void operateIntegerDouble(LongPointable longp, DoublePointable doublep, DataOutput dOut) throws Exception {
double value = longp.doubleValue();
value /= doublep.doubleValue();
- dOut.write(BuiltinTypeConstants.XS_DOUBLE_TYPE_ID);
+ dOut.write(ValueTag.XS_DOUBLE_TAG);
dOut.writeDouble(value);
}
@@ -102,7 +102,7 @@ public class DivideOperation extends Abs
public void operateIntegerDTDuration(LongPointable longp, IntegerPointable intp, DataOutput dOut) throws Exception {
long value = longp.longValue();
value /= intp.longValue();
- dOut.write(BuiltinTypeConstants.XS_DAY_TIME_DURATION_TYPE_ID);
+ dOut.write(ValueTag.XS_DAY_TIME_DURATION_TAG);
dOut.writeLong(value);
}
@@ -110,7 +110,7 @@ public class DivideOperation extends Abs
public void operateIntegerYMDuration(LongPointable longp, IntegerPointable intp, DataOutput dOut) throws Exception {
long value = longp.longValue();
value /= intp.longValue();
- dOut.write(BuiltinTypeConstants.XS_YEAR_MONTH_DURATION_TYPE_ID);
+ dOut.write(ValueTag.XS_YEAR_MONTH_DURATION_TAG);
dOut.writeLong(value);
}
@@ -118,7 +118,7 @@ public class DivideOperation extends Abs
public void operateFloatDecimal(FloatPointable floatp, XSDecimalPointable decp, DataOutput dOut) throws Exception {
float value = floatp.floatValue();
value /= decp.floatValue();
- dOut.write(BuiltinTypeConstants.XS_FLOAT_TYPE_ID);
+ dOut.write(ValueTag.XS_FLOAT_TAG);
dOut.writeDouble(value);
}
@@ -126,7 +126,7 @@ public class DivideOperation extends Abs
public void operateFloatInteger(FloatPointable floatp, LongPointable longp, DataOutput dOut) throws Exception {
float value = floatp.floatValue();
value /= longp.floatValue();
- dOut.write(BuiltinTypeConstants.XS_FLOAT_TYPE_ID);
+ dOut.write(ValueTag.XS_FLOAT_TAG);
dOut.writeFloat(value);
}
@@ -134,7 +134,7 @@ public class DivideOperation extends Abs
public void operateFloatFloat(FloatPointable floatp, FloatPointable floatp2, DataOutput dOut) throws Exception {
float value = floatp.floatValue();
value /= floatp2.floatValue();
- dOut.write(BuiltinTypeConstants.XS_FLOAT_TYPE_ID);
+ dOut.write(ValueTag.XS_FLOAT_TAG);
dOut.writeFloat(value);
}
@@ -142,7 +142,7 @@ public class DivideOperation extends Abs
public void operateFloatDouble(FloatPointable floatp, DoublePointable doublep, DataOutput dOut) throws Exception {
double value = floatp.doubleValue();
value /= doublep.doubleValue();
- dOut.write(BuiltinTypeConstants.XS_DOUBLE_TYPE_ID);
+ dOut.write(ValueTag.XS_DOUBLE_TAG);
dOut.writeDouble(value);
}
@@ -150,7 +150,7 @@ public class DivideOperation extends Abs
public void operateFloatDTDuration(FloatPointable floatp, IntegerPointable intp, DataOutput dOut) throws Exception {
long value = floatp.longValue();
value /= intp.longValue();
- dOut.write(BuiltinTypeConstants.XS_DAY_TIME_DURATION_TYPE_ID);
+ dOut.write(ValueTag.XS_DAY_TIME_DURATION_TAG);
dOut.writeLong(value);
}
@@ -158,7 +158,7 @@ public class DivideOperation extends Abs
public void operateFloatYMDuration(FloatPointable floatp, IntegerPointable intp, DataOutput dOut) throws Exception {
long value = floatp.longValue();
value /= intp.longValue();
- dOut.write(BuiltinTypeConstants.XS_YEAR_MONTH_DURATION_TYPE_ID);
+ dOut.write(ValueTag.XS_YEAR_MONTH_DURATION_TAG);
dOut.writeLong(value);
}
@@ -167,7 +167,7 @@ public class DivideOperation extends Abs
throws Exception {
double value = doublep.doubleValue();
value /= decp.doubleValue();
- dOut.write(BuiltinTypeConstants.XS_DOUBLE_TYPE_ID);
+ dOut.write(ValueTag.XS_DOUBLE_TAG);
dOut.writeDouble(value);
}
@@ -175,7 +175,7 @@ public class DivideOperation extends Abs
public void operateDoubleInteger(DoublePointable doublep, LongPointable longp, DataOutput dOut) throws Exception {
double value = doublep.doubleValue();
value /= longp.doubleValue();
- dOut.write(BuiltinTypeConstants.XS_DOUBLE_TYPE_ID);
+ dOut.write(ValueTag.XS_DOUBLE_TAG);
dOut.writeDouble(value);
}
@@ -183,7 +183,7 @@ public class DivideOperation extends Abs
public void operateDoubleFloat(DoublePointable doublep, FloatPointable floatp, DataOutput dOut) throws Exception {
double value = doublep.doubleValue();
value /= floatp.doubleValue();
- dOut.write(BuiltinTypeConstants.XS_DOUBLE_TYPE_ID);
+ dOut.write(ValueTag.XS_DOUBLE_TAG);
dOut.writeDouble(value);
}
@@ -192,7 +192,7 @@ public class DivideOperation extends Abs
throws Exception {
double value = doublep.doubleValue();
value /= doublep2.doubleValue();
- dOut.write(BuiltinTypeConstants.XS_DOUBLE_TYPE_ID);
+ dOut.write(ValueTag.XS_DOUBLE_TAG);
dOut.writeDouble(value);
}
@@ -201,7 +201,7 @@ public class DivideOperation extends Abs
throws Exception {
long value = doublep.longValue();
value /= intp.longValue();
- dOut.write(BuiltinTypeConstants.XS_DAY_TIME_DURATION_TYPE_ID);
+ dOut.write(ValueTag.XS_DAY_TIME_DURATION_TAG);
dOut.writeLong(value);
}
@@ -210,7 +210,7 @@ public class DivideOperation extends Abs
throws Exception {
long value = doublep.longValue();
value /= intp.longValue();
- dOut.write(BuiltinTypeConstants.XS_YEAR_MONTH_DURATION_TYPE_ID);
+ dOut.write(ValueTag.XS_YEAR_MONTH_DURATION_TAG);
dOut.writeLong(value);
}
@@ -267,7 +267,7 @@ public class DivideOperation extends Abs
throws Exception {
long value = intp.longValue();
value /= decp.longValue();
- dOut.write(BuiltinTypeConstants.XS_DAY_TIME_DURATION_TYPE_ID);
+ dOut.write(ValueTag.XS_DAY_TIME_DURATION_TAG);
dOut.writeLong(value);
}
@@ -275,7 +275,7 @@ public class DivideOperation extends Abs
public void operateDTDurationInteger(IntegerPointable intp, LongPointable longp, DataOutput dOut) throws Exception {
long value = intp.longValue();
value /= longp.longValue();
- dOut.write(BuiltinTypeConstants.XS_DAY_TIME_DURATION_TYPE_ID);
+ dOut.write(ValueTag.XS_DAY_TIME_DURATION_TAG);
dOut.writeLong(value);
}
@@ -283,7 +283,7 @@ public class DivideOperation extends Abs
public void operateDTDurationFloat(IntegerPointable intp, FloatPointable floatp, DataOutput dOut) throws Exception {
long value = intp.longValue();
value /= floatp.longValue();
- dOut.write(BuiltinTypeConstants.XS_DAY_TIME_DURATION_TYPE_ID);
+ dOut.write(ValueTag.XS_DAY_TIME_DURATION_TAG);
dOut.writeLong(value);
}
@@ -292,7 +292,7 @@ public class DivideOperation extends Abs
throws Exception {
long value = intp.longValue();
value /= doublep.longValue();
- dOut.write(BuiltinTypeConstants.XS_DAY_TIME_DURATION_TYPE_ID);
+ dOut.write(ValueTag.XS_DAY_TIME_DURATION_TAG);
dOut.writeLong(value);
}
@@ -317,7 +317,7 @@ public class DivideOperation extends Abs
throws Exception {
long value = intp.longValue();
value /= intp2.longValue();
- dOut.write(BuiltinTypeConstants.XS_DAY_TIME_DURATION_TYPE_ID);
+ dOut.write(ValueTag.XS_DAY_TIME_DURATION_TAG);
dOut.writeLong(value);
}
@@ -326,7 +326,7 @@ public class DivideOperation extends Abs
throws Exception {
long value = intp.longValue();
value /= decp.longValue();
- dOut.write(BuiltinTypeConstants.XS_YEAR_MONTH_DURATION_TYPE_ID);
+ dOut.write(ValueTag.XS_YEAR_MONTH_DURATION_TAG);
dOut.writeLong(value);
}
@@ -334,7 +334,7 @@ public class DivideOperation extends Abs
public void operateYMDurationInteger(IntegerPointable intp, LongPointable longp, DataOutput dOut) throws Exception {
long value = intp.longValue();
value /= longp.longValue();
- dOut.write(BuiltinTypeConstants.XS_YEAR_MONTH_DURATION_TYPE_ID);
+ dOut.write(ValueTag.XS_YEAR_MONTH_DURATION_TAG);
dOut.writeLong(value);
}
@@ -342,7 +342,7 @@ public class DivideOperation extends Abs
public void operateYMDurationFloat(IntegerPointable intp, FloatPointable floatp, DataOutput dOut) throws Exception {
long value = intp.longValue();
value /= floatp.longValue();
- dOut.write(BuiltinTypeConstants.XS_YEAR_MONTH_DURATION_TYPE_ID);
+ dOut.write(ValueTag.XS_YEAR_MONTH_DURATION_TAG);
dOut.writeLong(value);
}
@@ -351,7 +351,7 @@ public class DivideOperation extends Abs
throws Exception {
long value = intp.longValue();
value /= doublep.longValue();
- dOut.write(BuiltinTypeConstants.XS_YEAR_MONTH_DURATION_TYPE_ID);
+ dOut.write(ValueTag.XS_YEAR_MONTH_DURATION_TAG);
dOut.writeLong(value);
}
@@ -376,7 +376,7 @@ public class DivideOperation extends Abs
throws Exception {
long value = intp.longValue();
value /= intp2.longValue();
- dOut.write(BuiltinTypeConstants.XS_YEAR_MONTH_DURATION_TYPE_ID);
+ dOut.write(ValueTag.XS_YEAR_MONTH_DURATION_TAG);
dOut.writeLong(value);
}
}
\ No newline at end of file
Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/MultiplyOperation.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/MultiplyOperation.java?rev=1351984&r1=1351983&r2=1351984&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/MultiplyOperation.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/MultiplyOperation.java Wed Jun 20 08:16:12 2012
@@ -6,7 +6,7 @@ import org.apache.vxquery.datamodel.acce
import org.apache.vxquery.datamodel.accessors.atomic.XSDateTimePointable;
import org.apache.vxquery.datamodel.accessors.atomic.XSDecimalPointable;
import org.apache.vxquery.datamodel.accessors.atomic.XSTimePointable;
-import org.apache.vxquery.types.BuiltinTypeConstants;
+import org.apache.vxquery.datamodel.values.ValueTag;
import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
import edu.uci.ics.hyracks.data.std.primitive.FloatPointable;
@@ -19,7 +19,7 @@ public class MultiplyOperation extends A
throws Exception {
double value = decp1.doubleValue();
value *= decp2.doubleValue();
- dOut.write(BuiltinTypeConstants.XS_DECIMAL_TYPE_ID);
+ dOut.write(ValueTag.XS_DECIMAL_TAG);
dOut.writeDouble(value);
}
@@ -27,7 +27,7 @@ public class MultiplyOperation extends A
public void operateDecimalInteger(XSDecimalPointable decp, LongPointable longp, DataOutput dOut) throws Exception {
double value = decp.doubleValue();
value *= longp.doubleValue();
- dOut.write(BuiltinTypeConstants.XS_DECIMAL_TYPE_ID);
+ dOut.write(ValueTag.XS_DECIMAL_TAG);
dOut.writeDouble(value);
}
@@ -35,7 +35,7 @@ public class MultiplyOperation extends A
public void operateDecimalFloat(XSDecimalPointable decp, FloatPointable floatp, DataOutput dOut) throws Exception {
float value = decp.floatValue();
value *= floatp.floatValue();
- dOut.write(BuiltinTypeConstants.XS_FLOAT_TYPE_ID);
+ dOut.write(ValueTag.XS_FLOAT_TAG);
dOut.writeFloat(value);
}
@@ -44,7 +44,7 @@ public class MultiplyOperation extends A
throws Exception {
double value = decp.doubleValue();
value *= doublep.doubleValue();
- dOut.write(BuiltinTypeConstants.XS_DOUBLE_TYPE_ID);
+ dOut.write(ValueTag.XS_DOUBLE_TAG);
dOut.writeDouble(value);
}
@@ -53,7 +53,7 @@ public class MultiplyOperation extends A
throws Exception {
long value = decp.longValue();
value *= intp.longValue();
- dOut.write(BuiltinTypeConstants.XS_DAY_TIME_DURATION_TYPE_ID);
+ dOut.write(ValueTag.XS_DAY_TIME_DURATION_TAG);
dOut.writeLong(value);
}
@@ -62,7 +62,7 @@ public class MultiplyOperation extends A
throws Exception {
long value = decp.longValue();
value *= intp.longValue();
- dOut.write(BuiltinTypeConstants.XS_YEAR_MONTH_DURATION_TYPE_ID);
+ dOut.write(ValueTag.XS_YEAR_MONTH_DURATION_TAG);
dOut.writeLong(value);
}
@@ -75,7 +75,7 @@ public class MultiplyOperation extends A
public void operateIntegerInteger(LongPointable longp, LongPointable longp2, DataOutput dOut) throws Exception {
long value = longp.getLong();
value *= longp2.getLong();
- dOut.write(BuiltinTypeConstants.XS_INTEGER_TYPE_ID);
+ dOut.write(ValueTag.XS_INTEGER_TAG);
dOut.writeLong(value);
}
@@ -98,7 +98,7 @@ public class MultiplyOperation extends A
public void operateIntegerYMDuration(LongPointable longp, IntegerPointable intp, DataOutput dOut) throws Exception {
long value = longp.longValue();
value *= intp.longValue();
- dOut.write(BuiltinTypeConstants.XS_YEAR_MONTH_DURATION_TYPE_ID);
+ dOut.write(ValueTag.XS_YEAR_MONTH_DURATION_TAG);
dOut.writeLong(value);
}
@@ -111,7 +111,7 @@ public class MultiplyOperation extends A
public void operateFloatInteger(FloatPointable floatp, LongPointable longp, DataOutput dOut) throws Exception {
float value = floatp.floatValue();
value *= longp.floatValue();
- dOut.write(BuiltinTypeConstants.XS_FLOAT_TYPE_ID);
+ dOut.write(ValueTag.XS_FLOAT_TAG);
dOut.writeFloat(value);
}
@@ -119,7 +119,7 @@ public class MultiplyOperation extends A
public void operateFloatFloat(FloatPointable floatp, FloatPointable floatp2, DataOutput dOut) throws Exception {
float value = floatp.floatValue();
value *= floatp2.floatValue();
- dOut.write(BuiltinTypeConstants.XS_FLOAT_TYPE_ID);
+ dOut.write(ValueTag.XS_FLOAT_TAG);
dOut.writeFloat(value);
}
@@ -148,7 +148,7 @@ public class MultiplyOperation extends A
public void operateDoubleInteger(DoublePointable doublep, LongPointable longp, DataOutput dOut) throws Exception {
double value = doublep.doubleValue();
value *= longp.doubleValue();
- dOut.write(BuiltinTypeConstants.XS_DOUBLE_TYPE_ID);
+ dOut.write(ValueTag.XS_DOUBLE_TAG);
dOut.writeDouble(value);
}
@@ -156,7 +156,7 @@ public class MultiplyOperation extends A
public void operateDoubleFloat(DoublePointable doublep, FloatPointable floatp, DataOutput dOut) throws Exception {
double value = doublep.doubleValue();
value *= floatp.doubleValue();
- dOut.write(BuiltinTypeConstants.XS_DOUBLE_TYPE_ID);
+ dOut.write(ValueTag.XS_DOUBLE_TAG);
dOut.writeDouble(value);
}
@@ -165,7 +165,7 @@ public class MultiplyOperation extends A
throws Exception {
double value = doublep.doubleValue();
value *= doublep2.doubleValue();
- dOut.write(BuiltinTypeConstants.XS_DOUBLE_TYPE_ID);
+ dOut.write(ValueTag.XS_DOUBLE_TAG);
dOut.writeDouble(value);
}
@@ -180,7 +180,7 @@ operateDTDurationDouble(intp, doublep, d
throws Exception {
long value = doublep.longValue();
value *= intp.longValue();
- dOut.write(BuiltinTypeConstants.XS_YEAR_MONTH_DURATION_TYPE_ID);
+ dOut.write(ValueTag.XS_YEAR_MONTH_DURATION_TAG);
dOut.writeLong(value);
}
@@ -242,7 +242,7 @@ operateDTDurationDouble(intp, doublep, d
public void operateDTDurationInteger(IntegerPointable intp, LongPointable longp, DataOutput dOut) throws Exception {
long value = intp.longValue();
value *= longp.longValue();
- dOut.write(BuiltinTypeConstants.XS_DAY_TIME_DURATION_TYPE_ID);
+ dOut.write(ValueTag.XS_DAY_TIME_DURATION_TAG);
dOut.writeLong(value);
}
@@ -250,7 +250,7 @@ operateDTDurationDouble(intp, doublep, d
public void operateDTDurationFloat(IntegerPointable intp, FloatPointable floatp, DataOutput dOut) throws Exception {
long value = intp.longValue();
value *= floatp.longValue();
- dOut.write(BuiltinTypeConstants.XS_DAY_TIME_DURATION_TYPE_ID);
+ dOut.write(ValueTag.XS_DAY_TIME_DURATION_TAG);
dOut.writeLong(value);
}
@@ -259,7 +259,7 @@ operateDTDurationDouble(intp, doublep, d
throws Exception {
long value = intp.longValue();
value *= doublep.longValue();
- dOut.write(BuiltinTypeConstants.XS_DAY_TIME_DURATION_TYPE_ID);
+ dOut.write(ValueTag.XS_DAY_TIME_DURATION_TAG);
dOut.writeLong(value);
}
@@ -284,7 +284,7 @@ operateDTDurationDouble(intp, doublep, d
throws Exception {
long value = intp.longValue();
value *= intp2.longValue();
- dOut.write(BuiltinTypeConstants.XS_DAY_TIME_DURATION_TYPE_ID);
+ dOut.write(ValueTag.XS_DAY_TIME_DURATION_TAG);
dOut.writeLong(value);
}
@@ -331,7 +331,7 @@ operateDTDurationDouble(intp, doublep, d
throws Exception {
long value = intp.longValue();
value *= intp2.longValue();
- dOut.write(BuiltinTypeConstants.XS_YEAR_MONTH_DURATION_TYPE_ID);
+ dOut.write(ValueTag.XS_YEAR_MONTH_DURATION_TAG);
dOut.writeLong(value);
}
}
\ No newline at end of file
Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/SubtractOperation.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/SubtractOperation.java?rev=1351984&r1=1351983&r2=1351984&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/SubtractOperation.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/SubtractOperation.java Wed Jun 20 08:16:12 2012
@@ -6,7 +6,7 @@ import org.apache.vxquery.datamodel.acce
import org.apache.vxquery.datamodel.accessors.atomic.XSDateTimePointable;
import org.apache.vxquery.datamodel.accessors.atomic.XSDecimalPointable;
import org.apache.vxquery.datamodel.accessors.atomic.XSTimePointable;
-import org.apache.vxquery.types.BuiltinTypeConstants;
+import org.apache.vxquery.datamodel.values.ValueTag;
import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
import edu.uci.ics.hyracks.data.std.primitive.FloatPointable;
@@ -19,7 +19,7 @@ public class SubtractOperation extends A
throws Exception {
double value = decp1.doubleValue();
value -= decp2.doubleValue();
- dOut.write(BuiltinTypeConstants.XS_DECIMAL_TYPE_ID);
+ dOut.write(ValueTag.XS_DECIMAL_TAG);
dOut.writeDouble(value);
}
@@ -27,7 +27,7 @@ public class SubtractOperation extends A
public void operateDecimalInteger(XSDecimalPointable decp, LongPointable longp, DataOutput dOut) throws Exception {
double value = decp.doubleValue();
value -= longp.doubleValue();
- dOut.write(BuiltinTypeConstants.XS_DECIMAL_TYPE_ID);
+ dOut.write(ValueTag.XS_DECIMAL_TAG);
dOut.writeDouble(value);
}
@@ -35,7 +35,7 @@ public class SubtractOperation extends A
public void operateDecimalFloat(XSDecimalPointable decp, FloatPointable floatp, DataOutput dOut) throws Exception {
float value = decp.floatValue();
value -= floatp.floatValue();
- dOut.write(BuiltinTypeConstants.XS_FLOAT_TYPE_ID);
+ dOut.write(ValueTag.XS_FLOAT_TAG);
dOut.writeFloat(value);
}
@@ -44,7 +44,7 @@ public class SubtractOperation extends A
throws Exception {
double value = decp.doubleValue();
value -= doublep.doubleValue();
- dOut.write(BuiltinTypeConstants.XS_DOUBLE_TYPE_ID);
+ dOut.write(ValueTag.XS_DOUBLE_TAG);
dOut.writeDouble(value);
}
@@ -53,7 +53,7 @@ public class SubtractOperation extends A
throws Exception {
long value = decp.longValue();
value -= intp.longValue();
- dOut.write(BuiltinTypeConstants.XS_DAY_TIME_DURATION_TYPE_ID);
+ dOut.write(ValueTag.XS_DAY_TIME_DURATION_TAG);
dOut.writeLong(value);
}
@@ -62,7 +62,7 @@ public class SubtractOperation extends A
throws Exception {
long value = decp.longValue();
value -= intp.longValue();
- dOut.write(BuiltinTypeConstants.XS_YEAR_MONTH_DURATION_TYPE_ID);
+ dOut.write(ValueTag.XS_YEAR_MONTH_DURATION_TAG);
dOut.writeLong(value);
}
@@ -70,7 +70,7 @@ public class SubtractOperation extends A
public void operateIntegerDecimal(LongPointable longp, XSDecimalPointable decp, DataOutput dOut) throws Exception {
double value = longp.doubleValue();
value -= decp.doubleValue();
- dOut.write(BuiltinTypeConstants.XS_DECIMAL_TYPE_ID);
+ dOut.write(ValueTag.XS_DECIMAL_TAG);
dOut.writeDouble(value);
}
@@ -78,7 +78,7 @@ public class SubtractOperation extends A
public void operateIntegerInteger(LongPointable longp, LongPointable longp2, DataOutput dOut) throws Exception {
long value = longp.getLong();
value -= longp2.getLong();
- dOut.write(BuiltinTypeConstants.XS_INTEGER_TYPE_ID);
+ dOut.write(ValueTag.XS_INTEGER_TAG);
dOut.writeLong(value);
}
@@ -86,7 +86,7 @@ public class SubtractOperation extends A
public void operateIntegerFloat(LongPointable longp, FloatPointable floatp, DataOutput dOut) throws Exception {
float value = longp.floatValue();
value -= floatp.floatValue();
- dOut.write(BuiltinTypeConstants.XS_FLOAT_TYPE_ID);
+ dOut.write(ValueTag.XS_FLOAT_TAG);
dOut.writeFloat(value);
}
@@ -94,7 +94,7 @@ public class SubtractOperation extends A
public void operateIntegerDouble(LongPointable longp, DoublePointable doublep, DataOutput dOut) throws Exception {
double value = longp.doubleValue();
value -= doublep.doubleValue();
- dOut.write(BuiltinTypeConstants.XS_DOUBLE_TYPE_ID);
+ dOut.write(ValueTag.XS_DOUBLE_TAG);
dOut.writeDouble(value);
}
@@ -102,7 +102,7 @@ public class SubtractOperation extends A
public void operateIntegerDTDuration(LongPointable longp, IntegerPointable intp, DataOutput dOut) throws Exception {
long value = longp.longValue();
value -= intp.longValue();
- dOut.write(BuiltinTypeConstants.XS_DAY_TIME_DURATION_TYPE_ID);
+ dOut.write(ValueTag.XS_DAY_TIME_DURATION_TAG);
dOut.writeLong(value);
}
@@ -110,7 +110,7 @@ public class SubtractOperation extends A
public void operateIntegerYMDuration(LongPointable longp, IntegerPointable intp, DataOutput dOut) throws Exception {
long value = longp.longValue();
value -= intp.longValue();
- dOut.write(BuiltinTypeConstants.XS_YEAR_MONTH_DURATION_TYPE_ID);
+ dOut.write(ValueTag.XS_YEAR_MONTH_DURATION_TAG);
dOut.writeLong(value);
}
@@ -118,7 +118,7 @@ public class SubtractOperation extends A
public void operateFloatDecimal(FloatPointable floatp, XSDecimalPointable decp, DataOutput dOut) throws Exception {
float value = floatp.floatValue();
value -= decp.floatValue();
- dOut.write(BuiltinTypeConstants.XS_FLOAT_TYPE_ID);
+ dOut.write(ValueTag.XS_FLOAT_TAG);
dOut.writeDouble(value);
}
@@ -126,7 +126,7 @@ public class SubtractOperation extends A
public void operateFloatInteger(FloatPointable floatp, LongPointable longp, DataOutput dOut) throws Exception {
float value = floatp.floatValue();
value -= longp.floatValue();
- dOut.write(BuiltinTypeConstants.XS_FLOAT_TYPE_ID);
+ dOut.write(ValueTag.XS_FLOAT_TAG);
dOut.writeFloat(value);
}
@@ -134,7 +134,7 @@ public class SubtractOperation extends A
public void operateFloatFloat(FloatPointable floatp, FloatPointable floatp2, DataOutput dOut) throws Exception {
float value = floatp.floatValue();
value -= floatp2.floatValue();
- dOut.write(BuiltinTypeConstants.XS_FLOAT_TYPE_ID);
+ dOut.write(ValueTag.XS_FLOAT_TAG);
dOut.writeFloat(value);
}
@@ -142,7 +142,7 @@ public class SubtractOperation extends A
public void operateFloatDouble(FloatPointable floatp, DoublePointable doublep, DataOutput dOut) throws Exception {
double value = floatp.doubleValue();
value -= doublep.doubleValue();
- dOut.write(BuiltinTypeConstants.XS_DOUBLE_TYPE_ID);
+ dOut.write(ValueTag.XS_DOUBLE_TAG);
dOut.writeDouble(value);
}
@@ -150,7 +150,7 @@ public class SubtractOperation extends A
public void operateFloatDTDuration(FloatPointable floatp, IntegerPointable intp, DataOutput dOut) throws Exception {
long value = floatp.longValue();
value -= intp.longValue();
- dOut.write(BuiltinTypeConstants.XS_DAY_TIME_DURATION_TYPE_ID);
+ dOut.write(ValueTag.XS_DAY_TIME_DURATION_TAG);
dOut.writeLong(value);
}
@@ -158,7 +158,7 @@ public class SubtractOperation extends A
public void operateFloatYMDuration(FloatPointable floatp, IntegerPointable intp, DataOutput dOut) throws Exception {
long value = floatp.longValue();
value -= intp.longValue();
- dOut.write(BuiltinTypeConstants.XS_YEAR_MONTH_DURATION_TYPE_ID);
+ dOut.write(ValueTag.XS_YEAR_MONTH_DURATION_TAG);
dOut.writeLong(value);
}
@@ -167,7 +167,7 @@ public class SubtractOperation extends A
throws Exception {
double value = doublep.doubleValue();
value -= decp.doubleValue();
- dOut.write(BuiltinTypeConstants.XS_DOUBLE_TYPE_ID);
+ dOut.write(ValueTag.XS_DOUBLE_TAG);
dOut.writeDouble(value);
}
@@ -175,7 +175,7 @@ public class SubtractOperation extends A
public void operateDoubleInteger(DoublePointable doublep, LongPointable longp, DataOutput dOut) throws Exception {
double value = doublep.doubleValue();
value -= longp.doubleValue();
- dOut.write(BuiltinTypeConstants.XS_DOUBLE_TYPE_ID);
+ dOut.write(ValueTag.XS_DOUBLE_TAG);
dOut.writeDouble(value);
}
@@ -183,7 +183,7 @@ public class SubtractOperation extends A
public void operateDoubleFloat(DoublePointable doublep, FloatPointable floatp, DataOutput dOut) throws Exception {
double value = doublep.doubleValue();
value -= floatp.doubleValue();
- dOut.write(BuiltinTypeConstants.XS_DOUBLE_TYPE_ID);
+ dOut.write(ValueTag.XS_DOUBLE_TAG);
dOut.writeDouble(value);
}
@@ -192,7 +192,7 @@ public class SubtractOperation extends A
throws Exception {
double value = doublep.doubleValue();
value -= doublep2.doubleValue();
- dOut.write(BuiltinTypeConstants.XS_DOUBLE_TYPE_ID);
+ dOut.write(ValueTag.XS_DOUBLE_TAG);
dOut.writeDouble(value);
}
@@ -201,7 +201,7 @@ public class SubtractOperation extends A
throws Exception {
long value = doublep.longValue();
value -= intp.longValue();
- dOut.write(BuiltinTypeConstants.XS_DAY_TIME_DURATION_TYPE_ID);
+ dOut.write(ValueTag.XS_DAY_TIME_DURATION_TAG);
dOut.writeLong(value);
}
@@ -210,7 +210,7 @@ public class SubtractOperation extends A
throws Exception {
long value = doublep.longValue();
value -= intp.longValue();
- dOut.write(BuiltinTypeConstants.XS_YEAR_MONTH_DURATION_TYPE_ID);
+ dOut.write(ValueTag.XS_YEAR_MONTH_DURATION_TAG);
dOut.writeLong(value);
}
@@ -267,7 +267,7 @@ public class SubtractOperation extends A
throws Exception {
long value = intp.longValue();
value -= decp.longValue();
- dOut.write(BuiltinTypeConstants.XS_DAY_TIME_DURATION_TYPE_ID);
+ dOut.write(ValueTag.XS_DAY_TIME_DURATION_TAG);
dOut.writeLong(value);
}
@@ -275,7 +275,7 @@ public class SubtractOperation extends A
public void operateDTDurationInteger(IntegerPointable intp, LongPointable longp, DataOutput dOut) throws Exception {
long value = intp.longValue();
value -= longp.longValue();
- dOut.write(BuiltinTypeConstants.XS_DAY_TIME_DURATION_TYPE_ID);
+ dOut.write(ValueTag.XS_DAY_TIME_DURATION_TAG);
dOut.writeLong(value);
}
@@ -283,7 +283,7 @@ public class SubtractOperation extends A
public void operateDTDurationFloat(IntegerPointable intp, FloatPointable floatp, DataOutput dOut) throws Exception {
long value = intp.longValue();
value -= floatp.longValue();
- dOut.write(BuiltinTypeConstants.XS_DAY_TIME_DURATION_TYPE_ID);
+ dOut.write(ValueTag.XS_DAY_TIME_DURATION_TAG);
dOut.writeLong(value);
}
@@ -292,7 +292,7 @@ public class SubtractOperation extends A
throws Exception {
long value = intp.longValue();
value -= doublep.longValue();
- dOut.write(BuiltinTypeConstants.XS_DAY_TIME_DURATION_TYPE_ID);
+ dOut.write(ValueTag.XS_DAY_TIME_DURATION_TAG);
dOut.writeLong(value);
}
@@ -317,7 +317,7 @@ public class SubtractOperation extends A
throws Exception {
long value = intp.longValue();
value -= intp2.longValue();
- dOut.write(BuiltinTypeConstants.XS_DAY_TIME_DURATION_TYPE_ID);
+ dOut.write(ValueTag.XS_DAY_TIME_DURATION_TAG);
dOut.writeLong(value);
}
@@ -326,7 +326,7 @@ public class SubtractOperation extends A
throws Exception {
long value = intp.longValue();
value -= decp.longValue();
- dOut.write(BuiltinTypeConstants.XS_YEAR_MONTH_DURATION_TYPE_ID);
+ dOut.write(ValueTag.XS_YEAR_MONTH_DURATION_TAG);
dOut.writeLong(value);
}
@@ -334,7 +334,7 @@ public class SubtractOperation extends A
public void operateYMDurationInteger(IntegerPointable intp, LongPointable longp, DataOutput dOut) throws Exception {
long value = intp.longValue();
value -= longp.longValue();
- dOut.write(BuiltinTypeConstants.XS_YEAR_MONTH_DURATION_TYPE_ID);
+ dOut.write(ValueTag.XS_YEAR_MONTH_DURATION_TAG);
dOut.writeLong(value);
}
@@ -342,7 +342,7 @@ public class SubtractOperation extends A
public void operateYMDurationFloat(IntegerPointable intp, FloatPointable floatp, DataOutput dOut) throws Exception {
long value = intp.longValue();
value -= floatp.longValue();
- dOut.write(BuiltinTypeConstants.XS_YEAR_MONTH_DURATION_TYPE_ID);
+ dOut.write(ValueTag.XS_YEAR_MONTH_DURATION_TAG);
dOut.writeLong(value);
}
@@ -351,7 +351,7 @@ public class SubtractOperation extends A
throws Exception {
long value = intp.longValue();
value -= doublep.longValue();
- dOut.write(BuiltinTypeConstants.XS_YEAR_MONTH_DURATION_TYPE_ID);
+ dOut.write(ValueTag.XS_YEAR_MONTH_DURATION_TAG);
dOut.writeLong(value);
}
@@ -376,7 +376,7 @@ public class SubtractOperation extends A
throws Exception {
long value = intp.longValue();
value -= intp2.longValue();
- dOut.write(BuiltinTypeConstants.XS_YEAR_MONTH_DURATION_TYPE_ID);
+ dOut.write(ValueTag.XS_YEAR_MONTH_DURATION_TAG);
dOut.writeLong(value);
}
}
\ No newline at end of file