Changeset: be5952890c58 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=be5952890c58
Added Files:
sql/backends/monet5/vaults/bam/Tests/bam_lib_mal.malC
sql/benchmarks/ATIS/Tests/load.options5
sql/benchmarks/arno/Tests/insert_ATOM.options5
sql/benchmarks/arno/Tests/insert_BOND.options5
sql/benchmarks/arno_flt/Tests/doAll.options5
sql/benchmarks/arno_flt/Tests/doAll_sorted.options5
sql/benchmarks/arno_flt/Tests/init.options5
sql/benchmarks/moa/Tests/load.options5
sql/test/BugTracker-2019/Tests/select-distinct.Bug-6728.sql
sql/test/BugTracker-2019/Tests/select-distinct.Bug-6728.stable.err
sql/test/BugTracker-2019/Tests/select-distinct.Bug-6728.stable.out
sql/test/BugTracker-2019/Tests/table-duplicate-column.Bug-6729.sql
sql/test/BugTracker-2019/Tests/table-duplicate-column.Bug-6729.stable.err
sql/test/BugTracker-2019/Tests/table-duplicate-column.Bug-6729.stable.out
Removed Files:
monetdb5/mal/Tests/blkjoin.mal
monetdb5/mal/Tests/bloom.mal
sql/backends/monet5/vaults/bam/Tests/bam_lib_mal.mal
sql/benchmarks/ATIS/Tests/load.prologue5
sql/benchmarks/arno/Tests/insert_ATOM.prologue5
sql/benchmarks/arno/Tests/insert_BOND.prologue5
sql/benchmarks/arno_flt/Tests/doAll.prologue5
sql/benchmarks/arno_flt/Tests/doAll_sorted.prologue5
sql/benchmarks/arno_flt/Tests/init.prologue5
sql/benchmarks/moa/Tests/load.prologue5
Modified Files:
HowToStart.rst
clients/R/Tests/deps-install.timeout
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
common/options/monet_options.c
monetdb5/mal/mal_client.c
monetdb5/modules/atoms/Tests/All
monetdb5/tools/Tests/mserver5--help.stable.err
sql/backends/monet5/sql.c
sql/backends/monet5/sql.h
sql/backends/monet5/sql.mal
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_upgrades.c
sql/scripts/25_debug.sql
sql/server/rel_schema.c
sql/server/sql_mvc.c
sql/server/sql_mvc.h
sql/test/BugTracker-2015/Tests/schema-trigger.Bug-3710.sql
sql/test/BugTracker-2015/Tests/schema-trigger.Bug-3710.stable.out
sql/test/BugTracker-2019/Tests/All
sql/test/sys-schema/Tests/systemfunctions.sql
sql/test/sys-schema/Tests/systemfunctions.stable.out
sql/test/sys-schema/Tests/systemfunctions.stable.out.int128
testing/Mtest.py.in
testing/README
testing/monet_options.py.in
tools/mserver/mserver5.1.in
tools/mserver/mserver5.c
Branch: context
Log Message:
merged with default
diffs (truncated from 1713 to 300 lines):
diff --git a/HowToStart.rst b/HowToStart.rst
--- a/HowToStart.rst
+++ b/HowToStart.rst
@@ -346,10 +346,9 @@ paths.
Usage
-----
-The MonetDB5 engine can be used interactively or as a
-server. The SQL back-end can only be used as server.
+The MonetDB5 engine can only be used as a server.
-To run MonetDB5 interactively, just run::
+To run MonetDB5 as a server, just run::
mserver5
diff --git a/clients/R/Tests/deps-install.timeout
b/clients/R/Tests/deps-install.timeout
--- a/clients/R/Tests/deps-install.timeout
+++ b/clients/R/Tests/deps-install.timeout
@@ -1,1 +1,1 @@
-2
+20
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
@@ -11631,6 +11631,7 @@ stdout of test 'MAL-signatures` in direc
[ "sql", "delete", "unsafe pattern sql.delete(mvc:int, sname:str,
tname:str, b:any):int ", "mvc_delete_wrap;", "Delete a row from a table.
Returns sequence number for order dependece." ]
[ "sql", "delta", "command sql.delta(col:bat[:any_3],
uid:bat[:oid], uval:bat[:any_3]):bat[:any_3] ", "DELTAbat2;", "Return
column bat with delta's applied." ]
[ "sql", "delta", "command sql.delta(col:bat[:any_3],
uid:bat[:oid], uval:bat[:any_3], ins:bat[:any_3]):bat[:any_3] ",
"DELTAbat;", "Return column bat with delta's applied." ]
+[ "sql", "deltas", "pattern sql.deltas(schema:str, table:str,
column:str):bat[:lng] ", "mvc_delta_values;", "Return the delta values
sizes of a bat, plus the current transaction level" ]
[ "sql", "dense_rank", "pattern sql.dense_rank(b:any_1, p:bit,
o:bit):int ", "SQLdense_rank;", "return the densely ranked groups"
]
[ "sql", "diff", "pattern sql.diff(b:any_1):bit ", "SQLdiff;",
"return true if cur != prev row" ]
[ "sql", "diff", "pattern sql.diff(p:bit, b:any_1):bit ",
"SQLdiff;", "return true if cur != prev row" ]
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
@@ -16045,6 +16045,7 @@ stdout of test 'MAL-signatures` in direc
[ "sql", "delete", "unsafe pattern sql.delete(mvc:int, sname:str,
tname:str, b:any):int ", "mvc_delete_wrap;", "Delete a row from a table.
Returns sequence number for order dependece." ]
[ "sql", "delta", "command sql.delta(col:bat[:any_3],
uid:bat[:oid], uval:bat[:any_3]):bat[:any_3] ", "DELTAbat2;", "Return
column bat with delta's applied." ]
[ "sql", "delta", "command sql.delta(col:bat[:any_3],
uid:bat[:oid], uval:bat[:any_3], ins:bat[:any_3]):bat[:any_3] ",
"DELTAbat;", "Return column bat with delta's applied." ]
+[ "sql", "deltas", "pattern sql.deltas(schema:str, table:str,
column:str):bat[:lng] ", "mvc_delta_values;", "Return the delta values
sizes of a bat, plus the current transaction level" ]
[ "sql", "dense_rank", "pattern sql.dense_rank(b:any_1, p:bit,
o:bit):int ", "SQLdense_rank;", "return the densely ranked groups"
]
[ "sql", "diff", "pattern sql.diff(b:any_1):bit ", "SQLdiff;",
"return true if cur != prev row" ]
[ "sql", "diff", "pattern sql.diff(p:bit, b:any_1):bit ",
"SQLdiff;", "return true if cur != prev row" ]
diff --git a/common/options/monet_options.c b/common/options/monet_options.c
--- a/common/options/monet_options.c
+++ b/common/options/monet_options.c
@@ -219,7 +219,7 @@ mo_builtin_settings(opt **Set)
if (Set == NULL)
return 0;
-#define N_OPTIONS 8 /*MUST MATCH # OPTIONS BELOW */
+#define N_OPTIONS 7 /*MUST MATCH # OPTIONS BELOW */
set = malloc(sizeof(opt) * N_OPTIONS);
if (set == NULL)
return 0;
@@ -230,10 +230,6 @@ mo_builtin_settings(opt **Set)
"dbfarm" DIR_SEP_STR "demo");
i++;
set[i].kind = opt_builtin;
- set[i].name = strdup("monet_prompt");
- set[i].value = strdup(">");
- i++;
- set[i].kind = opt_builtin;
set[i].name = strdup("mapi_port");
set[i].value = strdup("50000");
i++;
diff --git a/monetdb5/mal/Tests/blkjoin.mal b/monetdb5/mal/Tests/blkjoin.mal
deleted file mode 100644
--- a/monetdb5/mal/Tests/blkjoin.mal
+++ /dev/null
@@ -1,175 +0,0 @@
-# the OOM join experiment
-# M= number elements in left
-# N= number elements in right
-
-# small: 100Mx100M
-M:= 100000000:int;
-N:= 100000000:int;
-
-## large: 1Gx1G
-#M:= 1000000000:int;
-#N:= 1000000000:int;
-
-include microbenchmark;
-t0:= alarm.usec();
-lbase:= microbenchmark.random(0:oid, M, nil:int);
-rbase:= microbenchmark.random(0:oid, N, nil:int);
-##lbase:= bat.new(:int);
-##barrier (go,i):= language.newRange(0:int);
-## k:= mmath.rand();
-## bat.append(lbase,k);
-## redo (go,i):= language.nextElement(1:int,M);
-##exit (go,i);
-##rbase:= bat.new(:int);
-##barrier (go,i):= language.newRange(0:int);
-## k:= mmath.rand();
-## bat.append(rbase,k);
-## redo (go,i):= language.nextElement(1:int,N);
-##exit (go,i);
-t1:= alarm.usec();
-d0:= t1-t0;
-io.printf("#loop %d\n",d0);
-t0:= alarm.usec();
-bat.save(lbase);
-bat.save(rbase);
-
-#cnt:= aggr.count(lbase);
-#io.printf("#left: %d\n",cnt);
-#cnt:= aggr.count(rbase);
-#io.printf("#right: %d\n",cnt);
-
-#mdb.setTrace(true);
-
-#get fresh copies for both experiments
-t0:= alarm.usec();
-lb2:= algebra.copy(lbase);
-rb2:= algebra.copy(rbase);
-rr2:= bat.reverse(rb2);
-t1:= alarm.usec();
-d0:= t1-t0;
-io.printf("#copy %d\n",d0);
-bat.save(lb2);
-bat.save(rb2);
-# the heart of the matter
-t0:= alarm.usec();
-w := algebra.join(lb2,rr2);
-t1:= alarm.usec();
-d0:= t1-t0;
-d1:= d0;
-io.printf("#join %d\n",d0);
-cnt:= aggr.count(w);
-io.print(cnt);
-w := nil;
-rr2:= nil;
-rb2:= nil;
-lb2:= nil;
-
-#get fresh copies for both experiments
-t0:= alarm.usec();
-lb2:= algebra.copy(lbase);
-rb2:= algebra.copy(rbase);
-rr2:= bat.reverse(rb2);
-t1:= alarm.usec();
-d0:= t1-t0;
-io.printf("#copy %d\n",d0);
-bat.save(lb2);
-bat.save(rb2);
-# the heart of the matter
-t0:= alarm.usec();
-w := algebra.partjoin(lb2,rr2);
-t1:= alarm.usec();
-d0:= t1-t0;
-d1:= d0;
-io.printf("#partjoin %d\n",d0);
-cnt:= aggr.count(w);
-io.print(cnt);
-w := nil;
-rr2:= nil;
-rb2:= nil;
-lb2:= nil;
-
-#get fresh copies for both experiments
-t0:= alarm.usec();
-lb2:= algebra.copy(lbase);
-rb2:= algebra.copy(rbase);
-rr2:= bat.reverse(rb2);
-t1:= alarm.usec();
-d0:= t1-t0;
-io.printf("#copy %d\n",d0);
-bat.save(lb2);
-bat.save(rb2);
-# the heart of the matter
-t0:= alarm.usec();
-w := algebra.partjoin(lb2,rr2);
-t1:= alarm.usec();
-d0:= t1-t0;
-d1:= d0;
-io.printf("#partjoin %d\n",d0);
-cnt:= aggr.count(w);
-io.print(cnt);
-w := nil;
-rr2:= nil;
-rb2:= nil;
-lb2:= nil;
-
-#
-##get fresh copies for both experiments
-#t0:= alarm.usec();
-#lb2:= algebra.copy(lbase);
-#rb2:= algebra.copy(rbase);
-#t1:= alarm.usec();
-#d0:= t1-t0;
-#io.printf("#copy %d\n",d0);
-#rr2:= bat.reverse(rb2);
-#bat.save(lb2);
-#bat.save(rb2);
-## the heart of the matter
-#t0:= alarm.usec();
-#w := algebra.blkjoin(lb2,rr2);
-#t1:= alarm.usec();
-#d0:= t1-t0;
-#d1:= d0;
-#io.printf("#blkjoin %d\n",d0);
-#cnt:= aggr.count(w);
-#io.print(cnt);
-#w := nil;
-#rr2:= nil;
-#rb2:= nil;
-#lb2:= nil;
-#
-##get fresh copies for both experiments
-#t0:= alarm.usec();
-#lb2:= algebra.copy(lbase);
-#rb2:= algebra.copy(rbase);
-#t1:= alarm.usec();
-#d0:= t1-t0;
-#io.printf("#copy %d\n",d0);
-#bat.save(lb2);
-#bat.save(rb2);
-## what if you sort first
-#t0:= alarm.usec();
-#s1 := algebra.sort(lb2);
-#t1:= alarm.usec();
-#d0:= t1-t0;
-#d1:= d0;
-#io.printf("#sort %d\n",d0);
-#lb2 := nil;
-#bat.save(s1);
-#t0:= alarm.usec();
-#s2 := algebra.sort(rb2);
-#t1:= alarm.usec();
-#d0:= t1-t0;
-#d1:= d1+d0;
-#io.printf("#sort %d\n",d0);
-#rb2 := nil;
-#ss2:= bat.reverse(s2);
-#bat.save(s2);
-#t0:= alarm.usec();
-#w := algebra.join(s1,ss2);
-#t1:= alarm.usec();
-#d0:= t1-t0;
-#d1:= d1+d0;
-#io.printf("#join %d\n",d0);
-#io.printf("#sortmerge join %d\n",d1);
-#cnt:= aggr.count(w);
-#io.print(cnt);
diff --git a/monetdb5/mal/Tests/bloom.mal b/monetdb5/mal/Tests/bloom.mal
deleted file mode 100644
--- a/monetdb5/mal/Tests/bloom.mal
+++ /dev/null
@@ -1,121 +0,0 @@
-# the bloom filter experiments
-# M= number elements in left, N= number elements in right
-# S= sample exchange size
-
-N:= 10000000:int;
-M:= 10000:int;
-S:= 1000:int;
-
-t0:= alarm.usec();
-lbase:= bat.new(:int);
-barrier (go,i):= language.newRange(0:int);
- k:= mmath.rand();
- bat.append(lbase,k);
- redo (go,i):= language.nextElement(1:int,M);
-exit (go,i);
-rbase:= bat.new(:int);
-barrier (go,i):= language.newRange(0:int);
- k:= mmath.rand();
- bat.append(rbase,k);
- redo (go,i):= language.nextElement(1:int,N);
-exit (go,i);
-# share a sample
-s1 := algebra.sample(lbase,S);
-s2 := algebra.sample(rbase,S);
-bat.append(lbase,s2);
-bat.append(rbase,s1);
-t1:= alarm.usec();
-d0:= t1-t0;
-io.printf("#loop %d\n",d0);
-t0:= alarm.usec();
-
-#get fresh copies for both experiments
-lb1:= algebra.copy(lbase);
-lb2:= algebra.copy(lbase);
-rb1:= algebra.copy(rbase);
-rb2:= algebra.copy(rbase);
-t1:= alarm.usec();
-#io.print(b);
-#io.print(c);
-d0:= t1-t0;
-io.printf("#copy %d\n",d0);
-t0:= alarm.usec();
-cc:= bat.reverse(rb1);
-j:= algebra.join(lb1,cc);
-t1:= alarm.usec();
-d0:= t1-t0;
-io.printf("#join %d\n",d0);
-t0:= alarm.usec();
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
