Fix of the ATime representation and serdes according to the ISO8601
git-svn-id: https://asterixdb.googlecode.com/svn/branches/asterix_stabilization_temporal_fixes@337 eaa15691-b419-025a-1212-ee371bd00084
diff --git a/asterix-app/data/nontagged/tempData.json b/asterix-app/data/nontagged/tempData.json
index dfcfa1e..cf04712 100644
--- a/asterix-app/data/nontagged/tempData.json
+++ b/asterix-app/data/nontagged/tempData.json
@@ -1,2 +1,2 @@
-{ "id": 10, "date": date("2011-01-27"), "time": time("12:20:30"), "datetime": datetime("1951-12-27T12:20:30"), "duration": duration("D30Y10M15DT10H30M50S"), "date2": date("2011-01-27-05:00"), "time2": time("12:20:30:999-05:00"), "datetime2": datetime("1951-12-27T12:20:30.250-08:45"), "duration2": duration("D10M15DT10H50S"), "date3": date("-2011-01-27-05:00"), "time3": time("12:20:30:999Z"), "datetime3": datetime("-1951-12-27T12:20:30.250-08:15"), "duration3": duration("-DT50S"), "date4": date("-2011-01-27Z"), "time4": time("12:20:30Z"), "datetime4": datetime("-1951-12-27T12:20:30.250Z"), "duration4": duration("-D10M"), "date5": date("2011-01-27"), "time5": time("12:20:30"), "datetime5": datetime("1951-12-27T12:20:30"), "duration5": duration("D30Y10M15DT10H30M50S") }
+{ "id": 10, "date": date("2011-01-27"), "time": time("12:20:30"), "datetime": datetime("1951-12-27T12:20:30"), "duration": duration("D30Y10M15DT10H30M50S"), "date2": date("2011-01-27-05:00"), "time2": time("12:20:30.999-05:00"), "datetime2": datetime("1951-12-27T12:20:30.250-08:45"), "duration2": duration("D10M15DT10H50S"), "date3": date("-2011-01-27-05:00"), "time3": time("12:20:30.999Z"), "datetime3": datetime("-1951-12-27T12:20:30.250-08:15"), "duration3": duration("-DT50S"), "date4": date("-2011-01-27Z"), "time4": time("12:20:30Z"), "datetime4": datetime("-1951-12-27T12:20:30.250Z"), "duration4": duration("-D10M"), "date5": date("2011-01-27"), "time5": time("12:20:30"), "datetime5": datetime("1951-12-27T12:20:30"), "duration5": duration("D30Y10M15DT10H30M50S") }
diff --git a/asterix-app/data/nontagged/tempData.txt b/asterix-app/data/nontagged/tempData.txt
index 6615812..db25721 100644
--- a/asterix-app/data/nontagged/tempData.txt
+++ b/asterix-app/data/nontagged/tempData.txt
@@ -1,4 +1,4 @@
10|date("2011-01-27")|time("12:20:30")|datetime("1951-12-27T12:20:30")|duration("D30Y10M15DT10H30M50S")
-20|date("2011-01-27-05:00")|time("12:20:30:999-05:00")|datetime("1951-12-27T12:20:30:250-08:45")|duration("D10M15DT10H50S")
-30|date("-2011-01-27-05:00")|time("12:20:30:999Z")|datetime("-1951-12-27T12:20:30:250-08:15")|duration("-DT50S")
-40|date("-2011-01-27Z")|time("12:20:30Z")|datetime("-1951-12-27T12:20:30:250Z")|duration("-D10M")
+20|date("2011-01-27-05:00")|time("12:20:30.999-05:00")|datetime("1951-12-27T12:20:30.250-08:45")|duration("D10M15DT10H50S")
+30|date("-2011-01-27-05:00")|time("12:20:30.999Z")|datetime("-1951-12-27T12:20:30.250-08:15")|duration("-DT50S")
+40|date("-2011-01-27Z")|time("12:20:30Z")|datetime("-1951-12-27T12:20:30.250Z")|duration("-D10M")
diff --git a/asterix-app/src/test/resources/runtimets/queries/constructor/time_01.aql b/asterix-app/src/test/resources/runtimets/queries/constructor/time_01.aql
index caa90f0..3936b21 100644
--- a/asterix-app/src/test/resources/runtimets/queries/constructor/time_01.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/constructor/time_01.aql
@@ -4,12 +4,12 @@
write output to nc1:"rttest/constructor_time_01.adm";
-let $c1 := time("10:50:56:200+05:00")
-let $c2 := time("10:50:56:200-10:15")
+let $c1 := time("10:50:56.200+05:00")
+let $c2 := time("10:50:56.200-10:15")
let $c3 := time("10:50:56")
-let $c4 := time("10:50:56:200Z")
-let $c5 := time("23:59:59:999-13:30")
-let $c6 := time("24:00:00:000+14:45")
-let $c7 := time("12:59:00:019-01:00")
+let $c4 := time("10:50:56.200Z")
+let $c5 := time("23:59:59.999-13:30")
+let $c6 := time("00:00:00.000+14:45")
+let $c7 := time("12:59:00.019-01:00")
return {"time1": $c1, "time2": $c2, "time3": $c3, "time4": $c4, "time5": $c5, "time6": $c6, "time7": $c7}
diff --git a/asterix-app/src/test/resources/runtimets/results/constructor/time_01.adm b/asterix-app/src/test/resources/runtimets/results/constructor/time_01.adm
index 2c932b5..009ad39 100644
--- a/asterix-app/src/test/resources/runtimets/results/constructor/time_01.adm
+++ b/asterix-app/src/test/resources/runtimets/results/constructor/time_01.adm
@@ -1 +1 @@
-{ "time1": time("10:50:56:200+05:00"), "time2": time("10:50:56:200-10:15"), "time3": time("10:50:56:000+00:00"), "time4": time("10:50:56:200+00:00"), "time5": time("23:59:59:980-13:30"), "time6": time("24:00:00:000+14:45"), "time7": time("12:59:00:000-01:00") }
+{ "time1": time("05:50:56.200Z"), "time2": time("21:05:56.200Z"), "time3": time("10:50:56.000Z"), "time4": time("10:50:56.200Z"), "time5": time("13:29:59.999Z"), "time6": time("09:15:00.000Z"), "time7": time("13:59:00.019Z") }
diff --git a/asterix-app/src/test/resources/runtimets/results/scan/alltypes_01.adm b/asterix-app/src/test/resources/runtimets/results/scan/alltypes_01.adm
index 206461c..e317c7e 100644
--- a/asterix-app/src/test/resources/runtimets/results/scan/alltypes_01.adm
+++ b/asterix-app/src/test/resources/runtimets/results/scan/alltypes_01.adm
@@ -1 +1 @@
-{ "id": 10, "name": "Nancy", "age": 32.5f, "salary": 12.0d, "married": true, "interests": {{ "reading", "writing" }}, "children": [ "Brad", "Scott" ], "address": { "number": 8389, "street": "Hill St.", "city": "Mountain View" }, "dob": date("-2011-01-27+00:00"), "time": time("12:20:30:000+00:00"), "datetime": datetime("-1951-12-27T12:20:30.000Z"), "duration": duration("D10Y11M12DT10H50M30S"), "location2d": point("41.0,44.0"), "location3d": point3d("44.0,13.0,41.0"), "line": line("10.1,11.1 10.2,11.2"), "polygon": polygon("1.2,1.3 2.1,2.5 3.5,3.6 4.6,4.8"), "circle": circle("10.1,11.1 10.2") }
+{ "id": 10, "name": "Nancy", "age": 32.5f, "salary": 12.0d, "married": true, "interests": {{ "reading", "writing" }}, "children": [ "Brad", "Scott" ], "address": { "number": 8389, "street": "Hill St.", "city": "Mountain View" }, "dob": date("-2011-01-27+00:00"), "time": time("12:20:30.000Z"), "datetime": datetime("-1951-12-27T12:20:30.000Z"), "duration": duration("D10Y11M12DT10H50M30S"), "location2d": point("41.0,44.0"), "location3d": point3d("44.0,13.0,41.0"), "line": line("10.1,11.1 10.2,11.2"), "polygon": polygon("1.2,1.3 2.1,2.5 3.5,3.6 4.6,4.8"), "circle": circle("10.1,11.1 10.2") }
diff --git a/asterix-app/src/test/resources/runtimets/results/scan/temp_types_01.adm b/asterix-app/src/test/resources/runtimets/results/scan/temp_types_01.adm
index 05a81df..16e2241 100644
--- a/asterix-app/src/test/resources/runtimets/results/scan/temp_types_01.adm
+++ b/asterix-app/src/test/resources/runtimets/results/scan/temp_types_01.adm
@@ -1 +1 @@
-{ "id": 10, "date": date("2011-01-27+00:00"), "time": time("12:20:30:000+00:00"), "datetime": datetime("1951-12-27T12:20:30.000Z"), "duration": duration("D30Y10M15DT10H30M50S"), "date2": date("2011-01-27-05:00"), "time2": time("12:20:30:980-05:00"), "datetime2": datetime("1951-12-27T21:05:30.250Z"), "duration2": duration("D0Y10M15DT10H0M50S"), "date3": date("-2011-01-27-05:00"), "time3": time("12:20:30:980+00:00"), "datetime3": datetime("-1951-12-27T20:35:30.250Z"), "duration3": duration("-D0Y0M0DT0H0M50S"), "date4": date("-2011-01-27+00:00"), "time4": time("12:20:30:000+00:00"), "datetime4": datetime("-1951-12-27T12:20:30.250Z"), "duration4": duration("-D0Y10M0DT0H0M0S"), "date5": date("2011-01-27+00:00"), "time5": time("12:20:30:000+00:00"), "datetime5": datetime("1951-12-27T12:20:30.000Z"), "duration5": duration("D30Y10M15DT10H30M50S") }
\ No newline at end of file
+{ "id": 10, "date": date("2011-01-27+00:00"), "time": time("12:20:30.000Z"), "datetime": datetime("1951-12-27T12:20:30.000Z"), "duration": duration("D30Y10M15DT10H30M50S"), "date2": date("2011-01-27-05:00"), "time2": time("17:20:30.999Z"), "datetime2": datetime("1951-12-27T21:05:30.250Z"), "duration2": duration("D0Y10M15DT10H0M50S"), "date3": date("-2011-01-27-05:00"), "time3": time("12:20:30.999Z"), "datetime3": datetime("-1951-12-27T20:35:30.250Z"), "duration3": duration("-D0Y0M0DT0H0M50S"), "date4": date("-2011-01-27+00:00"), "time4": time("12:20:30.000Z"), "datetime4": datetime("-1951-12-27T12:20:30.250Z"), "duration4": duration("-D0Y10M0DT0H0M0S"), "date5": date("2011-01-27+00:00"), "time5": time("12:20:30.000Z"), "datetime5": datetime("1951-12-27T12:20:30.000Z"), "duration5": duration("D30Y10M15DT10H30M50S") }
\ No newline at end of file
diff --git a/asterix-app/src/test/resources/runtimets/results/scan/temp_types_02.adm b/asterix-app/src/test/resources/runtimets/results/scan/temp_types_02.adm
index f87b1e5..701d172 100644
--- a/asterix-app/src/test/resources/runtimets/results/scan/temp_types_02.adm
+++ b/asterix-app/src/test/resources/runtimets/results/scan/temp_types_02.adm
@@ -1,4 +1,4 @@
-{ "id": 10, "date": date("2011-01-27+00:00"), "time": time("12:20:30:000+00:00"), "datetime": datetime("1951-12-27T12:20:30:000+00:00"), "duration": duration("D30Y10M15DT10H30M50S") }
-{ "id": 20, "date": date("2011-01-27-05:00"), "time": time("12:20:30:980-05:00"), "datetime": datetime("1951-12-27T12:20:30:240-08:45"), "duration": duration("D0Y10M15DT10H0M50S") }
-{ "id": 30, "date": date("-2011-01-27-05:00"), "time": time("12:20:30:980+00:00"), "datetime": datetime("-1951-12-27T12:20:30:240-08:15"), "duration": duration("-D0Y0M0DT0H0M50S") }
-{ "id": 40, "date": date("-2011-01-27+00:00"), "time": time("12:20:30:000+00:00"), "datetime": datetime("-1951-12-27T12:20:30:240+00:00"), "duration": duration("-D0Y10M0DT0H0M0S") }
+{ "id": 10, "date": date("2011-01-27+00:00"), "time": time("12:20:30.000Z"), "datetime": datetime("1951-12-27T12:20:30.000+00:00"), "duration": duration("D30Y10M15DT10H30M50S") }
+{ "id": 20, "date": date("2011-01-27-05:00"), "time": time("17:20:30.999Z"), "datetime": datetime("1951-12-27T12:20:30.240-08:45"), "duration": duration("D0Y10M15DT10H0M50S") }
+{ "id": 30, "date": date("-2011-01-27-05:00"), "time": time("12:20:30.999Z"), "datetime": datetime("-1951-12-27T12:20:30.240-08:15"), "duration": duration("-D0Y0M0DT0H0M50S") }
+{ "id": 40, "date": date("-2011-01-27+00:00"), "time": time("12:20:30.000Z"), "datetime": datetime("-1951-12-27T12:20:30.240+00:00"), "duration": duration("-D0Y10M0DT0H0M0S") }
diff --git a/asterix-om/src/main/java/edu/uci/ics/asterix/dataflow/data/nontagged/printers/ATimePrinter.java b/asterix-om/src/main/java/edu/uci/ics/asterix/dataflow/data/nontagged/printers/ATimePrinter.java
index 7f687ea..3bbae4a 100644
--- a/asterix-om/src/main/java/edu/uci/ics/asterix/dataflow/data/nontagged/printers/ATimePrinter.java
+++ b/asterix-om/src/main/java/edu/uci/ics/asterix/dataflow/data/nontagged/printers/ATimePrinter.java
@@ -1,12 +1,11 @@
package edu.uci.ics.asterix.dataflow.data.nontagged.printers;
-import java.io.IOException;
import java.io.PrintStream;
import edu.uci.ics.asterix.dataflow.data.nontagged.serde.AInt32SerializerDeserializer;
+import edu.uci.ics.asterix.om.base.temporal.GregorianCalendarSystem;
import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
import edu.uci.ics.hyracks.algebricks.data.IPrinter;
-import edu.uci.ics.hyracks.algebricks.data.utils.WriteValueTools;
public class ATimePrinter implements IPrinter {
@@ -21,55 +20,15 @@
@Override
public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
int time = AInt32SerializerDeserializer.getInt(b, s + 1);
+ GregorianCalendarSystem calendar = GregorianCalendarSystem.getInstance();
ps.print("time(\"");
- int timezone = time >> 24;
- time -= (timezone << 24);
- printTime(time, timezone, ps);
+
+ ps.append(String.format("%02d", calendar.getHourOfDay(time))).append(":")
+ .append(String.format("%02d", calendar.getMinOfHour(time))).append(":")
+ .append(String.format("%02d", calendar.getSecOfMin(time))).append(".")
+ .append(String.format("%03d", calendar.getMillisOfSec(time))).append("Z");
+
ps.print("\")");
}
- final static void printTime(int time, int timezone, PrintStream ps) throws AlgebricksException {
- int msec = time * 20 % 1000;
- int sec = time * 20 % 60000 / 1000;
- int min = time * 20 % 3600000 / 60000;
- int hour = time * 20 % 216000000 / 3600000;
- try {
- if (hour < 10) {
- ps.print("0");
- }
- WriteValueTools.writeInt(hour, ps);
- ps.print(":");
- if (min < 10) {
- ps.print("0");
- }
- WriteValueTools.writeInt(min, ps);
- ps.print(":");
- if (sec < 10) {
- ps.print("0");
- }
- WriteValueTools.writeInt(sec, ps);
- ps.print(":");
- if (msec < 100) {
- ps.print("0");
- }
- if (msec < 10) {
- ps.print("0");
- }
- WriteValueTools.writeInt(msec, ps);
- ps.print(timezone >= 0 ? "+" : "-");
- int t1 = Math.abs(timezone / 4);
- if (t1 < 10) {
- ps.print("0");
- }
- WriteValueTools.writeInt(t1, ps);
- ps.print(":");
- int t2 = timezone % 4 * ((timezone >= 0) ? 15 : -15);
- if (t2 < 10) {
- ps.print("0");
- }
- WriteValueTools.writeInt(t2, ps);
- } catch (IOException e) {
- throw new AlgebricksException(e);
- }
- }
}
\ No newline at end of file
diff --git a/asterix-om/src/main/java/edu/uci/ics/asterix/dataflow/data/nontagged/serde/ATimeSerializerDeserializer.java b/asterix-om/src/main/java/edu/uci/ics/asterix/dataflow/data/nontagged/serde/ATimeSerializerDeserializer.java
index 1d4fe07..021bc0f 100644
--- a/asterix-om/src/main/java/edu/uci/ics/asterix/dataflow/data/nontagged/serde/ATimeSerializerDeserializer.java
+++ b/asterix-om/src/main/java/edu/uci/ics/asterix/dataflow/data/nontagged/serde/ATimeSerializerDeserializer.java
@@ -7,6 +7,7 @@
import edu.uci.ics.asterix.formats.nontagged.AqlSerializerDeserializerProvider;
import edu.uci.ics.asterix.om.base.AMutableTime;
import edu.uci.ics.asterix.om.base.ATime;
+import edu.uci.ics.asterix.om.base.temporal.GregorianCalendarSystem;
import edu.uci.ics.asterix.om.types.BuiltinType;
import edu.uci.ics.hyracks.api.dataflow.value.ISerializerDeserializer;
import edu.uci.ics.hyracks.api.exceptions.HyracksDataException;
@@ -20,10 +21,10 @@
@SuppressWarnings("unchecked")
private static ISerializerDeserializer<ATime> timeSerde = AqlSerializerDeserializerProvider.INSTANCE
.getSerializerDeserializer(BuiltinType.ATIME);
- private static AMutableTime aTime = new AMutableTime(0, 0, 0, 0, 0, 0);
- private static String errorMessage = " can not be an instance of time";
+ private static AMutableTime aTime = new AMutableTime(0);
+ //private static String errorMessage = " can not be an instance of time";
- private int time, timezone;
+ private int ora;
private ATimeSerializerDeserializer() {
}
@@ -31,12 +32,9 @@
@Override
public ATime deserialize(DataInput in) throws HyracksDataException {
try {
- time = in.readInt();
- timezone = time >> 24;
- time -= (timezone << 24);
- return new ATime((short) ((time << 8 >> 8) * 20 % 216000000 / 3600000),
- (short) ((time << 8 >> 8) * 20 % 3600000 / 60000), (short) ((time << 8 >> 8) * 20 % 60000 / 1000),
- (short) ((time << 8 >> 8) * 20 % 1000), (short) 0, timezone);
+ ora = in.readInt();
+
+ return new ATime(ora);
} catch (IOException e) {
throw new HyracksDataException(e);
}
@@ -45,84 +43,15 @@
@Override
public void serialize(ATime instance, DataOutput out) throws HyracksDataException {
try {
- time = instance.getTimeZone();
- time = time << 24;
- time = time
- + ((((((instance.getHours() * 60) + instance.getMinutes()) * 60) + instance.getSeconds()) * 1000 + instance
- .getMilliseconds()) / 20);
- out.writeInt(time);
+ out.writeInt(instance.getOra());
} catch (IOException e) {
throw new HyracksDataException(e);
}
}
- public static final void serialize(short hour, short minute, short second, short msecond, byte timeZone,
- DataOutput out) throws HyracksDataException {
- try {
- int time = timeZone;
- time = time << 24;
- time = time + ((((((hour * 60) + minute) * 60) + second) * 1000 + msecond) / 20);
- out.writeInt(time);
- } catch (IOException e) {
- throw new HyracksDataException(e);
- }
- }
-
public static void parse(String time, DataOutput out) throws HyracksDataException {
- try {
- byte timezonePart = 0;
- int offset = 0;
- if (time.charAt(offset + 2) != ':' || time.charAt(offset + 5) != ':')
- throw new HyracksDataException(time + errorMessage);
-
- short hour = Short.parseShort(time.substring(offset, offset + 2));
- short minute = Short.parseShort(time.substring(offset + 3, offset + 5));
- short second = Short.parseShort(time.substring(offset + 6, offset + 8));
- short msecond = 0;
- if (time.length() > offset + 8 && time.charAt(offset + 8) == ':') {
- msecond = Short.parseShort(time.substring(offset + 9, offset + 12));
- if (hour < 0 || hour > 24 || minute < 0 || minute > 59 || second < 0 || second > 59 || msecond < 0
- || msecond > 999 || (hour == 24 && (minute != 0 || second != 0 || msecond != 0)))
- throw new HyracksDataException(time + errorMessage);
- offset += 12;
- } else {
- if (hour < 0 || hour > 24 || minute < 0 || minute > 59 || second < 0 || second > 59
- || (hour == 24 && (minute != 0 || second != 0)))
- throw new HyracksDataException(time + errorMessage);
- offset += 8;
- }
-
- short timezoneHour = 0, timezoneMinute = 0;
- if (time.length() > offset) {
- if (time.charAt(offset) == 'Z')
- timezonePart = 0;
- else {
- if ((time.charAt(offset) != '+' && time.charAt(offset) != '-') || (time.charAt(offset + 3) != ':'))
- throw new HyracksDataException(time + errorMessage);
-
- timezoneHour = Short.parseShort(time.substring(offset + 1, offset + 3));
- timezoneMinute = Short.parseShort(time.substring(offset + 4, offset + 6));
-
- if (timezoneHour < 0
- || timezoneHour > 24
- || (timezoneHour == 24 && timezoneMinute != 0)
- || (timezoneMinute != 0 && timezoneMinute != 15 && timezoneMinute != 30 && timezoneMinute != 45))
- throw new HyracksDataException(time + errorMessage);
-
- if (time.charAt(offset) == '-')
- timezonePart = (byte) -((timezoneHour * 4) + timezoneMinute / 15);
- else
- timezonePart = (byte) ((timezoneHour * 4) + timezoneMinute / 15);
- }
-
- }
-
- aTime.setValue(hour, minute, second, msecond, 0, timezonePart);
-
- timeSerde.serialize(aTime, out);
- } catch (HyracksDataException e) {
- throw new HyracksDataException(time + errorMessage);
- }
+ GregorianCalendarSystem.getInstance().parseStringForATime(time, aTime);
+ timeSerde.serialize(aTime, out);
}
}
\ No newline at end of file
diff --git a/asterix-om/src/main/java/edu/uci/ics/asterix/om/base/AMutableTime.java b/asterix-om/src/main/java/edu/uci/ics/asterix/om/base/AMutableTime.java
index a23b8e3..c14b075 100644
--- a/asterix-om/src/main/java/edu/uci/ics/asterix/om/base/AMutableTime.java
+++ b/asterix-om/src/main/java/edu/uci/ics/asterix/om/base/AMutableTime.java
@@ -2,16 +2,12 @@
public class AMutableTime extends ATime {
- public AMutableTime(int hour, int minutes, int seconds, int milliseconds, int microseconds, int timezone) {
- super(hour, minutes, seconds, milliseconds, microseconds, timezone);
+ public AMutableTime(int ora) {
+ super(ora);
}
- public void setValue(int hour, int minutes, int seconds, int milliseconds, int microseconds, int timezone) {
- this.hour = hour;
- this.minutes = minutes;
- this.seconds = seconds;
- this.milliseconds = milliseconds;
- this.timezone = timezone;
+ public void setValue(int ora) {
+ this.ora = ora;
}
}
diff --git a/asterix-om/src/main/java/edu/uci/ics/asterix/om/base/ATime.java b/asterix-om/src/main/java/edu/uci/ics/asterix/om/base/ATime.java
index f948ffc..3ec2cca 100644
--- a/asterix-om/src/main/java/edu/uci/ics/asterix/om/base/ATime.java
+++ b/asterix-om/src/main/java/edu/uci/ics/asterix/om/base/ATime.java
@@ -1,79 +1,54 @@
package edu.uci.ics.asterix.om.base;
import edu.uci.ics.asterix.common.exceptions.AsterixException;
+import edu.uci.ics.asterix.om.base.temporal.GregorianCalendarSystem;
import edu.uci.ics.asterix.om.types.BuiltinType;
import edu.uci.ics.asterix.om.types.IAType;
import edu.uci.ics.asterix.om.visitors.IOMVisitor;
public class ATime implements IAObject {
- protected int hour;
- protected int minutes;
- protected int seconds;
- protected int timezone;
- protected int milliseconds;
- protected int microseconds;
-
- public ATime(int hour, int minutes, int seconds, int timezone) {
- this.hour = hour;
- this.minutes = minutes;
- this.seconds = seconds;
- this.timezone = timezone;
+ protected int ora;
+
+ public ATime(int ora) {
+ this.ora = ora;
}
-
- public ATime(int hour, int minutes, int seconds, int milliseconds, int microseconds, int timezone) {
- this.hour = hour;
- this.minutes = minutes;
- this.seconds = seconds;
- this.milliseconds = milliseconds;
- this.microseconds = microseconds;
- this.timezone = timezone;
- }
-
- public int getHours() {
- return hour;
- }
-
- public int getMinutes() {
- return minutes;
- }
-
- public int getSeconds() {
- return seconds;
- }
-
- public int getTimeZone() {
- return timezone;
- }
-
+
@Override
public IAType getType() {
return BuiltinType.ATIME;
}
+
+ public int compare(Object o) {
+ if (!(o instanceof ATime)) {
+ return -1;
+ }
- public int getMicroseconds() {
- return microseconds;
+ ATime d = (ATime) o;
+ if (this.ora > d.ora) {
+ return 1;
+ } else if (this.ora < d.ora) {
+ return -1;
+ } else {
+ return 0;
+ }
}
-
- public int getMilliseconds() {
- return milliseconds;
- }
-
+
@Override
public boolean equals(Object o) {
+
if (!(o instanceof ATime)) {
return false;
} else {
ATime t = (ATime) o;
- return t.getMicroseconds() == microseconds && t.getMilliseconds() == milliseconds
- && t.getSeconds() == seconds && t.getMinutes() == minutes && t.getHours() == hour
- && t.getTimeZone() == timezone;
+ return t.ora == this.ora;
+
}
}
@Override
public int hashCode() {
- return ((((timezone * 31 + hour) * 31 + minutes) * 31 + seconds) * 31 + milliseconds) * 31 + microseconds;
+ return ora;
}
@Override
@@ -93,7 +68,16 @@
@Override
public String toString() {
- return "ATime: { " + hour + ":" + minutes + ":" + seconds + ":" + milliseconds + ":" + microseconds + ":"
- + timezone + " }";
+ StringBuilder sbder = new StringBuilder();
+ sbder.append("ATime: { ");
+ GregorianCalendarSystem.getInstance().getStringRepTime(ora, sbder);
+ sbder.append(" }");
+ return sbder.toString();
+
}
+
+ public int getOra() {
+ return ora;
+ }
+
}
diff --git a/asterix-om/src/main/java/edu/uci/ics/asterix/om/base/temporal/GregorianCalendarSystem.java b/asterix-om/src/main/java/edu/uci/ics/asterix/om/base/temporal/GregorianCalendarSystem.java
index 707daaa..b36ed26 100644
--- a/asterix-om/src/main/java/edu/uci/ics/asterix/om/base/temporal/GregorianCalendarSystem.java
+++ b/asterix-om/src/main/java/edu/uci/ics/asterix/om/base/temporal/GregorianCalendarSystem.java
@@ -34,6 +34,7 @@
import java.io.IOException;
import edu.uci.ics.asterix.om.base.AMutableDateTime;
+import edu.uci.ics.asterix.om.base.AMutableTime;
import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
import edu.uci.ics.hyracks.api.exceptions.HyracksDataException;
@@ -130,6 +131,28 @@
return true;
}
+ //ATime s
+ /**
+ * Check whether the given time value is a valid time following the gregorian calendar system.
+ *
+ * @param fields
+ * @return
+ */
+ public boolean validateTime(int hour, int min, int sec, int millis) {
+ // Check whether each field is within the value domain
+ if (hour < FIELD_MINS[3] || hour > FIELD_MAXS[3])
+ return false;
+ if (min < FIELD_MINS[4] || min > FIELD_MAXS[4])
+ return false;
+ if (sec < FIELD_MINS[5] || sec > FIELD_MAXS[5])
+ return false;
+ if (millis < FIELD_MINS[6] || millis > FIELD_MAXS[6])
+ return false;
+
+ return true;
+ }
+ //ATime e
+
/**
* Check whether the given time zone value is a valid time zone following the gregorian calendar system.
*
@@ -168,6 +191,22 @@
public boolean validate(int year, int month, int day, int hour, int min, int sec, int millis, int timezone) {
return validate(year, month, day, hour, min, sec, millis) && validateTimeZone(timezone);
}
+
+ //ATime s
+ /**
+ * Validate the given ora time and time zone.
+ *
+ * @param hour
+ * @param min
+ * @param sec
+ * @param millis
+ * @param timezone
+ * @return
+ */
+ public boolean validateTime(int hour, int min, int sec, int millis, int timezone) {
+ return validateTime(hour, min, sec, millis) && validateTimeZone(timezone);
+ }
+ //ATime e
/**
* Get the chronon time of the given date time and time zone.
@@ -197,7 +236,27 @@
return chrononTime;
}
+
+ //ATime s
+ /**
+ * Get the ora of the given time and time zone.
+ *
+ * @param hour
+ * @param min
+ * @param sec
+ * @param millis
+ * @param timezone
+ * @return
+ */
+ public int getOra(int hour, int min, int sec, int millis, int timezone) {
+ // Added milliseconds for all fields but month and day
+ int ora = (hour - timezone / 4) * CHRONON_OF_HOUR
+ + (min - (timezone % 4) * 15) * CHRONON_OF_MINUTE + sec * CHRONON_OF_SECOND + millis;
+ return ora;
+ }
+ //ATime e
+
/**
* Get the ISO8601 compatible representation of the given chronon time, using the extended form as<br/>
* [-]YYYY-MM-DDThh:mm:ss.xxx[+|-]hh:mm
@@ -239,7 +298,7 @@
.append(String.format("%02d", tzMin));
}
}
-
+
public void getBasicStringRepWithTimezone(long chrononTime, int timezone, StringBuilder sbder) {
int year = getYear(chrononTime);
int month = getMonthOfYear(chrononTime, year);
@@ -260,6 +319,58 @@
.append(String.format("%02d", tzMin));
}
}
+
+ //ATime s
+ /**
+ * Get the ISO8601 compatible representation of the given ora time, using the extended form as<br/>
+ * hh:mm:ss.xxx[+|-]hh:mm
+ */
+ public void getStringRepTime(int ora, StringBuilder sbder) {
+ getExtendStringRepTimeWithTimezone(ora, 0, sbder);
+ }
+
+ public void getStringRepTime(int ora, DataOutput out) throws IOException {
+
+ out.writeUTF(String.format("%02d", getHourOfDay(ora)) + ":"
+ + String.format("%02d", getMinOfHour(ora)) + ":"
+ + String.format("%02d", getSecOfMin(ora)) + "."
+ + String.format("%03d", getMillisOfSec(ora)) + "Z");
+ }
+
+ public void getExtendStringRepTimeWithTimezone(int chrononTime, int timezone, StringBuilder sbder) {
+
+ sbder.append(String.format("%02d", getHourOfDay(chrononTime))).append(":")
+ .append(String.format("%02d", getMinOfHour(chrononTime))).append(":")
+ .append(String.format("%02d", getSecOfMin(chrononTime))).append(".")
+ .append(String.format("%03d", getMillisOfSec(chrononTime)));
+
+ if (timezone == 0) {
+ sbder.append("Z");
+ } else {
+ short tzMin = (short) ((timezone % 4) * 15);
+ short tzHr = (short) (timezone / 4);
+ sbder.append((tzHr >= 0 ? "+" : "-")).append(String.format("%02d", (tzHr < 0 ? -tzHr : tzHr))).append(":")
+ .append(String.format("%02d", tzMin));
+ }
+ }
+
+ public void getBasicStringRepTimeWithTimezone(int ora, int timezone, StringBuilder sbder) {
+
+ sbder.append(String.format("%02d", getHourOfDay(ora)))
+ .append(String.format("%02d", getMinOfHour(ora)))
+ .append(String.format("%02d", getSecOfMin(ora)))
+ .append(String.format("%03d", getMillisOfSec(ora)));
+
+ if (timezone == 0) {
+ sbder.append("Z");
+ } else {
+ short tzMin = (short) ((timezone % 4) * 15);
+ short tzHr = (short) (timezone / 4);
+ sbder.append((tzHr >= 0 ? "+" : "-")).append(String.format("%02d", (tzHr < 0 ? -tzHr : tzHr)))
+ .append(String.format("%02d", tzMin));
+ }
+ }
+ //ATime e
/* (non-Javadoc)
* @see edu.uci.ics.asterix.om.base.temporal.ICalendarSystem#parseStringRep(java.lang.String, java.io.DataOutput)
@@ -373,6 +484,94 @@
throw new HyracksDataException(e.toString());
}
}
+
+ //ATime s
+ public void parseStringRepTime(String time, DataOutput out) throws HyracksDataException {
+ int offset = 0;
+ int hour, min, sec, millis = 0;
+ int timezone = 0;
+ if (time.contains(":")) {
+// // parse extended form
+
+ if (time.charAt(offset) == '-')
+ throw new HyracksDataException(time + ERROR_FORMAT);
+
+
+ if (time.charAt(offset + 2) != ':' || time.charAt(offset + 5) != ':')
+ throw new HyracksDataException(time + ERROR_FORMAT);
+
+ hour = Short.parseShort(time.substring(offset, offset + 2));
+ min = Short.parseShort(time.substring(offset + 3, offset + 5));
+ sec = Short.parseShort(time.substring(offset + 6, offset + 8));
+
+ offset += 8;
+ if (time.length() > offset && time.charAt(offset) == '.') {
+ millis = Short.parseShort(time.substring(offset + 1, offset + 4));
+ offset += 4;
+ }
+
+ if (time.length() > offset) {
+ if (time.charAt(offset) != 'Z') {
+ if ((time.charAt(offset) != '+' && time.charAt(offset) != '-')
+ || (time.charAt(offset + 3) != ':'))
+ throw new HyracksDataException(time + ERROR_FORMAT);
+
+ short timezoneHour = Short.parseShort(time.substring(offset + 1, offset + 3));
+ short timezoneMinute = Short.parseShort(time.substring(offset + 4, offset + 6));
+
+ if (time.charAt(offset) == '-')
+ timezone = (byte) -((timezoneHour * 4) + timezoneMinute / 15);
+ else
+ timezone = (byte) ((timezoneHour * 4) + timezoneMinute / 15);
+ }
+ }
+
+ } else {
+ // parse basic form
+ if (time.charAt(offset) == '-')
+ throw new HyracksDataException(time + ERROR_FORMAT);
+
+ hour = Short.parseShort(time.substring(offset, offset + 2));
+ min = Short.parseShort(time.substring(offset + 2, offset + 4));
+ sec = Short.parseShort(time.substring(offset + 4, offset + 6));
+
+ offset += 6;
+ //TODO: Remove the "." requirement from the basic of datetime
+ if (time.length() > offset) {
+ millis = Short.parseShort(time.substring(offset, offset + 3));
+ offset += 3;
+ }
+
+ if (time.length() > offset) {
+ if (time.charAt(offset) != 'Z') {
+ if ((time.charAt(offset) != '+' && time.charAt(offset) != '-'))
+ throw new HyracksDataException(time + ERROR_FORMAT);
+
+ short timezoneHour = Short.parseShort(time.substring(offset + 1, offset + 3));
+ short timezoneMinute = Short.parseShort(time.substring(offset + 3, offset + 5));
+
+ if (time.charAt(offset) == '-')
+ timezone = (byte) -((timezoneHour * 4) + timezoneMinute / 15);
+ else
+ timezone = (byte) ((timezoneHour * 4) + timezoneMinute / 15);
+ }
+ }
+ }
+
+ if (!validateTime(hour, min, sec, millis, timezone)) {
+ throw new HyracksDataException(time + ERROR_FORMAT);
+ }
+
+ int ora = getOra(hour, min, sec, (int) millis, timezone);
+
+ try {
+ out.writeInt(ora);
+ out.writeInt(timezone);
+ } catch (IOException e) {
+ throw new HyracksDataException(e.toString());
+ }
+ }
+ //ATime e
public void parseStringForADatetime(String datetime, AMutableDateTime aMutableDatetime) throws HyracksDataException {
int offset = 0;
@@ -476,6 +675,87 @@
aMutableDatetime.setValue(getChronon(year, month, day, hour, min, sec, (int) millis, timezone));
}
+ //ATime s
+ public void parseStringForATime(String time, AMutableTime aMutableTime) throws HyracksDataException {
+ int offset = 0;
+ int hour, min, sec, millis = 0;
+ int timezone = 0;
+ if (time.contains(":")) {
+ // parse extended form
+ if (time.charAt(offset) == '-') {
+ throw new HyracksDataException(time + ERROR_FORMAT);
+ }
+
+ if (time.charAt(offset + 2) != ':' || time.charAt(offset + 5) != ':')
+ throw new HyracksDataException(time + ERROR_FORMAT);
+
+ hour = Short.parseShort(time.substring(offset, offset + 2));
+ min = Short.parseShort(time.substring(offset + 3, offset + 5));
+ sec = Short.parseShort(time.substring(offset + 6, offset + 8));
+
+ offset += 8;
+ if (time.length() > offset && time.charAt(offset) == '.') {
+ millis = Short.parseShort(time.substring(offset + 1, offset + 4));
+ offset += 4;
+ }
+
+ if (time.length() > offset) {
+ if (time.charAt(offset) != 'Z') {
+ if ((time.charAt(offset) != '+' && time.charAt(offset) != '-')
+ || (time.charAt(offset + 3) != ':'))
+ throw new HyracksDataException(time + ERROR_FORMAT);
+
+ short timezoneHour = Short.parseShort(time.substring(offset + 1, offset + 3));
+ short timezoneMinute = Short.parseShort(time.substring(offset + 4, offset + 6));
+
+ if (time.charAt(offset) == '-')
+ timezone = (byte) -((timezoneHour * 4) + timezoneMinute / 15);
+ else
+ timezone = (byte) ((timezoneHour * 4) + timezoneMinute / 15);
+ }
+ }
+
+ } else {
+ // parse basic form
+ if (time.charAt(offset) == '-') {
+ throw new HyracksDataException(time + ERROR_FORMAT);
+ }
+
+ hour = Short.parseShort(time.substring(offset, offset + 2));
+ min = Short.parseShort(time.substring(offset + 2, offset + 4));
+ sec = Short.parseShort(time.substring(offset + 4, offset + 6));
+
+ offset += 6;
+ //TODO: Remove the "."
+ if (time.length() > offset) {
+ millis = Short.parseShort(time.substring(offset, offset + 3));
+ offset += 3;
+ }
+
+ if (time.length() > offset) {
+ if (time.charAt(offset) != 'Z') {
+ if ((time.charAt(offset) != '+' && time.charAt(offset) != '-'))
+ throw new HyracksDataException(time + ERROR_FORMAT);
+
+ short timezoneHour = Short.parseShort(time.substring(offset + 1, offset + 3));
+ short timezoneMinute = Short.parseShort(time.substring(offset + 3, offset + 5));
+
+ if (time.charAt(offset) == '-')
+ timezone = (byte) -((timezoneHour * 4) + timezoneMinute / 15);
+ else
+ timezone = (byte) ((timezoneHour * 4) + timezoneMinute / 15);
+ }
+ }
+ }
+
+ if (!validateTime(hour, min, sec, millis, timezone)) {
+ throw new HyracksDataException(time + ERROR_FORMAT);
+ }
+
+ aMutableTime.setValue(getOra(hour, min, sec, millis, timezone));
+ }
+ //ATime e
+
public void parseStringForADatetime(byte[] datetime, int offset, AMutableDateTime aMutableDatetime)
throws AlgebricksException {
int year, month, day, hour, min, sec, millis = 0;
@@ -581,6 +861,91 @@
aMutableDatetime.setValue(getChronon(year, month, day, hour, min, sec, (int) millis, timezone));
}
+ //ATime s
+ public void parseStringForATime(byte[] time, int offset, int length, AMutableTime aMutableTime)
+ throws AlgebricksException {
+ int hour, min, sec, millis = 0;
+ int timezone = 0;
+ boolean isExtendedForm = false;
+ if (time[offset + 2] == ':') {
+ isExtendedForm = true;
+ }
+ if (isExtendedForm) {
+ // parse extended form
+ if (time[offset] == '-')
+ throw new AlgebricksException(time + ERROR_FORMAT);
+
+
+ if (time[offset + 5] != ':')
+ throw new AlgebricksException(time + ERROR_FORMAT);
+
+ hour = getValue(time, offset, 2);
+ min = getValue(time, offset + 3, 2);
+ sec = getValue(time, offset + 6, 2);
+
+ //if (hour==24) hour=0;
+
+ offset += 8;
+ if (length > offset && time[offset] == '.') {
+ millis = getValue(time, offset + 1, 3);
+ offset += 4;
+ }
+
+ if (length > offset) {
+ if (time[offset] != 'Z') {
+ if ((time[offset] != '+' && time[offset] != '-') || (time[offset + 3] != ':'))
+ throw new AlgebricksException(time + ERROR_FORMAT);
+
+ short timezoneHour = getValue(time, offset + 1, 2);
+ short timezoneMinute = getValue(time, offset + 4, 2);
+
+ if (time[offset] == '-')
+ timezone = (byte) -((timezoneHour * 4) + timezoneMinute / 15);
+ else
+ timezone = (byte) ((timezoneHour * 4) + timezoneMinute / 15);
+ }
+ }
+
+ } else {
+ // parse basic form
+ if (time[offset] == '-')
+ throw new AlgebricksException(time + ERROR_FORMAT);
+
+ hour = getValue(time, offset, 2);
+ min = getValue(time, offset + 2, 2);
+ sec = getValue(time, offset + 4, 2);
+
+ offset += 6;
+ //TODO: Remove "."
+ if (length > offset) {
+ millis = getValue(time, offset, 3);
+ offset += 3;
+ }
+
+ if (length > offset) {
+ if (time[offset] != 'Z') {
+ if ((time[offset] != '+' && time[offset] != '-'))
+ throw new AlgebricksException(time + ERROR_FORMAT);
+
+ short timezoneHour = getValue(time, offset + 1, 2);
+ short timezoneMinute = getValue(time, offset + 3, 2);
+
+ if (time[offset] == '-')
+ timezone = (byte) -((timezoneHour * 4) + timezoneMinute / 15);
+ else
+ timezone = (byte) ((timezoneHour * 4) + timezoneMinute / 15);
+ }
+ }
+ }
+
+ if (!validateTime(hour, min, sec, millis, timezone)) {
+ throw new AlgebricksException(time + ERROR_FORMAT);
+ }
+
+ aMutableTime.setValue(getOra(hour, min, sec, millis, timezone));
+ }
+ //ATime e
+
private short getValue(byte[] b, int offset, int numberOfDigits) throws AlgebricksException {
short value = 0;
for (int i = 0; i < numberOfDigits; i++) {
@@ -742,6 +1107,7 @@
hour += 23;
}
}
+
return hour;
}
diff --git a/asterix-om/src/main/java/edu/uci/ics/asterix/om/base/temporal/ICalendarSystem.java b/asterix-om/src/main/java/edu/uci/ics/asterix/om/base/temporal/ICalendarSystem.java
index c6b7c84..9f0d68b 100644
--- a/asterix-om/src/main/java/edu/uci/ics/asterix/om/base/temporal/ICalendarSystem.java
+++ b/asterix-om/src/main/java/edu/uci/ics/asterix/om/base/temporal/ICalendarSystem.java
@@ -1,20 +1,25 @@
package edu.uci.ics.asterix.om.base.temporal;
import java.io.DataOutput;
-import java.io.IOException;
-import edu.uci.ics.asterix.om.base.IAObject;
-import edu.uci.ics.hyracks.api.dataflow.value.ISerializerDeserializer;
import edu.uci.ics.hyracks.api.exceptions.HyracksDataException;
public interface ICalendarSystem {
public boolean validate(int year, int month, int day, int hour, int min, int sec, int millis, int timezone);
-
+
+ public boolean validateTime(int hour, int min, int sec, int millis, int timezone);
+
public long getChronon(int year, int month, int day, int hour, int min, int sec, int millis, int timezone);
+
+ public int getOra(int hour, int min, int sec, int millis, int timezone);
public void getStringRep(long chrononTime, StringBuilder sbder);
+
+ public void getStringRepTime(int ora, StringBuilder sbder);
public void parseStringRep(String stringRep, DataOutput out) throws HyracksDataException;
+
+ public void parseStringRepTime(String stringRep, DataOutput out) throws HyracksDataException;
}
diff --git a/asterix-runtime/src/main/java/edu/uci/ics/asterix/runtime/evaluators/constructors/ATimeConstructorDescriptor.java b/asterix-runtime/src/main/java/edu/uci/ics/asterix/runtime/evaluators/constructors/ATimeConstructorDescriptor.java
index 6eb0556..f2926cd 100644
--- a/asterix-runtime/src/main/java/edu/uci/ics/asterix/runtime/evaluators/constructors/ATimeConstructorDescriptor.java
+++ b/asterix-runtime/src/main/java/edu/uci/ics/asterix/runtime/evaluators/constructors/ATimeConstructorDescriptor.java
@@ -8,6 +8,7 @@
import edu.uci.ics.asterix.om.base.AMutableTime;
import edu.uci.ics.asterix.om.base.ANull;
import edu.uci.ics.asterix.om.base.ATime;
+import edu.uci.ics.asterix.om.base.temporal.GregorianCalendarSystem;
import edu.uci.ics.asterix.om.types.ATypeTag;
import edu.uci.ics.asterix.om.types.BuiltinType;
import edu.uci.ics.asterix.runtime.evaluators.base.AbstractScalarFunctionDynamicDescriptor;
@@ -41,10 +42,8 @@
private ArrayBackedValueStorage outInput = new ArrayBackedValueStorage();
private IEvaluator eval = args[0].createEvaluator(outInput);
private int offset;
- private short hour, minute, second, msecond, timezoneHour, timezoneMinute, value;
- private byte timezonePart = 0;
private String errorMessage = "This can not be an instance of time";
- private AMutableTime aTime = new AMutableTime(0, 0, 0, 0, 0, 0);
+ private AMutableTime aTime = new AMutableTime(0);
@SuppressWarnings("unchecked")
private ISerializerDeserializer<ATime> timeSerde = AqlSerializerDeserializerProvider.INSTANCE
.getSerializerDeserializer(BuiltinType.ATIME);
@@ -61,53 +60,13 @@
byte[] serString = outInput.getBytes();
if (serString[0] == SER_STRING_TYPE_TAG) {
offset = 3;
- if (serString[offset + 2] != ':' || serString[offset + 5] != ':')
- throw new AlgebricksException(errorMessage);
-
- hour = getValue(serString, offset, 2);
- minute = getValue(serString, offset + 3, 2);
- second = getValue(serString, offset + 6, 2);
- msecond = 0;
-
- if (serString[offset + 8] == ':') {
- msecond = getValue(serString, offset + 9, 3);
- if (hour < 0 || hour > 24 || minute < 0 || minute > 59 || second < 0 || second > 59
- || msecond < 0 || msecond > 999
- || (hour == 24 && (minute != 0 || second != 0 || msecond != 0)))
- throw new AlgebricksException(errorMessage);
- offset += 12;
- } else {
- if (hour < 0 || hour > 24 || minute < 0 || minute > 59 || second < 0 || second > 59
- || (hour == 24 && (minute != 0 || second != 0)))
- throw new AlgebricksException(errorMessage);
- offset += 8;
- }
-
- if (outInput.getLength() > offset) {
- if (serString[offset] == 'Z')
- timezonePart = 0;
- else {
- if ((serString[offset] != '+' && serString[offset] != '-')
- || (serString[offset + 3] != ':'))
- throw new AlgebricksException(errorMessage);
-
- timezoneHour = getValue(serString, offset + 1, 2);
- timezoneMinute = getValue(serString, offset + 4, 2);
-
- if (timezoneHour < 0
- || timezoneHour > 24
- || (timezoneHour == 24 && timezoneMinute != 0)
- || (timezoneMinute != 0 && timezoneMinute != 15 && timezoneMinute != 30 && timezoneMinute != 45))
- throw new AlgebricksException(errorMessage);
-
- if (serString[offset] == '-')
- timezonePart = (byte) -((timezoneHour * 4) + timezoneMinute / 15);
- else
- timezonePart = (byte) ((timezoneHour * 4) + timezoneMinute / 15);
- }
- }
-
- aTime.setValue(hour, minute, second, msecond, 0, timezonePart);
+ int length=3;
+
+ while (serString[length]!='\0')
+ length++;
+
+ GregorianCalendarSystem.getInstance().parseStringForATime(serString, offset, length, aTime);
+
timeSerde.serialize(aTime, out);
} else if (serString[0] == SER_NULL_TYPE_TAG)
@@ -118,17 +77,6 @@
throw new AlgebricksException(errorMessage);
}
}
-
- private short getValue(byte[] b, int offset, int numberOfDigits) throws AlgebricksException {
- value = 0;
- for (int i = 0; i < numberOfDigits; i++) {
- if ((b[offset] >= '0' && b[offset] <= '9'))
- value = (short) (value * 10 + b[offset++] - '0');
- else
- throw new AlgebricksException(errorMessage);
- }
- return value;
- }
};
}
};