Return-Path: X-Original-To: apmail-incubator-vxquery-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-vxquery-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 42907DF6A for ; Tue, 25 Sep 2012 21:01:12 +0000 (UTC) Received: (qmail 85805 invoked by uid 500); 25 Sep 2012 21:01:12 -0000 Delivered-To: apmail-incubator-vxquery-commits-archive@incubator.apache.org Received: (qmail 85787 invoked by uid 500); 25 Sep 2012 21:01:12 -0000 Mailing-List: contact vxquery-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: vxquery-dev@incubator.apache.org Delivered-To: mailing list vxquery-commits@incubator.apache.org Received: (qmail 85778 invoked by uid 99); 25 Sep 2012 21:01:11 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Sep 2012 21:01:11 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Sep 2012 21:01:10 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 1AE642388A68; Tue, 25 Sep 2012 21:00:27 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1390130 - in /incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery: functions/ runtime/functions/strings/ Date: Tue, 25 Sep 2012 21:00:26 -0000 To: vxquery-commits@incubator.apache.org From: prestonc@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120925210027.1AE642388A68@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: prestonc Date: Tue Sep 25 21:00:26 2012 New Revision: 1390130 URL: http://svn.apache.org/viewvc?rev=1390130&view=rev Log: VXQUERY-67 Added fn:codepointsToString and fn:stringToCodepoints. Added: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnCodepointsToStringEvaluatorFactory.java (with props) incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStringToCodepointsEvaluatorFactory.java (with props) Modified: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/functions/builtin-functions.xml 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=1390130&r1=1390129&r2=1390130&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 Tue Sep 25 21:00:26 2012 @@ -111,6 +111,7 @@ + @@ -873,6 +874,7 @@ + Added: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnCodepointsToStringEvaluatorFactory.java URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnCodepointsToStringEvaluatorFactory.java?rev=1390130&view=auto ============================================================================== --- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnCodepointsToStringEvaluatorFactory.java (added) +++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnCodepointsToStringEvaluatorFactory.java Tue Sep 25 21:00:26 2012 @@ -0,0 +1,103 @@ +/* + * 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.strings; + +import java.io.DataOutput; +import java.io.IOException; + +import org.apache.vxquery.datamodel.accessors.SequencePointable; +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 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.LongPointable; +import edu.uci.ics.hyracks.data.std.primitive.VoidPointable; +import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage; + +public class FnCodepointsToStringEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory { + private static final long serialVersionUID = 1L; + + public FnCodepointsToStringEvaluatorFactory(IScalarEvaluatorFactory[] args) { + super(args); + } + + @Override + protected IScalarEvaluator createEvaluator(IHyracksTaskContext ctx, IScalarEvaluator[] args) + throws AlgebricksException { + final TaggedValuePointable tvp = (TaggedValuePointable) TaggedValuePointable.FACTORY.createPointable(); + final LongPointable longp = (LongPointable) LongPointable.FACTORY.createPointable(); + final SequencePointable seqp = (SequencePointable) SequencePointable.FACTORY.createPointable(); + final ArrayBackedValueStorage abvs = new ArrayBackedValueStorage(); + final VoidPointable p = (VoidPointable) VoidPointable.FACTORY.createPointable(); + + return new AbstractTaggedValueArgumentScalarEvaluator(args) { + @Override + protected void evaluate(TaggedValuePointable[] args, IPointable result) throws SystemException { + TaggedValuePointable tvp1 = args[0]; + // Only accept sequences as input. + if (tvp1.getTag() != ValueTag.SEQUENCE_TAG) { + throw new SystemException(ErrorCode.FORG0006); + } + tvp1.getValue(seqp); + + try { + // Byte Format: Type (1 byte) + String Length (2 bytes) + String. + DataOutput out = abvs.getDataOutput(); + out.write(ValueTag.XS_STRING_TAG); + + // Default values for the length and update later + out.write(0); + out.write(0); + + int c; + for (int j = 0; j < seqp.getEntryCount(); ++j) { + seqp.getEntry(j, p); + tvp.set(p.getByteArray(), p.getStartOffset(), p.getLength()); + tvp.getValue(longp); + c = longp.intValue(); + if ((c >= 0x0001) && (c <= 0x007F)) { + out.write((byte) c); + } else if (c > 0x07FF) { + out.write((byte) (0xE0 | ((c >> 12) & 0x0F))); + out.write((byte) (0x80 | ((c >> 6) & 0x3F))); + out.write((byte) (0x80 | ((c >> 0) & 0x3F))); + } else { + out.write((byte) (0xC0 | ((c >> 6) & 0x1F))); + out.write((byte) (0x80 | ((c >> 0) & 0x3F))); + } + } + + // Update the full length string in the byte array. + abvs.getByteArray()[1] = (byte) (((abvs.getLength() - 3) >>> 8) & 0xFF); + abvs.getByteArray()[2] = (byte) (((abvs.getLength() - 3) >>> 0) & 0xFF); + + result.set(abvs.getByteArray(), abvs.getStartOffset(), abvs.getLength()); + } catch (IOException e) { + throw new SystemException(ErrorCode.SYSE0001, e); + } + } + }; + } +} Propchange: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnCodepointsToStringEvaluatorFactory.java ------------------------------------------------------------------------------ svn:eol-style = native Added: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStringToCodepointsEvaluatorFactory.java URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStringToCodepointsEvaluatorFactory.java?rev=1390130&view=auto ============================================================================== --- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStringToCodepointsEvaluatorFactory.java (added) +++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStringToCodepointsEvaluatorFactory.java Tue Sep 25 21:00:26 2012 @@ -0,0 +1,105 @@ +/* + * 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.strings; + +import java.io.DataOutput; +import java.io.IOException; + +import org.apache.vxquery.datamodel.accessors.SequencePointable; +import org.apache.vxquery.datamodel.accessors.TaggedValuePointable; +import org.apache.vxquery.datamodel.builders.sequence.SequenceBuilder; +import org.apache.vxquery.datamodel.values.ValueTag; +import org.apache.vxquery.datamodel.values.XDMConstants; +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.util.FunctionHelper; + +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 FnStringToCodepointsEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory { + private static final long serialVersionUID = 1L; + + public FnStringToCodepointsEvaluatorFactory(IScalarEvaluatorFactory[] args) { + super(args); + } + + @Override + protected IScalarEvaluator createEvaluator(IHyracksTaskContext ctx, IScalarEvaluator[] args) + throws AlgebricksException { + final UTF8StringPointable stringp = (UTF8StringPointable) UTF8StringPointable.FACTORY.createPointable(); + final UTF8StringCharacterIterator charIterator = new UTF8StringCharacterIterator(stringp); + final SequencePointable seqp = (SequencePointable) SequencePointable.FACTORY.createPointable(); + final ArrayBackedValueStorage abvs = new ArrayBackedValueStorage(); + final SequenceBuilder sb = new SequenceBuilder(); + final ArrayBackedValueStorage abvsInner = new ArrayBackedValueStorage(); + final DataOutput dOutInner = abvsInner.getDataOutput(); + + return new AbstractTaggedValueArgumentScalarEvaluator(args) { + @Override + protected void evaluate(TaggedValuePointable[] args, IPointable result) throws SystemException { + TaggedValuePointable tvp1 = args[0]; + + // Only accept strings as input. + if (tvp1.getTag() == ValueTag.SEQUENCE_TAG) { + tvp1.getValue(seqp); + if (seqp.getEntryCount() == 0) { + XDMConstants.setEmptySequence(result); + return; + } else { + throw new SystemException(ErrorCode.FORG0006); + } + } else { + if (!FunctionHelper.isDerivedFromString(tvp1.getTag())) { + throw new SystemException(ErrorCode.FORG0006); + } + tvp1.getValue(stringp); + if (stringp.getLength() == 2) { + XDMConstants.setEmptySequence(result); + return; + } + } + + // Return sequence of character values. + try { + charIterator.reset(); + abvs.reset(); + sb.reset(abvs); + int c; + while ((c = charIterator.next()) != ICharacterIterator.EOS_CHAR) { + abvsInner.reset(); + dOutInner.write(ValueTag.XS_INTEGER_TAG); + dOutInner.writeLong(c); + sb.addItem(abvsInner); + } + + sb.finish(); + result.set(abvs); + } catch (IOException e) { + throw new SystemException(ErrorCode.SYSE0001); + } + } + }; + } +} Propchange: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStringToCodepointsEvaluatorFactory.java ------------------------------------------------------------------------------ svn:eol-style = native