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/28 01:09:37 UTC
svn commit: r1377908 - in
/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery:
datamodel/util/ functions/ runtime/functions/datetime/
Author: prestonc
Date: Mon Aug 27 23:09:37 2012
New Revision: 1377908
URL: http://svn.apache.org/viewvc?rev=1377908&view=rev
Log:
Added the adjust function for timezone.
Added:
incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnAdjustDateTimeToTimezoneScalarEvaluatorFactory.java (with props)
incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnAdjustDateToTimezoneScalarEvaluatorFactory.java (with props)
incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnAdjustTimeToTimezoneScalarEvaluatorFactory.java (with props)
Modified:
incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/datamodel/util/DateTime.java
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/datamodel/util/DateTime.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/datamodel/util/DateTime.java?rev=1377908&r1=1377907&r2=1377908&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/datamodel/util/DateTime.java (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/datamodel/util/DateTime.java Mon Aug 27 23:09:37 2012
@@ -99,7 +99,8 @@ public class DateTime {
/**
* Return a normalized time.
*/
- public static void normalizeDateTime(long yearMonth, long dayTime, DataOutput dOut) throws IOException {
+ public static void normalizeDateTime(long yearMonth, long dayTime, long timezoneHour, long timezoneMinute,
+ DataOutput dOut) throws IOException {
long[] monthDayLimits;
long day = dayTime / CHRONON_OF_DAY;
@@ -119,6 +120,11 @@ public class DateTime {
if (day < DateTime.FIELD_MINS[DateTime.DAY_FIELD_INDEX]) {
// Too small
--month;
+ if (month < DateTime.FIELD_MINS[DateTime.MONTH_FIELD_INDEX]) {
+ // Too small
+ month = DateTime.FIELD_MAXS[DateTime.MONTH_FIELD_INDEX];
+ --year;
+ }
day += monthDayLimits[(int) month - 1];
}
if (day > monthDayLimits[(int) month - 1]) {
@@ -144,8 +150,8 @@ public class DateTime {
dOut.writeByte((byte) hour);
dOut.writeByte((byte) minute);
dOut.writeInt((int) millisecond);
- dOut.writeByte((byte) 0);
- dOut.writeByte((byte) 0);
+ dOut.writeByte((byte) timezoneHour);
+ dOut.writeByte((byte) timezoneMinute);
}
public static void getTimezoneDateTime(ITimezone timezonep, DynamicContext dCtx, DataOutput dOut)
@@ -163,9 +169,28 @@ public class DateTime {
timezoneHour = timezonep.getTimezoneHour();
timezoneMinute = timezonep.getTimezoneMinute();
}
- long dayTime = timezonep.getDayTime() - (timezoneHour * DateTime.CHRONON_OF_HOUR + timezoneMinute
- * DateTime.CHRONON_OF_HOUR);
+ long dayTime = timezonep.getDayTime()
+ - (timezoneHour * DateTime.CHRONON_OF_HOUR + timezoneMinute * DateTime.CHRONON_OF_HOUR);
DateTime.normalizeDateTime(timezonep.getYearMonth(), dayTime, dOut);
}
+ public static void adjustDateTimeToTimezone(ITimezone timezonep, long timezone, DataOutput dOut) throws IOException {
+ long timezoneHour = timezone / 60;
+ long timezoneMinute = timezone % 60;
+ long dayTime = timezonep.getDayTime();
+ if (timezonep.getTimezoneHour() == DateTime.TIMEZONE_HOUR_NULL
+ || timezonep.getTimezoneMinute() == DateTime.TIMEZONE_MINUTE_NULL) {
+ // No change.
+ } else {
+ dayTime -= (timezonep.getTimezoneHour() * DateTime.CHRONON_OF_HOUR + timezonep.getTimezoneMinute()
+ * DateTime.CHRONON_OF_MINUTE);
+ dayTime += (timezoneHour * DateTime.CHRONON_OF_HOUR + timezoneMinute * DateTime.CHRONON_OF_MINUTE);
+ }
+ DateTime.normalizeDateTime(timezonep.getYearMonth(), dayTime, timezoneHour, timezoneMinute, dOut);
+ }
+
+ public static void normalizeDateTime(long yearMonth, long dayTime, DataOutput dOut) throws IOException {
+ normalizeDateTime(yearMonth, dayTime, 0, 0, dOut);
+ }
+
}
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=1377908&r1=1377907&r2=1377908&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 Mon Aug 27 23:09:37 2012
@@ -26,6 +26,7 @@
<function name="fn:adjust-date-to-timezone">
<param name="arg" type="xs:date?"/>
<return type="xs:date?"/>
+ <runtime type="scalar" class="org.apache.vxquery.runtime.functions.datetime.FnAdjustDateToTimezoneScalarEvaluatorFactory"/>
</function>
<!-- fn:adjust-date-to-timezone( $arg as xs:date?, $timezone as xs:dayTimeDuration?) as xs:date? -->
@@ -33,12 +34,14 @@
<param name="arg" type="xs:date?"/>
<param name="timezone" type="xs:dayTimeDuration?"/>
<return type="xs:date?"/>
+ <runtime type="scalar" class="org.apache.vxquery.runtime.functions.datetime.FnAdjustDateToTimezoneScalarEvaluatorFactory"/>
</function>
<!-- fn:adjust-dateTime-to-timezone( $arg as xs:dateTime?) as xs:dateTime? -->
<function name="fn:adjust-dateTime-to-timezone">
<param name="arg" type="xs:dateTime?"/>
<return type="xs:dateTime?"/>
+ <runtime type="scalar" class="org.apache.vxquery.runtime.functions.datetime.FnAdjustDateTimeToTimezoneScalarEvaluatorFactory"/>
</function>
<!-- fn:adjust-dateTime-to-timezone( $arg as xs:dateTime?, $timezone as xs:dayTimeDuration?) as xs:dateTime? -->
@@ -46,12 +49,14 @@
<param name="arg" type="xs:dateTime?"/>
<param name="timezone" type="xs:dayTimeDuration?"/>
<return type="xs:dateTime?"/>
+ <runtime type="scalar" class="org.apache.vxquery.runtime.functions.datetime.FnAdjustDateTimeToTimezoneScalarEvaluatorFactory"/>
</function>
<!-- fn:adjust-time-to-timezone( $arg as xs:time?) as xs:time? -->
<function name="fn:adjust-time-to-timezone">
<param name="arg" type="xs:time?"/>
<return type="xs:time?"/>
+ <runtime type="scalar" class="org.apache.vxquery.runtime.functions.datetime.FnAdjustTimeToTimezoneScalarEvaluatorFactory"/>
</function>
<!-- fn:adjust-time-to-timezone( $arg as xs:time?, $timezone as xs:dayTimeDuration?) as xs:time? -->
@@ -59,6 +64,7 @@
<param name="arg" type="xs:time?"/>
<param name="timezone" type="xs:dayTimeDuration?"/>
<return type="xs:time?"/>
+ <runtime type="scalar" class="org.apache.vxquery.runtime.functions.datetime.FnAdjustTimeToTimezoneScalarEvaluatorFactory"/>
</function>
<!-- fn:avg($arg as xs:anyAtomicType*) as xs:anyAtomicType? -->
Added: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnAdjustDateTimeToTimezoneScalarEvaluatorFactory.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnAdjustDateTimeToTimezoneScalarEvaluatorFactory.java?rev=1377908&view=auto
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnAdjustDateTimeToTimezoneScalarEvaluatorFactory.java (added)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnAdjustDateTimeToTimezoneScalarEvaluatorFactory.java Mon Aug 27 23:09:37 2012
@@ -0,0 +1,78 @@
+package org.apache.vxquery.runtime.functions.datetime;
+
+import java.io.DataOutput;
+import java.io.IOException;
+
+import org.apache.vxquery.context.DynamicContext;
+import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
+import org.apache.vxquery.datamodel.accessors.atomic.XSDateTimePointable;
+import org.apache.vxquery.datamodel.util.DateTime;
+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.util.ArrayBackedValueStorage;
+
+public class FnAdjustDateTimeToTimezoneScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
+ private static final long serialVersionUID = 1L;
+
+ public FnAdjustDateTimeToTimezoneScalarEvaluatorFactory(IScalarEvaluatorFactory[] args) {
+ super(args);
+ }
+
+ @Override
+ protected IScalarEvaluator createEvaluator(IHyracksTaskContext ctx, IScalarEvaluator[] args)
+ throws AlgebricksException {
+ final DynamicContext dCtx = (DynamicContext) ctx.getJobletContext().getGlobalJobData();
+ final XSDateTimePointable datetimep = (XSDateTimePointable) XSDateTimePointable.FACTORY.createPointable();
+ final XSDateTimePointable ctxDatetimep = (XSDateTimePointable) XSDateTimePointable.FACTORY.createPointable();
+ final LongPointable longp = (LongPointable) LongPointable.FACTORY.createPointable();
+ final ArrayBackedValueStorage abvsInner = new ArrayBackedValueStorage();
+ final DataOutput dOutInner = abvsInner.getDataOutput();
+
+ return new AbstractTaggedValueArgumentScalarEvaluator(args) {
+ @Override
+ protected void evaluate(TaggedValuePointable[] args, IPointable result) throws SystemException {
+ dCtx.getCurrentDateTime(ctxDatetimep);
+ TaggedValuePointable tvp1 = args[0];
+ if (tvp1.getTag() != ValueTag.XS_DATETIME_TAG) {
+ throw new SystemException(ErrorCode.FORG0006);
+ }
+ tvp1.getValue(datetimep);
+
+ // Second argument is optional and will used the dynamic context if not supplied.
+ long tz;
+ if (args.length == 2) {
+ TaggedValuePointable tvp2 = args[1];
+ if (tvp2.getTag() == ValueTag.XS_DAY_TIME_DURATION_TAG) {
+ tvp2.getValue(longp);
+ if (Math.abs(longp.getLong()) > DateTime.CHRONON_OF_HOUR * 14) {
+ throw new SystemException(ErrorCode.FODT0003);
+ }
+ tz = longp.getLong() / DateTime.CHRONON_OF_MINUTE;
+ } else {
+ throw new SystemException(ErrorCode.FORG0006);
+ }
+ } else {
+ tz = ctxDatetimep.getTimezoneHour() * 60 + ctxDatetimep.getTimezoneMinute();
+ }
+
+ try {
+ abvsInner.reset();
+ DateTime.adjustDateTimeToTimezone(datetimep, tz, dOutInner);
+ result.set(abvsInner);
+ } catch (IOException e) {
+ throw new SystemException(ErrorCode.SYSE0001, e);
+ }
+ }
+ };
+ }
+}
Propchange: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnAdjustDateTimeToTimezoneScalarEvaluatorFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnAdjustDateToTimezoneScalarEvaluatorFactory.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnAdjustDateToTimezoneScalarEvaluatorFactory.java?rev=1377908&view=auto
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnAdjustDateToTimezoneScalarEvaluatorFactory.java (added)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnAdjustDateToTimezoneScalarEvaluatorFactory.java Mon Aug 27 23:09:37 2012
@@ -0,0 +1,93 @@
+package org.apache.vxquery.runtime.functions.datetime;
+
+import java.io.DataOutput;
+import java.io.IOException;
+
+import org.apache.vxquery.context.DynamicContext;
+import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
+import org.apache.vxquery.datamodel.accessors.atomic.XSDatePointable;
+import org.apache.vxquery.datamodel.accessors.atomic.XSDateTimePointable;
+import org.apache.vxquery.datamodel.util.DateTime;
+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.util.ArrayBackedValueStorage;
+
+public class FnAdjustDateToTimezoneScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
+ private static final long serialVersionUID = 1L;
+
+ public FnAdjustDateToTimezoneScalarEvaluatorFactory(IScalarEvaluatorFactory[] args) {
+ super(args);
+ }
+
+ @Override
+ protected IScalarEvaluator createEvaluator(IHyracksTaskContext ctx, IScalarEvaluator[] args)
+ throws AlgebricksException {
+ final DynamicContext dCtx = (DynamicContext) ctx.getJobletContext().getGlobalJobData();
+ final XSDatePointable datep = (XSDatePointable) XSDatePointable.FACTORY.createPointable();
+ final XSDateTimePointable ctxDatetimep = (XSDateTimePointable) XSDateTimePointable.FACTORY.createPointable();
+ final LongPointable longp = (LongPointable) LongPointable.FACTORY.createPointable();
+ final ArrayBackedValueStorage abvsInner = new ArrayBackedValueStorage();
+ final DataOutput dOutInner = abvsInner.getDataOutput();
+ final ArrayBackedValueStorage abvs = new ArrayBackedValueStorage();
+ final DataOutput dOut = abvs.getDataOutput();
+
+ return new AbstractTaggedValueArgumentScalarEvaluator(args) {
+ @Override
+ protected void evaluate(TaggedValuePointable[] args, IPointable result) throws SystemException {
+ dCtx.getCurrentDateTime(ctxDatetimep);
+ TaggedValuePointable tvp1 = args[0];
+ if (tvp1.getTag() != ValueTag.XS_DATE_TAG) {
+ throw new SystemException(ErrorCode.FORG0006);
+ }
+ tvp1.getValue(datep);
+
+ // Second argument is optional and will used the dynamic context if not supplied.
+ long tz;
+ if (args.length == 2) {
+ TaggedValuePointable tvp2 = args[1];
+ if (tvp2.getTag() == ValueTag.XS_DAY_TIME_DURATION_TAG) {
+ tvp2.getValue(longp);
+ if (Math.abs(longp.getLong()) > DateTime.CHRONON_OF_HOUR * 14) {
+ throw new SystemException(ErrorCode.FODT0003);
+ }
+ tz = longp.getLong() / DateTime.CHRONON_OF_MINUTE;
+ } else {
+ throw new SystemException(ErrorCode.FORG0006);
+ }
+ } else {
+ tz = ctxDatetimep.getTimezoneHour() * 60 + ctxDatetimep.getTimezoneMinute();
+ }
+
+ try {
+ abvs.reset();
+ abvsInner.reset();
+ DateTime.adjustDateTimeToTimezone(datep, tz, dOutInner);
+
+ byte[] bytes = abvsInner.getByteArray();
+ int startOffset = abvsInner.getStartOffset() + 1;
+ // Convert to date.
+ bytes[startOffset + XSDatePointable.TIMEZONE_HOUR_OFFSET] = bytes[startOffset
+ + XSDateTimePointable.TIMEZONE_HOUR_OFFSET];
+ bytes[startOffset + XSDatePointable.TIMEZONE_MINUTE_OFFSET] = bytes[startOffset
+ + XSDateTimePointable.TIMEZONE_MINUTE_OFFSET];
+ dOut.write(ValueTag.XS_DATE_TAG);
+ dOut.write(bytes, startOffset, XSDatePointable.TYPE_TRAITS.getFixedLength());
+
+ result.set(abvs);
+ } catch (IOException e) {
+ throw new SystemException(ErrorCode.SYSE0001, e);
+ }
+ }
+ };
+ }
+}
Propchange: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnAdjustDateToTimezoneScalarEvaluatorFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnAdjustTimeToTimezoneScalarEvaluatorFactory.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnAdjustTimeToTimezoneScalarEvaluatorFactory.java?rev=1377908&view=auto
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnAdjustTimeToTimezoneScalarEvaluatorFactory.java (added)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnAdjustTimeToTimezoneScalarEvaluatorFactory.java Mon Aug 27 23:09:37 2012
@@ -0,0 +1,97 @@
+package org.apache.vxquery.runtime.functions.datetime;
+
+import java.io.DataOutput;
+import java.io.IOException;
+
+import org.apache.vxquery.context.DynamicContext;
+import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
+import org.apache.vxquery.datamodel.accessors.atomic.XSDateTimePointable;
+import org.apache.vxquery.datamodel.accessors.atomic.XSTimePointable;
+import org.apache.vxquery.datamodel.util.DateTime;
+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.util.ArrayBackedValueStorage;
+
+public class FnAdjustTimeToTimezoneScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory {
+ private static final long serialVersionUID = 1L;
+
+ public FnAdjustTimeToTimezoneScalarEvaluatorFactory(IScalarEvaluatorFactory[] args) {
+ super(args);
+ }
+
+ @Override
+ protected IScalarEvaluator createEvaluator(IHyracksTaskContext ctx, IScalarEvaluator[] args)
+ throws AlgebricksException {
+ final DynamicContext dCtx = (DynamicContext) ctx.getJobletContext().getGlobalJobData();
+ final XSTimePointable timep = (XSTimePointable) XSTimePointable.FACTORY.createPointable();
+ final XSDateTimePointable datetimep = (XSDateTimePointable) XSDateTimePointable.FACTORY.createPointable();
+ final XSDateTimePointable ctxDatetimep = (XSDateTimePointable) XSDateTimePointable.FACTORY.createPointable();
+ final LongPointable longp = (LongPointable) LongPointable.FACTORY.createPointable();
+ final ArrayBackedValueStorage abvsInner = new ArrayBackedValueStorage();
+ final DataOutput dOutInner = abvsInner.getDataOutput();
+ final ArrayBackedValueStorage abvs = new ArrayBackedValueStorage();
+ final DataOutput dOut = abvs.getDataOutput();
+
+ return new AbstractTaggedValueArgumentScalarEvaluator(args) {
+ @Override
+ protected void evaluate(TaggedValuePointable[] args, IPointable result) throws SystemException {
+ dCtx.getCurrentDateTime(ctxDatetimep);
+ TaggedValuePointable tvp1 = args[0];
+ if (tvp1.getTag() != ValueTag.XS_TIME_TAG) {
+ throw new SystemException(ErrorCode.FORG0006);
+ }
+ tvp1.getValue(timep);
+
+ // Second argument is optional and will used the dynamic context if not supplied.
+ long tz;
+ if (args.length == 2) {
+ TaggedValuePointable tvp2 = args[1];
+ if (tvp2.getTag() == ValueTag.XS_DAY_TIME_DURATION_TAG) {
+ tvp2.getValue(longp);
+ if (Math.abs(longp.getLong()) > DateTime.CHRONON_OF_HOUR * 14) {
+ throw new SystemException(ErrorCode.FODT0003);
+ }
+ tz = longp.getLong() / DateTime.CHRONON_OF_MINUTE;
+ } else {
+ throw new SystemException(ErrorCode.FORG0006);
+ }
+ } else {
+ tz = ctxDatetimep.getTimezoneHour() * 60 + ctxDatetimep.getTimezoneMinute();
+ }
+
+ try {
+ abvs.reset();
+ abvsInner.reset();
+ // Convert to DateTime to help have a good date.
+ datetimep.set(abvsInner.getByteArray(), abvsInner.getStartOffset(),
+ XSDateTimePointable.TYPE_TRAITS.getFixedLength());
+ datetimep.setDateTime(1970, 1, 1, timep.getHour(), timep.getMinute(), timep.getMilliSecond(),
+ timep.getTimezoneHour(), timep.getTimezoneMinute());
+
+ DateTime.adjustDateTimeToTimezone(datetimep, tz, dOutInner);
+
+ byte[] bytes = abvsInner.getByteArray();
+ int startOffset = abvsInner.getStartOffset() + 1;
+ // Convert to time.
+ dOut.write(ValueTag.XS_TIME_TAG);
+ dOut.write(bytes, startOffset + XSDateTimePointable.HOUR_OFFSET,
+ XSTimePointable.TYPE_TRAITS.getFixedLength());
+
+ result.set(abvs);
+ } catch (IOException e) {
+ throw new SystemException(ErrorCode.SYSE0001, e);
+ }
+ }
+ };
+ }
+}
Propchange: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/datetime/FnAdjustTimeToTimezoneScalarEvaluatorFactory.java
------------------------------------------------------------------------------
svn:eol-style = native