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/25 02:18:11 UTC
svn commit: r1377160 - in
/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery:
datamodel/accessors/atomic/ functions/ runtime/functions/cast/
runtime/functions/qname/
Author: prestonc
Date: Sat Aug 25 00:18:11 2012
New Revision: 1377160
URL: http://svn.apache.org/viewvc?rev=1377160&view=rev
Log:
Added fn:QName and fixed a few of the naming issues in the qname pointable to support saving and printing the qname value.
Added:
incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/qname/
incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/qname/FnQNameScalarEvaluatorFactory.java (with props)
Modified:
incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSQNamePointable.java
incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/functions/builtin-functions.xml
incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToStringOperation.java
Modified: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSQNamePointable.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSQNamePointable.java?rev=1377160&r1=1377159&r2=1377160&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSQNamePointable.java (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSQNamePointable.java Sat Aug 25 00:18:11 2012
@@ -35,43 +35,57 @@ public class XSQNamePointable extends Ab
}
};
- /* TODO Do we need this?
- public void setQName(IPointable uri, IPointable prefix, IPointable localName) {
- int uriLength = uri.getLength();
- int prefixLength = prefix.getLength();
- set(uri);
- set(prefix.getByteArray(), prefixLength, uriLength);
- set(localName.getByteArray(), localName.getLength(), (uriLength + prefixLength));
- }
- */
-
public int getUriLength() {
- return UTF8StringPointable.getUTFLength(bytes, start) + 2;
+ return getUriLength(bytes, start);
}
public static int getUriLength(byte[] bytes, int start) {
- return UTF8StringPointable.getUTFLength(bytes, start) + 2;
+ return getUriUTFLength(bytes, start) + 2;
+ }
+
+ public int getUriUTFLength() {
+ return getUriUTFLength(bytes, start);
+ }
+
+ public static int getUriUTFLength(byte[] bytes, int start) {
+ return UTF8StringPointable.getUTFLength(bytes, start);
}
public int getPrefixLength() {
- return UTF8StringPointable.getUTFLength(bytes, start + getUriLength()) + 2;
+ return getPrefixLength(bytes, start);
}
public static int getPrefixLength(byte[] bytes, int start) {
- return UTF8StringPointable.getUTFLength(bytes, start + getUriLength(bytes, start)) + 2;
+ return getPrefixUTFLength(bytes, start) + 2;
+ }
+
+ public int getPrefixUTFLength() {
+ return getPrefixUTFLength(bytes, start);
+ }
+
+ public static int getPrefixUTFLength(byte[] bytes, int start) {
+ return UTF8StringPointable.getUTFLength(bytes, start + getUriLength(bytes, start));
}
public int getLocalNameLength() {
- return UTF8StringPointable.getUTFLength(bytes, start + getUriLength() + getPrefixLength()) + 2;
+ return getLocalNameLength(bytes, start);
}
public static int getLocalNameLength(byte[] bytes, int start) {
+ return getLocalNameUTFLength(bytes, start) + 2;
+ }
+
+ public int getLocalNameUTFLength() {
+ return getLocalNameUTFLength(bytes, start);
+ }
+
+ public static int getLocalNameUTFLength(byte[] bytes, int start) {
return UTF8StringPointable.getUTFLength(bytes,
- start + getUriLength(bytes, start) + getPrefixLength(bytes, start)) + 2;
+ start + getUriLength(bytes, start) + getPrefixLength(bytes, start));
}
public void getUri(IPointable stringp) {
- stringp.set(bytes, start, getUriLength());
+ getUri(bytes, start, stringp);
}
public static void getUri(byte[] bytes, int start, IPointable stringp) {
@@ -79,7 +93,7 @@ public class XSQNamePointable extends Ab
}
public void getPrefix(IPointable stringp) {
- stringp.set(bytes, start + getUriLength(), getPrefixLength());
+ getPrefix(bytes, start, stringp);
}
public static void getPrefix(byte[] bytes, int start, IPointable stringp) {
@@ -87,7 +101,7 @@ public class XSQNamePointable extends Ab
}
public void getLocalName(IPointable stringp) {
- stringp.set(bytes, start + getUriLength() + getPrefixLength(), getLocalNameLength());
+ getLocalName(bytes, start, stringp);
}
public static void getLocalName(byte[] bytes, int start, IPointable stringp) {
Modified: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/functions/builtin-functions.xml
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/functions/builtin-functions.xml?rev=1377160&r1=1377159&r2=1377160&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/functions/builtin-functions.xml (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/functions/builtin-functions.xml Sat Aug 25 00:18:11 2012
@@ -666,6 +666,7 @@
<param name="paramURI" type="xs:string?"/>
<param name="paramQName" type="xs:string"/>
<return type="xs:QName"/>
+ <runtime type="scalar" class="org.apache.vxquery.runtime.functions.qname.FnQNameScalarEvaluatorFactory"/>
</function>
<!-- fn:remove($target as item()*, $position as xs:integer) as item()* -->
Modified: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToStringOperation.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToStringOperation.java?rev=1377160&r1=1377159&r2=1377160&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToStringOperation.java (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToStringOperation.java Sat Aug 25 00:18:11 2012
@@ -666,12 +666,14 @@ public class CastToStringOperation exten
@Override
public void convertQName(XSQNamePointable qnamep, DataOutput dOut) throws SystemException, IOException {
abvsInner.reset();
- dOutInner.write(qnamep.getByteArray(), qnamep.getStartOffset() + qnamep.getUriLength() + 4,
- qnamep.getPrefixLength());
- writeChar(':', dOutInner);
+ if (qnamep.getPrefixUTFLength() > 0) {
+ dOutInner.write(qnamep.getByteArray(), qnamep.getStartOffset() + qnamep.getUriLength() + 2,
+ qnamep.getPrefixUTFLength());
+ writeChar(':', dOutInner);
+ }
dOutInner.write(qnamep.getByteArray(),
- qnamep.getStartOffset() + qnamep.getUriLength() + qnamep.getPrefixLength() + 6,
- qnamep.getLocalNameLength());
+ qnamep.getStartOffset() + qnamep.getUriLength() + qnamep.getPrefixLength() + 2,
+ qnamep.getLocalNameUTFLength());
sendStringDataOutput(dOut);
}
@@ -841,5 +843,5 @@ public class CastToStringOperation exten
}
}
}
-
+
}
\ No newline at end of file
Added: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/qname/FnQNameScalarEvaluatorFactory.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/qname/FnQNameScalarEvaluatorFactory.java?rev=1377160&view=auto
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/qname/FnQNameScalarEvaluatorFactory.java (added)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/qname/FnQNameScalarEvaluatorFactory.java Sat Aug 25 00:18:11 2012
@@ -0,0 +1,91 @@
+package org.apache.vxquery.runtime.functions.qname;
+
+import java.io.DataOutput;
+
+import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
+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.runtime.functions.strings.ICharacterIterator;
+import org.apache.vxquery.runtime.functions.strings.UTF8StringCharacterIterator;
+
+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.UTF8StringPointable;
+import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+
+public class FnQNameScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
+ private static final long serialVersionUID = 1L;
+
+ public FnQNameScalarEvaluatorFactory(IScalarEvaluatorFactory[] args) {
+ super(args);
+ }
+
+ @Override
+ protected IScalarEvaluator createEvaluator(IHyracksTaskContext ctx, IScalarEvaluator[] args)
+ throws AlgebricksException {
+ final UTF8StringPointable paramURI = (UTF8StringPointable) UTF8StringPointable.FACTORY.createPointable();
+ final UTF8StringPointable paramQName = (UTF8StringPointable) UTF8StringPointable.FACTORY.createPointable();
+ final ArrayBackedValueStorage abvs = new ArrayBackedValueStorage();
+ final DataOutput dOut = abvs.getDataOutput();
+ final ArrayBackedValueStorage abvsParamQName = new ArrayBackedValueStorage();
+ final DataOutput dOutParamQName = abvsParamQName.getDataOutput();
+
+ return new AbstractTaggedValueArgumentScalarEvaluator(args) {
+ @Override
+ protected void evaluate(TaggedValuePointable[] args, IPointable result) throws SystemException {
+ TaggedValuePointable tvp1 = args[0];
+ TaggedValuePointable tvp2 = args[1];
+
+ // Only accept a strings.
+ if (tvp1.getTag() != ValueTag.XS_STRING_TAG) {
+ throw new SystemException(ErrorCode.FORG0006);
+ }
+ if (tvp2.getTag() != ValueTag.XS_STRING_TAG) {
+ throw new SystemException(ErrorCode.FORG0006);
+ }
+ tvp1.getValue(paramURI);
+ tvp2.getValue(paramQName);
+
+ try {
+ abvs.reset();
+ dOut.write(ValueTag.XS_QNAME_TAG);
+ dOut.write(paramURI.getByteArray(), paramURI.getStartOffset(), paramURI.getLength());
+
+ // Separate the local name and prefix.
+ abvsParamQName.reset();
+ ICharacterIterator charIterator = new UTF8StringCharacterIterator(paramQName);
+ charIterator.reset();
+ int c = 0;
+ int prefixLength = 0;
+ while ((c = charIterator.next()) != ICharacterIterator.EOS_CHAR) {
+ if (c == Character.valueOf(':')) {
+ prefixLength = abvsParamQName.getLength();
+ } else {
+ dOutParamQName.writeChar(c);
+ }
+ }
+
+ dOut.write((byte) ((prefixLength >>> 8) & 0xFF));
+ dOut.write((byte) ((prefixLength >>> 0) & 0xFF));
+ dOut.write(abvsParamQName.getByteArray(), abvsParamQName.getStartOffset(), prefixLength);
+
+ int localNameLength = abvsParamQName.getLength() - prefixLength;
+ dOut.write((byte) ((localNameLength >>> 8) & 0xFF));
+ dOut.write((byte) ((localNameLength >>> 0) & 0xFF));
+ dOut.write(abvsParamQName.getByteArray(), abvsParamQName.getStartOffset() + prefixLength,
+ localNameLength);
+
+ result.set(abvs);
+ } catch (Exception e) {
+ // TODO: handle exception
+ }
+ }
+ };
+ }
+}
\ No newline at end of file
Propchange: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/qname/FnQNameScalarEvaluatorFactory.java
------------------------------------------------------------------------------
svn:eol-style = native