You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@vxquery.apache.org by pr...@apache.org on 2012/08/07 22:39:57 UTC
svn commit: r1370506 - in
/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery:
functions/ runtime/functions/unary/
Author: prestonc
Date: Tue Aug 7 20:39:57 2012
New Revision: 1370506
URL: http://svn.apache.org/viewvc?rev=1370506&view=rev
Log:
VXQUERY-49 The unary operations for numerics.
Added:
incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/
incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/AbstractNumericUnaryOperation.java (with props)
incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/AbstractNumericUnaryScalarEvaluatorFactory.java (with props)
incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/NumericUnaryMinusOperation.java (with props)
incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/NumericUnaryMinusScalarEvaluatorFactory.java (with props)
incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/NumericUnaryPlusOperation.java (with props)
incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/NumericUnaryPlusScalarEvaluatorFactory.java (with props)
Modified:
incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/functions/builtin-operators.xml
Modified: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/functions/builtin-operators.xml
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/functions/builtin-operators.xml?rev=1370506&r1=1370505&r2=1370506&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/functions/builtin-operators.xml (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/functions/builtin-operators.xml Tue Aug 7 20:39:57 2012
@@ -358,12 +358,14 @@
<operator name="op:numeric-unary-minus">
<param name="arg1" type="xsext:numeric"/>
<return type="xsext:numeric"/>
+ <runtime type="scalar" class="org.apache.vxquery.runtime.functions.unary.NumericUnaryMinusScalarEvaluatorFactory"/>
</operator>
<!-- op:numeric-unary-plus( $arg as numeric) as numeric -->
<operator name="op:numeric-unary-plus">
<param name="arg1" type="xsext:numeric"/>
<return type="xsext:numeric"/>
+ <runtime type="scalar" class="org.apache.vxquery.runtime.functions.unary.NumericUnaryPlusScalarEvaluatorFactory"/>
</operator>
<!-- op:QName-equal($arg1 as xs:QName, $arg2 as xs:QName) as xs:boolean -->
Added: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/AbstractNumericUnaryOperation.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/AbstractNumericUnaryOperation.java?rev=1370506&view=auto
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/AbstractNumericUnaryOperation.java (added)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/AbstractNumericUnaryOperation.java Tue Aug 7 20:39:57 2012
@@ -0,0 +1,23 @@
+package org.apache.vxquery.runtime.functions.unary;
+
+import java.io.DataOutput;
+import java.io.IOException;
+
+import org.apache.vxquery.datamodel.accessors.atomic.XSDecimalPointable;
+import org.apache.vxquery.exceptions.SystemException;
+
+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.LongPointable;
+
+public abstract class AbstractNumericUnaryOperation {
+
+ public abstract void operateDecimal(XSDecimalPointable decp, DataOutput dOut) throws SystemException, IOException;
+
+ public abstract void operateDouble(DoublePointable doublep, DataOutput dOut) throws SystemException, IOException;
+
+ public abstract void operateFloat(FloatPointable floatp, DataOutput dOut) throws SystemException, IOException;
+
+ public abstract void operateInteger(LongPointable longp, DataOutput dOut) throws SystemException, IOException;
+
+}
Propchange: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/AbstractNumericUnaryOperation.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/AbstractNumericUnaryScalarEvaluatorFactory.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/AbstractNumericUnaryScalarEvaluatorFactory.java?rev=1370506&view=auto
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/AbstractNumericUnaryScalarEvaluatorFactory.java (added)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/AbstractNumericUnaryScalarEvaluatorFactory.java Tue Aug 7 20:39:57 2012
@@ -0,0 +1,125 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package org.apache.vxquery.runtime.functions.unary;
+
+import java.io.DataOutput;
+
+import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
+import org.apache.vxquery.datamodel.accessors.atomic.XSDecimalPointable;
+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.BuiltinTypeRegistry;
+
+import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
+import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+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.DoublePointable;
+import edu.uci.ics.hyracks.data.std.primitive.FloatPointable;
+import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
+import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+
+public abstract class AbstractNumericUnaryScalarEvaluatorFactory extends
+ AbstractTaggedValueArgumentScalarEvaluatorFactory {
+ private static final long serialVersionUID = 1L;
+
+ public AbstractNumericUnaryScalarEvaluatorFactory(IScalarEvaluatorFactory[] args) {
+ super(args);
+ }
+
+ @Override
+ protected AbstractTaggedValueArgumentScalarEvaluator createEvaluator(IHyracksTaskContext ctx,
+ IScalarEvaluator[] args) throws AlgebricksException {
+ return new AbstractTaggedValueArgumentScalarEvaluator(args) {
+ final AbstractNumericUnaryOperation aOp = createNumericUnaryOperation();
+ final ArrayBackedValueStorage abvs = new ArrayBackedValueStorage();
+ final DataOutput dOut = abvs.getDataOutput();
+ final TypedPointables tp = new TypedPointables();
+
+ @Override
+ protected void evaluate(TaggedValuePointable[] args, IPointable result) throws SystemException {
+ TaggedValuePointable tvp1 = args[0];
+ int tid = getBaseTypeForArithmetics(tvp1.getTag());
+ abvs.reset();
+ try {
+ switch (tid) {
+ case ValueTag.XS_DECIMAL_TAG:
+ tvp1.getValue(tp.decp);
+ aOp.operateDecimal(tp.decp, dOut);
+ result.set(abvs);
+ return;
+
+ case ValueTag.XS_INTEGER_TAG:
+ tvp1.getValue(tp.longp);
+ aOp.operateInteger(tp.longp, dOut);
+ result.set(abvs);
+ return;
+
+ case ValueTag.XS_FLOAT_TAG:
+ tvp1.getValue(tp.floatp);
+ aOp.operateFloat(tp.floatp, dOut);
+ result.set(abvs);
+ return;
+
+ case ValueTag.XS_DOUBLE_TAG:
+ tvp1.getValue(tp.doublep);
+ aOp.operateDouble(tp.doublep, dOut);
+ result.set(abvs);
+ return;
+ }
+ } catch (SystemException se) {
+ throw se;
+ } catch (Exception e) {
+ throw new SystemException(ErrorCode.SYSE0001, e);
+ }
+ throw new SystemException(ErrorCode.XPTY0004);
+ }
+
+ private int getBaseTypeForArithmetics(int tid) throws SystemException {
+ while (true) {
+ switch (tid) {
+ case ValueTag.XS_DECIMAL_TAG:
+ case ValueTag.XS_DOUBLE_TAG:
+ case ValueTag.XS_FLOAT_TAG:
+ case ValueTag.XS_INTEGER_TAG:
+ case ValueTag.XS_LONG_TAG:
+ return tid;
+
+ case ValueTag.XS_ANY_ATOMIC_TAG:
+ throw new SystemException(ErrorCode.XPTY0004);
+
+ default:
+ tid = BuiltinTypeRegistry.INSTANCE.getSchemaTypeById(tid).getBaseType().getTypeId();
+ }
+ }
+ }
+ };
+ }
+
+ private static class TypedPointables {
+ DoublePointable doublep = (DoublePointable) DoublePointable.FACTORY.createPointable();
+ FloatPointable floatp = (FloatPointable) FloatPointable.FACTORY.createPointable();
+ LongPointable longp = (LongPointable) LongPointable.FACTORY.createPointable();
+ XSDecimalPointable decp = (XSDecimalPointable) XSDecimalPointable.FACTORY.createPointable();
+ }
+
+ protected abstract AbstractNumericUnaryOperation createNumericUnaryOperation();
+}
\ No newline at end of file
Propchange: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/AbstractNumericUnaryScalarEvaluatorFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/AbstractNumericUnaryScalarEvaluatorFactory.java
------------------------------------------------------------------------------
svn:executable = *
Added: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/NumericUnaryMinusOperation.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/NumericUnaryMinusOperation.java?rev=1370506&view=auto
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/NumericUnaryMinusOperation.java (added)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/NumericUnaryMinusOperation.java Tue Aug 7 20:39:57 2012
@@ -0,0 +1,40 @@
+package org.apache.vxquery.runtime.functions.unary;
+
+import java.io.DataOutput;
+import java.io.IOException;
+
+import org.apache.vxquery.datamodel.accessors.atomic.XSDecimalPointable;
+import org.apache.vxquery.datamodel.values.ValueTag;
+import org.apache.vxquery.exceptions.SystemException;
+
+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.LongPointable;
+
+public class NumericUnaryMinusOperation extends AbstractNumericUnaryOperation {
+
+ @Override
+ public void operateDecimal(XSDecimalPointable decp, DataOutput dOut) throws SystemException, IOException {
+ dOut.write(ValueTag.XS_DECIMAL_TAG);
+ dOut.write(decp.getDecimalPlace());
+ dOut.writeLong(-decp.getDecimalValue());
+ }
+
+ @Override
+ public void operateDouble(DoublePointable doublep, DataOutput dOut) throws SystemException, IOException {
+ dOut.write(ValueTag.XS_DOUBLE_TAG);
+ dOut.writeDouble(-doublep.getDouble());
+ }
+
+ @Override
+ public void operateFloat(FloatPointable floatp, DataOutput dOut) throws SystemException, IOException {
+ dOut.write(ValueTag.XS_FLOAT_TAG);
+ dOut.writeFloat(-floatp.getFloat());
+ }
+
+ @Override
+ public void operateInteger(LongPointable longp, DataOutput dOut) throws SystemException, IOException {
+ dOut.write(ValueTag.XS_INTEGER_TAG);
+ dOut.writeLong(-longp.getLong());
+ }
+}
\ No newline at end of file
Propchange: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/NumericUnaryMinusOperation.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/NumericUnaryMinusScalarEvaluatorFactory.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/NumericUnaryMinusScalarEvaluatorFactory.java?rev=1370506&view=auto
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/NumericUnaryMinusScalarEvaluatorFactory.java (added)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/NumericUnaryMinusScalarEvaluatorFactory.java Tue Aug 7 20:39:57 2012
@@ -0,0 +1,16 @@
+package org.apache.vxquery.runtime.functions.unary;
+
+import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+
+public class NumericUnaryMinusScalarEvaluatorFactory extends AbstractNumericUnaryScalarEvaluatorFactory {
+ private static final long serialVersionUID = 1L;
+
+ public NumericUnaryMinusScalarEvaluatorFactory(IScalarEvaluatorFactory[] args) {
+ super(args);
+ }
+
+ @Override
+ protected AbstractNumericUnaryOperation createNumericUnaryOperation() {
+ return new NumericUnaryMinusOperation();
+ }
+}
\ No newline at end of file
Propchange: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/NumericUnaryMinusScalarEvaluatorFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/NumericUnaryPlusOperation.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/NumericUnaryPlusOperation.java?rev=1370506&view=auto
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/NumericUnaryPlusOperation.java (added)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/NumericUnaryPlusOperation.java Tue Aug 7 20:39:57 2012
@@ -0,0 +1,39 @@
+package org.apache.vxquery.runtime.functions.unary;
+
+import java.io.DataOutput;
+import java.io.IOException;
+
+import org.apache.vxquery.datamodel.accessors.atomic.XSDecimalPointable;
+import org.apache.vxquery.datamodel.values.ValueTag;
+import org.apache.vxquery.exceptions.SystemException;
+
+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.LongPointable;
+
+public class NumericUnaryPlusOperation extends AbstractNumericUnaryOperation {
+
+ @Override
+ public void operateDecimal(XSDecimalPointable decp, DataOutput dOut) throws SystemException, IOException {
+ dOut.write(ValueTag.XS_DECIMAL_TAG);
+ dOut.write(decp.getByteArray(), decp.getStartOffset(), decp.getLength());
+ }
+
+ @Override
+ public void operateDouble(DoublePointable doublep, DataOutput dOut) throws SystemException, IOException {
+ dOut.write(ValueTag.XS_DOUBLE_TAG);
+ dOut.write(doublep.getByteArray(), doublep.getStartOffset(), doublep.getLength());
+ }
+
+ @Override
+ public void operateFloat(FloatPointable floatp, DataOutput dOut) throws SystemException, IOException {
+ dOut.write(ValueTag.XS_FLOAT_TAG);
+ dOut.write(floatp.getByteArray(), floatp.getStartOffset(), floatp.getLength());
+ }
+
+ @Override
+ public void operateInteger(LongPointable longp, DataOutput dOut) throws SystemException, IOException {
+ dOut.write(ValueTag.XS_INTEGER_TAG);
+ dOut.write(longp.getByteArray(), longp.getStartOffset(), longp.getLength());
+ }
+}
\ No newline at end of file
Propchange: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/NumericUnaryPlusOperation.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/NumericUnaryPlusScalarEvaluatorFactory.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/NumericUnaryPlusScalarEvaluatorFactory.java?rev=1370506&view=auto
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/NumericUnaryPlusScalarEvaluatorFactory.java (added)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/NumericUnaryPlusScalarEvaluatorFactory.java Tue Aug 7 20:39:57 2012
@@ -0,0 +1,16 @@
+package org.apache.vxquery.runtime.functions.unary;
+
+import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+
+public class NumericUnaryPlusScalarEvaluatorFactory extends AbstractNumericUnaryScalarEvaluatorFactory {
+ private static final long serialVersionUID = 1L;
+
+ public NumericUnaryPlusScalarEvaluatorFactory(IScalarEvaluatorFactory[] args) {
+ super(args);
+ }
+
+ @Override
+ protected AbstractNumericUnaryOperation createNumericUnaryOperation() {
+ return new NumericUnaryMinusOperation();
+ }
+}
\ No newline at end of file
Propchange: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/NumericUnaryPlusScalarEvaluatorFactory.java
------------------------------------------------------------------------------
svn:eol-style = native