re-enabled all existing temporal test cases.
git-svn-id: https://asterixdb.googlecode.com/svn/branches/asterix_stabilization_temp_missing_tests@1287 eaa15691-b419-025a-1212-ee371bd00084
diff --git a/asterix-app/data/temporal/temporalData.json b/asterix-app/data/temporal/temporalData.json
index 27a812e..95cc470 100644
--- a/asterix-app/data/temporal/temporalData.json
+++ b/asterix-app/data/temporal/temporalData.json
@@ -1,3 +1,3 @@
{"id": "001", "dateField": date("-2012-12-12"), "dateFieldPlus": date("0990-01-01"), "timeField": time("23:49:12.39Z"), "timeFieldPlus": time("03:23:12.2"), "datetimeField": datetime("2012-12-12T00:00:00.001"), "datetimeFieldPlus": datetime("-00130810T221015398"), "durationField": duration("P20Y19DT3H74M23.34S"), "durationFieldPlus": duration("-P2MT4M300.68S"), "intervalField": interval-datetime("2012-12-12T00:00:00.001,20130810T221015398") }
-{"id": "002", "datetimeField": datetime("19201220T232918478") }
-{"id": "003", "intervalPlus": interval-time("19:23:32.328Z,23:20:20") }
\ No newline at end of file
+{"id": "002", "timeField": time("12:12:12.219+08:00"), "timeField2": time("13:13:13.321-08:00"), "datetimeField": datetime("19201220T232918478"), "intervalField": interval-time("12:29:30+08:00, 235959999-0800") }
+{"id": "003", "intervalField": interval-date("-2012-03-17, 2013-04-01"), "intervalPlus": interval-time("19:23:32.328Z,23:20:20") }
\ No newline at end of file
diff --git a/asterix-app/src/test/resources/runtimets/queries/comparison/time_order.aql b/asterix-app/src/test/resources/runtimets/queries/comparison/time_order.aql
index ba0d211..df9966e 100644
--- a/asterix-app/src/test/resources/runtimets/queries/comparison/time_order.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/comparison/time_order.aql
@@ -7,7 +7,7 @@
let $t1 := time("13:00:00.382-10:00")
let $t2 := time("23:59:59.999Z")
let $t3 := time("22:00:00+03:00")
-let $t4 := time("00:00:00.00Z")
+let $t4 := time("00:00:00.00")
let $t5 := time("00:00:00.00-02:00")
let $t6 := time("00:00:00.47+04:00")
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 4a040a1..995215d 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
@@ -14,6 +14,6 @@
let $c8 := time("12:59:00.01-01:00")
let $c9 := time("12:59:00.019-01:00")
let $c10 := time("12590001-0100")
-let $c11 := time("125900019-0100")
+let $c11 := time("125900019+0100")
return {"time1": $c1, "time2": $c2, "time3": $c3, "time4": $c4, "time5": $c5, "time6": $c6, "time7": $c7, "time8": $c8, "time9": $c9, "time10": $c10, "time11": $c11}
diff --git a/asterix-app/src/test/resources/runtimets/results/constructor/interval.adm b/asterix-app/src/test/resources/runtimets/results/constructor/interval.adm
index 8fb7e25..4a8ec57 100644
--- a/asterix-app/src/test/resources/runtimets/results/constructor/interval.adm
+++ b/asterix-app/src/test/resources/runtimets/results/constructor/interval.adm
@@ -1 +1 @@
-{ "interval1": interval("date("2010-10-30"), date("2012-10-21")"), "interval2": interval("time("03:04:05.678Z"), time("23:24:25.267Z")"), "interval3": interval("datetime("-1987-11-19T02:43:57.938Z"), datetime("1999-11-12T12:49:35.948Z")"), "interval4": interval("date("0001-12-27"), date("0006-01-27")"), "interval5": interval("time("20:03:20.948Z"), time("20:57:50.886Z")"), "interval6": interval("datetime("-2043-11-19T15:32:39.293Z"), datetime("-1603-03-12T12:12:38.242Z")") }
\ No newline at end of file
+{ "interval1": interval-date("2010-10-30, 2012-10-21"), "interval2": interval-time("03:04:05.678Z, 23:24:25.267Z"), "interval3": interval-datetime("-1987-11-19T02:43:57.938Z, 1999-11-12T12:49:35.948Z"), "interval4": interval-date("0001-12-27, 0006-01-27"), "interval5": interval-time("20:03:20.948Z, 20:57:50.886Z"), "interval6": interval-datetime("-2043-11-19T15:32:39.293Z, -1603-03-12T12:12:38.242Z") }
\ No newline at end of file
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 ef6adc9..34a119f 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("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"), "time8": time("13:59:00.010Z"), "time9": time("13:59:00.019Z"), "time10": time("13:59:00.010Z"), "time11": time("13:59:00.019Z") }
+{ "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"), "time8": time("13:59:00.010Z"), "time9": time("13:59:00.019Z"), "time10": time("13:59:00.010Z"), "time11": time("11:59:00.019Z") }
diff --git a/asterix-app/src/test/resources/runtimets/results/temp/insert_from_ext_ds.adm b/asterix-app/src/test/resources/runtimets/results/temp/insert_from_ext_ds.adm
index 842d00c..31312be 100644
--- a/asterix-app/src/test/resources/runtimets/results/temp/insert_from_ext_ds.adm
+++ b/asterix-app/src/test/resources/runtimets/results/temp/insert_from_ext_ds.adm
@@ -1,3 +1,3 @@
{ "date": date("-2012-12-12"), "time": time("23:49:12.390Z"), "datetime": datetime("2012-12-12T00:00:00.001Z"), "duration": duration("P20Y19DT4H14M23.34S"), "interval": interval-datetime("2012-12-12T00:00:00.001Z, 2013-08-10T22:10:15.398Z") }
-{ "date": null, "time": null, "datetime": datetime("1920-12-20T23:29:18.478Z"), "duration": null, "interval": null }
-{ "date": null, "time": null, "datetime": null, "duration": null, "interval": null }
\ No newline at end of file
+{ "date": null, "time": time("04:12:12.219Z"), "datetime": datetime("1920-12-20T23:29:18.478Z"), "duration": null, "interval": interval-time("04:29:30.000Z, 07:59:59.999Z") }
+{ "date": null, "time": null, "datetime": null, "duration": null, "interval": interval-date("-2012-03-17, 2013-04-01") }
\ No newline at end of file
diff --git a/asterix-app/src/test/resources/runtimets/testsuite.xml b/asterix-app/src/test/resources/runtimets/testsuite.xml
index 480438d..1eb03ca 100644
--- a/asterix-app/src/test/resources/runtimets/testsuite.xml
+++ b/asterix-app/src/test/resources/runtimets/testsuite.xml
@@ -1,5 +1,5 @@
<test-suite xmlns="urn:xml.testframework.asterix.ics.uci.edu" ResultOffsetPath="results" QueryOffsetPath="queries" QueryFileExtension=".aql">
- <test-group name="aggregate">
+<!-- <test-group name="aggregate">
<test-case FilePath="aggregate">
<compilation-unit name="avg_double">
<output-file compare="Text">avg_double.adm</output-file>
@@ -90,13 +90,13 @@
<output-file compare="Text">count_null.adm</output-file>
</compilation-unit>
</test-case>
- <!--
+
<test-case FilePath="aggregate">
<compilation-unit name="droptype">
<output-file compare="Text">droptype.adm</output-file>
</compilation-unit>
</test-case>
- -->
+
<test-case FilePath="aggregate">
<compilation-unit name="global-avg_01">
<output-file compare="Text">global-avg_01.adm</output-file>
@@ -476,13 +476,13 @@
<output-file compare="Text">neq_01.adm</output-file>
</compilation-unit>
</test-case>
- <!--
+
<test-case FilePath="comparison">
<compilation-unit name="numeric-comparison_01">
<output-file compare="Text">numeric-comparison_01.adm</output-file>
</compilation-unit>
</test-case>
- -->
+
<test-case FilePath="comparison">
<compilation-unit name="string">
<output-file compare="Text">string.adm</output-file>
@@ -587,13 +587,13 @@
</test-case>
</test-group>
<test-group name="custord">
- <!--
+
<test-case FilePath="custord">
<compilation-unit name="co">
<output-file compare="Text">co.adm</output-file>
</compilation-unit>
</test-case>
- -->
+
<test-case FilePath="custord">
<compilation-unit name="customer_q_01">
<output-file compare="Text">customer_q_01.adm</output-file>
@@ -634,32 +634,32 @@
<output-file compare="Text">customer_q_08.adm</output-file>
</compilation-unit>
</test-case>
- <!--
+
<test-case FilePath="custord">
<compilation-unit name="denorm-cust-order_01">
<output-file compare="Text">denorm-cust-order_01.adm</output-file>
</compilation-unit>
</test-case>
- -->
+
<test-case FilePath="custord">
<compilation-unit name="denorm-cust-order_02">
<output-file compare="Text">denorm-cust-order_02.adm</output-file>
</compilation-unit>
</test-case>
- <!--
+
<test-case FilePath="custord">
<compilation-unit name="denorm-cust-order_03">
<output-file compare="Text">denorm-cust-order_03.adm</output-file>
</compilation-unit>
</test-case>
- -->
- <!--
+
+
<test-case FilePath="custord">
<compilation-unit name="freq-clerk">
<output-file compare="Text">freq-clerk.adm</output-file>
</compilation-unit>
</test-case>
- -->
+
<test-case FilePath="custord">
<compilation-unit name="join_q_01">
<output-file compare="Text">join_q_01.adm</output-file>
@@ -675,13 +675,13 @@
<output-file compare="Text">join_q_03.adm</output-file>
</compilation-unit>
</test-case>
- <!--
+
<test-case FilePath="custord">
<compilation-unit name="join_q_04">
<output-file compare="Text">join_q_04.adm</output-file>
</compilation-unit>
</test-case>
- -->
+
<test-case FilePath="custord">
<compilation-unit name="load-test">
<output-file compare="Text">load-test.adm</output-file>
@@ -729,13 +729,13 @@
<output-file compare="Text">q2.adm</output-file>
</compilation-unit>
</test-case>
- <!--
+
<test-case FilePath="dapd">
<compilation-unit name="q3">
<output-file compare="Text">q3.adm</output-file>
</compilation-unit>
</test-case>
- -->
+
</test-group>
<test-group name="dml">
<test-case FilePath="dml">
@@ -823,13 +823,13 @@
<output-file compare="Text">insert_less_nc.adm</output-file>
</compilation-unit>
</test-case>
- <!--
+
<test-case FilePath="dml">
<compilation-unit name="load-from-hdfs">
<output-file compare="Text">load-from-hdfs.adm</output-file>
</compilation-unit>
</test-case>
- -->
+
<test-case FilePath="dml">
<compilation-unit name="load-with-index">
<output-file compare="Text">load-with-index.adm</output-file>
@@ -960,15 +960,15 @@
<output-file compare="Text">insert.adm</output-file>
</compilation-unit>
</test-case>
- <!--
+
<test-case FilePath="failure">
<compilation-unit name="q1_pricing_summary_report_failure">
<output-file compare="Text">q1_pricing_summary_report_failure.adm</output-file>
</compilation-unit>
</test-case>
- -->
+
</test-group>
- <!--
+
<test-group name="flwor">
<test-case FilePath="flwor">
<compilation-unit name="for01">
@@ -1391,7 +1391,7 @@
</compilation-unit>
</test-case>
</test-group>
- -->
+
<test-group name="fuzzyjoin">
<test-case FilePath="fuzzyjoin">
<compilation-unit name="dblp-1_1">
@@ -1619,13 +1619,13 @@
<output-file compare="Text">dblp-lookup_1.adm</output-file>
</compilation-unit>
</test-case>
- <!--
+
<test-case FilePath="fuzzyjoin">
<compilation-unit name="dblp-splits-3_1">
<output-file compare="Text">dblp-splits-3_1.adm</output-file>
</compilation-unit>
</test-case>
- -->
+
</test-group>
<test-group name="index-join">
<test-case FilePath="index-join">
@@ -2324,27 +2324,27 @@
</test-case>
</test-group>
<test-group name="open-closed">
- <!--
+
<test-case FilePath="open-closed">
<compilation-unit name="c2c-w-optional">
<output-file compare="Text">c2c-w-optional.adm</output-file>
</compilation-unit>
</test-case>
- -->
- <!--
+
+
<test-case FilePath="open-closed">
<compilation-unit name="c2c-wo-optional">
<output-file compare="Text">c2c-wo-optional.adm</output-file>
</compilation-unit>
</test-case>
- -->
- <!--
+
+
<test-case FilePath="open-closed">
<compilation-unit name="c2c">
<output-file compare="Text">c2c.adm</output-file>
</compilation-unit>
</test-case>
- -->
+
<test-case FilePath="open-closed">
<compilation-unit name="heterog-list-ordered01">
<output-file compare="Text">heterog-list-ordered01.adm</output-file>
@@ -2355,20 +2355,20 @@
<output-file compare="Text">heterog-list01.adm</output-file>
</compilation-unit>
</test-case>
- <!--
+
<test-case FilePath="open-closed">
<compilation-unit name="heterog-list02">
<output-file compare="Text">heterog-list02.adm</output-file>
</compilation-unit>
</test-case>
- -->
- <!--
+
+
<test-case FilePath="open-closed">
<compilation-unit name="heterog-list03">
<output-file compare="Text">heterog-list03.adm</output-file>
</compilation-unit>
</test-case>
- -->
+
<test-case FilePath="open-closed">
<compilation-unit name="open-closed-01">
<output-file compare="Text">open-closed-01.adm</output-file>
@@ -2414,55 +2414,55 @@
<output-file compare="Text">query-issue236.adm</output-file>
</compilation-unit>
</test-case>
- <!--
+
<test-case FilePath="open-closed">
<compilation-unit name="open-closed-15">
<output-file compare="Text">open-closed-15.adm</output-file>
</compilation-unit>
</test-case>
- -->
- <!--
+
+
<test-case FilePath="open-closed">
<compilation-unit name="open-closed-16">
<output-file compare="Text">open-closed-16.adm</output-file>
</compilation-unit>
</test-case>
- -->
- <!--
+
+
<test-case FilePath="open-closed">
<compilation-unit name="open-closed-17">
<output-file compare="Text">open-closed-17.adm</output-file>
</compilation-unit>
</test-case>
- -->
- <!--
+
+
<test-case FilePath="open-closed">
<compilation-unit name="open-closed-19">
<output-file compare="Text">open-closed-19.adm</output-file>
</compilation-unit>
</test-case>
- -->
- <!--
+
+
<test-case FilePath="open-closed">
<compilation-unit name="open-closed-20">
<output-file compare="Text">open-closed-20.adm</output-file>
</compilation-unit>
</test-case>
- -->
- <!--
+
+
<test-case FilePath="open-closed">
<compilation-unit name="open-closed-21">
<output-file compare="Text">open-closed-21.adm</output-file>
</compilation-unit>
</test-case>
- -->
- <!--
+
+
<test-case FilePath="open-closed">
<compilation-unit name="open-closed-22">
<output-file compare="Text">open-closed-22.adm</output-file>
</compilation-unit>
</test-case>
- -->
+
<test-case FilePath="open-closed">
<compilation-unit name="open-closed-24">
<output-file compare="Text">open-closed-24.adm</output-file>
@@ -2478,25 +2478,25 @@
<output-file compare="Text">open-closed-26.adm</output-file>
</compilation-unit>
</test-case>
- <!--
+
<test-case FilePath="open-closed">
<compilation-unit name="open-closed-28">
<output-file compare="Text">open-closed-28.adm</output-file>
</compilation-unit>
</test-case>
- -->
+
<test-case FilePath="open-closed">
<compilation-unit name="open-closed-29">
<output-file compare="Text">open-closed-29.adm</output-file>
</compilation-unit>
</test-case>
- <!--
+
<test-case FilePath="open-closed">
<compilation-unit name="open-closed-30">
<output-file compare="Text">open-closed-30.adm</output-file>
</compilation-unit>
</test-case>
- -->
+
<test-case FilePath="open-closed">
<compilation-unit name="open-closed-31">
<output-file compare="Text">open-closed-31.adm</output-file>
@@ -2529,20 +2529,20 @@
<output-file compare="Text">everysat_01.adm</output-file>
</compilation-unit>
</test-case>
- <!--
+
<test-case FilePath="quantifiers">
<compilation-unit name="everysat_02">
<output-file compare="Text">everysat_02.adm</output-file>
</compilation-unit>
</test-case>
- -->
- <!--
+
+
<test-case FilePath="quantifiers">
<compilation-unit name="everysat_03">
<output-file compare="Text">everysat_03.adm</output-file>
</compilation-unit>
</test-case>
- -->
+
<test-case FilePath="quantifiers">
<compilation-unit name="everysat_04">
<output-file compare="Text">everysat_04.adm</output-file>
@@ -2558,27 +2558,27 @@
<output-file compare="Text">somesat_02.adm</output-file>
</compilation-unit>
</test-case>
- <!--
+
<test-case FilePath="quantifiers">
<compilation-unit name="somesat_03">
<output-file compare="Text">somesat_03.adm</output-file>
</compilation-unit>
</test-case>
- -->
- <!--
+
+
<test-case FilePath="quantifiers">
<compilation-unit name="somesat_04">
<output-file compare="Text">somesat_04.adm</output-file>
</compilation-unit>
</test-case>
- -->
- <!--
+
+
<test-case FilePath="quantifiers">
<compilation-unit name="somesat_05">
<output-file compare="Text">somesat_05.adm</output-file>
</compilation-unit>
</test-case>
- -->
+
<test-case FilePath="quantifiers">
<compilation-unit name="somesat_06">
<output-file compare="Text">somesat_06.adm</output-file>
@@ -2686,25 +2686,25 @@
<output-file compare="Text">spatial_types_01.adm</output-file>
</compilation-unit>
</test-case>
- <!--
+
<test-case FilePath="scan">
<compilation-unit name="spatial_types_02">
<output-file compare="Text">spatial_types_02.adm</output-file>
</compilation-unit>
</test-case>
- -->
+
<test-case FilePath="scan">
<compilation-unit name="temp_types_01">
<output-file compare="Text">temp_types_01.adm</output-file>
</compilation-unit>
</test-case>
- <!--
+
<test-case FilePath="scan">
<compilation-unit name="temp_types_02">
<output-file compare="Text">temp_types_02.adm</output-file>
</compilation-unit>
</test-case>
- -->
+
</test-group>
<test-group name="semistructured">
<test-case FilePath="semistructured">
@@ -3198,13 +3198,13 @@
<output-file compare="Text">startwith02.adm</output-file>
</compilation-unit>
</test-case>
- <!--
+
<test-case FilePath="string">
<compilation-unit name="startwith03">
<output-file compare="Text">startwith03.adm</output-file>
</compilation-unit>
</test-case>
- -->
+
<test-case FilePath="string">
<compilation-unit name="strconcat01">
<output-file compare="Text">strconcat01.adm</output-file>
@@ -3285,7 +3285,7 @@
<output-file compare="Text">substr01.adm</output-file>
</compilation-unit>
</test-case>
- <!-- Issue no 219
+ Issue no 219
<test-case FilePath="string">
<compilation-unit name="substr04">
<output-file compare="Text">substr04.adm</output-file>
@@ -3296,7 +3296,7 @@
<output-file compare="Text">substr05.adm</output-file>
</compilation-unit>
</test-case>
- -->
+
<test-case FilePath="string">
<compilation-unit name="substr06">
<output-file compare="Text">substr06.adm</output-file>
@@ -3394,13 +3394,13 @@
<output-file compare="Text">03.adm</output-file>
</compilation-unit>
</test-case>
- <!--
+
<test-case FilePath="subset-collection">
<compilation-unit name="04">
<output-file compare="Text">04.adm</output-file>
</compilation-unit>
</test-case>
- -->
+
<test-case FilePath="subset-collection">
<compilation-unit name="05">
<output-file compare="Text">05.adm</output-file>
@@ -3634,13 +3634,13 @@
<output-file compare="Text">cross-dv07.adm</output-file>
</compilation-unit>
</test-case>
- <!--NotImplementedException: No binary comparator factory implemented for type RECORD.
+ NotImplementedException: No binary comparator factory implemented for type RECORD.
<test-case FilePath="cross-dataverse">
<compilation-unit name="cross-dv08">
<output-file compare="Text">cross-dv08.adm</output-file>
</compilation-unit>
</test-case>
- -->
+
<test-case FilePath="cross-dataverse">
<compilation-unit name="cross-dv09">
<output-file compare="Text">cross-dv09.adm</output-file>
@@ -3678,20 +3678,20 @@
<expected-error>edu.uci.ics.asterix.common.exceptions.AsterixException</expected-error>
</compilation-unit>
</test-case>
- <!--NotImplementedException: No binary comparator factory implemented for type RECORD.
+ NotImplementedException: No binary comparator factory implemented for type RECORD.
<test-case FilePath="cross-dataverse">
<compilation-unit name="cross-dv17">
<output-file compare="Text">cross-dv17.adm</output-file>
</compilation-unit>
</test-case>
- -->
- <!--NotImplementedException: No binary comparator factory implemented for type RECORD.
+
+ NotImplementedException: No binary comparator factory implemented for type RECORD.
<test-case FilePath="cross-dataverse">
<compilation-unit name="cross-dv18">
<output-file compare="Text">cross-dv18.adm</output-file>
</compilation-unit>
</test-case>
- -->
+
<test-case FilePath="cross-dataverse">
<compilation-unit name="cross-dv19">
<output-file compare="Text">cross-dv19.adm</output-file>
@@ -3724,13 +3724,13 @@
<output-file compare="Text">udf02.adm</output-file>
</compilation-unit>
</test-case>
- <!-- causes NPE: Issue 200
+ causes NPE: Issue 200
<test-case FilePath="user-defined-functions">
<compilation-unit name="udf03">
<output-file compare="Text">udf03.adm</output-file>
</compilation-unit>
</test-case>
- -->
+
<test-case FilePath="user-defined-functions">
<compilation-unit name="udf04">
<output-file compare="Text">udf04.adm</output-file>
@@ -3786,13 +3786,13 @@
<output-file compare="Text">udf14.adm</output-file>
</compilation-unit>
</test-case>
- <!-- Issue 166
+ Issue 166
<test-case FilePath="user-defined-functions">
<compilation-unit name="udf15">
<output-file compare="Text">udf15.adm</output-file>
</compilation-unit>
</test-case>
- -->
+
<test-case FilePath="user-defined-functions">
<compilation-unit name="udf16">
<output-file compare="Text">udf16.adm</output-file>
@@ -3833,20 +3833,20 @@
<output-file compare="Text">udf23.adm</output-file>
</compilation-unit>
</test-case>
- <!-- Issue 195
+ Issue 195
<test-case FilePath="user-defined-functions">
<compilation-unit name="udf24">
<output-file compare="Text">udf24.adm</output-file>
</compilation-unit>
</test-case>
- -->
- <!-- Issue 218
+
+ Issue 218
<test-case FilePath="user-defined-functions">
<compilation-unit name="udf25">
<output-file compare="Text">udf25.adm</output-file>
</compilation-unit>
</test-case>
- -->
+
<test-case FilePath="user-defined-functions">
<compilation-unit name="udf26">
<output-file compare="Text">udf26.adm</output-file>
@@ -3933,7 +3933,7 @@
<output-file compare="Text">hdfs_03.adm</output-file>
</compilation-unit>
</test-case>
- </test-group>
+ </test-group> -->
<test-group name="temp">
<test-case FilePath="temp">
<compilation-unit name="accessors">
@@ -3980,5 +3980,30 @@
<output-file compare="Text">time_functions.adm</output-file>
</compilation-unit>
</test-case>
+ <test-case FilePath="constructor">
+ <compilation-unit name="date_01">
+ <output-file compare="Text">date_01.adm</output-file>
+ </compilation-unit>
+ </test-case>
+ <test-case FilePath="constructor">
+ <compilation-unit name="time_01">
+ <output-file compare="Text">time_01.adm</output-file>
+ </compilation-unit>
+ </test-case>
+ <test-case FilePath="constructor">
+ <compilation-unit name="datetime_01">
+ <output-file compare="Text">datetime_01.adm</output-file>
+ </compilation-unit>
+ </test-case>
+ <test-case FilePath="constructor">
+ <compilation-unit name="duration_01">
+ <output-file compare="Text">duration_01.adm</output-file>
+ </compilation-unit>
+ </test-case>
+ <test-case FilePath="constructor">
+ <compilation-unit name="interval">
+ <output-file compare="Text">interval.adm</output-file>
+ </compilation-unit>
+ </test-case>
</test-group>
</test-suite>
diff --git a/asterix-om/src/main/java/edu/uci/ics/asterix/dataflow/data/nontagged/serde/AIntervalSerializerDeserializer.java b/asterix-om/src/main/java/edu/uci/ics/asterix/dataflow/data/nontagged/serde/AIntervalSerializerDeserializer.java
index f1dc57a..25ef597 100644
--- a/asterix-om/src/main/java/edu/uci/ics/asterix/dataflow/data/nontagged/serde/AIntervalSerializerDeserializer.java
+++ b/asterix-om/src/main/java/edu/uci/ics/asterix/dataflow/data/nontagged/serde/AIntervalSerializerDeserializer.java
@@ -271,7 +271,7 @@
// Interval End
startOffset = commaIndex + 1;
endOffset = interval.length() - 1;
- while (interval.charAt(startOffset) == '"' || interval.charAt(endOffset) == ' ') {
+ while (interval.charAt(endOffset) == '"' || interval.charAt(endOffset) == ' ') {
endOffset--;
}
@@ -280,7 +280,7 @@
}
charAccessor.reset(interval, startOffset, endOffset - startOffset + 1);
- chrononTimeInMsEnd += ATimeParserFactory.parseTimePart(charAccessor);
+ chrononTimeInMsEnd = ADateParserFactory.parseDatePart(charAccessor);
} catch (Exception e) {
throw new HyracksDataException(e);
diff --git a/asterix-om/src/main/java/edu/uci/ics/asterix/om/base/temporal/ADateTimeParserFactory.java b/asterix-om/src/main/java/edu/uci/ics/asterix/om/base/temporal/ADateTimeParserFactory.java
index 4c05d88..b555c38 100644
--- a/asterix-om/src/main/java/edu/uci/ics/asterix/om/base/temporal/ADateTimeParserFactory.java
+++ b/asterix-om/src/main/java/edu/uci/ics/asterix/om/base/temporal/ADateTimeParserFactory.java
@@ -60,7 +60,7 @@
charArrayAccessor.reset(buffer, start, timeOffset);
chrononTimeInMs = ADateParserFactory.parseDatePart(charArrayAccessor);
- charArrayAccessor.reset(buffer, start + timeOffset, length - timeOffset);
+ charArrayAccessor.reset(buffer, start + timeOffset + 1, length - timeOffset - 1);
chrononTimeInMs += ATimeParserFactory.parseTimePart(charArrayAccessor);
try {
diff --git a/asterix-runtime/src/main/java/edu/uci/ics/asterix/runtime/evaluators/constructors/ADateTimeConstructorDescriptor.java b/asterix-runtime/src/main/java/edu/uci/ics/asterix/runtime/evaluators/constructors/ADateTimeConstructorDescriptor.java
index 104dc32..f1565aa 100644
--- a/asterix-runtime/src/main/java/edu/uci/ics/asterix/runtime/evaluators/constructors/ADateTimeConstructorDescriptor.java
+++ b/asterix-runtime/src/main/java/edu/uci/ics/asterix/runtime/evaluators/constructors/ADateTimeConstructorDescriptor.java
@@ -85,20 +85,7 @@
int stringLength = (serString[1] & 0xff << 8) + (serString[2] & 0xff << 0);
- int startOffset = 3;
- int endOffset = stringLength - 1 + 3;
-
- // skip leading space
- while (serString[startOffset] == ' ') {
- startOffset++;
- }
-
- // skip tailing space
- while (serString[endOffset] == ' ') {
- endOffset--;
- }
-
- charAccessor.reset(serString, startOffset, endOffset - startOffset + 1);
+ charAccessor.reset(serString, 3, stringLength);
// +1 if it is negative (-)
short timeOffset = (short) ((charAccessor.getCharAt(0) == '-') ? 1 : 0);
@@ -112,12 +99,11 @@
}
}
- charAccessor.reset(serString, startOffset, timeOffset);
+ charAccessor.reset(serString, 3, timeOffset);
long chrononTimeInMs = ADateParserFactory.parseDatePart(charAccessor);
- charAccessor.reset(serString, startOffset + timeOffset + 1, endOffset
- - (startOffset + timeOffset + 1) + 1);
+ charAccessor.reset(serString, 3 + timeOffset + 1, stringLength - timeOffset - 1);
chrononTimeInMs += ATimeParserFactory.parseTimePart(charAccessor);
diff --git a/asterix-runtime/src/main/java/edu/uci/ics/asterix/runtime/evaluators/constructors/AIntervalStartFromDateTimeConstructorDescriptor.java b/asterix-runtime/src/main/java/edu/uci/ics/asterix/runtime/evaluators/constructors/AIntervalStartFromDateTimeConstructorDescriptor.java
index 92469f0..7366f1c 100644
--- a/asterix-runtime/src/main/java/edu/uci/ics/asterix/runtime/evaluators/constructors/AIntervalStartFromDateTimeConstructorDescriptor.java
+++ b/asterix-runtime/src/main/java/edu/uci/ics/asterix/runtime/evaluators/constructors/AIntervalStartFromDateTimeConstructorDescriptor.java
@@ -117,8 +117,10 @@
}
}
+ charAccessor.reset(argOut0.getByteArray(), 3, timeOffset);
long intervalStart = ADateParserFactory.parseDatePart(charAccessor);
- charAccessor.reset(argOut0.getByteArray(), 3 + timeOffset + 1, stringLength - timeOffset - 1);
+ charAccessor.reset(argOut0.getByteArray(), 3 + timeOffset + 1, stringLength
+ - timeOffset - 1);
intervalStart += ATimeParserFactory.parseTimePart(charAccessor);
// duration