Changeset: 31d55c03b059 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=31d55c03b059
Added Files:
sql/test/BugTracker-2012/Tests/huge_table_update.Bug-2803.timeout
sql/test/Tests/alastair_udf_mergetable_bug.stable.out.int128
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
monetdb5/modules/atoms/uuid.mal
sql/server/sql_datetime.c
sql/test/Tests/alastair_udf_mergetable_bug.stable.out
sql/test/pg_regress/Tests/interval.stable.err
sql/test/pg_regress/Tests/interval.stable.out
sql/test/remote/Tests/All
Branch: default
Log Message:
Merge with Jul2015 branch.
diffs (124 lines):
diff --git a/clients/Tests/MAL-signatures.stable.out
b/clients/Tests/MAL-signatures.stable.out
--- a/clients/Tests/MAL-signatures.stable.out
+++ b/clients/Tests/MAL-signatures.stable.out
@@ -37307,6 +37307,7 @@ command calc.timestamp(t:timestamp):time
address MTIMEtimestamp2timestamp;
command calc.timestamp(s:str):timestamp
address MTIMEtimestamp_fromstr;
+function calc.uuid(u:uuid):uuid;
command calc.uuid(s:str):uuid
address UUIDstr2uuid;
comment Coerce a string to a uuid, validating its format
diff --git a/clients/Tests/MAL-signatures.stable.out.int128
b/clients/Tests/MAL-signatures.stable.out.int128
--- a/clients/Tests/MAL-signatures.stable.out.int128
+++ b/clients/Tests/MAL-signatures.stable.out.int128
@@ -48162,6 +48162,7 @@ command calc.timestamp(t:timestamp):time
address MTIMEtimestamp2timestamp;
command calc.timestamp(s:str):timestamp
address MTIMEtimestamp_fromstr;
+function calc.uuid(u:uuid):uuid;
command calc.uuid(s:str):uuid
address UUIDstr2uuid;
comment Coerce a string to a uuid, validating its format
diff --git a/monetdb5/modules/atoms/uuid.mal b/monetdb5/modules/atoms/uuid.mal
--- a/monetdb5/modules/atoms/uuid.mal
+++ b/monetdb5/modules/atoms/uuid.mal
@@ -40,3 +40,7 @@ comment "Test a string for a UUID format
command calc.==(l:uuid,r:uuid):bit
address UUIDequal
comment "Compare two UUID values for equality";
+
+function calc.uuid(u:uuid):uuid;
+ return u;
+end calc.uuid;
diff --git a/sql/server/sql_datetime.c b/sql/server/sql_datetime.c
--- a/sql/server/sql_datetime.c
+++ b/sql/server/sql_datetime.c
@@ -118,7 +118,7 @@ parse_interval_(mvc *sql, lng sign, char
return -1;
}
- val = strtol(str, &n, 10);
+ val = strtoll(str, &n, 10);
if (!n)
return -1;
if (sk == isec) {
@@ -222,7 +222,7 @@ parse_interval(mvc *sql, lng sign, char
return -1;
}
- val = strtol(str, &n, 10);
+ val = strtoll(str, &n, 10);
if (!n)
return -1;
if (sk == isec) {
diff --git a/sql/test/BugTracker-2012/Tests/huge_table_update.Bug-2803.timeout
b/sql/test/BugTracker-2012/Tests/huge_table_update.Bug-2803.timeout
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2012/Tests/huge_table_update.Bug-2803.timeout
@@ -0,0 +1,1 @@
+2
diff --git a/sql/test/Tests/alastair_udf_mergetable_bug.stable.out
b/sql/test/Tests/alastair_udf_mergetable_bug.stable.out
--- a/sql/test/Tests/alastair_udf_mergetable_bug.stable.out
+++ b/sql/test/Tests/alastair_udf_mergetable_bug.stable.out
@@ -21,7 +21,7 @@ stdout of test 'alastair_udf_mergetable_
#select tab1.group_by_col,SUM(fuse(cast (tab1.f as INT),cast (tab2.f as INT)))
from tab2 inner join tab1 on tab1.index_col = tab2.index_col group by
tab1.group_by_col;
% sys.tab1, sys.L3 # table_name
% group_by_col, L3 # name
-% int, hugeint # type
+% int, bigint # type
% 1, 11 # length
[ 1, 12884902221 ]
[ 2, 30064771405 ]
diff --git a/sql/test/Tests/alastair_udf_mergetable_bug.stable.out
b/sql/test/Tests/alastair_udf_mergetable_bug.stable.out.int128
copy from sql/test/Tests/alastair_udf_mergetable_bug.stable.out
copy to sql/test/Tests/alastair_udf_mergetable_bug.stable.out.int128
diff --git a/sql/test/pg_regress/Tests/interval.stable.err
b/sql/test/pg_regress/Tests/interval.stable.err
--- a/sql/test/pg_regress/Tests/interval.stable.err
+++ b/sql/test/pg_regress/Tests/interval.stable.err
@@ -114,14 +114,17 @@ ERROR = !types sec_interval(13,0) and do
MAPI = (monetdb) /var/tmp/mtest-21889/.s.monetdb.34286
QUERY = select avg(cast(f1 as double)) from interval_tbl;
ERROR = !types sec_interval(13,0) and double(53,0) are not equal for column
'f1'
-MAPI = (monetdb) /var/tmp/mtest-21889/.s.monetdb.34286
+MAPI = (monetdb) /var/tmp/mtest-11560/.s.monetdb.36606
+QUERY = select avg(cast(f1 as decimal)) from interval_tbl;
+ERROR = !too many digits (22 > 18)
+MAPI = (monetdb) /var/tmp/mtest-11560/.s.monetdb.36606
QUERY = select avg(cast(f1 as decimal(22,3))) from interval_tbl;
ERROR = !decimal(22,3) isn't supported because P=22 > 18 in: "select
avg(cast(f1 as decimal(22,3)"
- !syntax/parse error,
-MAPI = (monetdb) /var/tmp/mtest-21889/.s.monetdb.34286
+ !syntax error, unexpected ')' in: ")"
+MAPI = (monetdb) /var/tmp/mtest-11560/.s.monetdb.36606
QUERY = select sum(cast(f1 as decimal(22,3))) from interval_tbl;
ERROR = !decimal(22,3) isn't supported because P=22 > 18 in: "select
sum(cast(f1 as decimal(22,3)"
- !syntax/parse error,
+ !syntax error, unexpected ')' in: ")"
# 15:52:24 >
# 15:52:24 > "Done."
diff --git a/sql/test/pg_regress/Tests/interval.stable.out
b/sql/test/pg_regress/Tests/interval.stable.out
--- a/sql/test/pg_regress/Tests/interval.stable.out
+++ b/sql/test/pg_regress/Tests/interval.stable.out
@@ -80,13 +80,6 @@ Ready.
[ "", -1.000 ]
[ "", -1363962815083169.272 ]
[ "", -5670419503621183.312 ]
-#select avg(cast(f1 as decimal)) from interval_tbl;
-% sys. # table_name
-# sys.L2 # table_name
-% L2 # name
-% double # type
-% 24 # length
-[ 1.399119099e+13 ]
#select min(f1) from interval_tbl;
% sys.L1 # table_name
% L1 # name
diff --git a/sql/test/remote/Tests/All b/sql/test/remote/Tests/All
--- a/sql/test/remote/Tests/All
+++ b/sql/test/remote/Tests/All
@@ -1,2 +1,2 @@
ssbm
-partition_elim
+THREADS>=2?partition_elim
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
