MonetDB: default - added upgrade code, ie upgrade schema from 52...
Changeset: 030e25be7a90 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=030e25be7a90
Modified Files:
sql/storage/bat/bat_logger.c
Branch: default
Log Message:
added upgrade code, ie upgrade schema from 52001 -> 52002 (ie add
schemas.system column)
diffs (52 lines):
diff --git a/sql/storage/bat/bat_logger.c b/sql/storage/bat/bat_logger.c
--- a/sql/storage/bat/bat_logger.c
+++ b/sql/storage/bat/bat_logger.c
@@ -31,8 +31,13 @@ bl_preversion( int oldversion, int newve
#define CATALOG_APR2011 51100
#define CATALOG_AUG2011 51101
#define CATALOG_DEC2011 52000
+#define CATALOG_FEB2013 52001
(void)newversion;
+ if (oldversion == CATALOG_FEB2013) {
+ catalog_version = oldversion;
+ return 0;
+ }
if (oldversion == CATALOG_OCT2010) {
catalog_version = oldversion;
return 0;
@@ -74,6 +79,34 @@ static void
bl_postversion( void *lg)
{
(void)lg;
+ if (catalog_version == CATALOG_FEB2013) {
+ /* we need to add the new schemas.system column */
+ BAT *b, *b1;
+ BATiter bi;
+ char *s = "sys", n[64];
+ BUN p,q;
+
+ b = temp_descriptor(logger_find_bat(lg, N(n, NULL, s,
"schemas_name")));
+ if (!b)
+ return;
+ bi = bat_iterator(b);
+ b1 = BATnew(TYPE_void, TYPE_bit, BATcount(b));
+ BATseqbase(b1, b->hseqbase);
+ if (!b1)
+ return;
+ /* only sys and tmp are system schemas */
+ for(p=BUNfirst(b), q=BUNlast(b); phttps://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - properly set seqbase in manifold
Changeset: df470e91bf89 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=df470e91bf89
Modified Files:
monetdb5/modules/mal/manifold.c
Branch: default
Log Message:
properly set seqbase in manifold
diffs (38 lines):
diff --git a/monetdb5/modules/mal/manifold.c b/monetdb5/modules/mal/manifold.c
--- a/monetdb5/modules/mal/manifold.c
+++ b/monetdb5/modules/mal/manifold.c
@@ -272,13 +272,18 @@ MANIFOLDevaluate(Client cntxt, MalBlkPtr
}
}
+ // Then iterator over all BATs
+ if( mut.fvar ==0){
+ msg= createException(MAL,"mal.manifold","At least one column
required");
+ goto wrapup;
+ }
+
// prepare result variable
mat[0].b =BATnew(TYPE_void, getTailType(getArgType(mb,pci,0)), cnt);
if ( mat[0].b == NULL){
msg= createException(MAL,"mal.manifold",MAL_MALLOC_FAIL);
goto wrapup;
}
- BATseqbase(mat[0].b, 0);
mat[0].b->hsorted= 0;
mat[0].b->hrevsorted= 0;
mat[0].b->T->nonil=0;
@@ -287,13 +292,7 @@ MANIFOLDevaluate(Client cntxt, MalBlkPtr
mat[0].bi = bat_iterator(mat[0].b);
mat[0].first = (void *) Tloc(mat[0].b, BUNfirst(mat[0].b));
mat[0].last = (void *) Tloc(mat[0].b, BUNlast(mat[0].b));
-
-
- // Then iterator over all BATs
- if( mut.fvar ==0){
- msg= createException(MAL,"mal.manifold","At least one column
required");
- goto wrapup;
- }
+ BATseqbase(mat[0].b, mat[mut.fvar].b->H->seq);
mut.pci = copyInstruction(pci);
mut.pci->fcn = fcn;
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: RIntegration - Two more tests finished
Changeset: 71c4b0a6ea92 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=71c4b0a6ea92
Added Files:
monetdb5/extras/rapi/Tests/rapi04.stable.err
monetdb5/extras/rapi/Tests/rapi04.stable.out
monetdb5/extras/rapi/Tests/rapi05.stable.err
monetdb5/extras/rapi/Tests/rapi05.stable.out
Modified Files:
monetdb5/extras/rapi/Tests/rapi04.mal
monetdb5/extras/rapi/Tests/rapi05.mal
monetdb5/extras/rapi/rapi.c
Branch: RIntegration
Log Message:
Two more tests finished
diffs (257 lines):
diff --git a/monetdb5/extras/rapi/Tests/rapi04.mal
b/monetdb5/extras/rapi/Tests/rapi04.mal
--- a/monetdb5/extras/rapi/Tests/rapi04.mal
+++ b/monetdb5/extras/rapi/Tests/rapi04.mal
@@ -1,7 +1,7 @@
-b1:= bat.new(:oid,:int);
-bat.append(b1,1);
-bat.append(b1,2);
-bat.append(b1,3);
+b1:= bat.new(:oid,:dbl);
+bat.append(b1,1.0:dbl);
+bat.append(b1,2.0:dbl);
+bat.append(b1,3.0:dbl);
b2:= bat.new(:oid,:int);
bat.append(b2,1);
diff --git a/monetdb5/extras/rapi/Tests/rapi04.stable.err
b/monetdb5/extras/rapi/Tests/rapi04.stable.err
new file mode 100644
--- /dev/null
+++ b/monetdb5/extras/rapi/Tests/rapi04.stable.err
@@ -0,0 +1,29 @@
+stderr of test 'rapi04` in directory 'monetdb5/extras/rapi` itself:
+
+
+# 13:51:29 >
+# 13:51:29 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=36601" "--set"
"mapi_usock=/var/tmp/mtest-19338/.s.monetdb.36601" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/mk/rapi//Linux/var/MonetDB/mTests_monetdb5_extras_rapi"
"rapi04.mal"
+# 13:51:29 >
+
+# builtin opt gdk_dbpath =
/export/scratch1/mk/rapi//Linux/var/monetdb5/dbfarm/demo
+# builtin opt gdk_debug = 0
+# builtin opt gdk_vmtrim = yes
+# builtin opt monet_prompt = >
+# builtin opt monet_daemon = no
+# builtin opt mapi_port = 5
+# builtin opt mapi_open = false
+# builtin opt mapi_autosense = false
+# builtin opt sql_optimizer = default_pipe
+# builtin opt sql_debug = 0
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 36601
+# cmdline opt mapi_usock = /var/tmp/mtest-19338/.s.monetdb.36601
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/export/scratch1/mk/rapi//Linux/var/MonetDB/mTests_monetdb5_extras_rapi
+
+# 13:51:30 >
+# 13:51:30 > "Done."
+# 13:51:30 >
+
diff --git a/monetdb5/extras/rapi/Tests/rapi04.stable.out
b/monetdb5/extras/rapi/Tests/rapi04.stable.out
new file mode 100644
--- /dev/null
+++ b/monetdb5/extras/rapi/Tests/rapi04.stable.out
@@ -0,0 +1,50 @@
+stdout of test 'rapi04` in directory 'monetdb5/extras/rapi` itself:
+
+
+# 13:51:29 >
+# 13:51:29 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=36601" "--set"
"mapi_usock=/var/tmp/mtest-19338/.s.monetdb.36601" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/mk/rapi//Linux/var/MonetDB/mTests_monetdb5_extras_rapi"
"rapi04.mal"
+# 13:51:29 >
+
+# MonetDB 5 server v11.18.0
+# This is an unreleased version
+# Serving database 'mTests_monetdb5_extras_rapi', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 15.591 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2014 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://vienna.ins.cwi.nl:36601/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-19338/.s.monetdb.36601
+# MonetDB/GIS module loaded
+# MonetDB/JAQL module loaded
+# MonetDB/SQL module loaded
+function user.main():void;
+b1 := bat.new(:oid,:dbl);
+bat.append(b1,1:dbl);
+bat.append(b1,2:dbl);
+bat.append(b1,3:dbl);
+b2 := bat.new(:oid,:int);
+bat.append(b2,1);
+bat.append(b2,2);
+bat.append(b2,3);
+(r:bat[:oid,:dbl] ,s:bat[:oid,:dbl] ) :=
rapi.eval("print(arg1);print(arg2); print(arg3);
print(arg4);data.frame(r=arg1,s=as.numeric((smooth(Re(fft(arg1)),kind=arg4)+arg2)/arg3))[1:2,]",b1,b2,42:int,"3RSR");
+io.print(r,s);
+end main;
+# User R expression: print(arg1);print(arg2); print(arg3);
print(arg4);data.frame(r=arg1,s=as.numeric((smooth(Re(fft(arg1)),kind=arg4)+arg2)/arg3))[1:2,]
+# Executed R expression ret <-
as.data.frame((function(arg1,arg2,arg3,arg4){print(arg1);print(arg2);
print(arg3);
print(arg4);data.frame(r=arg1,s=as.numeric((smooth(Re(fft(arg1)),kind=arg4)+arg2)/arg3))[1:2,]})(arg1,arg2,arg3,arg4),nm=NA,stringsAsFactors=F)
+
+#[1]# 1# 2# 3#
+#[1]# 1# 2# 3#
+#[1]# 42#
+#[1]# "3RSR"#
+#--#
+# ht t # name
+# void dbl dbl # type
+#--#
+[ 0@0, 1, -0.011904761904761904 ]
+[ 1@0, 2, 0.011904761904761904 ]
+
+# 13:51:30 >
+# 13:51:30 > "Done."
+# 13:51:30 >
+
dif
MonetDB: default - approved correct error message
Changeset: c943a5e1a755 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c943a5e1a755 Modified Files: sql/test/Dependencies/Tests/Dependencies.stable.err Branch: default Log Message: approved correct error message diffs (83 lines): diff --git a/sql/test/Dependencies/Tests/Dependencies.stable.err b/sql/test/Dependencies/Tests/Dependencies.stable.err --- a/sql/test/Dependencies/Tests/Dependencies.stable.err +++ b/sql/test/Dependencies/Tests/Dependencies.stable.err @@ -5,60 +5,55 @@ stderr of test 'Dependencies` in directo # 23:01:45 > Mtimeout -timeout 180 mserver5 "--config=/ufs/goncalve/scratch/MonetDB/monetdb5/etc/MonetDB5.conf" --debug=10 --set "monet_mod_path=/ufs/goncalve/scratch/MonetDB/monetdb5/lib/MonetDB5:/ufs/goncalve/scratch/MonetDB/monetdb5/lib/MonetDB5/lib:/ufs/goncalve/scratch/MonetDB/monetdb5/lib/MonetDB5/bin" --set "gdk_dbfarm=/ufs/goncalve/scratch/MonetDB/monetdb5/var/MonetDB5/dbfarm" --set "sql_logdir=/ufs/goncalve/scratch/MonetDB/monetdb5/var/MonetDB5/sql_logs" --set "sql_logdir=/ufs/goncalve/scratch/MonetDB/monetdb5/var/MonetDB5/xquery_logs" --set mapi_port=39017 --set monet_prompt= --trace "--dbname=mTests_src_test_Dependencies" --dbinit='include sql;' ; echo ; echo Over.. # 23:01:45 > - -# 23:01:45 > -# 23:01:45 > Mtimeout -timeout 60 ./Dependencies.SQL Dependencies -# 23:01:45 > - -MAPI = (monetdb) /var/tmp/mtest-19467/.s.monetdb.38439 +MAPI = (monetdb) /var/tmp/mtest-20269/.s.monetdb.36091 QUERY = DROP USER monetdb; - -MAPI = (monetdb) /var/tmp/mtest-19467/.s.monetdb.38439 +ERROR = !DROP USER: 'monetdb' owns a schema +MAPI = (monetdb) /var/tmp/mtest-20269/.s.monetdb.36091 QUERY = DROP SCHEMA test; ERROR = !DROP SCHEMA: unable to drop schema 'test' (there are database objects which depend on it -MAPI = (monet_test) /var/tmp/mtest-19467/.s.monetdb.38439 +MAPI = (monet_test) /var/tmp/mtest-20269/.s.monetdb.36091 QUERY = CREATE SCHEMA "test_2" AUTHORIZATION "public"; ERROR = !CREATE SCHEMA: insufficient privileges for user 'monet_test' -MAPI = (monet_test) /var/tmp/mtest-19467/.s.monetdb.38439 +MAPI = (monet_test) /var/tmp/mtest-20269/.s.monetdb.36091 QUERY = DROP USER monetdb; - -MAPI = (monetdb) /var/tmp/mtest-19467/.s.monetdb.38439 +ERROR = !DROP USER: 'monetdb' owns a schema +MAPI = (monetdb) /var/tmp/mtest-20269/.s.monetdb.36091 QUERY = CREATE INDEX id_age_index ON v1(id,age); ERROR = !CREATE INDEX: cannot create index on view 'v1' -MAPI = (monetdb) /var/tmp/mtest-19467/.s.monetdb.38439 +MAPI = (monetdb) /var/tmp/mtest-20269/.s.monetdb.36091 QUERY = ALTER TABLE t1 DROP COLUMN id; ERROR = !ALTER TABLE: cannot drop column 'id': there are database objects which depend on it -MAPI = (monetdb) /var/tmp/mtest-19467/.s.monetdb.38439 +MAPI = (monetdb) /var/tmp/mtest-20269/.s.monetdb.36091 QUERY = ALTER TABLE v1 DROP COLUMN age; ERROR = !ALTER TABLE: cannot drop column from VIEW 'v1' -MAPI = (monetdb) /var/tmp/mtest-19467/.s.monetdb.38439 +MAPI = (monetdb) /var/tmp/mtest-20269/.s.monetdb.36091 QUERY = ALTER TABLE t2 ADD FOREIGN KEY(age_v1) REFERENCES v1(age); ERROR = !CONSTRAINT FOREIGN KEY: could not find referenced PRIMARY KEY in table 'v1' -MAPI = (monetdb) /var/tmp/mtest-19467/.s.monetdb.38439 +MAPI = (monetdb) /var/tmp/mtest-20269/.s.monetdb.36091 QUERY = DROP TABLE t1; ERROR = !DROP TABLE: FOREIGN KEY t2.t2_id_t1_fkey depends on t1 -MAPI = (monetdb) /var/tmp/mtest-19467/.s.monetdb.38439 +MAPI = (monetdb) /var/tmp/mtest-20269/.s.monetdb.36091 QUERY = DROP VIEW v1; ERROR = !DROP VIEW: cannot drop view 'v1', there are database objects which depend on it -MAPI = (monetdb) /var/tmp/mtest-19467/.s.monetdb.38439 +MAPI = (monetdb) /var/tmp/mtest-20269/.s.monetdb.36091 QUERY = DROP TABLE t2; ERROR = !DROP TABLE: unable to drop table t2 (there are database objects which depend on it) -MAPI = (monetdb) /var/tmp/mtest-19467/.s.monetdb.38439 +MAPI = (monetdb) /var/tmp/mtest-20269/.s.monetdb.36091 QUERY = DROP FUNCTION f1; ERROR = !DROP FUNCTION: there are database objects dependent on function f1; -MAPI = (monetdb) /var/tmp/mtest-19467/.s.monetdb.38439 +MAPI = (monetdb) /var/tmp/mtest-20269/.s.monetdb.36091 QUERY = DROP INDEX id_age_index; ERROR = !DROP INDEX: no such index 'id_age_index' -MAPI = (monetdb) /var/tmp/mtest-19467/.s.monetdb.38439 +MAPI = (monetdb) /var/tmp/mtest-20269/.s.monetdb.36091 QUERY = DROP VIEW v1; ERROR = !DROP VIEW: cannot drop view 'v1', there are database objects which depend on it -MAPI = (monetdb) /var/tmp/mtest-19467/.s.monetdb.38439 +MAPI = (monetdb) /var/tmp/mtest-20269/.s.monetdb.36091 QUERY = DROP TABLE t1; ERROR = !DROP TABLE: unable to drop table t1 (there are database objects which depend on it) -MAPI = (monetdb) /var/tmp/mtest-19467/.s.monetdb.38439 +MAPI = (monetdb) /var/tmp/mtest-20269/.s.monetdb.36091 QUERY = DROP function f1; ERROR = !DROP FUNCTION: there are database objects dependent on function f1; -MAPI = (monetdb) /var/tmp/mtes
MonetDB: default - approved correct error message
Changeset: ad0505a19a66 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ad0505a19a66 Modified Files: sql/test/BugTracker-2013/Tests/pivot.Bug-3339.stable.err sql/test/BugTracker-2013/Tests/pivot.Bug-3339.stable.out Branch: default Log Message: approved correct error message diffs (48 lines): diff --git a/sql/test/BugTracker-2013/Tests/pivot.Bug-3339.stable.err b/sql/test/BugTracker-2013/Tests/pivot.Bug-3339.stable.err --- a/sql/test/BugTracker-2013/Tests/pivot.Bug-3339.stable.err +++ b/sql/test/BugTracker-2013/Tests/pivot.Bug-3339.stable.err @@ -28,7 +28,10 @@ stderr of test 'pivot.Bug-3339` in direc # 09:16:37 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-21191" "--port=32634" # 09:16:37 > -?DO WE EXPECT THIS ERROR HERE? +MAPI = (monetdb) /var/tmp/mtest-20269/.s.monetdb.36091 +QUERY = SELECT (SELECT * FROM groupElements(pivot.x)) +FROM (SELECT * FROM tmp) as pivot; +ERROR = !cardinality violation (2>1) # 09:16:37 > # 09:16:37 > "Done." diff --git a/sql/test/BugTracker-2013/Tests/pivot.Bug-3339.stable.out b/sql/test/BugTracker-2013/Tests/pivot.Bug-3339.stable.out --- a/sql/test/BugTracker-2013/Tests/pivot.Bug-3339.stable.out +++ b/sql/test/BugTracker-2013/Tests/pivot.Bug-3339.stable.out @@ -49,12 +49,9 @@ Ready. # loading sql script: 80_udf.sql # loading sql script: 99_system.sql -# 09:16:37 > -# 09:16:37 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-21191" "--port=32634" -# 09:16:37 > - - -!OUTPUT BELOW NEEDS TO BE VALIDATED OR FIXED! +# 13:34:05 > +# 13:34:05 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-20269" "--port=36091" +# 13:34:05 > #CREATE FUNCTION groupElements(beg INTEGER) #RETURNS TABLE (x INTEGER) @@ -84,10 +81,7 @@ Ready. #DROP TABLE tmp; #DROP FUNCTION groupElements; -!OUTPUT ABOVE NEEDS TO BE VALIDATED OR FIXED! +# 13:34:05 > +# 13:34:05 > "Done." +# 13:34:05 > - -# 09:16:37 > -# 09:16:37 > "Done." -# 09:16:37 > - ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: RIntegration - Update some more copyright years.
Changeset: e88df7d357a6 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e88df7d357a6 Modified Files: monetdb5/extras/rapi/50_rapi.mal monetdb5/extras/rapi/Makefile.ag monetdb5/extras/rapi/Tests/rapi00.stable.out monetdb5/extras/rapi/Tests/rapi01.stable.out monetdb5/extras/rapi/Tests/rapi02.stable.out monetdb5/extras/rapi/Tests/rapi03.stable.out monetdb5/extras/rapi/Tests/rapi07.stable.out monetdb5/extras/rapi/rapi.c monetdb5/extras/rapi/rapi.h monetdb5/extras/rapi/rapi.mal sql/backends/monet5/sql_rapi.c sql/backends/monet5/sql_rapi.h sql/backends/monet5/sql_rapi.mal sql/scripts/50_rapi.sql Branch: RIntegration Log Message: Update some more copyright years. diffs (168 lines): diff --git a/monetdb5/extras/rapi/50_rapi.mal b/monetdb5/extras/rapi/50_rapi.mal --- a/monetdb5/extras/rapi/50_rapi.mal +++ b/monetdb5/extras/rapi/50_rapi.mal @@ -12,7 +12,7 @@ # # The Initial Developer of the Original Code is CWI. # Portions created by CWI are Copyright (C) 1997-July 2008 CWI. -# Copyright August 2008-2013 MonetDB B.V. +# Copyright August 2008-2014 MonetDB B.V. # All Rights Reserved. # This loads the MonetDB/RAPI module diff --git a/monetdb5/extras/rapi/Makefile.ag b/monetdb5/extras/rapi/Makefile.ag --- a/monetdb5/extras/rapi/Makefile.ag +++ b/monetdb5/extras/rapi/Makefile.ag @@ -12,7 +12,7 @@ # # The Initial Developer of the Original Code is CWI. # Portions created by CWI are Copyright (C) 1997-July 2008 CWI. -# Copyright August 2008-2013 MonetDB B.V. +# Copyright August 2008-2014 MonetDB B.V. # All Rights Reserved. INCLUDES = \ diff --git a/monetdb5/extras/rapi/Tests/rapi00.stable.out b/monetdb5/extras/rapi/Tests/rapi00.stable.out --- a/monetdb5/extras/rapi/Tests/rapi00.stable.out +++ b/monetdb5/extras/rapi/Tests/rapi00.stable.out @@ -11,7 +11,7 @@ stdout of test 'rapi00` in directory 'mo # Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically linked # Found 15.591 GiB available main-memory. # Copyright (c) 1993-July 2008 CWI. -# Copyright (c) August 2008-2013 MonetDB B.V., all rights reserved +# Copyright (c) August 2008-2014 MonetDB B.V., all rights reserved # Visit http://www.monetdb.org/ for further information # Listening for connection requests on mapi:monetdb://vienna.ins.cwi.nl:31781/ # Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-13409/.s.monetdb.31781 diff --git a/monetdb5/extras/rapi/Tests/rapi01.stable.out b/monetdb5/extras/rapi/Tests/rapi01.stable.out --- a/monetdb5/extras/rapi/Tests/rapi01.stable.out +++ b/monetdb5/extras/rapi/Tests/rapi01.stable.out @@ -11,7 +11,7 @@ stdout of test 'rapi01` in directory 'mo # Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically linked # Found 15.592 GiB available main-memory. # Copyright (c) 1993-July 2008 CWI. -# Copyright (c) August 2008-2013 MonetDB B.V., all rights reserved +# Copyright (c) August 2008-2014 MonetDB B.V., all rights reserved # Visit http://www.monetdb.org/ for further information # Listening for connection requests on mapi:monetdb://bristol.ins.cwi.nl:32234/ # Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-13776/.s.monetdb.32234 diff --git a/monetdb5/extras/rapi/Tests/rapi02.stable.out b/monetdb5/extras/rapi/Tests/rapi02.stable.out --- a/monetdb5/extras/rapi/Tests/rapi02.stable.out +++ b/monetdb5/extras/rapi/Tests/rapi02.stable.out @@ -11,7 +11,7 @@ stdout of test 'rapi02` in directory 'mo # Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically linked # Found 15.592 GiB available main-memory. # Copyright (c) 1993-July 2008 CWI. -# Copyright (c) August 2008-2013 MonetDB B.V., all rights reserved +# Copyright (c) August 2008-2014 MonetDB B.V., all rights reserved # Visit http://www.monetdb.org/ for further information # Listening for connection requests on mapi:monetdb://bristol.ins.cwi.nl:32234/ # Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-13776/.s.monetdb.32234 diff --git a/monetdb5/extras/rapi/Tests/rapi03.stable.out b/monetdb5/extras/rapi/Tests/rapi03.stable.out --- a/monetdb5/extras/rapi/Tests/rapi03.stable.out +++ b/monetdb5/extras/rapi/Tests/rapi03.stable.out @@ -11,7 +11,7 @@ stdout of test 'rapi03` in directory 'mo # Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically linked # Found 15.591 GiB available main-memory. # Copyright (c) 1993-July 2008 CWI. -# Copyright (c) August 2008-2013 MonetDB B.V., all rights reserved +# Copyright (c) August 2008-2014 MonetDB B.V., all rights reserved # Visit http://www.monetdb.org/ for further information # Listening for connection requests on mapi:monetdb://vienna.ins.cwi.nl:39906/ # Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-27475/.s.monetdb.39906 diff --git a/monetdb5/extras/rapi/Tests/rapi07.stable.out b/mone
MonetDB: Jan2014 - Removed m4client.bat.
Changeset: dc25ab9685ff for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=dc25ab9685ff Removed Files: clients/NT/m4client.bat Branch: Jan2014 Log Message: Removed m4client.bat. diffs (25 lines): diff --git a/clients/NT/m4client.bat b/clients/NT/m4client.bat deleted file mode 100755 --- a/clients/NT/m4client.bat +++ /dev/null @@ -1,20 +0,0 @@ -@echo off -rem figure out the folder name -set MONETDB=%~dp0 - -rem remove the final backslash from the path -set MONETDB=%MONETDB:~0,-1% - -rem extend the search path with our EXE and DLL folders -rem we depend on pthreadVCE.dll having been copied to the lib folder -set PATH=%MONETDB%\bin;%MONETDB%\lib;%MONETDB%\lib\bin;%PATH% - -if not "%1"=="/STARTED-FROM-MENU" goto skip -shift -if "%DOTMONETDBFILE%"=="" if exist "%MONETDB%\etc\.monetdb" set DOTMONETDBFILE=%MONETDB%\etc\.monetdb -:skip - -rem start the real client -"%MONETDB%\bin\m4client.exe" %1 %2 %3 %4 %5 %6 %7 %8 - -if ERRORLEVEL 1 pause ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jan2014 - approved correct output
Changeset: 199b46f198ba for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=199b46f198ba Modified Files: sql/test/BugTracker-2013/Tests/pivot.Bug-3339.stable.err sql/test/BugTracker-2013/Tests/pivot.Bug-3339.stable.out sql/test/BugTracker-2013/Tests/rangejoin_optimizer.Bug-3411.stable.out Branch: Jan2014 Log Message: approved correct output diffs (96 lines): diff --git a/sql/test/BugTracker-2013/Tests/pivot.Bug-3339.stable.err b/sql/test/BugTracker-2013/Tests/pivot.Bug-3339.stable.err --- a/sql/test/BugTracker-2013/Tests/pivot.Bug-3339.stable.err +++ b/sql/test/BugTracker-2013/Tests/pivot.Bug-3339.stable.err @@ -28,7 +28,10 @@ stderr of test 'pivot.Bug-3339` in direc # 09:16:37 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-21191" "--port=32634" # 09:16:37 > -?DO WE EXPECT THIS ERROR HERE? +MAPI = monetdb@niels:35691 +QUERY = SELECT (SELECT * FROM groupElements(pivot.x)) +FROM (SELECT * FROM tmp) as pivot; +ERROR = !cardinality violation (2>1) # 09:16:37 > # 09:16:37 > "Done." diff --git a/sql/test/BugTracker-2013/Tests/pivot.Bug-3339.stable.out b/sql/test/BugTracker-2013/Tests/pivot.Bug-3339.stable.out --- a/sql/test/BugTracker-2013/Tests/pivot.Bug-3339.stable.out +++ b/sql/test/BugTracker-2013/Tests/pivot.Bug-3339.stable.out @@ -47,12 +47,9 @@ Ready. # loading sql script: 80_udf.sql # loading sql script: 99_system.sql -# 09:16:37 > -# 09:16:37 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-21191" "--port=32634" -# 09:16:37 > - - -!OUTPUT BELOW NEEDS TO BE VALIDATED OR FIXED! +# 15:13:19 > +# 15:13:19 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=niels" "--port=35691" +# 15:13:19 > #CREATE FUNCTION groupElements(beg INTEGER) #RETURNS TABLE (x INTEGER) @@ -82,10 +79,7 @@ Ready. #DROP TABLE tmp; #DROP FUNCTION groupElements; -!OUTPUT ABOVE NEEDS TO BE VALIDATED OR FIXED! +# 15:13:19 > +# 15:13:19 > "Done." +# 15:13:19 > - -# 09:16:37 > -# 09:16:37 > "Done." -# 09:16:37 > - diff --git a/sql/test/BugTracker-2013/Tests/rangejoin_optimizer.Bug-3411.stable.out b/sql/test/BugTracker-2013/Tests/rangejoin_optimizer.Bug-3411.stable.out --- a/sql/test/BugTracker-2013/Tests/rangejoin_optimizer.Bug-3411.stable.out +++ b/sql/test/BugTracker-2013/Tests/rangejoin_optimizer.Bug-3411.stable.out @@ -33,11 +33,11 @@ Ready. % .plan # table_name % rel # name % clob # type -% 98 # length +% 64 # length project ( | join ( -| | table(sys.t4311) [ t4311.a as t2.a, t4311.%TID% NOT NULL as t2.%TID% ] COUNT , -| | table(sys.t4311) [ t4311.a as t1.a, t4311.b as t1.b, t4311.%TID% NOT NULL as t1.%TID% ] COUNT +| | table(sys.t4311) [ t4311.a as t2.a ] COUNT , +| | table(sys.t4311) [ t4311.a as t1.a, t4311.b as t1.b ] COUNT | ) [ t1.a <= t2.a <= t1.b ] ) [ t2.a ] #plan @@ -48,11 +48,11 @@ project ( % .plan # table_name % rel # name % clob # type -% 98 # length +% 64 # length project ( | join ( -| | table(sys.t4311) [ t4311.a as t2.a, t4311.%TID% NOT NULL as t2.%TID% ] COUNT , -| | table(sys.t4311) [ t4311.a as t1.a, t4311.b as t1.b, t4311.%TID% NOT NULL as t1.%TID% ] COUNT +| | table(sys.t4311) [ t4311.a as t2.a ] COUNT , +| | table(sys.t4311) [ t4311.a as t1.a, t4311.b as t1.b ] COUNT | ) [ t1.a <= t2.a <= t1.b ] ) [ t2.a ] #plan @@ -63,11 +63,11 @@ project ( % .plan # table_name % rel # name % clob # type -% 98 # length +% 64 # length project ( | join ( -| | table(sys.t4311) [ t4311.a as t2.a, t4311.%TID% NOT NULL as t2.%TID% ] COUNT , -| | table(sys.t4311) [ t4311.a as t1.a, t4311.b as t1.b, t4311.%TID% NOT NULL as t1.%TID% ] COUNT +| | table(sys.t4311) [ t4311.a as t2.a ] COUNT , +| | table(sys.t4311) [ t4311.a as t1.a, t4311.b as t1.b ] COUNT | ) [ t1.a <= t2.a <= t1.b ] ) [ t2.a ] #drop table t4311; ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jan2014 - disable centipede test (should not be propaga...
Changeset: b33493a6a4de for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b33493a6a4de Modified Files: sql/test/centipede/Tests/All Branch: Jan2014 Log Message: disable centipede test (should not be propagated) diffs (6 lines): diff --git a/sql/test/centipede/Tests/All b/sql/test/centipede/Tests/All --- a/sql/test/centipede/Tests/All +++ b/sql/test/centipede/Tests/All @@ -1,1 +1,1 @@ -NOT_WIN32?olap +#NOT_WIN32?olap ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - merged with Jan2014
Changeset: 07bfe9eaa24e for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=07bfe9eaa24e Removed Files: clients/NT/m4client.bat Modified Files: sql/test/BugTracker-2013/Tests/pivot.Bug-3339.stable.err sql/test/BugTracker-2013/Tests/pivot.Bug-3339.stable.out sql/test/BugTracker-2013/Tests/rangejoin_optimizer.Bug-3411.stable.out sql/test/centipede/Tests/All Branch: default Log Message: merged with Jan2014 diffs (25 lines): diff --git a/clients/NT/m4client.bat b/clients/NT/m4client.bat deleted file mode 100755 --- a/clients/NT/m4client.bat +++ /dev/null @@ -1,20 +0,0 @@ -@echo off -rem figure out the folder name -set MONETDB=%~dp0 - -rem remove the final backslash from the path -set MONETDB=%MONETDB:~0,-1% - -rem extend the search path with our EXE and DLL folders -rem we depend on pthreadVCE.dll having been copied to the lib folder -set PATH=%MONETDB%\bin;%MONETDB%\lib;%MONETDB%\lib\bin;%PATH% - -if not "%1"=="/STARTED-FROM-MENU" goto skip -shift -if "%DOTMONETDBFILE%"=="" if exist "%MONETDB%\etc\.monetdb" set DOTMONETDBFILE=%MONETDB%\etc\.monetdb -:skip - -rem start the real client -"%MONETDB%\bin\m4client.exe" %1 %2 %3 %4 %5 %6 %7 %8 - -if ERRORLEVEL 1 pause ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jan2014 - Preserve file mode when deleting license.
Changeset: bb771530efaa for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bb771530efaa Modified Files: buildtools/conf/fixlicense.py Branch: Jan2014 Log Message: Preserve file mode when deleting license. diffs (15 lines): diff --git a/buildtools/conf/fixlicense.py b/buildtools/conf/fixlicense.py --- a/buildtools/conf/fixlicense.py +++ b/buildtools/conf/fixlicense.py @@ -443,6 +443,11 @@ def dellicense(file, pre = None, post = f.close() g.close() try: +st = os.stat(file) +os.chmod(file + '.new', stat.S_IMODE(st.st_mode)) +except OSError: +pass +try: os.rename(file, file + '~') # make backup except OSError: print >> sys.stderr, 'Cannot make backup for %s' % file ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jan2014 - Fixed up licenses.
Changeset: fe1b680009e5 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fe1b680009e5 Modified Files: HowToStart.rst NT/installer32/cv64-32.sh NT/installer64/cv32-64.sh NT/installer64/fixmsi.py NT/monetdb_config.h.in NT/updatecodes.py NT/wincompile.py buildtools/conf/Maddlog buildtools/doc/HowToRelease.rst clients/NT/mclient.bat clients/NT/msqldump.bat clients/NT/stethoscope.bat clients/R/MonetDB.R/src/mapi.c clients/R/MonetDB.R/src/mapisplit.c clients/examples/php/sqlsample.php clients/examples/python/perf.py clients/mapilib/monetdb-mapi.pc.in clients/perl/DBD/t/01base.t clients/php/doc/generate_doc.sh clients/php/examples/query.php clients/php/examples/simple_query.php clients/php/lib/php_monetdb.php clients/python2/README.rst clients/python2/monetdb/__init__.py clients/python2/monetdb/control.py clients/python2/monetdb/exceptions.py clients/python2/test/run.sh clients/python2/test/test_monetize.py clients/python2/test/test_pythonize.py clients/python3/README.rst clients/python3/monetdb/__init__.py clients/python3/monetdb/control.py clients/python3/monetdb/exceptions.py clients/python3/test/run.sh clients/python3/test/test_monetize.py clients/python3/test/test_pythonize.py clients/ruby/lib/MonetDB.rb clients/ruby/lib/test/test_capabilities.rb common/stream/monetdb-stream.pc.in common/stream/stream.h common/utils/msabaoth.c common/utils/msabaoth.h debian/libmonetdb-client-odbc.postinst debian/libmonetdb-client-odbc.postrm debian/monetdb5-server.postinst debian/monetdb5-sql.init.d debian/monetdb5-sql.postinst debian/rules gdk/monetdb-gdk.pc.in geom/sql/40_geom.sql java/pom.xml java/src/nl/cwi/monetdb/util/SQLRestore.java java/tests/drop.sql monetdb5/NT/M5server.bat monetdb5/extras/mal_optimizer_template/opt_sql_append.c monetdb5/extras/mal_optimizer_template/opt_sql_append.h monetdb5/extras/mal_optimizer_template/opt_sql_append.mal monetdb5/extras/rdf/rdf_shredder.c monetdb5/mal/mal_dataflow.h monetdb5/mal/mal_debugger.c monetdb5/mal/mal_debugger.h monetdb5/mal/mal_instruction.c monetdb5/mal/mal_instruction.h monetdb5/mal/mal_interpreter.c monetdb5/mal/mal_interpreter.h monetdb5/mal/mal_listing.c monetdb5/mal/mal_listing.h monetdb5/mal/mal_module.c monetdb5/mal/mal_profiler.c monetdb5/mal/mal_profiler.h monetdb5/mal/mal_resource.c monetdb5/mal/mal_resource.h monetdb5/mal/mal_runtime.c monetdb5/mal/mal_sabaoth.h monetdb5/mal/mal_scenario.h monetdb5/modules/atoms/batxml.c monetdb5/modules/atoms/batxml.mal monetdb5/modules/atoms/batxml.sql monetdb5/modules/atoms/mcurl.c monetdb5/modules/atoms/mcurl.mal monetdb5/modules/atoms/mtime.mal monetdb5/modules/atoms/str.c monetdb5/modules/atoms/str.h monetdb5/modules/atoms/str.mal monetdb5/modules/atoms/streams.c monetdb5/modules/atoms/streams.h monetdb5/modules/atoms/streams.mal monetdb5/modules/atoms/url.c monetdb5/modules/atoms/url.h monetdb5/modules/atoms/url.mal monetdb5/modules/atoms/xml.sql monetdb5/modules/kernel/array.c monetdb5/modules/kernel/array.h monetdb5/modules/kernel/array.mal monetdb5/modules/kernel/bat5.h monetdb5/modules/kernel/bat5.mal monetdb5/modules/kernel/batcolor.c monetdb5/modules/kernel/batcolor.h monetdb5/modules/kernel/batcolor.mal monetdb5/modules/kernel/batmmath.c monetdb5/modules/kernel/batmmath.h monetdb5/modules/kernel/batmmath.mal monetdb5/modules/kernel/batstr.c monetdb5/modules/kernel/batstr.mal monetdb5/modules/kernel/mmath.c monetdb5/modules/kernel/mmath.h monetdb5/modules/kernel/mmath.mal monetdb5/modules/kernel/status.c monetdb5/modules/kernel/status.h monetdb5/modules/kernel/status.mal monetdb5/modules/mal/bbp.c monetdb5/modules/mal/bbp.h monetdb5/modules/mal/bbp.mal monetdb5/modules/mal/box.c monetdb5/modules/mal/box.h monetdb5/modules/mal/box.mal monetdb5/modules/mal/clients.c monetdb5/modules/mal/clients.h monetdb5/modules/mal/clients.mal monetdb5/modules/mal/cluster.c monetdb5/modules/mal/cluster.h monetdb5/modules/mal/cluster.mal monetdb5/modules/mal/factories.c monetdb5/modules/mal/factories.h monetdb5/modules/mal/fact
MonetDB: Jan2014 - Approve after changeset fe1b680009e5.
Changeset: 94bf493d83e5 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=94bf493d83e5 Modified Files: clients/Tests/SQL-dump.stable.out clients/Tests/SQL-dump.stable.out.32bit clients/Tests/SQL-dump.stable.out.64bit.oid32 clients/Tests/SQL-dump_gsl.stable.out clients/Tests/SQL-dump_nogeom.stable.out sql/test/Tests/systemfunctions.stable.out sql/test/Tests/systemfunctions_gsl.stable.out sql/test/Tests/systemfunctions_nogeom.stable.out Branch: Jan2014 Log Message: Approve after changeset fe1b680009e5. diffs (truncated from 2131 to 300 lines): diff --git a/clients/Tests/SQL-dump.stable.out b/clients/Tests/SQL-dump.stable.out --- a/clients/Tests/SQL-dump.stable.out +++ b/clients/Tests/SQL-dump.stable.out @@ -485,6 +485,7 @@ create function buffer(a geometry, dista -- The Original Code is the MonetDB Database System. -- -- The Initial Developer of the Original Code is CWI. +-- Portions created by CWI are Copyright (C) 1997-July 2008 CWI. -- Copyright August 2008-2014 MonetDB B.V. -- All Rights Reserved. @@ -557,6 +558,7 @@ CREATE FUNCTION db_users () RETURNS TABL -- The Original Code is the MonetDB Database System. -- -- The Initial Developer of the Original Code is CWI. +-- Portions created by CWI are Copyright (C) 1997-July 2008 CWI. -- Copyright August 2008-2014 MonetDB B.V. -- All Rights Reserved. @@ -612,6 +614,7 @@ return table (select a.name, s.name, 'DE -- The Original Code is the MonetDB Database System. -- -- The Initial Developer of the Original Code is CWI. +-- Portions created by CWI are Copyright (C) 1997-July 2008 CWI. -- Copyright August 2008-2014 MonetDB B.V. -- All Rights Reserved. @@ -723,6 +726,7 @@ create function getuser(theurl url) retu -- The Original Code is the MonetDB Database System. -- -- The Initial Developer of the Original Code is CWI. +-- Portions created by CWI are Copyright (C) 1997-July 2008 CWI. -- Copyright August 2008-2014 MonetDB B.V. -- All Rights Reserved. @@ -790,6 +794,23 @@ returns json external name json.path; create function sys.json_text(js json, e string) returns string external name json.text; create function length(g geometry) returns float external name geom."Length"; +-- The contents of this file are subject to the MonetDB Public License +-- Version 1.1 (the "License"); you may not use this file except in +-- compliance with the License. You may obtain a copy of the License at +-- http://www.monetdb.org/Legal/MonetDBLicense +-- +-- Software distributed under the License is distributed on an "AS IS" +-- basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the +-- License for the specific language governing rights and limitations +-- under the License. +-- +-- The Original Code is the MonetDB Database System. +-- +-- The Initial Developer of the Original Code is CWI. +-- Portions created by CWI are Copyright (C) 1997-July 2008 CWI. +-- Copyright August 2008-2014 MonetDB B.V. +-- All Rights Reserved. + create filter function "like"(val string, pat string, esc string) external name algebra.likesubselect; create function linefromtext(wkt string, srid smallint) returns linestring external name geom."LineFromText"; create function "masklen" (p inet) returns int @@ -851,6 +872,7 @@ end; -- The Original Code is the MonetDB Database System. -- -- The Initial Developer of the Original Code is CWI. +-- Portions created by CWI are Copyright (C) 1997-July 2008 CWI. -- Copyright August 2008-2014 MonetDB B.V. -- All Rights Reserved. @@ -892,6 +914,7 @@ create function "network" (p inet) retur -- The Original Code is the MonetDB Database System. -- -- The Initial Developer of the Original Code is CWI. +-- Portions created by CWI are Copyright (C) 1997-July 2008 CWI. -- Copyright August 2008-2014 MonetDB B.V. -- All Rights Reserved. @@ -916,6 +939,7 @@ create function newurl(protocol string, -- The Original Code is the MonetDB Database System. -- -- The Initial Developer of the Original Code is CWI. +-- Portions created by CWI are Copyright (C) 1997-July 2008 CWI. -- Copyright August 2008-2014 MonetDB B.V. -- All Rights Reserved. @@ -942,6 +966,7 @@ create function overlaps(a geometry, b g -- The Original Code is the MonetDB Database System. -- -- The Initial Developer of the Original Code is CWI. +-- Portions created by CWI are Copyright (C) 1997-July 2008 CWI. -- Copyright August 2008-2014 MonetDB B.V. -- All Rights Reserved. @@ -1030,6 +1055,7 @@ external name sql.querylog_calls; -- The Original Code is the MonetDB Database System. -- -- The Initial Developer of the Original Code is CWI. +-- Portions created by CWI are Copyright (C) 1997-July 2008 CWI. -- Copyright August 2008-2014 MonetDB B.V. -- All Rights Reserved. @@ -1072,6 +1098,7 @@ external name sql.querylog_enable_thresh -- The Original Code is the MonetDB Database System. -- -- The Initial Developer of the Original Code is CWI. +-- Porti
MonetDB: Jan2014 - Approve after changeset ad82887fd063.
Changeset: f1f8709a858c for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f1f8709a858c Modified Files: clients/Tests/exports.stable.out Branch: Jan2014 Log Message: Approve after changeset ad82887fd063. diffs (11 lines): diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out --- a/clients/Tests/exports.stable.out +++ b/clients/Tests/exports.stable.out @@ -2517,6 +2517,7 @@ int findVariable(MalBlkPtr mb, str name) int findVariableLength(MalBlkPtr mb, str name, int len); void finishNamespace(void); str finishRef; +void finishSessionProfiler(Client cntxt); Module fixModule(Module scope, str nme); int fndConstant(MalBlkPtr mb, const ValRecord *cst, int depth); void formatVolume(str buf, int len, lng vol); ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: RIntegration - make sure we can use the body of the (r,...
Changeset: 72f3ea87cc61 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=72f3ea87cc61
Modified Files:
sql/storage/store.c
Branch: RIntegration
Log Message:
make sure we can use the body of the (r,c,javascript, sql) function.
diffs (12 lines):
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -736,7 +736,7 @@ load_func(sql_trans *tr, sql_schema *s,
t->res.type = NULL;
t->s = s;
t->fix_scale = SCALE_EQ;
- if (t->sql) {
+ if (t->type != FUNC_LANG_MAL) {
t->query = t->imp;
t->imp = NULL;
}
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jan2014 branch.
Changeset: 56d618c15e04 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=56d618c15e04 Modified Files: HowToStart.rst NT/installer32/cv64-32.sh NT/installer64/cv32-64.sh NT/installer64/fixmsi.py NT/monetdb_config.h.in NT/updatecodes.py NT/wincompile.py buildtools/conf/Maddlog buildtools/conf/fixlicense.py buildtools/doc/HowToRelease.rst clients/NT/mclient.bat clients/NT/msqldump.bat clients/NT/stethoscope.bat clients/R/MonetDB.R/src/mapi.c clients/R/MonetDB.R/src/mapisplit.c clients/Tests/SQL-dump.stable.out clients/Tests/SQL-dump.stable.out.32bit clients/Tests/SQL-dump.stable.out.64bit.oid32 clients/Tests/SQL-dump_gsl.stable.out clients/Tests/SQL-dump_nogeom.stable.out clients/Tests/exports.stable.out clients/examples/php/sqlsample.php clients/examples/python/perf.py clients/mapilib/monetdb-mapi.pc.in clients/perl/DBD/t/01base.t clients/php/doc/generate_doc.sh clients/php/examples/query.php clients/php/examples/simple_query.php clients/php/lib/php_monetdb.php clients/python2/README.rst clients/python2/monetdb/__init__.py clients/python2/monetdb/control.py clients/python2/monetdb/exceptions.py clients/python2/test/run.sh clients/python2/test/test_monetize.py clients/python2/test/test_pythonize.py clients/python3/README.rst clients/python3/monetdb/__init__.py clients/python3/monetdb/control.py clients/python3/monetdb/exceptions.py clients/python3/test/run.sh clients/python3/test/test_monetize.py clients/python3/test/test_pythonize.py clients/ruby/lib/MonetDB.rb clients/ruby/lib/test/test_capabilities.rb common/stream/monetdb-stream.pc.in common/stream/stream.h common/utils/msabaoth.c common/utils/msabaoth.h debian/libmonetdb-client-odbc.postinst debian/libmonetdb-client-odbc.postrm debian/monetdb5-server.postinst debian/monetdb5-sql.init.d debian/monetdb5-sql.postinst debian/rules gdk/monetdb-gdk.pc.in geom/sql/40_geom.sql java/pom.xml java/src/nl/cwi/monetdb/util/SQLRestore.java java/tests/drop.sql monetdb5/NT/M5server.bat monetdb5/extras/mal_optimizer_template/opt_sql_append.c monetdb5/extras/mal_optimizer_template/opt_sql_append.h monetdb5/extras/mal_optimizer_template/opt_sql_append.mal monetdb5/extras/rdf/rdf_shredder.c monetdb5/mal/mal_dataflow.h monetdb5/mal/mal_debugger.c monetdb5/mal/mal_debugger.h monetdb5/mal/mal_instruction.c monetdb5/mal/mal_instruction.h monetdb5/mal/mal_interpreter.c monetdb5/mal/mal_interpreter.h monetdb5/mal/mal_listing.c monetdb5/mal/mal_listing.h monetdb5/mal/mal_module.c monetdb5/mal/mal_profiler.c monetdb5/mal/mal_profiler.h monetdb5/mal/mal_resource.c monetdb5/mal/mal_resource.h monetdb5/mal/mal_runtime.c monetdb5/mal/mal_sabaoth.h monetdb5/mal/mal_scenario.h monetdb5/modules/atoms/batxml.c monetdb5/modules/atoms/batxml.mal monetdb5/modules/atoms/batxml.sql monetdb5/modules/atoms/mcurl.c monetdb5/modules/atoms/mcurl.mal monetdb5/modules/atoms/mtime.mal monetdb5/modules/atoms/str.c monetdb5/modules/atoms/str.h monetdb5/modules/atoms/str.mal monetdb5/modules/atoms/streams.c monetdb5/modules/atoms/streams.h monetdb5/modules/atoms/streams.mal monetdb5/modules/atoms/url.c monetdb5/modules/atoms/url.h monetdb5/modules/atoms/url.mal monetdb5/modules/atoms/xml.sql monetdb5/modules/kernel/array.c monetdb5/modules/kernel/array.h monetdb5/modules/kernel/array.mal monetdb5/modules/kernel/bat5.h monetdb5/modules/kernel/bat5.mal monetdb5/modules/kernel/batcolor.c monetdb5/modules/kernel/batcolor.h monetdb5/modules/kernel/batcolor.mal monetdb5/modules/kernel/batmmath.c monetdb5/modules/kernel/batmmath.h monetdb5/modules/kernel/batmmath.mal monetdb5/modules/kernel/batstr.c monetdb5/modules/kernel/batstr.mal monetdb5/modules/kernel/mmath.c monetdb5/modules/kernel/mmath.h monetdb5/modules/kernel/mmath.mal monetdb5/modules/kernel/status.c monetdb5/modules/kernel/status.h monetdb5/modules/kernel/status.mal monetdb5/modules/mal/bbp.c monetdb5/modules/mal/bbp.h monetdb5/modules/mal/bbp.mal monetdb5/modules/mal/box.c monetdb5/modules/mal/box.h monetdb5/modules/mal/box.mal monetdb5/modules/mal/client
MonetDB: default - Approved after recent changes.
Changeset: 0f8f1f53d5b6 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0f8f1f53d5b6 Modified Files: clients/Tests/SQL-dump.stable.out clients/Tests/SQL-dump.stable.out.32bit clients/Tests/SQL-dump.stable.out.64bit.oid32 clients/Tests/SQL-dump_gsl.stable.out clients/Tests/exports.stable.out Branch: default Log Message: Approved after recent changes. diffs (truncated from 37784 to 300 lines): diff --git a/clients/Tests/SQL-dump.stable.out b/clients/Tests/SQL-dump.stable.out --- a/clients/Tests/SQL-dump.stable.out +++ b/clients/Tests/SQL-dump.stable.out @@ -48,8 +48,10 @@ Ready. # 20:08:35 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-1201" "--port=33437" # 20:08:35 > +SCHEMA json SCHEMA tmp SCHEMA tmp +SCHEMA json SYSTEM SCHEMA sys SYSTEM TABLE sys._columns SYSTEM TABLE sys._tables @@ -165,14 +167,6 @@ SYSTEM FUNCTION sys.isaurl SYSTEM FUNCTION sys.isauuid SYSTEM FUNCTION sys.isempty SYSTEM FUNCTION sys.issimple -SYSTEM FUNCTION sys.json_filter -SYSTEM FUNCTION sys.json_filter_all -SYSTEM FUNCTION sys.json_isvalid -SYSTEM FUNCTION sys.json_isvalidarray -SYSTEM FUNCTION sys.json_isvalidobject -SYSTEM FUNCTION sys.json_length -SYSTEM FUNCTION sys.json_path -SYSTEM FUNCTION sys.json_text SYSTEM FUNCTION sys.length SYSTEM FUNCTION sys.like SYSTEM FUNCTION sys.linefromtext @@ -343,7 +337,8 @@ CREATE TABLE "sys"."schemas" ( "id"INTEGER, "name" VARCHAR(1024), "authorization" INTEGER, - "owner" INTEGER + "owner" INTEGER, + "system"BOOLEAN ); CREATE TABLE "sys"."sequences" ( "id"INTEGER, @@ -777,27 +772,6 @@ create function sys.isauuid(u uuid) returns uuid external name uuid."isaUUID"; create function isempty(g geometry) returns boolean external name geom."IsEmpty"; create function issimple(g geometry) returns boolean external name geom."IsSimple"; --- access the top level key by name, return its value -create function sys.json_filter(js json, name string) -returns json external name json.filter; -create function sys.json_filter_all(js json, name string) -returns json external name json.filterall; --- test string for JSON compliancy -create function sys.json_isvalid(js string) -returns bool external name json.isvalid; -create function sys.json_isvalidarray(js string) -returns bool external name json.isvalidarray; -create function sys.json_isvalidobject(js string) -returns bool external name json.isvalidobject; --- return the number of primary components -create function sys.json_length(js json) -returns integer external name json.length; --- a simple path extractor -create function sys.json_path(js json, e string) -returns json external name json.path; --- a simple path extractor as plain text -create function sys.json_text(js json, e string) -returns string external name json.text; create function length(g geometry) returns float external name geom."Length"; -- The contents of this file are subject to the MonetDB Public License -- Version 1.1 (the "License"); you may not use this file except in @@ -1526,425 +1500,426 @@ CREATE TABLE "sys"."_columns" ( "number" INTEGER, "storage" VARCHAR(2048) ); -COPY 418 RECORDS INTO "sys"."_columns" FROM stdin USING DELIMITERS '\t','\n','"'; +COPY 419 RECORDS INTO "sys"."_columns" FROM stdin USING DELIMITERS '\t','\n','"'; 2002 "id""int" 32 0 2001NULLtrue0 NULL 2003 "name" "varchar" 10240 2001NULLtrue1 NULL 2004 "authorization" "int" 32 0 2001NULLtrue2 NULL 2005 "owner" "int" 32 0 2001NULLtrue3 NULL -2007 "id""int" 32 0 2006NULLtrue0 NULL -2008 "systemname""varchar" 256 0 2006NULLtrue 1 NULL -2009 "sqlname" "varchar" 10240 2006NULLtrue 2 NULL -2010 "digits""int" 32 0 2006NULLtrue3 NULL -2011 "scale" "int" 32 0 2006NULLtrue4 NULL -2012 "radix" "int" 32 0 2006NULLtrue5 NULL -2013 "eclass""int" 32 0 2006NULLtrue6 NULL -2014 "schema_id" "int" 32 0 2006NULLtrue7 NULL -2016 "id""int" 32 0 2015NULLtrue0 NULL -2017 "name" "varchar" 256 0 2015NULLtrue1 NULL -2018 "func" "varchar" 81960 2015NULLtrue2 NULL -2019 "mod" "varchar" 81960 2015NULLtrue3 NULL -2020 "sql" "boolean" 1 0 2015NULLtrue4 NULL -2021 "type" "int" 32 0 2015NULLtrue5
MonetDB: default - Bulk operations over json tables
Changeset: 12498434feec for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=12498434feec
Added Files:
sql/test/json/Tests/bulkjson.sql
sql/test/json/Tests/bulkjson.stable.err
sql/test/json/Tests/bulkjson.stable.out
Modified Files:
monetdb5/modules/atoms/Tests/All
monetdb5/modules/atoms/Tests/json08.mal
monetdb5/modules/atoms/Tests/json08.stable.out
monetdb5/modules/atoms/json_atom.mal
sql/scripts/40_json.sql
Branch: default
Log Message:
Bulk operations over json tables
diffs (truncated from 358 to 300 lines):
diff --git a/monetdb5/modules/atoms/Tests/All b/monetdb5/modules/atoms/Tests/All
--- a/monetdb5/modules/atoms/Tests/All
+++ b/monetdb5/modules/atoms/Tests/All
@@ -23,6 +23,7 @@ json04
json05
json07
json08
+json09
jsonrender
uuid00
diff --git a/monetdb5/modules/atoms/Tests/json08.mal
b/monetdb5/modules/atoms/Tests/json08.mal
--- a/monetdb5/modules/atoms/Tests/json08.mal
+++ b/monetdb5/modules/atoms/Tests/json08.mal
@@ -10,8 +10,6 @@ b:= json.new("{\"f1\":1,\"f2\":2,\"f1\":
bat.append(j,b);
b:= json.new("{\"f1\":{\"f12\":3},\"f2\":[2,3,4]}");
bat.append(j,b);
-b:= json.new("[1,\"f2\", 2]");
-bat.append(j,b);
f:bat[:oid,:json]:= mal.manifold("json","filter",j,"f1");
io.print(f);
diff --git a/monetdb5/modules/atoms/Tests/json08.stable.out
b/monetdb5/modules/atoms/Tests/json08.stable.out
--- a/monetdb5/modules/atoms/Tests/json08.stable.out
+++ b/monetdb5/modules/atoms/Tests/json08.stable.out
@@ -31,8 +31,6 @@ function user.main():void;
bat.append(j,b);
b := json.new("{\"f1\":{\"f12\":3},\"f2\":[2,3,4]}");
bat.append(j,b);
-b := json.new("[1,\"f2\", 2]");
-bat.append(j,b);
f:bat[:oid,:json] := mal.manifold("json","filter",j,"f1");
io.print(f);
f:bat[:oid,:json] := mal.manifold("json","filter",j,"f1");
@@ -63,61 +61,55 @@ end main;
# void json # type
#--#
[ 0@0, "[]" ]
-[ 1@0, "[]" ]
+[ 1@0, "[1]" ]
[ 2@0, "[1]" ]
[ 3@0, "[1]" ]
-[ 4@0, "[1]" ]
-[ 5@0, "[{\"f12\":3}]" ]
+[ 4@0, "[{\"f12\":3}]" ]
+#--#
+# ht # name
+# void json # type
+#--#
+[ 0@0, "[]" ]
+[ 1@0, "[1]" ]
+[ 2@0, "[1]" ]
+[ 3@0, "[1]" ]
+[ 4@0, "[{\"f12\":3}]" ]
#--#
# ht # name
# void json # type
#--#
[ 0@0, "[]" ]
[ 1@0, "[]" ]
-[ 2@0, "[1]" ]
-[ 3@0, "[1]" ]
-[ 4@0, "[1]" ]
-[ 5@0, "[{\"f12\":3}]" ]
+[ 2@0, "[2]" ]
+[ 3@0, "[2]" ]
+[ 4@0, "[[2,3,4]]" ]
#--#
# ht # name
# void json # type
#--#
[ 0@0, "[]" ]
-[ 1@0, "[]" ]
-[ 2@0, "[]" ]
-[ 3@0, "[2]" ]
-[ 4@0, "[2]" ]
-[ 5@0, "[[2,3,4]]" ]
+[ 1@0, "[1]" ]
+[ 2@0, "[1]" ]
+[ 3@0, "[1]" ]
+[ 4@0, "[{\"f12\":3}]" ]
#--#
# ht # name
# void json # type
#--#
[ 0@0, "[]" ]
-[ 1@0, "[]" ]
+[ 1@0, "[1]" ]
[ 2@0, "[1]" ]
[ 3@0, "[1]" ]
-[ 4@0, "[1]" ]
-[ 5@0, "[{\"f12\":3}]" ]
+[ 4@0, "[{\"f12\":3}]" ]
#--#
# ht # name
# void json # type
#--#
[ 0@0, "[]" ]
-[ 1@0, "[]" ]
+[ 1@0, "[1]" ]
[ 2@0, "[1]" ]
[ 3@0, "[1]" ]
-[ 4@0, "[1]" ]
-[ 5@0, "[{\"f12\":3}]" ]
-#--#
-# ht # name
-# void json # type
-#--#
-[ 0@0, "[]" ]
-[ 1@0, "[]" ]
-[ 2@0, "[1]" ]
-[ 3@0, "[1]" ]
-[ 4@0, "[1]" ]
-[ 5@0, "[{\"f12\":3}]" ]
+[ 4@0, "[{\"f12\":3}]" ]
#next batch
#--#
# ht # name
diff --git a/monetdb5/modules/atoms/json_atom.mal
b/monetdb5/modules/atoms/json_atom.mal
--- a/monetdb5/modules/atoms/json_atom.mal
+++ b/monetdb5/modules/atoms/json_atom.mal
@@ -49,10 +49,22 @@ command filterall(name:json, s:str) :jso
address JSONfilterObjectAll
comment "Filter the members of an object by name";
+command filter(name:json, i:bte) :json
+address JSONfilterArray
+comment "Extract a single element from an array";
+
+command filter(name:json, i:sht) :json
+address JSONfilterArray
+comment "Extract a single element from an array";
+
command filter(name:json, i:int) :json
address JSONfilterArray
comment "Extract a single element from an array";
+command filter(name:json, i:lng) :json
+address JSONfilterArray
+comment "Extract a single element from an array";
+
command isvalid(val:str):bit
address JSONisvalid
comment "Validate the string as a valid JSON document";
diff --git a/sql/scripts/40_json.sql b/sql/scripts/40_json.sql
--- a/sql/scripts/40_json.sql
+++ b/sql/scripts/40_json.sql
@@ -26,9 +26,15 @@ create type json external name json;
create function json.filter(js json, name string)
returns json external name json.filter;
+create function json.filter(js json, name tinyint)
+returns json external name json.filter;
+
create function json.filter(js json, name integer)
returns json external name json.filter;
+create func
MonetDB: RIntegration - approved tests and fixed bug in handling...
Changeset: a41eab244f5b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a41eab244f5b
Modified Files:
clients/mapiclient/dump.c
sql/backends/monet5/Tests/rapi02.sql
sql/backends/monet5/sql_gencode.c
sql/include/sql_catalog.h
sql/jdbc/tests/Tests/Test_Dobjects.stable.out
sql/server/rel_psm.c
sql/storage/store.c
sql/test/BugDay_2005-10-06_2.9.3/Tests/CrashMe_SQL_server_crash-2.SF-921673.stable.out
sql/test/BugTracker-2010/Tests/slow-query.Bug-2671.sql
sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-0.Bug-3063.stable.out
sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-1.Bug-3063.stable.out
sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
sql/test/Dependencies/Tests/Dependencies.stable.out
sql/test/Tests/systemfunctions.stable.out
sql/test/bugs/Tests/groupby_having_charlength-bug-sf-943566.stable.out
sql/test/bugs/Tests/innerjoin_multiple-bug-sf-943661.stable.out
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check5.stable.out
Branch: RIntegration
Log Message:
approved tests and fixed bug in handling the sql/mal functions
set return types also for calls which return single values.
diffs (truncated from 1007 to 300 lines):
diff --git a/clients/mapiclient/dump.c b/clients/mapiclient/dump.c
--- a/clients/mapiclient/dump.c
+++ b/clients/mapiclient/dump.c
@@ -1202,7 +1202,7 @@ dump_external_functions(Mapi mid, const
"FROM \"sys\".\"args\" \"a\","
"\"sys\".\"functions\" \"f\", "
"\"sys\".\"schemas\" \"s\" "
- "WHERE \"f\".\"sql\" = FALSE AND "
+ "WHERE \"f\".\"language\" = 1 AND "
"\"a\".\"func_id\" = \"f\".\"id\" AND "
"\"f\".\"schema_id\" = \"s\".\"id\" "
"%s %s "
@@ -1328,7 +1328,7 @@ dump_functions(Mapi mid, stream *toConso
"SELECT \"f\".\"func\", \"f\".\"name\", \"s\".\"name\" "
"FROM \"sys\".\"schemas\" \"s\","
"\"sys\".\"functions\" \"f\" "
- "WHERE \"f\".\"sql\" = TRUE AND "
+ "WHERE \"f\".\"language\" = 2 AND "
"\"s\".\"id\" = \"f\".\"schema_id\""
"%s %s "
"%s%s%s "
@@ -1536,7 +1536,7 @@ dump_database(Mapi mid, stream *toConsol
"\"f\".\"func\" AS \"func\" "
"FROM \"sys\".\"schemas\" \"s\", "
"\"sys\".\"functions\" \"f\" "
- "WHERE \"f\".\"sql\" = TRUE AND "
+ "WHERE \"f\".\"language\" = 2 AND "
"\"s\".\"id\" = \"f\".\"schema_id\" "
"%s" /* and f.id not in systemfunctions */
"UNION "
diff --git a/sql/backends/monet5/Tests/rapi02.sql
b/sql/backends/monet5/Tests/rapi02.sql
--- a/sql/backends/monet5/Tests/rapi02.sql
+++ b/sql/backends/monet5/Tests/rapi02.sql
@@ -1,14 +1,14 @@
-- MonetDB R interface
-- testing robustness, should not cause a segfault
-create function rapi00(i integer) returns table (d float)
+create function rapi02(i integer) returns table (d float)
language R {
arg1 <- c(1804289383, 846930886, 1681692777, 1714636915, 1957747793,
424238335, 719885386, 1649760492, 596516649, 1189641421);
someval <- Re(fft(arg1)); return(someval);
};
-select * from functions where name = 'rapi00';
+select * from functions where name = 'rapi02';
-explain select * from rapi00() as R;
+explain select * from rapi02() as R;
-drop function rapi00;
+drop function rapi02;
diff --git a/sql/backends/monet5/sql_gencode.c
b/sql/backends/monet5/sql_gencode.c
--- a/sql/backends/monet5/sql_gencode.c
+++ b/sql/backends/monet5/sql_gencode.c
@@ -1567,20 +1567,19 @@ static int
char *mod, *fimp;
int l = _dumpstmt(sql, mb, s->op1);
sql_func *f = s->op4.funcval->func;
+ int rtype = s->op4.funcval->res.type->localtype;
if (backend_create_func(sql, f) < 0)
return -1;
mod = sql_func_mod(s->op4.funcval->func);
fimp = sql_func_imp(s->op4.funcval->func);
if (s->op1->nrcols && strcmp(fimp, "not_uniques") == 0)
{
- int rtype = s->op4.funcval->res.type->localtype;
q = newStmt(mb, mod, fimp);
setVarType(mb, getArg(q, 0),
newBatType(TYPE_oid, rtype));
setVarUDFtype(mb, getArg(q,
