MonetDB: default - SQL-dump_geom: fixed 32-bit output
Changeset: 65c0d033aea8 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=65c0d033aea8 Modified Files: clients/Tests/SQL-dump_geom.stable.out.32bit Branch: default Log Message: SQL-dump_geom: fixed 32-bit output diffs (11 lines): diff --git a/clients/Tests/SQL-dump_geom.stable.out.32bit b/clients/Tests/SQL-dump_geom.stable.out.32bit --- a/clients/Tests/SQL-dump_geom.stable.out.32bit +++ b/clients/Tests/SQL-dump_geom.stable.out.32bit @@ -793,6 +793,7 @@ begin or nme = 'smallint' or nme = 'int' or nme = 'bigint' + or nme = 'hugeint' or nme = 'decimal' or nme = 'date' or nme = 'timestamp' ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jan2014 - Use apostrophe instead of semicolon to make t...
Changeset: 977f95eaa0fe for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=977f95eaa0fe Modified Files: monetdb5/mal/Tests/tst1225.mal monetdb5/mal/Tests/tst1225.stable.out monetdb5/mal/Tests/tst220.mal monetdb5/mal/Tests/tst220.stable.out monetdb5/mal/Tests/tst2510.mal monetdb5/mal/Tests/tst2510.stable.out monetdb5/mal/mal_parser.c monetdb5/mal/mal_resolve.c monetdb5/modules/kernel/algebra.c monetdb5/modules/mal/bbp.c monetdb5/optimizer/Tests/common.mal monetdb5/optimizer/Tests/common.stable.out monetdb5/optimizer/Tests/dictionary00.mal monetdb5/optimizer/Tests/dictionary01.mal monetdb5/optimizer/Tests/reorder01.mal monetdb5/optimizer/Tests/reorder01.stable.out monetdb5/optimizer/Tests/tst4631.mal monetdb5/optimizer/Tests/tst4631.stable.out monetdb5/optimizer/Tests/tst4730.mal monetdb5/optimizer/Tests/tst4730.stable.out monetdb5/optimizer/opt_dictionary.c monetdb5/optimizer/opt_support.c monetdb5/scheduler/run_pipeline.c sql/backends/monet5/embeddedclient.c.in sql/backends/monet5/sql_scenario.c Branch: Jan2014 Log Message: Use apostrophe instead of semicolon to make text look like English. diffs (truncated from 319 to 300 lines): diff --git a/monetdb5/mal/Tests/tst1225.mal b/monetdb5/mal/Tests/tst1225.mal --- a/monetdb5/mal/Tests/tst1225.mal +++ b/monetdb5/mal/Tests/tst1225.mal @@ -10,8 +10,8 @@ pc_a := calc.*(23,60); qc_a := calc.+(pc_a,59); tzone_bat:= bat.new(:oid,:timezone); - i8:= 8@0; # don;t use 08@0 - io.print(i8); # don;t use 09@0 + i8:= 8@0; # don't use 08@0 + io.print(i8); # don't use 09@0 i9:= 9@0; io.print(i9); bd_a := bat.insert(tzone_bat,8@0,tzone_08); diff --git a/monetdb5/mal/Tests/tst1225.stable.out b/monetdb5/mal/Tests/tst1225.stable.out --- a/monetdb5/mal/Tests/tst1225.stable.out +++ b/monetdb5/mal/Tests/tst1225.stable.out @@ -22,8 +22,8 @@ stdout of test 'tst1225` in directory 'm # pc_a := calc.*(23,60); # qc_a := calc.+(pc_a,59); # tzone_bat:= bat.new(:oid,:timezone); -# i8:= 8@0; # don;t use 08@0 -# io.print(i8); # don;t use 09@0 +# i8:= 8@0; # don't use 08@0 +# io.print(i8); # don't use 09@0 # i9:= 9@0; # io.print(i9); # bd_a := bat.insert(tzone_bat,8@0,tzone_08); @@ -45,9 +45,9 @@ function user.main():void; qc_a := calc.+(pc_a,59); tzone_bat := bat.new(:oid,:timezone); i8 := 8@0; -# don;t use 08@0 +# don't use 08@0 io.print(i8); -# don;t use 09@0 +# don't use 09@0 i9 := 9@0; io.print(i9); bd_a := bat.insert(tzone_bat,8@0,tzone_08); diff --git a/monetdb5/mal/Tests/tst220.mal b/monetdb5/mal/Tests/tst220.mal --- a/monetdb5/mal/Tests/tst220.mal +++ b/monetdb5/mal/Tests/tst220.mal @@ -24,7 +24,7 @@ end createone; i:= bbp.getLRefCount(b); io.printf(refcount =%d[1]\n,i); - #handle an alias, which isn;t used! + #handle an alias, which isn't used! b2:= b; i:= bbp.getLRefCount(b); io.printf(after assignment refcount =%d[2]\n,i); diff --git a/monetdb5/mal/Tests/tst220.stable.out b/monetdb5/mal/Tests/tst220.stable.out --- a/monetdb5/mal/Tests/tst220.stable.out +++ b/monetdb5/mal/Tests/tst220.stable.out @@ -82,7 +82,7 @@ function user.main():void; io.print(b); i := bbp.getLRefCount(b); io.printf(refcount =%d[1]\n,i); -#handle an alias, which isn;t used! +#handle an alias, which isn't used! b2 := b; i := bbp.getLRefCount(b); io.printf(after assignment refcount =%d[2]\n,i); diff --git a/monetdb5/mal/Tests/tst2510.mal b/monetdb5/mal/Tests/tst2510.mal --- a/monetdb5/mal/Tests/tst2510.mal +++ b/monetdb5/mal/Tests/tst2510.mal @@ -12,4 +12,4 @@ exit always; #exit MALException; return tryme:= false; end tryme; -user.tryme();# shouldn;t hang when you forget the exception +user.tryme();# shouldn't hang when you forget the exception diff --git a/monetdb5/mal/Tests/tst2510.stable.out b/monetdb5/mal/Tests/tst2510.stable.out --- a/monetdb5/mal/Tests/tst2510.stable.out +++ b/monetdb5/mal/Tests/tst2510.stable.out @@ -37,12 +37,12 @@ exit always; #exit MALException; return tryme := false; end tryme; -#user.tryme();# shouldn;t hang when you forget the exception +#user.tryme();# shouldn't hang when you forget the exception # function user.main():void; # A exception in a factory should terminate it user.tryme(); -# shouldn;t hang when you forget the exception +# shouldn't hang when you forget the exception end main; # 08:58:58 diff --git a/monetdb5/mal/mal_parser.c b/monetdb5/mal/mal_parser.c --- a/monetdb5/mal/mal_parser.c +++ b/monetdb5/mal/mal_parser.c @@ -1662,7 +1662,7 @@ parseAssign(Client cntxt, int cntrl) if (l == 0 ||
MonetDB: Jan2014 - Implemented option to not pass --forcemito to...
Changeset: c86b6c89e97b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c86b6c89e97b
Modified Files:
testing/Mtest.py.in
testing/README
Branch: Jan2014
Log Message:
Implemented option to not pass --forcemito to server for a test.
diffs (63 lines):
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -1838,6 +1838,8 @@ def RunTest(env, TST, BusyPorts, COND, o
MissingMods = CheckMods(env, TST, SERVER, CALL)
MissingTests = CheckTests(env, TST, oktests)
+nomito = os.path.isfile(TST + '.nomito')
+
os.chdir(TSTTRGDIR)
@@ -2031,7 +2033,7 @@ def RunTest(env, TST, BusyPorts, COND, o
TestErr.close()
t0 = time.time()
-tres = DoIt(env, SERVER, CALL, TST, EXT, PRELUDE, TestOutFile,
TestErrFile, STIMEOUT, CTIMEOUT, TIMEOUT, ME, MAPIsockets, length)
+tres = DoIt(env, SERVER, CALL, TST, EXT, PRELUDE, TestOutFile,
TestErrFile, STIMEOUT, CTIMEOUT, TIMEOUT, ME, MAPIsockets, length, nomito)
if tres == 'segfault':
# rename core file, if any -- might have to check
# /proc/sys/kernel/core_pattern in the future but hopefully
@@ -2664,7 +2666,7 @@ def mapi_ping(port,lang) :
return False
### mapi_ping() #
-def DoIt(env, SERVER, CALL, TST, EXT, PRELUDE, TestOutFile, TestErrFile,
STIMEOUT, CTIMEOUT, TIMEOUT, ME, MAPIsockets, length) :
+def DoIt(env, SERVER, CALL, TST, EXT, PRELUDE, TestOutFile, TestErrFile,
STIMEOUT, CTIMEOUT, TIMEOUT, ME, MAPIsockets, length, nomito) :
ATJOB2 =
STDERR.flush()
if quiet:
@@ -2732,6 +2734,11 @@ def DoIt(env, SERVER, CALL, TST, EXT, PR
DBINIT = ['--dbinit=%s' % dbinit]
Srvr = splitcommand(exe['Mserver'][1]) + LOCAL_CONF +
['--dbpath=%s' % os.path.join(env['GDK_DBFARM'], TSTDB)]
+if nomito:
+try:
+Srvr.remove('--forcemito')
+except ValueError:
+pass
lang=
if SERVER == MAL:
@@ -2991,7 +2998,7 @@ def DoIt(env, SERVER, CALL, TST, EXT, PR
return None
-### DoIt(env, SERVER, CALL, TST, EXT, PRELUDE, TestOut, TestErr, STIMEOUT,
CTIMEOUT, TIMEOUT, ME, MAPIsockets) #
+### DoIt(env, SERVER, CALL, TST, EXT, PRELUDE, TestOutFile, TestErrFile,
STIMEOUT, CTIMEOUT, TIMEOUT, ME, MAPIsockets, length, nomito) #
def Check(command, input) :
global setpgrp
diff --git a/testing/README b/testing/README
--- a/testing/README
+++ b/testing/README
@@ -86,6 +86,8 @@ http://monetdb.cwi.nl/Development/TestWe
required by the test (optional) (TST.modules)
(^,`)
+ a file that contains a list of tests (one per line) that must
have run successfully prior to the test (optional) (TST.reqtests)
+ + a file that if it exists indicates that the --forcemito flag
+ must not be passed to the server (TST.nomito)
+ a set of files used by the arbitrary executable
(optional) (TST.*)
(^,`)
+ stable (i.e. correct) versions of stdout and stderr
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jan2014 - Implemented --nomito flag to start server wit...
Changeset: 80f248ae65a8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=80f248ae65a8
Modified Files:
testing/Mtest.py.in
Branch: Jan2014
Log Message:
Implemented --nomito flag to start server without --forcemito flag.
diffs (31 lines):
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -3441,6 +3441,8 @@ def main(argv) :
('testweb', None, 'testweb', None, 'Optimize testing for testweb'),
('releaserun', None, 'releaserun', None,
'run tests as if for a release test'),
+('nomito', None, 'nomito', None,
+ 'Do not pass --forcemito to server'),
]
if THISFILE == 'Mtest.py':
@@ -3509,6 +3511,7 @@ def main(argv) :
procdebug = opts.get('procdebug', False)
global releaserun
releaserun = opts.get('releaserun', releaserun)
+nomito = opts.get('nomito', False)
CONDITIONALS['RELEASERUN'] = releaserun
if THISFILE == Mtest.py:
_IGNORE = dftIGNORE
@@ -3790,8 +3793,8 @@ def main(argv) :
exe = {}
exe['Mtimeout'] = CheckExec('Mtimeout') , 'Mtimeout
-timeout %d ' % par['TIMEOUT']
-exe['Mserver'] = CheckExec('mserver5') , '%s mserver5 %s
--debug=%s --set gdk_nr_threads=%s %s --set mapi_open=true --set mapi_port=%s
%s --set monet_prompt= --forcemito --set mal_listing=2 %s' % \
-
(env['setDBG'], config, env['GDK_DEBUG'], env['GDK_NR_THREADS'],
env['setMONETDB_MOD_PATH'], env['MAPIPORT'], SOCK, env['MSERVER_SET'])
+exe['Mserver'] = CheckExec('mserver5') , '%s mserver5 %s
--debug=%s --set gdk_nr_threads=%s %s --set mapi_open=true --set mapi_port=%s
%s --set monet_prompt= %s --set mal_listing=2 %s' % \
+
(env['setDBG'], config, env['GDK_DEBUG'], env['GDK_NR_THREADS'],
env['setMONETDB_MOD_PATH'], env['MAPIPORT'], SOCK, not nomito and '--forcemito'
or '', env['MSERVER_SET'])
exe['Mdiff'] = CheckExec('Mdiff'), 'Mdiff'
exe['python']= CheckExec(sys.executable) , sys.executable
exe['MAL_Client']= CheckExec(env['MALCLIENT'].split(None,
1)[0]) , '%s -i -e --host=%s --port=%s' % (env['MALCLIENT'], HOST,
env['MAPIPORT'])
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jan2014 - Test for bug 3527.
Changeset: d380de461d7a for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d380de461d7a Added Files: sql/test/BugTracker-2014/Tests/select-distinct-order-limit.Bug-3527.nomito sql/test/BugTracker-2014/Tests/select-distinct-order-limit.Bug-3527.sql sql/test/BugTracker-2014/Tests/select-distinct-order-limit.Bug-3527.stable.err sql/test/BugTracker-2014/Tests/select-distinct-order-limit.Bug-3527.stable.out Modified Files: sql/test/BugTracker-2014/Tests/All Branch: Jan2014 Log Message: Test for bug 3527. It needs to run without --forcemito for the full effect. diffs (262 lines): diff --git a/sql/test/BugTracker-2014/Tests/All b/sql/test/BugTracker-2014/Tests/All --- a/sql/test/BugTracker-2014/Tests/All +++ b/sql/test/BugTracker-2014/Tests/All @@ -30,3 +30,4 @@ unsafe_project_push_down.Bug-3523 non_groupby_column.Bug-3524 orderby_count.Bug-3526 outer_join_using_diff_types_using.Bug-3536 +select-distinct-order-limit.Bug-3527 diff --git a/sql/test/BugTracker-2014/Tests/select-distinct-order-limit.Bug-3527.nomito b/sql/test/BugTracker-2014/Tests/select-distinct-order-limit.Bug-3527.nomito new file mode 100644 diff --git a/sql/test/BugTracker-2014/Tests/select-distinct-order-limit.Bug-3527.sql b/sql/test/BugTracker-2014/Tests/select-distinct-order-limit.Bug-3527.sql new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2014/Tests/select-distinct-order-limit.Bug-3527.sql @@ -0,0 +1,67 @@ +start transaction; + +create table test3527 ( + a int, + b int, + c int +); +copy 54 records into test3527 from stdin using delimiters ',','\n'; +0,0,0 +0,0,1 +0,0,2 +0,1,0 +0,1,1 +0,1,2 +0,2,0 +0,2,1 +0,2,2 +1,0,0 +1,0,1 +1,0,2 +1,1,0 +1,1,1 +1,1,2 +1,2,0 +1,2,1 +1,2,2 +2,0,0 +2,0,1 +2,0,2 +2,1,0 +2,1,1 +2,1,2 +2,2,0 +2,2,1 +2,2,2 +0,0,0 +0,0,1 +0,0,2 +0,1,0 +0,1,1 +0,1,2 +0,2,0 +0,2,1 +0,2,2 +1,0,0 +1,0,1 +1,0,2 +1,1,0 +1,1,1 +1,1,2 +1,2,0 +1,2,1 +1,2,2 +2,0,0 +2,0,1 +2,0,2 +2,1,0 +2,1,1 +2,1,2 +2,2,0 +2,2,1 +2,2,2 + +select a,b,c from test3527 order by a,b,c limit 2; +select distinct a,b,c from test3527 order by a,b,c limit 2; + +rollback; diff --git a/sql/test/BugTracker-2014/Tests/select-distinct-order-limit.Bug-3527.stable.err b/sql/test/BugTracker-2014/Tests/select-distinct-order-limit.Bug-3527.stable.err new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2014/Tests/select-distinct-order-limit.Bug-3527.stable.err @@ -0,0 +1,35 @@ +stderr of test 'select-distinct-order-limit.Bug-3527` in directory 'sql/test/BugTracker-2014` itself: + + +# 10:52:19 +# 10:52:19 mserver5 --debug=10 --set gdk_nr_threads=0 --set mapi_open=true --set mapi_port=38758 --set mapi_usock=/var/tmp/mtest-8054/.s.monetdb.38758 --set monet_prompt= --forcemito --set mal_listing=2 --dbpath=/ufs/sjoerd/Monet-stable/var/MonetDB/mTests_sql_test_BugTracker-2014 --set mal_listing=0 +# 10:52:19 + +# builtin opt gdk_dbpath = /ufs/sjoerd/Monet-stable/var/monetdb5/dbfarm/demo +# builtin opt gdk_debug = 0 +# builtin opt gdk_vmtrim = no +# 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 = 38758 +# cmdline opt mapi_usock = /var/tmp/mtest-8054/.s.monetdb.38758 +# cmdline opt monet_prompt = +# cmdline opt mal_listing = 2 +# cmdline opt gdk_dbpath = /ufs/sjoerd/Monet-stable/var/MonetDB/mTests_sql_test_BugTracker-2014 +# cmdline opt mal_listing = 0 + +# 10:52:20 +# 10:52:20 mclient -lsql -ftest -Eutf-8 -i -e --host=/var/tmp/mtest-8054 --port=38758 +# 10:52:20 + + +# 10:52:20 +# 10:52:20 Done. +# 10:52:20 + diff --git a/sql/test/BugTracker-2014/Tests/select-distinct-order-limit.Bug-3527.stable.out b/sql/test/BugTracker-2014/Tests/select-distinct-order-limit.Bug-3527.stable.out new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2014/Tests/select-distinct-order-limit.Bug-3527.stable.out @@ -0,0 +1,135 @@ +stdout of test 'select-distinct-order-limit.Bug-3527` in directory 'sql/test/BugTracker-2014` itself: + + +# 10:52:19 +# 10:52:19 mserver5 --debug=10 --set gdk_nr_threads=0 --set mapi_open=true --set mapi_port=38758 --set mapi_usock=/var/tmp/mtest-8054/.s.monetdb.38758 --set monet_prompt= --forcemito --set mal_listing=2 --dbpath=/ufs/sjoerd/Monet-stable/var/MonetDB/mTests_sql_test_BugTracker-2014 --set mal_listing=0 +# 10:52:19 + +# MonetDB 5 server v11.17.22 (hg id: bec0fb76305a+) +# This is an unreleased version +# Serving database 'mTests_sql_test_BugTracker-2014', using 8 threads +# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically linked +# Found 15.590 GiB available main-memory. +# Copyright (c) 1993-July 2008 CWI. +# Copyright (c) August 2008-2014 MonetDB B.V., all rights reserved +#
MonetDB: Oct2014 - Fix SELECT DISTINCT with ORDER BY and LIMIT.
Changeset: b373303ee299 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b373303ee299 Modified Files: clients/Tests/MAL-signatures_all.stable.out clients/Tests/MAL-signatures_fits_geom.stable.out clients/Tests/MAL-signatures_geom.stable.out clients/Tests/MAL-signatures_none.stable.out clients/Tests/exports.stable.out gdk/gdk.h gdk/gdk_firstn.c monetdb5/modules/kernel/algebra.c monetdb5/modules/kernel/algebra.mal monetdb5/modules/mal/Tests/pqueue.mal monetdb5/modules/mal/Tests/pqueue.stable.out monetdb5/modules/mal/Tests/pqueue2.mal monetdb5/modules/mal/Tests/pqueue2.stable.out monetdb5/modules/mal/Tests/pqueue3.mal monetdb5/modules/mal/Tests/pqueue3.stable.out monetdb5/tests/gdkTests/Tests/firstn.mal sql/backends/monet5/sql_gencode.c sql/benchmarks/tpch/Tests/02-explain.stable.out sql/benchmarks/tpch/Tests/03-explain.stable.out sql/benchmarks/tpch/Tests/10-explain.stable.out sql/benchmarks/tpch/Tests/18-explain.stable.out sql/benchmarks/tpch/Tests/21-explain.stable.out sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out Branch: Oct2014 Log Message: Fix SELECT DISTINCT with ORDER BY and LIMIT. This fixes bug 3527, but only for the next feature release. Niels, there is still an issue in sql_gencode.c. See the TODO comment. diffs (truncated from 1550 to 300 lines): diff --git a/clients/Tests/MAL-signatures_all.stable.out b/clients/Tests/MAL-signatures_all.stable.out --- a/clients/Tests/MAL-signatures_all.stable.out +++ b/clients/Tests/MAL-signatures_all.stable.out @@ -2422,27 +2422,27 @@ command algebra.exist(b:bat[:oid,:any_1] address ALGexist; comment Returns whether 'val' occurs in b. -pattern algebra.firstn(b:bat[:oid,:any],s:bat[:oid,:oid],g:bat[:oid,:oid],n:wrd,asc:bit) (X_6:bat[:oid,:oid],X_7:bat[:oid,:oid]) +pattern algebra.firstn(b:bat[:oid,:any],s:bat[:oid,:oid],g:bat[:oid,:oid],n:wrd,asc:bit,distinct:bit) (X_7:bat[:oid,:oid],X_8:bat[:oid,:oid]) address ALGfirstn; comment Calculate first N values of B with candidate list S -pattern algebra.firstn(b:bat[:oid,:any],s:bat[:oid,:oid],n:wrd,asc:bit) (X_5:bat[:oid,:oid],X_6:bat[:oid,:oid]) +pattern algebra.firstn(b:bat[:oid,:any],s:bat[:oid,:oid],n:wrd,asc:bit,distinct:bit) (X_6:bat[:oid,:oid],X_7:bat[:oid,:oid]) address ALGfirstn; comment Calculate first N values of B with candidate list S -pattern algebra.firstn(b:bat[:oid,:any],n:wrd,asc:bit) (X_4:bat[:oid,:oid],X_5:bat[:oid,:oid]) +pattern algebra.firstn(b:bat[:oid,:any],n:wrd,asc:bit,distinct:bit) (X_5:bat[:oid,:oid],X_6:bat[:oid,:oid]) address ALGfirstn; comment Calculate first N values of B -pattern algebra.firstn(b:bat[:oid,:any],s:bat[:oid,:oid],g:bat[:oid,:oid],n:wrd,asc:bit):bat[:oid,:oid] +pattern algebra.firstn(b:bat[:oid,:any],s:bat[:oid,:oid],g:bat[:oid,:oid],n:wrd,asc:bit,distinct:bit):bat[:oid,:oid] address ALGfirstn; comment Calculate first N values of B with candidate list S -pattern algebra.firstn(b:bat[:oid,:any],s:bat[:oid,:oid],n:wrd,asc:bit):bat[:oid,:oid] +pattern algebra.firstn(b:bat[:oid,:any],s:bat[:oid,:oid],n:wrd,asc:bit,distinct:bit):bat[:oid,:oid] address ALGfirstn; comment Calculate first N values of B with candidate list S -pattern algebra.firstn(b:bat[:oid,:any],n:wrd,asc:bit):bat[:oid,:oid] +pattern algebra.firstn(b:bat[:oid,:any],n:wrd,asc:bit,distinct:bit):bat[:oid,:oid] address ALGfirstn; comment Calculate first N values of B diff --git a/clients/Tests/MAL-signatures_fits_geom.stable.out b/clients/Tests/MAL-signatures_fits_geom.stable.out --- a/clients/Tests/MAL-signatures_fits_geom.stable.out +++ b/clients/Tests/MAL-signatures_fits_geom.stable.out @@ -2422,27 +2422,27 @@ command algebra.exist(b:bat[:oid,:any_1] address ALGexist; comment Returns whether 'val' occurs in b. -pattern algebra.firstn(b:bat[:oid,:any],s:bat[:oid,:oid],g:bat[:oid,:oid],n:wrd,asc:bit) (X_6:bat[:oid,:oid],X_7:bat[:oid,:oid]) +pattern algebra.firstn(b:bat[:oid,:any],s:bat[:oid,:oid],g:bat[:oid,:oid],n:wrd,asc:bit,distinct:bit) (X_7:bat[:oid,:oid],X_8:bat[:oid,:oid]) address ALGfirstn; comment Calculate first N values of B with candidate list S -pattern algebra.firstn(b:bat[:oid,:any],s:bat[:oid,:oid],n:wrd,asc:bit) (X_5:bat[:oid,:oid],X_6:bat[:oid,:oid]) +pattern algebra.firstn(b:bat[:oid,:any],s:bat[:oid,:oid],n:wrd,asc:bit,distinct:bit) (X_6:bat[:oid,:oid],X_7:bat[:oid,:oid]) address ALGfirstn; comment Calculate first N values of B with candidate list S -pattern algebra.firstn(b:bat[:oid,:any],n:wrd,asc:bit) (X_4:bat[:oid,:oid],X_5:bat[:oid,:oid]) +pattern algebra.firstn(b:bat[:oid,:any],n:wrd,asc:bit,distinct:bit) (X_5:bat[:oid,:oid],X_6:bat[:oid,:oid]) address ALGfirstn; comment Calculate first N values of B -pattern
MonetDB: default - Merge with Oct2014 branch.
Changeset: 0656448233d2 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0656448233d2 Added Files: sql/test/BugTracker-2014/Tests/select-distinct-order-limit.Bug-3527.nomito sql/test/BugTracker-2014/Tests/select-distinct-order-limit.Bug-3527.sql sql/test/BugTracker-2014/Tests/select-distinct-order-limit.Bug-3527.stable.err sql/test/BugTracker-2014/Tests/select-distinct-order-limit.Bug-3527.stable.out Modified Files: clients/Tests/MAL-signatures_all.stable.out clients/Tests/MAL-signatures_fits_geom.stable.out clients/Tests/MAL-signatures_geom.stable.out clients/Tests/MAL-signatures_none.stable.out clients/Tests/exports.stable.out gdk/gdk.h gdk/gdk_firstn.c monetdb5/mal/Tests/tst1225.mal monetdb5/mal/Tests/tst1225.stable.out monetdb5/mal/Tests/tst220.mal monetdb5/mal/Tests/tst220.stable.out monetdb5/mal/Tests/tst2510.mal monetdb5/mal/Tests/tst2510.stable.out monetdb5/mal/mal_parser.c monetdb5/mal/mal_resolve.c monetdb5/modules/kernel/algebra.c monetdb5/modules/kernel/algebra.mal monetdb5/modules/mal/Tests/pqueue.mal monetdb5/modules/mal/Tests/pqueue.stable.out monetdb5/modules/mal/Tests/pqueue2.mal monetdb5/modules/mal/Tests/pqueue2.stable.out monetdb5/modules/mal/Tests/pqueue3.mal monetdb5/modules/mal/Tests/pqueue3.stable.out monetdb5/modules/mal/bbp.c monetdb5/optimizer/Tests/common.mal monetdb5/optimizer/Tests/common.stable.out monetdb5/optimizer/Tests/reorder01.mal monetdb5/optimizer/Tests/reorder01.stable.out monetdb5/optimizer/Tests/tst4631.mal monetdb5/optimizer/Tests/tst4631.stable.out monetdb5/optimizer/Tests/tst4730.mal monetdb5/optimizer/Tests/tst4730.stable.out monetdb5/optimizer/opt_support.c monetdb5/scheduler/run_pipeline.c monetdb5/tests/gdkTests/Tests/firstn.mal sql/backends/monet5/embeddedclient.c.in sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_scenario.c sql/benchmarks/tpch/Tests/02-explain.stable.out sql/benchmarks/tpch/Tests/03-explain.stable.out sql/benchmarks/tpch/Tests/10-explain.stable.out sql/benchmarks/tpch/Tests/18-explain.stable.out sql/benchmarks/tpch/Tests/21-explain.stable.out sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out sql/test/BugTracker-2014/Tests/All testing/Mtest.py.in testing/README Branch: default Log Message: Merge with Oct2014 branch. diffs (truncated from 2187 to 300 lines): diff --git a/clients/Tests/MAL-signatures_all.stable.out b/clients/Tests/MAL-signatures_all.stable.out --- a/clients/Tests/MAL-signatures_all.stable.out +++ b/clients/Tests/MAL-signatures_all.stable.out @@ -2302,27 +2302,27 @@ command algebra.exist(b:bat[:oid,:any_1] address ALGexist; comment Returns whether 'val' occurs in b. -pattern algebra.firstn(b:bat[:oid,:any],s:bat[:oid,:oid],g:bat[:oid,:oid],n:wrd,asc:bit) (X_6:bat[:oid,:oid],X_7:bat[:oid,:oid]) +pattern algebra.firstn(b:bat[:oid,:any],s:bat[:oid,:oid],g:bat[:oid,:oid],n:wrd,asc:bit,distinct:bit) (X_7:bat[:oid,:oid],X_8:bat[:oid,:oid]) address ALGfirstn; comment Calculate first N values of B with candidate list S -pattern algebra.firstn(b:bat[:oid,:any],s:bat[:oid,:oid],n:wrd,asc:bit) (X_5:bat[:oid,:oid],X_6:bat[:oid,:oid]) +pattern algebra.firstn(b:bat[:oid,:any],s:bat[:oid,:oid],n:wrd,asc:bit,distinct:bit) (X_6:bat[:oid,:oid],X_7:bat[:oid,:oid]) address ALGfirstn; comment Calculate first N values of B with candidate list S -pattern algebra.firstn(b:bat[:oid,:any],n:wrd,asc:bit) (X_4:bat[:oid,:oid],X_5:bat[:oid,:oid]) +pattern algebra.firstn(b:bat[:oid,:any],n:wrd,asc:bit,distinct:bit) (X_5:bat[:oid,:oid],X_6:bat[:oid,:oid]) address ALGfirstn; comment Calculate first N values of B -pattern algebra.firstn(b:bat[:oid,:any],s:bat[:oid,:oid],g:bat[:oid,:oid],n:wrd,asc:bit):bat[:oid,:oid] +pattern algebra.firstn(b:bat[:oid,:any],s:bat[:oid,:oid],g:bat[:oid,:oid],n:wrd,asc:bit,distinct:bit):bat[:oid,:oid] address ALGfirstn; comment Calculate first N values of B with candidate list S -pattern algebra.firstn(b:bat[:oid,:any],s:bat[:oid,:oid],n:wrd,asc:bit):bat[:oid,:oid] +pattern algebra.firstn(b:bat[:oid,:any],s:bat[:oid,:oid],n:wrd,asc:bit,distinct:bit):bat[:oid,:oid] address ALGfirstn; comment Calculate first N values of B with candidate list S -pattern algebra.firstn(b:bat[:oid,:any],n:wrd,asc:bit):bat[:oid,:oid] +pattern algebra.firstn(b:bat[:oid,:any],n:wrd,asc:bit,distinct:bit):bat[:oid,:oid] address ALGfirstn; comment Calculate first N values of B diff --git a/clients/Tests/MAL-signatures_fits_geom.stable.out b/clients/Tests/MAL-signatures_fits_geom.stable.out ---
MonetDB: Jan2014 - Another misplaced semicolon bites the dust.
Changeset: 6e2e00587b25 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6e2e00587b25 Modified Files: monetdb5/mal/mal_interpreter.c Branch: Jan2014 Log Message: Another misplaced semicolon bites the dust. diffs (12 lines): diff --git a/monetdb5/mal/mal_interpreter.c b/monetdb5/mal/mal_interpreter.c --- a/monetdb5/mal/mal_interpreter.c +++ b/monetdb5/mal/mal_interpreter.c @@ -1431,7 +1431,7 @@ void garbageCollector(Client cntxt, MalB } /* - * Sometimes it helps to release a BAT when it won;t be used anymore. + * Sometimes it helps to release a BAT when it won't be used anymore. * In this case, we have to assure that all references are cleared * as well. The routine below performs this action in the local * stack frame and its parents only. ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: mosaic - The first join series on compresseddata
Changeset: 6673d2365df8 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6673d2365df8 Added Files: monetdb5/modules/mal/Tests/mosaic_mix_joins.mal monetdb5/modules/mal/Tests/mosaic_mix_joins.stable.err monetdb5/modules/mal/Tests/mosaic_mix_joins.stable.out monetdb5/modules/mal/Tests/mosaic_none_joins.mal monetdb5/modules/mal/Tests/mosaic_none_joins.stable.err monetdb5/modules/mal/Tests/mosaic_none_joins.stable.out monetdb5/modules/mal/Tests/mosaic_rle_joins.mal monetdb5/modules/mal/Tests/mosaic_rle_joins.stable.err monetdb5/modules/mal/Tests/mosaic_rle_joins.stable.out Removed Files: monetdb5/modules/mal/Tests/mosaic_none_fetchjoin.mal monetdb5/modules/mal/Tests/mosaic_none_fetchjoin.stable.err monetdb5/modules/mal/Tests/mosaic_none_fetchjoin.stable.out monetdb5/modules/mal/Tests/mosaic_rle_fetchjoin.mal monetdb5/modules/mal/Tests/mosaic_rle_fetchjoin.stable.err monetdb5/modules/mal/Tests/mosaic_rle_fetchjoin.stable.out Modified Files: monetdb5/modules/mal/Tests/All monetdb5/modules/mal/mosaic.c monetdb5/modules/mal/mosaic_none.c monetdb5/modules/mal/mosaic_rle.c Branch: mosaic Log Message: The first join series on compresseddata diffs (truncated from 802 to 300 lines): diff --git a/monetdb5/modules/mal/Tests/All b/monetdb5/modules/mal/Tests/All --- a/monetdb5/modules/mal/Tests/All +++ b/monetdb5/modules/mal/Tests/All @@ -81,8 +81,9 @@ mosaic_none_thetasubselect mosaic_rle_thetasubselect mosaic_mix_thetasubselect -mosaic_none_fetchjoin -mosaic_rle_fetchjoin +mosaic_none_joins +mosaic_rle_joins +mosaic_mix_joins #HAVE_RAPTOR?rdf diff --git a/monetdb5/modules/mal/Tests/mosaic_mix_joins.mal b/monetdb5/modules/mal/Tests/mosaic_mix_joins.mal new file mode 100644 --- /dev/null +++ b/monetdb5/modules/mal/Tests/mosaic_mix_joins.mal @@ -0,0 +1,52 @@ +# OID list compressions + +o := 19531025:int; + +b:= bat.new(:oid,:int); +bat.append(b,0); +bat.append(b,1); +bat.append(b,2); +bat.append(b,3); +bat.append(b,188); +bat.append(b,50); +bat.append(b,50); +bat.append(b,48); +bat.append(b,1003); +bat.append(b,1002); +bat.append(b,1290); +bat.append(b,o); +bat.append(b,o); +bat.append(b,o); +bat.append(b,9); +bat.append(b,9); +bat.append(b,9); + +io.print(b); +x:= mosaic.compress(b); +mosaic.dump(x); + +c:= bat.new(:oid,:oid); +bat.append(c,0@0); +bat.append(c,2@0); +bat.append(c,5@0); +io.print(c); + +#mosaic.dump(x); +s:= algebra.leftfetchjoin(c,b); +io.print(s); +xs:= mosaic.leftfetchjoin(c,b); +io.print(xs); + +d:= bat.new(:oid,:int); +bat.append(d,9); +bat.append(d,11); + +(jl,jr):= algebra.join(b,d); +io.print(jl,jr); +(ml,mr):= mosaic.join(x,d); +io.print(ml,mr); + +(jl,jr):= algebra.join(d,b); +io.print(jl,jr); +(ml,mr):= mosaic.join(d,x); +io.print(ml,mr); diff --git a/monetdb5/modules/mal/Tests/mosaic_mix_joins.stable.err b/monetdb5/modules/mal/Tests/mosaic_mix_joins.stable.err new file mode 100644 --- /dev/null +++ b/monetdb5/modules/mal/Tests/mosaic_mix_joins.stable.err @@ -0,0 +1,30 @@ +stderr of test 'mosaic_mix_joins` in directory 'monetdb5/modules/mal` itself: + + +# 11:40:47 +# 11:40:47 mserver5 --debug=10 --set gdk_nr_threads=0 --set mapi_open=true --set mapi_port=30803 --set mapi_usock=/var/tmp/mtest-23345/.s.monetdb.30803 --set monet_prompt= --forcemito --set mal_listing=2 --dbpath=/export/scratch1/mk/mosaic//Linux/var/MonetDB/mTests_monetdb5_modules_mal mosaic_mix_joins.mal +# 11:40:47 + +# builtin opt gdk_dbpath = /export/scratch1/mk/mosaic//Linux/var/monetdb5/dbfarm/demo +# builtin opt gdk_debug = 0 +# builtin opt gdk_vmtrim = no +# 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 = 30803 +# cmdline opt mapi_usock = /var/tmp/mtest-23345/.s.monetdb.30803 +# cmdline opt monet_prompt = +# cmdline opt mal_listing = 2 +# cmdline opt gdk_dbpath = /export/scratch1/mk/mosaic//Linux/var/MonetDB/mTests_monetdb5_modules_mal +# cmdline opt gdk_debug = 536870922 + +# 11:40:47 +# 11:40:47 Done. +# 11:40:47 + diff --git a/monetdb5/modules/mal/Tests/mosaic_mix_joins.stable.out b/monetdb5/modules/mal/Tests/mosaic_mix_joins.stable.out new file mode 100644 --- /dev/null +++ b/monetdb5/modules/mal/Tests/mosaic_mix_joins.stable.out @@ -0,0 +1,174 @@ +stdout of test 'mosaic_mix_joins` in directory 'monetdb5/modules/mal` itself: + + +# 11:40:47 +# 11:40:47 mserver5 --debug=10 --set gdk_nr_threads=0 --set mapi_open=true --set mapi_port=30803 --set mapi_usock=/var/tmp/mtest-23345/.s.monetdb.30803 --set monet_prompt= --forcemito --set mal_listing=2
MonetDB: geo - MakePolygon/Polygon implmentation. Works only for...
Changeset: 4d4c6ce1a817 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4d4c6ce1a817
Modified Files:
geom/monetdb5/geom.c
geom/monetdb5/geom.mal
geom/sql/40_geom.sql
Branch: geo
Log Message:
MakePolygon/Polygon implmentation. Works only for polygons without holes.
Changes to geos library were necessary so, it will not work with standard geos
library.
diffs (80 lines):
diff --git a/geom/monetdb5/geom.c b/geom/monetdb5/geom.c
--- a/geom/monetdb5/geom.c
+++ b/geom/monetdb5/geom.c
@@ -600,7 +600,7 @@ str geom_2_geom(wkb** resWKB, wkb **valu
int valueType = 0;
int valueSRID = (*valueWKB)-srid;
-//fprintf(stderr, in geom_2_geom\n);
+
/* get the geosGeometry from the wkb */
geosGeometry = wkb2geos(*valueWKB);
/* get the number of coordinates the geometry has */
@@ -784,7 +784,7 @@ wkb* geos2wkb(const GEOSGeometry* geosGe
geomWKB-srid = GEOSGetSRID(geosGeometry);
memcpy(geomWKB-data, w, wkbLen);
GEOSFree(w);
-
+
return geomWKB;
}
@@ -1944,13 +1944,13 @@ str wkbMakePolygon(wkb** out, wkb** exte
}
externalGeometry = wkb2geos(*external);
- if ((GEOSGeomTypeId(externalGeometry)+1) != wkbLineString) {
+ if ((GEOSGeomTypeId(externalGeometry)+1) != wkbLinearRing) {
*out = wkb_nil;
GEOSGeom_destroy(externalGeometry);
- throw(MAL, geom.Polygon, Geometries should be LineStrings);
+ throw(MAL, geom.Polygon, Geometries should be LinearRings);
}
- if(internalBAT_id == NULL) {
+ if(*internalBAT_id == 0) {
geosGeometry = GEOSGeom_createPolygon(externalGeometry, NULL,
0);
if(geosGeometry == NULL) {
GEOSGeom_destroy(externalGeometry);
diff --git a/geom/monetdb5/geom.mal b/geom/monetdb5/geom.mal
--- a/geom/monetdb5/geom.mal
+++ b/geom/monetdb5/geom.mal
@@ -289,14 +289,14 @@ function MakeEnvelope(xmin:dbl, ymin:dbl
return x;
end MakeEnvelope;
-#function MakePolygon(external:wkb) :wkb;
-# x := Polygon(external, NULL, 0);
-# return x;
-#end MakePolygon;
-#function MakePolygon(external:wkb, srid:int) :wkb;
-# x := Polygon(external, NULL, srid);
-# return x;
-#end MakePolygon;
+function MakePolygon(external:wkb) :wkb;
+ x := Polygon(external, nil:bat, 0);
+ return x;
+end MakePolygon;
+function MakePolygon(external:wkb, srid:int) :wkb;
+ x := Polygon(external, nil:bat, srid);
+ return x;
+end MakePolygon;
#function MakePolygon(external:wkb, internal:bat[:oid,:wkb]) :wkb;
# x := Polygon(external, internal, 0);
# return x;
diff --git a/geom/sql/40_geom.sql b/geom/sql/40_geom.sql
--- a/geom/sql/40_geom.sql
+++ b/geom/sql/40_geom.sql
@@ -4070,9 +4070,9 @@ CREATE FUNCTION ST_MakePointM(x double,
--CREATE FUNCTION ST_LineFromMultiPoint(pointGeom Geometry) RETURNS Geometry
external name geom.LineFromMultiPoint; --gets mutlipoint returns linestring
CREATE FUNCTION ST_MakeEnvelope(xmin double, ymin double, xmax double, ymax
double, srid integer) RETURNS Geometry external name geom.MakeEnvelope;
CREATE FUNCTION ST_MakeEnvelope(xmin double, ymin double, xmax double, ymax
double) RETURNS Geometry external name geom.MakeEnvelope;
---CREATE FUNCTION ST_MakePolygon(geom Geometry) RETURNS Geometry external name
geom.MakePolygon; --gets linestring
---CREATE FUNCTION ST_MakePolygon(outerGeom Geometry, interiorGeoms Geometry[])
RETURNS Geometry external name geom.MakePolygon; --gets linestrings
---CREATE FUNCTION ST_Polygon(geom Geometry, srid integer) RETURNS Geometry
external name geom.MakePolygon; --gets linestring
+CREATE FUNCTION ST_MakePolygon(geom Geometry) RETURNS Geometry external name
geom.MakePolygon; --gets linestring
+--CREATE FUNCTION ST_MakePolygon(outerGeom Geometry, interiorGeoms table(g
Geometry)) RETURNS Geometry external name geom.MakePolygon; --gets linestrings
+CREATE FUNCTION ST_Polygon(geom Geometry, srid integer) RETURNS Geometry
external name geom.MakePolygon; --gets linestring
CREATE FUNCTION ST_MakeBox2D(lowLeftPointGeom Geometry, upRightPointGeom
Geometry) RETURNS mbr external name geom.MakeBox2D; --gets 2d points
--CREATE FUNCTION ST_3DMakeBox(lowLeftPointGeom Geometry, upRightPointGeom
Geometry) RETURNS mbr external name geom.MakeBox3D; --gets 3d points
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: mosaic - Type expansion to cover the other built-in types.
Changeset: 1ba3e1f76aba for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1ba3e1f76aba
Modified Files:
monetdb5/modules/mal/Tests/mosaic_mix_joins.mal
monetdb5/modules/mal/Tests/mosaic_mix_joins.stable.out
monetdb5/modules/mal/Tests/mosaic_none_joins.mal
monetdb5/modules/mal/Tests/mosaic_none_joins.stable.out
monetdb5/modules/mal/Tests/mosaic_rle_joins.mal
monetdb5/modules/mal/Tests/mosaic_rle_joins.stable.out
monetdb5/modules/mal/mosaic.c
monetdb5/modules/mal/mosaic_none.c
monetdb5/modules/mal/mosaic_rle.c
Branch: mosaic
Log Message:
Type expansion to cover the other built-in types.
diffs (truncated from 564 to 300 lines):
diff --git a/monetdb5/modules/mal/Tests/mosaic_mix_joins.mal
b/monetdb5/modules/mal/Tests/mosaic_mix_joins.mal
--- a/monetdb5/modules/mal/Tests/mosaic_mix_joins.mal
+++ b/monetdb5/modules/mal/Tests/mosaic_mix_joins.mal
@@ -40,6 +40,7 @@ io.print(xs);
d:= bat.new(:oid,:int);
bat.append(d,9);
bat.append(d,11);
+bat.append(d,nil:int);
(jl,jr):= algebra.join(b,d);
io.print(jl,jr);
diff --git a/monetdb5/modules/mal/Tests/mosaic_mix_joins.stable.out
b/monetdb5/modules/mal/Tests/mosaic_mix_joins.stable.out
--- a/monetdb5/modules/mal/Tests/mosaic_mix_joins.stable.out
+++ b/monetdb5/modules/mal/Tests/mosaic_mix_joins.stable.out
@@ -54,6 +54,7 @@ function user.main():void;
d := bat.new(:oid,:int);
bat.append(d,9);
bat.append(d,11);
+bat.append(d,nil:int);
(jl,jr) := algebra.join(b,d);
io.print(jl,jr);
(ml,mr) := mosaic.join(x,d);
diff --git a/monetdb5/modules/mal/Tests/mosaic_none_joins.mal
b/monetdb5/modules/mal/Tests/mosaic_none_joins.mal
--- a/monetdb5/modules/mal/Tests/mosaic_none_joins.mal
+++ b/monetdb5/modules/mal/Tests/mosaic_none_joins.mal
@@ -24,6 +24,7 @@ io.print(xs);
d:= bat.new(:oid,:int);
bat.append(d,9);
bat.append(d,11);
+bat.append(d,nil:int);
(jl,jr):= algebra.join(b,d);
io.print(jl,jr);
diff --git a/monetdb5/modules/mal/Tests/mosaic_none_joins.stable.out
b/monetdb5/modules/mal/Tests/mosaic_none_joins.stable.out
--- a/monetdb5/modules/mal/Tests/mosaic_none_joins.stable.out
+++ b/monetdb5/modules/mal/Tests/mosaic_none_joins.stable.out
@@ -39,6 +39,7 @@ function user.main():void;
d := bat.new(:oid,:int);
bat.append(d,9);
bat.append(d,11);
+bat.append(d,nil:int);
(jl,jr) := algebra.join(b,d);
io.print(jl,jr);
(ml,mr) := mosaic.join(x,d);
diff --git a/monetdb5/modules/mal/Tests/mosaic_rle_joins.mal
b/monetdb5/modules/mal/Tests/mosaic_rle_joins.mal
--- a/monetdb5/modules/mal/Tests/mosaic_rle_joins.mal
+++ b/monetdb5/modules/mal/Tests/mosaic_rle_joins.mal
@@ -25,6 +25,7 @@ io.print(xs);
d:= bat.new(:oid,:int);
bat.append(d,9);
bat.append(d,11);
+bat.append(d,nil:int);
(jl,jr):= algebra.join(b,d);
io.print(jl,jr);
diff --git a/monetdb5/modules/mal/Tests/mosaic_rle_joins.stable.out
b/monetdb5/modules/mal/Tests/mosaic_rle_joins.stable.out
--- a/monetdb5/modules/mal/Tests/mosaic_rle_joins.stable.out
+++ b/monetdb5/modules/mal/Tests/mosaic_rle_joins.stable.out
@@ -41,6 +41,7 @@ function user.main():void;
d := bat.new(:oid,:int);
bat.append(d,9);
bat.append(d,11);
+bat.append(d,nil:int);
(jl,jr) := algebra.join(b,d);
io.print(jl,jr);
(ml,mr) := mosaic.join(x,d);
diff --git a/monetdb5/modules/mal/mosaic.c b/monetdb5/modules/mal/mosaic.c
--- a/monetdb5/modules/mal/mosaic.c
+++ b/monetdb5/modules/mal/mosaic.c
@@ -113,6 +113,7 @@ typedef struct MOSINDEX{
float nextafterf(float x, float y);
#endif
+#define PREVVALUEbit(x) ((x) - 1)
#define PREVVALUEbte(x) ((x) - 1)
#define PREVVALUEsht(x) ((x) - 1)
#define PREVVALUEint(x) ((x) - 1)
@@ -121,6 +122,7 @@ float nextafterf(float x, float y);
#define PREVVALUEflt(x) nextafterf((x), -GDK_flt_max)
#define PREVVALUEdbl(x) nextafter((x), -GDK_dbl_max)
+#define NEXTVALUEbit(x) ((x) + 1)
#define NEXTVALUEbte(x) ((x) + 1)
#define NEXTVALUEsht(x) ((x) + 1)
#define NEXTVALUEint(x) ((x) + 1)
@@ -746,7 +748,7 @@ str MOSleftfetchjoin(Client cntxt, MalBl
{
int *ret, *lid =0, *rid=0;
BAT *bl = NULL, *br = NULL, *bn;
- BUN cnt, first;
+ BUN cnt, first=0;
oid *ol =0, o = 0;
str msg= MAL_SUCCEED;
MOStask task;
@@ -841,7 +843,7 @@ MOSjoin(Client cntxt, MalBlkPtr mb, MalS
{
int *ret,*lid,*rid;
BAT *bl = NULL, *br = NULL, *bln = NULL, *brn= NULL;
- BUN cnt = 0, first;
+ BUN cnt = 0, first= 0;
int swapped = 0;
str msg = MAL_SUCCEED;
MOStask task;
@@ -903,12 +905,12 @@ MOSjoin(Client cntxt, MalBlkPtr mb, MalS
switch(task-blk-tag){
case MOSAIC_RLE:
MOSjoin_rle(cntxt, task, first, first + task-blk-cnt);
- first += task-blk-cnt;
+ first += (BUN) task-blk-cnt;
MOSskip_rle(task);
break;
MonetDB: Oct2014 - Fixed two RAPI MAL test cases
Changeset: 5423c2f393b7 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5423c2f393b7 Modified Files: monetdb5/extras/rapi/Tests/rapi07.malC monetdb5/extras/rapi/Tests/rapi07.stable.out monetdb5/extras/rapi/Tests/rapi08.malC monetdb5/extras/rapi/Tests/rapi08.stable.out monetdb5/extras/rapi/rapi.mal testing/README Branch: Oct2014 Log Message: Fixed two RAPI MAL test cases Unterschiede (gekürzt von 317 auf 300 Zeilen): diff --git a/monetdb5/extras/rapi/Tests/rapi07.malC b/monetdb5/extras/rapi/Tests/rapi07.malC --- a/monetdb5/extras/rapi/Tests/rapi07.malC +++ b/monetdb5/extras/rapi/Tests/rapi07.malC @@ -1,2 +1,4 @@ (x:bat[:oid,:dbl], y:bat[:oid,:dbl]) := rapi.eval(nil:ptr,x - seq(arg1,arg2,by=arg3);y - dnorm(x,mean=arg4,sd=arg5);return(data.frame(x,y)),-10,10,0.1,10,3); +io.printf(#~BeginVariableOutput~#\n); io.print(x,y); +io.printf(#~EndVariableOutput~#\n); diff --git a/monetdb5/extras/rapi/Tests/rapi07.stable.out b/monetdb5/extras/rapi/Tests/rapi07.stable.out --- a/monetdb5/extras/rapi/Tests/rapi07.stable.out +++ b/monetdb5/extras/rapi/Tests/rapi07.stable.out @@ -21,13 +21,221 @@ stdout of test 'rapi07` in directory 'mo Ready. -# 20:20:45 -# 20:20:45 mclient -lmal -ftest -Eutf-8 -i -e --host=/var/tmp/mtest-2827 --port=38117 -# 20:20:45 +# 12:48:51 +# 12:48:51 mclient -lmal -ftest -Eutf-8 -i -e --host=/var/tmp/mtest-8117 --port=30681 +# 12:48:51 -= ! correct/expected output needs to be verifed approved ! = +#io.printf(#~BeginVariableOutput~#\n); +#~BeginVariableOutput~# +#io.print(x,y); +#--# +# ht t # name +# void dbl dbl # type +#--# +[ 0@0, -10,2 ] +[ 1@0, -9, 3 ] +[ 2@0, -9, 4 ] +[ 3@0, -9, 5 ] +[ 4@0, -9, 7 ] +[ 5@0, -9, 8 ] +[ 6@0, -9, 1 ] +[ 7@0, -9, 1 ] +[ 8@0, -9, 1 ] +[ 9@0, -9, 2 ] +[ 10@0,-8, 2 ] +[ 11@0,-8, 3 ] +[ 12@0,-8, 3 ] +[ 13@0,-8, 4 ] +[ 14@0,-8, 5 ] +[ 15@0,-8, 7 ] +[ 16@0,-8, 9 ] +[ 17@0,-8, 1 ] +[ 18@0,-8, 1 ] +[ 19@0,-8, 1 ] +[ 20@0,-7, 2 ] +[ 21@0,-7, 2 ] +[ 22@0,-7, 3 ] +[ 23@0,-7, 3 ] +[ 24@0,-7, 4 ] +[ 25@0,-7, 5 ] +[ 26@0,-7, 6 ] +[ 27@0,-7, 7 ] +[ 28@0,-7, 9 ] +[ 29@0,-7, 1 ] +[ 30@0,-6, 1 ] +[ 31@0,-6, 1 ] +[ 32@0,-6, 2 ] +[ 33@0,-6, 2 ] +[ 34@0,-6, 2 ] +[ 35@0,-6, 3 ] +[ 36@0,-6, 4 ] +[ 37@0,-6, 5 ] +[ 38@0,-6, 6 ] +[ 39@0,-6, 7 ] +[ 40@0,-5, 8 ] +[ 41@0,-5, 1 ] +[ 42@0,-5, 1 ] +[ 43@0,-5, 1 ] +[ 44@0,-5, 1 ] +[ 45@0,-5, 2 ] +[ 46@0,-5, 2 ] +[ 47@0,-5, 2 ] +[ 48@0,-5, 3 ] +[ 49@0,-5, 4 ] +[ 50@0,-4, 4 ] +[ 51@0,-4, 5 ] +[ 52@0,-4, 6 ] +[ 53@0,-4, 8 ] +[ 54@0,-4, 9 ] +[ 55@0,-4, 1 ] +[ 56@0,-4, 1 ] +[ 57@0,-4, 1 ] +[ 58@0,-4, 1 ] +[ 59@0,-4, 2 ] +[ 60@0,-3, 2 ] +[ 61@0,-3, 2 ] +[ 62@0,-3, 3 ] +[ 63@0,-3, 3 ] +[ 64@0,-3, 4 ] +[ 65@0,-3, 5 ] +[ 66@0,-3, 6 ] +[ 67@0,-3, 7 ] +[ 68@0,-3, 8 ] +[ 69@0,-3, 9 ] +[ 70@0,-2, 1 ] +[ 71@0,-2, 1 ] +[ 72@0,-2, 1 ] +[ 73@0,-2, 1 ] +[ 74@0,-2, 1 ] +[ 75@0,-2, 2 ] +[ 76@0,-2, 2 ] +[ 77@0,-2, 2 ] +[ 78@0,-2, 3 ] +[ 79@0,-2, 3 ] +[ 80@0,-1, 4 ] +[ 81@0,-1, 5 ] +[ 82@0,-1, 5 ] +[ 83@0,-1, 6 ] +[ 84@0,-1, 7 ] +[ 85@0,-1, 8 ] +[ 86@0,-1, 9 ] +[ 87@0,-1, 0 ] +[ 88@0,-1, 0 ] +[ 89@0,-1, 0 ] +[ 90@0,-0, 0 ] +[ 91@0,-0, 0 ] +[ 92@0,-0, 0 ] +[ 93@0,-0, 0 ] +[ 94@0,-0, 0 ] +[ 95@0,-0, 0 ] +[ 96@0,-0, 0 ] +[ 97@0,-0, 0 ] +[ 98@0,
MonetDB: Jan2014 - Removed -vs10 extension from our Windows libr...
Changeset: 40684cddfaef for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=40684cddfaef
Modified Files:
NT/installer32/MonetDB-ODBC-Installer.vdproj
NT/installer32/MonetDB5-Geom-Module.vdproj
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB-ODBC-Installer.vdproj
NT/installer64/MonetDB5-Geom-Module.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
Branch: Jan2014
Log Message:
Removed -vs10 extension from our Windows library directories.
diffs (truncated from 378 to 300 lines):
diff --git a/NT/installer32/MonetDB-ODBC-Installer.vdproj
b/NT/installer32/MonetDB-ODBC-Installer.vdproj
--- a/NT/installer32/MonetDB-ODBC-Installer.vdproj
+++ b/NT/installer32/MonetDB-ODBC-Installer.vdproj
@@ -210,7 +210,7 @@
{
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_11741B73503C4B6AA61599A42BA38851
{
-SourcePath =
8:C:\\Libraries\\openssl-1.0.1g.win32-vs10\\bin\\libeay32.dll
+SourcePath =
8:C:\\Libraries\\openssl-1.0.1g.win32\\bin\\libeay32.dll
TargetName = 8:libeay32.dll
Tag = 8:
Folder = 8:_376EC0506E4F452CA2C78ACE11515435
@@ -250,7 +250,7 @@
}
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_17D7FB69076E415C8973295D502161C5
{
-SourcePath =
8:C:\\Libraries\\iconv-1.11.1.win32-vs10\\bin\\iconv.dll
+SourcePath =
8:C:\\Libraries\\iconv-1.11.1.win32\\bin\\iconv.dll
TargetName = 8:iconv.dll
Tag = 8:
Folder = 8:_376EC0506E4F452CA2C78ACE11515435
@@ -270,7 +270,7 @@
}
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2E74F1B1BDE548A7922BAD968E690A3A
{
-SourcePath =
8:C:\\Libraries\\bzip2-1.0.6.win32-vs10\\bin\\libbz2.dll
+SourcePath =
8:C:\\Libraries\\bzip2-1.0.6.win32\\bin\\libbz2.dll
TargetName = 8:libbz2.dll
Tag = 8:
Folder = 8:_376EC0506E4F452CA2C78ACE11515435
@@ -310,7 +310,7 @@
}
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_4F0D2367141846EFA634DA35B05CDA4D
{
-SourcePath =
8:C:\\Libraries\\zlib-1.2.5.win32-vs10\\bin\\zlib1.dll
+SourcePath = 8:C:\\Libraries\\zlib-1.2.5.win32\\bin\\zlib1.dll
TargetName = 8:zlib1.dll
Tag = 8:
Folder = 8:_376EC0506E4F452CA2C78ACE11515435
@@ -350,7 +350,7 @@
}
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_64A4AC448DEF46D89377E6F79019D632
{
-SourcePath =
8:C:\\Libraries\\openssl-1.0.1g.win32-vs10\\bin\\ssleay32.dll
+SourcePath =
8:C:\\Libraries\\openssl-1.0.1g.win32\\bin\\ssleay32.dll
TargetName = 8:ssleay32.dll
Tag = 8:
Folder = 8:_376EC0506E4F452CA2C78ACE11515435
diff --git a/NT/installer32/MonetDB5-Geom-Module.vdproj
b/NT/installer32/MonetDB5-Geom-Module.vdproj
--- a/NT/installer32/MonetDB5-Geom-Module.vdproj
+++ b/NT/installer32/MonetDB5-Geom-Module.vdproj
@@ -226,7 +226,7 @@
}
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6C07D912740F414490DD35D5A179D268
{
-SourcePath =
8:C:\\Libraries\\geos-3.4.2.win32-vs10\\bin\\geos_c.dll
+SourcePath = 8:C:\\Libraries\\geos-3.4.2.win32\\bin\\geos_c.dll
TargetName = 8:geos_c.dll
Tag = 8:
Folder = 8:_4D9CE65EDD774551869CFD46B59B4F9E
diff --git a/NT/installer32/MonetDB5-SQL-Installer.vdproj
b/NT/installer32/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer32/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer32/MonetDB5-SQL-Installer.vdproj
@@ -1082,7 +1082,7 @@
{
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_03431EDC85094776AD217020CB3E26D4
{
-SourcePath =
8:C:\\Libraries\\zlib-1.2.5.win32-vs10\\lib\\zdll.lib
+SourcePath = 8:C:\\Libraries\\zlib-1.2.5.win32\\lib\\zdll.lib
TargetName = 8:zdll.lib
Tag = 8:
Folder = 8:_A3C9BE5CA72B42628868618D180581DA
@@ -1182,7 +1182,7 @@
}
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0D84516ED4054FEA84A5E2C60F42AFE3
{
-SourcePath =
8:C:\\Libraries\\bzip2-1.0.6.win32-vs10\\bin\\libbz2.dll
+SourcePath =
8:C:\\Libraries\\bzip2-1.0.6.win32\\bin\\libbz2.dll
TargetName = 8:libbz2.dll
Tag = 8:
Folder = 8:_A3C9BE5CA72B42628868618D180581DA
@@ -1282,7 +1282,7 @@
}
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_13440C2EDE6842BF8D9F24F554EEB87F
{
-SourcePath =
8:C:\\Libraries\\libxml2-2.7.8.win32-vs10\\lib\\libxml2.dll
+SourcePath =
8:C:\\Libraries\\libxml2-2.7.8.win32\\lib\\libxml2.dll
TargetName = 8:libxml2.dll
Tag = 8:
Folder = 8:_A3C9BE5CA72B42628868618D180581DA
@@ -1382,7 +1382,7 @@
MonetDB: Oct2014 - Merged with Jan2014 branch.
Changeset: 5e3c36afc54d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5e3c36afc54d
Modified Files:
NT/installer32/MonetDB-ODBC-Installer.vdproj
NT/installer32/MonetDB5-Geom-Module.vdproj
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB-ODBC-Installer.vdproj
NT/installer64/MonetDB5-Geom-Module.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
monetdb5/mal/mal_interpreter.c
Branch: Oct2014
Log Message:
Merged with Jan2014 branch.
diffs (truncated from 390 to 300 lines):
diff --git a/NT/installer32/MonetDB-ODBC-Installer.vdproj
b/NT/installer32/MonetDB-ODBC-Installer.vdproj
--- a/NT/installer32/MonetDB-ODBC-Installer.vdproj
+++ b/NT/installer32/MonetDB-ODBC-Installer.vdproj
@@ -230,7 +230,7 @@
}
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_17D7FB69076E415C8973295D502161C5
{
-SourcePath =
8:C:\\Libraries\\iconv-1.11.1.win32-vs10\\bin\\iconv.dll
+SourcePath =
8:C:\\Libraries\\iconv-1.11.1.win32\\bin\\iconv.dll
TargetName = 8:iconv.dll
Tag = 8:
Folder = 8:_376EC0506E4F452CA2C78ACE11515435
@@ -250,7 +250,7 @@
}
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2E74F1B1BDE548A7922BAD968E690A3A
{
-SourcePath =
8:C:\\Libraries\\bzip2-1.0.6.win32-vs10\\bin\\libbz2.dll
+SourcePath =
8:C:\\Libraries\\bzip2-1.0.6.win32\\bin\\libbz2.dll
TargetName = 8:libbz2.dll
Tag = 8:
Folder = 8:_376EC0506E4F452CA2C78ACE11515435
@@ -290,7 +290,7 @@
}
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_4F0D2367141846EFA634DA35B05CDA4D
{
-SourcePath =
8:C:\\Libraries\\zlib-1.2.5.win32-vs10\\bin\\zlib1.dll
+SourcePath = 8:C:\\Libraries\\zlib-1.2.5.win32\\bin\\zlib1.dll
TargetName = 8:zlib1.dll
Tag = 8:
Folder = 8:_376EC0506E4F452CA2C78ACE11515435
@@ -330,7 +330,7 @@
}
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_779449EF5BAD4B068A50802402E52278
{
-SourcePath =
8:C:\\Libraries\\openssl-1.0.1g.win32-vs10\\bin\\libeay32.dll
+SourcePath =
8:C:\\Libraries\\openssl-1.0.1g.win32\\bin\\libeay32.dll
TargetName = 8:libeay32.dll
Tag = 8:
Folder = 8:_376EC0506E4F452CA2C78ACE11515435
@@ -370,7 +370,7 @@
}
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B1B1C0011D7945F892A77F529772EA72
{
-SourcePath =
8:C:\\Libraries\\openssl-1.0.1g.win32-vs10\\bin\\ssleay32.dll
+SourcePath =
8:C:\\Libraries\\openssl-1.0.1g.win32\\bin\\ssleay32.dll
TargetName = 8:ssleay32.dll
Tag = 8:
Folder = 8:_376EC0506E4F452CA2C78ACE11515435
diff --git a/NT/installer32/MonetDB5-Geom-Module.vdproj
b/NT/installer32/MonetDB5-Geom-Module.vdproj
--- a/NT/installer32/MonetDB5-Geom-Module.vdproj
+++ b/NT/installer32/MonetDB5-Geom-Module.vdproj
@@ -226,7 +226,7 @@
}
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6C07D912740F414490DD35D5A179D268
{
-SourcePath =
8:C:\\Libraries\\geos-3.4.2.win32-vs10\\bin\\geos_c.dll
+SourcePath = 8:C:\\Libraries\\geos-3.4.2.win32\\bin\\geos_c.dll
TargetName = 8:geos_c.dll
Tag = 8:
Folder = 8:_4D9CE65EDD774551869CFD46B59B4F9E
diff --git a/NT/installer32/MonetDB5-SQL-Installer.vdproj
b/NT/installer32/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer32/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer32/MonetDB5-SQL-Installer.vdproj
@@ -1042,7 +1042,7 @@
}
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_03431EDC85094776AD217020CB3E26D4
{
-SourcePath =
8:C:\\Libraries\\zlib-1.2.5.win32-vs10\\lib\\zdll.lib
+SourcePath = 8:C:\\Libraries\\zlib-1.2.5.win32\\lib\\zdll.lib
TargetName = 8:zdll.lib
Tag = 8:
Folder = 8:_A3C9BE5CA72B42628868618D180581DA
@@ -1182,7 +1182,7 @@
}
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0D84516ED4054FEA84A5E2C60F42AFE3
{
-SourcePath =
8:C:\\Libraries\\bzip2-1.0.6.win32-vs10\\bin\\libbz2.dll
+SourcePath =
8:C:\\Libraries\\bzip2-1.0.6.win32\\bin\\libbz2.dll
TargetName = 8:libbz2.dll
Tag = 8:
Folder = 8:_A3C9BE5CA72B42628868618D180581DA
@@ -1282,7 +1282,7 @@
}
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_13440C2EDE6842BF8D9F24F554EEB87F
{
-SourcePath =
8:C:\\Libraries\\libxml2-2.7.8.win32-vs10\\lib\\libxml2.dll
+SourcePath =
8:C:\\Libraries\\libxml2-2.7.8.win32\\lib\\libxml2.dll
TargetName = 8:libxml2.dll
Tag = 8:
Folder = 8:_A3C9BE5CA72B42628868618D180581DA
@@ -1442,7
MonetDB: default - Merged with Oct2014 branch.
Changeset: 493e3f110044 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=493e3f110044
Modified Files:
NT/installer32/MonetDB-ODBC-Installer.vdproj
NT/installer32/MonetDB5-Geom-Module.vdproj
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB-ODBC-Installer.vdproj
NT/installer64/MonetDB5-Geom-Module.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
monetdb5/extras/rapi/Tests/rapi07.malC
monetdb5/extras/rapi/Tests/rapi07.stable.out
monetdb5/extras/rapi/Tests/rapi08.malC
monetdb5/extras/rapi/Tests/rapi08.stable.out
monetdb5/extras/rapi/rapi.mal
monetdb5/mal/mal_interpreter.c
testing/README
Branch: default
Log Message:
Merged with Oct2014 branch.
diffs (truncated from 707 to 300 lines):
diff --git a/NT/installer32/MonetDB-ODBC-Installer.vdproj
b/NT/installer32/MonetDB-ODBC-Installer.vdproj
--- a/NT/installer32/MonetDB-ODBC-Installer.vdproj
+++ b/NT/installer32/MonetDB-ODBC-Installer.vdproj
@@ -230,7 +230,7 @@
}
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_17D7FB69076E415C8973295D502161C5
{
-SourcePath =
8:C:\\Libraries\\iconv-1.11.1.win32-vs10\\bin\\iconv.dll
+SourcePath =
8:C:\\Libraries\\iconv-1.11.1.win32\\bin\\iconv.dll
TargetName = 8:iconv.dll
Tag = 8:
Folder = 8:_376EC0506E4F452CA2C78ACE11515435
@@ -250,7 +250,7 @@
}
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2E74F1B1BDE548A7922BAD968E690A3A
{
-SourcePath =
8:C:\\Libraries\\bzip2-1.0.6.win32-vs10\\bin\\libbz2.dll
+SourcePath =
8:C:\\Libraries\\bzip2-1.0.6.win32\\bin\\libbz2.dll
TargetName = 8:libbz2.dll
Tag = 8:
Folder = 8:_376EC0506E4F452CA2C78ACE11515435
@@ -290,7 +290,7 @@
}
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_4F0D2367141846EFA634DA35B05CDA4D
{
-SourcePath =
8:C:\\Libraries\\zlib-1.2.5.win32-vs10\\bin\\zlib1.dll
+SourcePath = 8:C:\\Libraries\\zlib-1.2.5.win32\\bin\\zlib1.dll
TargetName = 8:zlib1.dll
Tag = 8:
Folder = 8:_376EC0506E4F452CA2C78ACE11515435
@@ -330,7 +330,7 @@
}
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_779449EF5BAD4B068A50802402E52278
{
-SourcePath =
8:C:\\Libraries\\openssl-1.0.1g.win32-vs10\\bin\\libeay32.dll
+SourcePath =
8:C:\\Libraries\\openssl-1.0.1g.win32\\bin\\libeay32.dll
TargetName = 8:libeay32.dll
Tag = 8:
Folder = 8:_376EC0506E4F452CA2C78ACE11515435
@@ -370,7 +370,7 @@
}
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B1B1C0011D7945F892A77F529772EA72
{
-SourcePath =
8:C:\\Libraries\\openssl-1.0.1g.win32-vs10\\bin\\ssleay32.dll
+SourcePath =
8:C:\\Libraries\\openssl-1.0.1g.win32\\bin\\ssleay32.dll
TargetName = 8:ssleay32.dll
Tag = 8:
Folder = 8:_376EC0506E4F452CA2C78ACE11515435
diff --git a/NT/installer32/MonetDB5-Geom-Module.vdproj
b/NT/installer32/MonetDB5-Geom-Module.vdproj
--- a/NT/installer32/MonetDB5-Geom-Module.vdproj
+++ b/NT/installer32/MonetDB5-Geom-Module.vdproj
@@ -226,7 +226,7 @@
}
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6C07D912740F414490DD35D5A179D268
{
-SourcePath =
8:C:\\Libraries\\geos-3.4.2.win32-vs10\\bin\\geos_c.dll
+SourcePath = 8:C:\\Libraries\\geos-3.4.2.win32\\bin\\geos_c.dll
TargetName = 8:geos_c.dll
Tag = 8:
Folder = 8:_4D9CE65EDD774551869CFD46B59B4F9E
diff --git a/NT/installer32/MonetDB5-SQL-Installer.vdproj
b/NT/installer32/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer32/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer32/MonetDB5-SQL-Installer.vdproj
@@ -1042,7 +1042,7 @@
}
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_03431EDC85094776AD217020CB3E26D4
{
-SourcePath =
8:C:\\Libraries\\zlib-1.2.5.win32-vs10\\lib\\zdll.lib
+SourcePath = 8:C:\\Libraries\\zlib-1.2.5.win32\\lib\\zdll.lib
TargetName = 8:zdll.lib
Tag = 8:
Folder = 8:_A3C9BE5CA72B42628868618D180581DA
@@ -1182,7 +1182,7 @@
}
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0D84516ED4054FEA84A5E2C60F42AFE3
{
-SourcePath =
8:C:\\Libraries\\bzip2-1.0.6.win32-vs10\\bin\\libbz2.dll
+SourcePath =
8:C:\\Libraries\\bzip2-1.0.6.win32\\bin\\libbz2.dll
TargetName = 8:libbz2.dll
Tag = 8:
Folder = 8:_A3C9BE5CA72B42628868618D180581DA
@@ -1282,7 +1282,7 @@
}
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_13440C2EDE6842BF8D9F24F554EEB87F
{
-SourcePath =
MonetDB: Oct2014 - Make datacell compile
Changeset: 1a101b427500 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1a101b427500
Modified Files:
sql/backends/monet5/datacell/basket.c
sql/backends/monet5/datacell/emitter.c
Branch: Oct2014
Log Message:
Make datacell compile
The BATcopy has an extra argument nowadays.
diffs (42 lines):
diff --git a/sql/backends/monet5/datacell/basket.c
b/sql/backends/monet5/datacell/basket.c
--- a/sql/backends/monet5/datacell/basket.c
+++ b/sql/backends/monet5/datacell/basket.c
@@ -414,7 +414,7 @@ BSKTgrab(Client cntxt, MalBlkPtr mb, Mal
throw(MAL, basket.grab, too early);
}
- bn = BATcopy(b, b-htype, b-ttype, TRUE);
+ bn = BATcopy(b, b-htype, b-ttype, TRUE, TRANSIENT);
v = BATslice(bn, baskets[bskt].winstride, BATcount(bn));
b = BATsetaccess(b, BAT_WRITE);
BATclear(b, TRUE);
@@ -432,7 +432,7 @@ BSKTgrab(Client cntxt, MalBlkPtr mb, Mal
for (i = 0; i baskets[bskt].colcount; i++) {
ret = (int *) getArgReference(stk, pci, i);
b = baskets[bskt].primary[i];
- bn = BATcopy(b, b-htype, b-ttype, TRUE);
+ bn = BATcopy(b, b-htype, b-ttype, TRUE, TRANSIENT);
cnt = (int) BATcount(b);
BATclear(b, TRUE);
*ret = bn-batCacheid;
diff --git a/sql/backends/monet5/datacell/emitter.c
b/sql/backends/monet5/datacell/emitter.c
--- a/sql/backends/monet5/datacell/emitter.c
+++ b/sql/backends/monet5/datacell/emitter.c
@@ -126,7 +126,7 @@ EMemitterStartInternal(int *ret, str *tb
throw(MAL, receptor.new, Could not access
descriptor);
}
- em-table.format[j].c = BATcopy(b, b-htype, b-ttype, FALSE);
+ em-table.format[j].c = BATcopy(b, b-htype, b-ttype, FALSE,
TRANSIENT);
em-table.format[j].ci = bat_iterator(em-table.format[j].c);
em-table.format[j].name = baskets[idx].cols[i];
em-table.format[j].sep = ,;
@@ -327,7 +327,7 @@ bodyRestart:
if (em-table.format[k].c)
BBPunfix(em-table.format[k].c-batCacheid);
b = baskets[em-bskt].primary[k];
- em-table.format[k].c = BATcopy(b, b-htype, b-ttype,
TRUE);
+ em-table.format[k].c = BATcopy(b, b-htype, b-ttype,
TRUE,TRANSIENT);
em-table.format[k].ci = bat_iterator(b);
BATclear(b, FALSE);
}
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: geo - Merge with default branch.
Changeset: 2d14e09ebcd7 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2d14e09ebcd7 Added Files: clients/Tests/MAL-signatures_all.malC clients/Tests/MAL-signatures_fits_geom.malC.src clients/Tests/MAL-signatures_fits_geom.stable.err clients/Tests/MAL-signatures_fits_geom.stable.out clients/Tests/MAL-signatures_fits_geom.stable.out.int128 clients/Tests/MAL-signatures_geom.malC.src clients/Tests/MAL-signatures_geom.stable.err clients/Tests/MAL-signatures_geom.stable.out clients/Tests/MAL-signatures_geom.stable.out.int128 clients/Tests/SQL-dump_all.sql clients/Tests/SQL-dump_geom.sql.src clients/Tests/SQL-dump_geom.stable.err clients/Tests/SQL-dump_geom.stable.out clients/Tests/SQL-dump_geom.stable.out.32bit clients/Tests/SQL-dump_geom.stable.out.64bit.oid32 clients/Tests/SQL-dump_geom.stable.out.int128 clients/Tests/SQL-dump_geom.stable.out.oid32.int128 sql/test/BugTracker-2014/Tests/select-distinct-order-limit.Bug-3527.nomito sql/test/BugTracker-2014/Tests/select-distinct-order-limit.Bug-3527.sql sql/test/BugTracker-2014/Tests/select-distinct-order-limit.Bug-3527.stable.err sql/test/BugTracker-2014/Tests/select-distinct-order-limit.Bug-3527.stable.out Removed Files: clients/Tests/MAL-signatures.malC clients/Tests/MAL-signatures.stable.err clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/MAL-signatures_R.malC.src clients/Tests/MAL-signatures_R.stable.err clients/Tests/MAL-signatures_R.stable.out clients/Tests/MAL-signatures_R.stable.out.int128 clients/Tests/MAL-signatures_all.malC.src clients/Tests/MAL-signatures_bam.malC.src clients/Tests/MAL-signatures_bam.stable.err clients/Tests/MAL-signatures_bam.stable.out clients/Tests/MAL-signatures_bam.stable.out.int128 clients/Tests/MAL-signatures_gsl.malC.src clients/Tests/MAL-signatures_gsl.stable.err clients/Tests/MAL-signatures_gsl.stable.out clients/Tests/MAL-signatures_gsl.stable.out.int128 clients/Tests/MAL-signatures_nocfitsio.malC.src clients/Tests/MAL-signatures_nocfitsio.stable.err clients/Tests/MAL-signatures_nocfitsio.stable.out clients/Tests/MAL-signatures_nocfitsio.stable.out.int128 clients/Tests/SQL-dump.sql clients/Tests/SQL-dump.stable.err 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.stable.out.64bit.oid32.int128 clients/Tests/SQL-dump.stable.out.int128 clients/Tests/SQL-dump.timeout clients/Tests/SQL-dump_all.sql.src Modified Files: NT/installer32/MonetDB-ODBC-Installer.vdproj NT/installer32/MonetDB5-Geom-Module.vdproj NT/installer32/MonetDB5-SQL-Installer.vdproj NT/installer64/MonetDB-ODBC-Installer.vdproj NT/installer64/MonetDB5-Geom-Module.vdproj NT/installer64/MonetDB5-SQL-Installer.vdproj clients/Tests/All clients/Tests/MAL-signatures_all.stable.out clients/Tests/MAL-signatures_all.stable.out.int128 clients/Tests/MAL-signatures_none.malC.src clients/Tests/MAL-signatures_none.stable.out clients/Tests/MAL-signatures_none.stable.out.int128 clients/Tests/SQL-dump_none.sql.src clients/Tests/exports.stable.out configure.ag gdk/gdk.h gdk/gdk_firstn.c monetdb5/extras/rapi/Tests/All monetdb5/extras/rapi/Tests/rapi07.malC monetdb5/extras/rapi/Tests/rapi07.stable.out monetdb5/extras/rapi/Tests/rapi08.malC monetdb5/extras/rapi/Tests/rapi08.stable.out monetdb5/extras/rapi/rapi.c monetdb5/extras/rapi/rapi.mal monetdb5/mal/Tests/tst1225.mal monetdb5/mal/Tests/tst1225.stable.out monetdb5/mal/Tests/tst220.mal monetdb5/mal/Tests/tst220.stable.out monetdb5/mal/Tests/tst2510.mal monetdb5/mal/Tests/tst2510.stable.out monetdb5/mal/mal_interpreter.c monetdb5/mal/mal_parser.c monetdb5/mal/mal_resolve.c monetdb5/modules/atoms/json.c monetdb5/modules/atoms/json.h monetdb5/modules/atoms/json.mal monetdb5/modules/kernel/algebra.c monetdb5/modules/kernel/algebra.mal monetdb5/modules/mal/Tests/pqueue.mal monetdb5/modules/mal/Tests/pqueue.stable.out monetdb5/modules/mal/Tests/pqueue2.mal monetdb5/modules/mal/Tests/pqueue2.stable.out monetdb5/modules/mal/Tests/pqueue3.mal monetdb5/modules/mal/Tests/pqueue3.stable.out monetdb5/modules/mal/bbp.c monetdb5/optimizer/Tests/common.mal monetdb5/optimizer/Tests/common.stable.out
MonetDB: transaction-replication - Merge with default branch.
Changeset: 29607ac1b361 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=29607ac1b361 Added Files: clients/Tests/MAL-signatures_all.malC clients/Tests/MAL-signatures_fits_geom.malC.src clients/Tests/MAL-signatures_fits_geom.stable.err clients/Tests/MAL-signatures_fits_geom.stable.out clients/Tests/MAL-signatures_fits_geom.stable.out.int128 clients/Tests/MAL-signatures_geom.malC.src clients/Tests/MAL-signatures_geom.stable.err clients/Tests/MAL-signatures_geom.stable.out clients/Tests/MAL-signatures_geom.stable.out.int128 clients/Tests/SQL-dump_all.sql clients/Tests/SQL-dump_geom.sql.src clients/Tests/SQL-dump_geom.stable.err clients/Tests/SQL-dump_geom.stable.out clients/Tests/SQL-dump_geom.stable.out.32bit clients/Tests/SQL-dump_geom.stable.out.64bit.oid32 clients/Tests/SQL-dump_geom.stable.out.int128 clients/Tests/SQL-dump_geom.stable.out.oid32.int128 sql/test/BugTracker-2014/Tests/select-distinct-order-limit.Bug-3527.nomito sql/test/BugTracker-2014/Tests/select-distinct-order-limit.Bug-3527.sql sql/test/BugTracker-2014/Tests/select-distinct-order-limit.Bug-3527.stable.err sql/test/BugTracker-2014/Tests/select-distinct-order-limit.Bug-3527.stable.out Removed Files: clients/Tests/MAL-signatures.malC clients/Tests/MAL-signatures.stable.err clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/MAL-signatures_R.malC.src clients/Tests/MAL-signatures_R.stable.err clients/Tests/MAL-signatures_R.stable.out clients/Tests/MAL-signatures_R.stable.out.int128 clients/Tests/MAL-signatures_all.malC.src clients/Tests/MAL-signatures_bam.malC.src clients/Tests/MAL-signatures_bam.stable.err clients/Tests/MAL-signatures_bam.stable.out clients/Tests/MAL-signatures_bam.stable.out.int128 clients/Tests/MAL-signatures_gsl.malC.src clients/Tests/MAL-signatures_gsl.stable.err clients/Tests/MAL-signatures_gsl.stable.out clients/Tests/MAL-signatures_gsl.stable.out.int128 clients/Tests/MAL-signatures_nocfitsio.malC.src clients/Tests/MAL-signatures_nocfitsio.stable.err clients/Tests/MAL-signatures_nocfitsio.stable.out clients/Tests/MAL-signatures_nocfitsio.stable.out.int128 clients/Tests/SQL-dump.sql clients/Tests/SQL-dump.stable.err 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.stable.out.64bit.oid32.int128 clients/Tests/SQL-dump.stable.out.int128 clients/Tests/SQL-dump.timeout clients/Tests/SQL-dump_all.sql.src Modified Files: NT/installer32/MonetDB-ODBC-Installer.vdproj NT/installer32/MonetDB5-Geom-Module.vdproj NT/installer32/MonetDB5-SQL-Installer.vdproj NT/installer64/MonetDB-ODBC-Installer.vdproj NT/installer64/MonetDB5-Geom-Module.vdproj NT/installer64/MonetDB5-SQL-Installer.vdproj clients/Tests/All clients/Tests/MAL-signatures_all.stable.out clients/Tests/MAL-signatures_all.stable.out.int128 clients/Tests/MAL-signatures_none.malC.src clients/Tests/MAL-signatures_none.stable.out clients/Tests/MAL-signatures_none.stable.out.int128 clients/Tests/SQL-dump_none.sql.src clients/Tests/exports.stable.out configure.ag gdk/gdk.h gdk/gdk_firstn.c monetdb5/extras/rapi/Tests/All monetdb5/extras/rapi/Tests/rapi07.malC monetdb5/extras/rapi/Tests/rapi07.stable.out monetdb5/extras/rapi/Tests/rapi08.malC monetdb5/extras/rapi/Tests/rapi08.stable.out monetdb5/extras/rapi/rapi.c monetdb5/extras/rapi/rapi.mal monetdb5/mal/Tests/tst1225.mal monetdb5/mal/Tests/tst1225.stable.out monetdb5/mal/Tests/tst220.mal monetdb5/mal/Tests/tst220.stable.out monetdb5/mal/Tests/tst2510.mal monetdb5/mal/Tests/tst2510.stable.out monetdb5/mal/mal_interpreter.c monetdb5/mal/mal_parser.c monetdb5/mal/mal_resolve.c monetdb5/modules/atoms/json.c monetdb5/modules/atoms/json.h monetdb5/modules/atoms/json.mal monetdb5/modules/kernel/algebra.c monetdb5/modules/kernel/algebra.mal monetdb5/modules/mal/Tests/pqueue.mal monetdb5/modules/mal/Tests/pqueue.stable.out monetdb5/modules/mal/Tests/pqueue2.mal monetdb5/modules/mal/Tests/pqueue2.stable.out monetdb5/modules/mal/Tests/pqueue3.mal monetdb5/modules/mal/Tests/pqueue3.stable.out monetdb5/modules/mal/bbp.c monetdb5/optimizer/Tests/common.mal monetdb5/optimizer/Tests/common.stable.out
MonetDB: Oct2014 - Disable pg_regress tests on Oct2014 branch.
Changeset: d2761495e696 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d2761495e696 Modified Files: sql/test/pg_regress/Tests/All Branch: Oct2014 Log Message: Disable pg_regress tests on Oct2014 branch. This change will *not* be propagated to the default branch. diffs (222 lines): diff --git a/sql/test/pg_regress/Tests/All b/sql/test/pg_regress/Tests/All --- a/sql/test/pg_regress/Tests/All +++ b/sql/test/pg_regress/Tests/All @@ -1,112 +1,112 @@ load -# pgregress set; in order as given by -# http://git.postgresql.org/gitweb/?p=postgresql.git;a=blob_plain;f=src/test/regress/serial_schedule;hb=HEAD +# # pgregress set; in order as given by +# # http://git.postgresql.org/gitweb/?p=postgresql.git;a=blob_plain;f=src/test/regress/serial_schedule;hb=HEAD -boolean -char -#name This is a special PostgresSQL datatype NOT supported in MonetDB. -# See also: http://www.postgresql.org/docs/9.3/static/datatype-character.html#DATATYPE-CHARACTER-SPECIAL-TABLE -varchar -text +# boolean +# char +# #name This is a special PostgresSQL datatype NOT supported in MonetDB. +# # See also: http://www.postgresql.org/docs/9.3/static/datatype-character.html#DATATYPE-CHARACTER-SPECIAL-TABLE +# varchar +# text -# these three are not in the pgregress set; -# no idea where they come from; -# but the need to be executed after the tests above -strings_concat -strings_cast -strings_like +# # these three are not in the pgregress set; +# # no idea where they come from; +# # but the need to be executed after the tests above +# strings_concat +# strings_cast +# strings_like -int2 -int4 -int8 -oid -float4 -float8 -# bit NOT supported in MonetDB. BIT is also not standard SQL so exclude this test -numeric -strings -numerology -point -lseg -box -path -polygon -circle -date -time -timetz -timestamp -timestamptz -interval -# abstime NOT supported ABSTIME, deprecated in Postgresql -reltime -# tinterval NOT supported in MonetDB, deprecated in Postgresql and is also not standard SQL so exclude this test -inet -comments -geometry -horology -oidjoins -type_sanity -opr_sanity -insert -create_type -create_table -create_misc -create_operator -create_index -create_view -create_aggregate -triggers -inherit -vacuum -sanity_check -errors -select -select_into -select_distinct -select_distinct_on -select_implicit -select_having -subselect -union -case -join -aggregates -transactions -random -portals -arrays -btree_index -hash_index -update -namespace -privileges -rules -select_views -portals_p2 -foreign_key -cluster -limit -plpgsql -copy2 -temp -domain -rangefuncs -prepare -without_oid -conversion -truncate -alter_table -sequence -polymorphism -rowtypes -stats +# int2 +# int4 +# int8 +# oid +# float4 +# float8 +# # bit NOT supported in MonetDB. BIT is also not standard SQL so exclude this test +# numeric +# strings +# numerology +# point +# lseg +# box +# path +# polygon +# circle +# date +# time +# timetz +# timestamp +# timestamptz +# interval +# # abstime NOT supported ABSTIME, deprecated in Postgresql +# reltime +# # tinterval NOT supported in MonetDB, deprecated in Postgresql and is also not standard SQL so exclude this test +# inet +# comments +# geometry +# horology +# oidjoins +# type_sanity +# opr_sanity +# insert +# create_type +# create_table +# create_misc +# create_operator +# create_index +# create_view +# create_aggregate +# triggers +# inherit +# vacuum +# sanity_check +# errors +# select +# select_into +# select_distinct +# select_distinct_on +# select_implicit +# select_having +# subselect +# union +# case +# join +# aggregates +# transactions +# random +# portals +# arrays +# btree_index +# hash_index +# update +# namespace +# privileges +# rules +# select_views +# portals_p2 +# foreign_key +# cluster +# limit +# plpgsql +# copy2 +# temp +# domain +# rangefuncs +# prepare +# without_oid +# conversion +# truncate +# alter_table +# sequence +# polymorphism +# rowtypes +# stats -# these four were in a 2005 pgregress set, but are no longer -# in the 2014 v9.3.4 pgregress set; not sure when/where they -# should be run; keep them for last for now -drop -mule_internal -numeric_big -sql_ascii +# # these four were in a 2005 pgregress set, but are no longer +# # in the 2014 v9.3.4 pgregress set; not sure when/where they +# # should be run; keep them for last for now +# drop +# mule_internal +# numeric_big +# sql_ascii ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Oct2014 branch; not propagating pg...
Changeset: 57c3e1c6c858 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=57c3e1c6c858
Modified Files:
sql/backends/monet5/datacell/basket.c
sql/backends/monet5/datacell/emitter.c
sql/test/pg_regress/Tests/All
Branch: default
Log Message:
Merge with Oct2014 branch; not propagating pg_regress change.
diffs (42 lines):
diff --git a/sql/backends/monet5/datacell/basket.c
b/sql/backends/monet5/datacell/basket.c
--- a/sql/backends/monet5/datacell/basket.c
+++ b/sql/backends/monet5/datacell/basket.c
@@ -414,7 +414,7 @@ BSKTgrab(Client cntxt, MalBlkPtr mb, Mal
throw(MAL, basket.grab, too early);
}
- bn = BATcopy(b, b-htype, b-ttype, TRUE);
+ bn = BATcopy(b, b-htype, b-ttype, TRUE, TRANSIENT);
v = BATslice(bn, baskets[bskt].winstride, BATcount(bn));
b = BATsetaccess(b, BAT_WRITE);
BATclear(b, TRUE);
@@ -432,7 +432,7 @@ BSKTgrab(Client cntxt, MalBlkPtr mb, Mal
for (i = 0; i baskets[bskt].colcount; i++) {
ret = (int *) getArgReference(stk, pci, i);
b = baskets[bskt].primary[i];
- bn = BATcopy(b, b-htype, b-ttype, TRUE);
+ bn = BATcopy(b, b-htype, b-ttype, TRUE, TRANSIENT);
cnt = (int) BATcount(b);
BATclear(b, TRUE);
*ret = bn-batCacheid;
diff --git a/sql/backends/monet5/datacell/emitter.c
b/sql/backends/monet5/datacell/emitter.c
--- a/sql/backends/monet5/datacell/emitter.c
+++ b/sql/backends/monet5/datacell/emitter.c
@@ -126,7 +126,7 @@ EMemitterStartInternal(int *ret, str *tb
throw(MAL, receptor.new, Could not access
descriptor);
}
- em-table.format[j].c = BATcopy(b, b-htype, b-ttype, FALSE);
+ em-table.format[j].c = BATcopy(b, b-htype, b-ttype, FALSE,
TRANSIENT);
em-table.format[j].ci = bat_iterator(em-table.format[j].c);
em-table.format[j].name = baskets[idx].cols[i];
em-table.format[j].sep = ,;
@@ -327,7 +327,7 @@ bodyRestart:
if (em-table.format[k].c)
BBPunfix(em-table.format[k].c-batCacheid);
b = baskets[em-bskt].primary[k];
- em-table.format[k].c = BATcopy(b, b-htype, b-ttype,
TRUE);
+ em-table.format[k].c = BATcopy(b, b-htype, b-ttype,
TRUE,TRANSIENT);
em-table.format[k].ci = bat_iterator(b);
BATclear(b, FALSE);
}
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Oct2014 - properly call firstn with distinct True (only...
Changeset: 4592f95b53ff for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4592f95b53ff
Modified Files:
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_statement.h
sql/benchmarks/tpch/Tests/02-explain.stable.out
sql/benchmarks/tpch/Tests/03-explain.stable.out
sql/benchmarks/tpch/Tests/10-explain.stable.out
sql/benchmarks/tpch/Tests/18-explain.stable.out
sql/benchmarks/tpch/Tests/21-explain.stable.out
sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
Branch: Oct2014
Log Message:
properly call firstn with distinct True (only when realy needed)
diffs (truncated from 341 to 300 lines):
diff --git a/sql/backends/monet5/rel_bin.c b/sql/backends/monet5/rel_bin.c
--- a/sql/backends/monet5/rel_bin.c
+++ b/sql/backends/monet5/rel_bin.c
@@ -2286,13 +2286,13 @@ rel2bin_project( mvc *sql, sql_rel *rel,
*/
if (topn rel-r) {
list *oexps = rel-r, *npl = sa_list(sql-sa);
- /* distinct, topn returns atleast N (unique) */
+ /* distinct, topn returns atleast N (unique groups) */
int distinct = need_distinct(rel);
stmt *limit = NULL, *lpiv = NULL, *lgid = NULL;
for (n=oexps-h; n; n = n-next) {
sql_exp *orderbycole = n-data;
- int inc = distinct || n-next;
+ int last = (n-next == NULL);
stmt *orderbycolstmt = exp_bin(sql, orderbycole, sub,
psub, NULL, NULL, NULL, NULL);
@@ -2300,21 +2300,20 @@ rel2bin_project( mvc *sql, sql_rel *rel,
return NULL;
if (!limit) { /* topn based on a single column */
- limit = stmt_limit(sql-sa, orderbycolstmt,
stmt_atom_wrd(sql-sa, 0), l, LIMIT_DIRECTION(is_ascending(orderbycole), 1,
inc));
+ limit = stmt_limit(sql-sa, orderbycolstmt,
stmt_atom_wrd(sql-sa, 0), l, LIMIT_FLAG(distinct, is_ascending(orderbycole),
last, 1));
} else {/* topn based on 2 columns */
- limit = stmt_limit2(sql-sa, orderbycolstmt,
lpiv, lgid, stmt_atom_wrd(sql-sa, 0), l,
LIMIT_DIRECTION(is_ascending(orderbycole), 1, inc));
+ limit = stmt_limit2(sql-sa, orderbycolstmt,
lpiv, lgid, stmt_atom_wrd(sql-sa, 0), l, LIMIT_FLAG(distinct,
is_ascending(orderbycole), last, 1));
}
if (!limit)
return NULL;
- lpiv = stmt_result(sql-sa, limit, 0);
- lgid = stmt_result(sql-sa, limit, 1);
+ lpiv = limit;
+ if (!last) {
+ lpiv = stmt_result(sql-sa, limit, 0);
+ lgid = stmt_result(sql-sa, limit, 1);
+ }
}
- if (!distinct) /* ready to project */
- limit = lpiv;
- else/* TODO */
- limit = lpiv;
-
+ limit = lpiv;
for ( n=pl-h ; n; n = n-next)
list_append(npl, stmt_project(sql-sa, limit,
column(sql-sa, n-data)));
psub = stmt_list(sql-sa, npl);
@@ -2584,7 +2583,7 @@ rel2bin_topn( mvc *sql, sql_rel *rel, li
o = stmt_atom_wrd(sql-sa, 0);
sc = column(sql-sa, sc);
- limit = stmt_limit(sql-sa, stmt_alias(sql-sa, sc, tname,
cname), o, l, LIMIT_DIRECTION(0,0,0));
+ limit = stmt_limit(sql-sa, stmt_alias(sql-sa, sc, tname,
cname), o, l, LIMIT_FLAG(0,0,0,0));
for ( ; n; n = n-next) {
stmt *sc = n-data;
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
@@ -1018,9 +1018,10 @@ static int
c = k;
}
if (s-flag1) {
- int topn = 0, flag = s-flag, grps = flag 2;
-
- flag = 2;
+ int topn = 0, flag = s-flag;
+ int last = (flag 2);
+ int dir = (flag 4);
+ int distinct = (flag 8);
q = newStmt1(mb, calcRef, +);
q = pushArgument(mb, q, offset);
@@ -1030,7 +1031,7 @@ static int
topn = getDestVar(q);
q = newStmt(mb, algebraRef, firstnRef);
- if (grps) /* we need the groups for the next
firstn */
MonetDB: rdf - use lng not long.
Changeset: a6be39a12361 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a6be39a12361
Modified Files:
monetdb5/extras/rdf/rdf_shredder.c
monetdb5/extras/rdf/rdftypes.c
monetdb5/extras/rdf/rdftypes.h
Branch: rdf
Log Message:
use lng not long.
diffs (125 lines):
diff --git a/monetdb5/extras/rdf/rdf_shredder.c
b/monetdb5/extras/rdf/rdf_shredder.c
--- a/monetdb5/extras/rdf/rdf_shredder.c
+++ b/monetdb5/extras/rdf/rdf_shredder.c
@@ -198,8 +198,8 @@ getObjectType_and_Value(unsigned char* o
double realDbl;
int realInt;
- longnTime;
- longrealLng;
+ lng nTime;
+ lng realLng;
len = strlen((str)objStr);
if (len 100 || len = 20){
diff --git a/monetdb5/extras/rdf/rdftypes.c b/monetdb5/extras/rdf/rdftypes.c
--- a/monetdb5/extras/rdf/rdftypes.c
+++ b/monetdb5/extras/rdf/rdftypes.c
@@ -325,7 +325,7 @@ char rdfcast(ObjectType srcT, ObjectType
dstPtr-len,
srcPtr-val.dval);
dstPtr-vtype = TYPE_str;
return 1;
- case DATETIME: //Datetime in encoded long
value of timestamp
+ case DATETIME: //Datetime in encoded lng value
of timestamp
{
char buf[64], *s1 = buf;
int len = 64;
@@ -451,11 +451,11 @@ int convertDateTimeToTimeT(char *sDateTi
* Using/extending monetdb mtime functions
* */
-int convertDateTimeToLong(char *sDateTime, long *t){
+int convertDateTimeToLong(char *sDateTime, lng *t){
timestamp *ts = NULL;
//tzone *tz;
int len, pos = 0;
- long encodeLng = 0;
+ lng encodeLng = 0;
int positiveDate = 0;
int sign = 0;
@@ -501,7 +501,7 @@ int convertDateTimeToLong(char *sDateTim
return 0;
}
- //Encoding timestamp to long.
+ //Encoding timestamp to lng.
//First 4 bits are not used, 5th bits for sign of number of days value
//(1, if the number of days is negative)
//27 bits for days, 32 bits for msecs
@@ -513,14 +513,14 @@ int convertDateTimeToLong(char *sDateTim
sign = 0;
}
- encodeLng |= (long) positiveDate;
+ encodeLng |= (lng) positiveDate;
encodeLng = encodeLng (sizeof(ts-msecs) * 8); //Move 32 bits
- encodeLng |= (long)sign (sizeof(long) * 8 - 5); //Set the sign
bit
- encodeLng = encodeLng | (long) ts-msecs; //Set 32 bits for msecs
+ encodeLng |= (lng)sign (sizeof(lng) * 8 - 5);//Set the sign
bit
+ encodeLng = encodeLng | (lng) ts-msecs;//Set 32 bits for msecs
*t = encodeLng;
- //printf(Encode string %s with days %d and msecs %d to long %ld
\n,sDateTime, ts-days, ts-msecs, *t);
+ //printf(Encode string %s with days %d and msecs %d to lng %ld
\n,sDateTime, ts-days, ts-msecs, *t);
if (ts) GDKfree(ts);
return 1;
@@ -535,7 +535,7 @@ void
encodeValueInOid(ValPtr vrPtrRealValue, ObjectType objType, BUN* bun){
int positiveInt = 0;
- long positiveLng = 0;
+ lng positiveLng = 0;
*bun = 0;
@@ -564,8 +564,8 @@ encodeValueInOid(ValPtr vrPtrRealValue,
}
break;
case DATETIME:
- //Consider it is as long value
- //No sign bit needed for this encoded long
+ //Consider it is as lng value
+ //No sign bit needed for this encoded lng
assert (vrPtrRealValue-val.lval = 0);
positiveLng = vrPtrRealValue-val.lval;
@@ -584,7 +584,7 @@ decodeValueFromOid(BUN bun, ObjectType o
BUN realval = 0;
int sign = 0;
int ival = 0;
- long lval = 0;
+ lng lval = 0;
double *realdbl = NULL;
//printf(Decode value from oid: BUNFMT \n,bun);
@@ -656,7 +656,7 @@ void convertTMtimeToMTime(time_t t, time
* Convert value from tm format to timestamp of monet mtime
* Only convert when storing in monetdb BAT for datetime
* */
-void convert_encodedLng_toTimestamp(long t, timestamp *ts){
+void convert_encodedLng_toTimestamp(lng t, timestamp *ts){
int sign = 0;
int daypart = 0;
int msecpart = 0;
diff --git a/monetdb5/extras/rdf/rdftypes.h b/monetdb5/extras/rdf/rdftypes.h
--- a/monetdb5/extras/rdf/rdftypes.h
+++ b/monetdb5/extras/rdf/rdftypes.h
@@ -81,13 +81,13 @@ rdf_export int
convertDateTimeToTimeT(char *sDateTime, int len, time_t *t);
rdf_export int
-convertDateTimeToLong(char *sDateTime, long *t);
+convertDateTimeToLong(char *sDateTime, lng *t);
rdf_export void
MonetDB: geo - adapt type ids to handle also linearRing
Changeset: 182a0720bdb3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=182a0720bdb3
Modified Files:
geom/monetdb5/geom.mal
Branch: geo
Log Message:
adapt type ids to handle also linearRing
diffs (61 lines):
diff --git a/geom/monetdb5/geom.mal b/geom/monetdb5/geom.mal
--- a/geom/monetdb5/geom.mal
+++ b/geom/monetdb5/geom.mal
@@ -92,23 +92,23 @@ function LineFromText{unsafe}(wkt:str, s
return x;
end LineFromText;
function PolygonFromText{unsafe}(wkt:str, srid:int) :wkb;
- x := wkb.FromText(wkt,srid,3);
+ x := wkb.FromText(wkt,srid,4);
return x;
end PolygonFromText;
function MPointFromText{unsafe}(wkt:str, srid:int) :wkb;
- x := wkb.FromText(wkt,srid,4);
+ x := wkb.FromText(wkt,srid,5);
return x;
end MPointFromText;
function MLineFromText{unsafe}(wkt:str, srid:int) :wkb;
- x := wkb.FromText(wkt,srid,5);
+ x := wkb.FromText(wkt,srid,6);
return x;
end MLineFromText;
function MPolyFromText{unsafe}(wkt:str, srid:int) :wkb;
- x := wkb.FromText(wkt,srid,6);
+ x := wkb.FromText(wkt,srid,7);
return x;
end MPolyFromText;
function GeomCollFromText{unsafe}(wkt:str, srid:int) :wkb;
- x := wkb.FromText(wkt,srid,7);
+ x := wkb.FromText(wkt,srid,8);
return x;
end GeomCollFromText;
@@ -125,23 +125,23 @@ function LineFromText{unsafe}(wkt:str) :
return x;
end LineFromText;
function PolygonFromText{unsafe}(wkt:str) :wkb;
- x := wkb.FromText(wkt,0,3);
+ x := wkb.FromText(wkt,0,4);
return x;
end PolygonFromText;
function MPointFromText{unsafe}(wkt:str) :wkb;
- x := wkb.FromText(wkt,0,4);
+ x := wkb.FromText(wkt,0,5);
return x;
end MPointFromText;
function MLineFromText{unsafe}(wkt:str) :wkb;
- x := wkb.FromText(wkt,0,5);
+ x := wkb.FromText(wkt,0,6);
return x;
end MLineFromText;
function MPolyFromText{unsafe}(wkt:str) :wkb;
- x := wkb.FromText(wkt,0,6);
+ x := wkb.FromText(wkt,0,7);
return x;
end MPolyFromText;
function GeomCollFromText{unsafe}(wkt:str) :wkb;
- x := wkb.FromText(wkt,0,7);
+ x := wkb.FromText(wkt,0,8);
return x;
end GeomCollFromText;
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: geo - removed batcalc module definition
Changeset: 518e35da0959 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=518e35da0959 Modified Files: geom/monetdb5/geom.mal Branch: geo Log Message: removed batcalc module definition diffs (15 lines): diff --git a/geom/monetdb5/geom.mal b/geom/monetdb5/geom.mal --- a/geom/monetdb5/geom.mal +++ b/geom/monetdb5/geom.mal @@ -489,9 +489,9 @@ comment It is called when adding a new command wkb(geo:wkb, columnType:int, columnSRID:int) :wkb address geom_2_geom comment Called when inserting values to a table in order to check if the inserted geometries are of the same type and srid required by the column definition; -module batcalc; +#module batcalc; -command wkb(geo:bat[:oid,:wkb], columnType:int, columnSRID:int) :bat[:oid,:wkb] address geom_2_geom_bat +command batcalc.wkb(geo:bat[:oid,:wkb], columnType:int, columnSRID:int) :bat[:oid,:wkb] address geom_2_geom_bat comment Called when inserting values to a table in order to check if the inserted geometries are of the same type and srid required by the column definition; #Is it needed ??? #command wkb(v:bat[:oid,:wkb]) :bat[:oid,:wkb] address wkbFromWKB_bat; ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: geo - merge with default
Changeset: 4e1c2e440497 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4e1c2e440497 Added Files: clients/Tests/MAL-signatures_all.malC clients/Tests/MAL-signatures_fits_geom.malC.src clients/Tests/MAL-signatures_fits_geom.stable.err clients/Tests/MAL-signatures_fits_geom.stable.out clients/Tests/MAL-signatures_fits_geom.stable.out.int128 clients/Tests/MAL-signatures_geom.malC.src clients/Tests/MAL-signatures_geom.stable.err clients/Tests/MAL-signatures_geom.stable.out clients/Tests/MAL-signatures_geom.stable.out.int128 clients/Tests/SQL-dump_all.sql clients/Tests/SQL-dump_geom.sql.src clients/Tests/SQL-dump_geom.stable.err clients/Tests/SQL-dump_geom.stable.out clients/Tests/SQL-dump_geom.stable.out.32bit clients/Tests/SQL-dump_geom.stable.out.64bit.oid32 clients/Tests/SQL-dump_geom.stable.out.int128 clients/Tests/SQL-dump_geom.stable.out.oid32.int128 sql/test/BugTracker-2014/Tests/select-distinct-order-limit.Bug-3527.nomito sql/test/BugTracker-2014/Tests/select-distinct-order-limit.Bug-3527.sql sql/test/BugTracker-2014/Tests/select-distinct-order-limit.Bug-3527.stable.err sql/test/BugTracker-2014/Tests/select-distinct-order-limit.Bug-3527.stable.out Removed Files: clients/Tests/MAL-signatures.malC clients/Tests/MAL-signatures.stable.err clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/MAL-signatures_R.malC.src clients/Tests/MAL-signatures_R.stable.err clients/Tests/MAL-signatures_R.stable.out clients/Tests/MAL-signatures_R.stable.out.int128 clients/Tests/MAL-signatures_all.malC.src clients/Tests/MAL-signatures_bam.malC.src clients/Tests/MAL-signatures_bam.stable.err clients/Tests/MAL-signatures_bam.stable.out clients/Tests/MAL-signatures_bam.stable.out.int128 clients/Tests/MAL-signatures_gsl.malC.src clients/Tests/MAL-signatures_gsl.stable.err clients/Tests/MAL-signatures_gsl.stable.out clients/Tests/MAL-signatures_gsl.stable.out.int128 clients/Tests/MAL-signatures_nocfitsio.malC.src clients/Tests/MAL-signatures_nocfitsio.stable.err clients/Tests/MAL-signatures_nocfitsio.stable.out clients/Tests/MAL-signatures_nocfitsio.stable.out.int128 clients/Tests/SQL-dump.sql clients/Tests/SQL-dump.stable.err 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.stable.out.64bit.oid32.int128 clients/Tests/SQL-dump.stable.out.int128 clients/Tests/SQL-dump.timeout clients/Tests/SQL-dump_all.sql.src Modified Files: NT/installer32/MonetDB-ODBC-Installer.vdproj NT/installer32/MonetDB5-Geom-Module.vdproj NT/installer32/MonetDB5-SQL-Installer.vdproj NT/installer64/MonetDB-ODBC-Installer.vdproj NT/installer64/MonetDB5-Geom-Module.vdproj NT/installer64/MonetDB5-SQL-Installer.vdproj clients/Tests/All clients/Tests/MAL-signatures_all.stable.out clients/Tests/MAL-signatures_all.stable.out.int128 clients/Tests/MAL-signatures_none.malC.src clients/Tests/MAL-signatures_none.stable.out clients/Tests/MAL-signatures_none.stable.out.int128 clients/Tests/SQL-dump_none.sql.src clients/Tests/exports.stable.out configure.ag gdk/gdk.h gdk/gdk_firstn.c monetdb5/extras/rapi/Tests/All monetdb5/extras/rapi/Tests/rapi07.malC monetdb5/extras/rapi/Tests/rapi07.stable.out monetdb5/extras/rapi/Tests/rapi08.malC monetdb5/extras/rapi/Tests/rapi08.stable.out monetdb5/extras/rapi/rapi.c monetdb5/extras/rapi/rapi.mal monetdb5/mal/Tests/tst1225.mal monetdb5/mal/Tests/tst1225.stable.out monetdb5/mal/Tests/tst220.mal monetdb5/mal/Tests/tst220.stable.out monetdb5/mal/Tests/tst2510.mal monetdb5/mal/Tests/tst2510.stable.out monetdb5/mal/mal_interpreter.c monetdb5/mal/mal_parser.c monetdb5/mal/mal_resolve.c monetdb5/modules/atoms/json.c monetdb5/modules/atoms/json.h monetdb5/modules/atoms/json.mal monetdb5/modules/kernel/algebra.c monetdb5/modules/kernel/algebra.mal monetdb5/modules/mal/Tests/pqueue.mal monetdb5/modules/mal/Tests/pqueue.stable.out monetdb5/modules/mal/Tests/pqueue2.mal monetdb5/modules/mal/Tests/pqueue2.stable.out monetdb5/modules/mal/Tests/pqueue3.mal monetdb5/modules/mal/Tests/pqueue3.stable.out monetdb5/modules/mal/bbp.c monetdb5/optimizer/Tests/common.mal monetdb5/optimizer/Tests/common.stable.out
MonetDB: Oct2014 - Fixed SELECT DISTINCT with ORDER BY and LIMIT...
Changeset: 007632271b61 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=007632271b61
Modified Files:
gdk/gdk_firstn.c
Branch: Oct2014
Log Message:
Fixed SELECT DISTINCT with ORDER BY and LIMIT again.
After changeset 4592f95b53ff, BATfirstn was called with distinct set,
but only a single return BAT. We now cater for this situation as well.
diffs (106 lines):
diff --git a/gdk/gdk_firstn.c b/gdk/gdk_firstn.c
--- a/gdk/gdk_firstn.c
+++ b/gdk/gdk_firstn.c
@@ -452,7 +452,6 @@ BATfirstn_grouped(BAT **topn, BAT **gids
} *groups;
assert(topn);
- assert(gids);
CANDINIT(b, s, start, end, cnt, cand, candend);
@@ -616,15 +615,18 @@ BATfirstn_grouped(BAT **topn, BAT **gids
bn-T-nil = 0;
bn-T-nonil = 1;
}
- BATsetcount(gn, ncnt);
- BATseqbase(gn, 0);
- gn-tkey = ncnt == top;
- gn-tsorted = ncnt = 1;
- gn-trevsorted = ncnt = 1;
- gn-T-nil = 0;
- gn-T-nonil = 1;
+ if (gids) {
+ BATsetcount(gn, ncnt);
+ BATseqbase(gn, 0);
+ gn-tkey = ncnt == top;
+ gn-tsorted = ncnt = 1;
+ gn-trevsorted = ncnt = 1;
+ gn-T-nil = 0;
+ gn-T-nonil = 1;
+ *gids = gn;
+ } else
+ BBPreclaim(gn);
*topn = bn;
- *gids = gn;
return GDK_SUCCEED;
}
@@ -712,20 +714,20 @@ BATfirstn_grouped_with_groups(BAT **topn
} *groups;
assert(topn);
- assert(gids);
if (BATtdense(g)) {
/* trivial: g determines ordering, return initial
* slice of s */
bn = BATslice(s, 0, n);
- gn = BATslice(g, 0, n);
- if (bn == NULL || gn == NULL) {
+ gn = gids ? BATslice(g, 0, n) : NULL;
+ if (bn == NULL || (gids != NULL gn == NULL)) {
BBPreclaim(bn);
BBPreclaim(gn);
return GDK_FAIL;
}
*topn = bn;
- *gids = gn;
+ if (gids)
+ *gids = gn;
return GDK_SUCCEED;
}
@@ -894,15 +896,18 @@ BATfirstn_grouped_with_groups(BAT **topn
bn-T-nil = 0;
bn-T-nonil = 1;
}
- BATsetcount(gn, ncnt);
- BATseqbase(gn, 0);
- gn-tkey = ncnt == top;
- gn-tsorted = ncnt = 1;
- gn-trevsorted = ncnt = 1;
- gn-T-nil = 0;
- gn-T-nonil = 1;
+ if (gids) {
+ BATsetcount(gn, ncnt);
+ BATseqbase(gn, 0);
+ gn-tkey = ncnt == top;
+ gn-tsorted = ncnt = 1;
+ gn-trevsorted = ncnt = 1;
+ gn-T-nil = 0;
+ gn-T-nonil = 1;
+ *gids = gn;
+ } else
+ BBPreclaim(gn);
*topn = bn;
- *gids = gn;
return GDK_SUCCEED;
}
@@ -945,13 +950,13 @@ BATfirstn(BAT **topn, BAT **gids, BAT *b
}
if (g == NULL) {
- if (gids == NULL) {
+ if (gids == NULL !distinct) {
*topn = BATfirstn_unique(b, s, n, asc);
return *topn ? GDK_SUCCEED : GDK_FAIL;
}
return BATfirstn_grouped(topn, gids, b, s, n, asc, distinct);
}
- if (gids == NULL) {
+ if (gids == NULL !distinct) {
*topn = BATfirstn_unique_with_groups(b, s, g, n, asc);
return *topn ? GDK_SUCCEED : GDK_FAIL;
}
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Oct2014 - No need for ... ? 1 : 0. Ever.
Changeset: 53c6676dc182 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=53c6676dc182
Modified Files:
clients/mapiclient/dump.c
common/utils/msabaoth.c
gdk/gdk_imprints.h
geom/monetdb5/geom.c
monetdb5/modules/kernel/algebra.c
monetdb5/modules/kernel/bat5.c
monetdb5/modules/mal/clients.c
monetdb5/optimizer/opt_mergetable.c
sql/backends/monet5/datacell/sensor.c
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_scenario.c
sql/server/rel_planner.c
sql/server/rel_schema.c
sql/server/rel_updates.c
sql/server/sql_decimal.c
sql/server/sql_env.c
sql/storage/store.c
testing/difflib.c
Branch: Oct2014
Log Message:
No need for ... ? 1 : 0. Ever.
The expression (T ? 1 : 0) is exactly equivalent to (T != 0).
Moreover, if T is already a Boolean expression, it is equivalent to
just T. Similarly, (T ? 0 : 1) is equivalent to (T == 0).
diffs (truncated from 316 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
@@ -1284,7 +1284,7 @@ dump_functions(Mapi mid, stream *toConso
if (schema)
free(schema);
mapi_close_handle(hdl);
- return mnstr_errnr(toConsole) ? 1 : 0;
+ return mnstr_errnr(toConsole) != 0;
bailout:
if (schema)
diff --git a/common/utils/msabaoth.c b/common/utils/msabaoth.c
--- a/common/utils/msabaoth.c
+++ b/common/utils/msabaoth.c
@@ -804,7 +804,7 @@ msab_getUplogInfo(sabuplog *ret, const s
memmove(avg10[0], avg10[1],
sizeof(int) * 9);
memmove(avg30[0], avg30[1],
sizeof(int) * 29);
avg10[9] = avg30[29] = ret-crashavg1 =
- (start != 0 ? 1 : 0);
+ (start != 0);
*p = '\0';
ret-laststart = start =
(time_t)atol(data);
p = data;
@@ -834,9 +834,9 @@ msab_getUplogInfo(sabuplog *ret, const s
memmove(avg10[0], avg10[1], sizeof(int) * 9);
memmove(avg30[0], avg30[1], sizeof(int) * 29);
avg10[9] = avg30[29] = ret-crashavg1 =
- (start != 0 ? (db-state != SABdbRunning ? 1 : 0) : 0);
+ (start != 0 ? (db-state != SABdbRunning) : 0);
ret-crashcntr =
- ret-startcntr - (db-state == SABdbRunning ? 1 : 0) -
+ ret-startcntr - (db-state == SABdbRunning) -
ret-stopcntr;
for (i = 0; i 10; i++)
ret-crashavg10 += avg10[i];
diff --git a/gdk/gdk_imprints.h b/gdk/gdk_imprints.h
--- a/gdk/gdk_imprints.h
+++ b/gdk/gdk_imprints.h
@@ -37,12 +37,12 @@ typedef struct {
#define IMPScnt(X) ((X) 16777215) /* 24 bits for cnt */
#define IMPSsetcnt(X,Y) ((X) = (Y)) /* no overflow check */
#define IMPScnt_inc(X) ((X)++) /* no overflow check */
-#define IMPSrepeat(X)(((X) 16777216)?1:0)
+#define IMPSrepeat(X)(((X) 16777216) != 0)
#define IMPSsetrepeat(X) ((X) |= 16777216)
#define IMPSunsetrepeat(X) ((X) = (~16777216))
#define IMPSsetBit(B,X,Y) uint##B##_t)1)(Y))|(X))
#define IMPSunsetBit(B,X,Y)((~(((uint##B##_t)1)(Y)))(X))
-#define IMPSisSet(B,X,Y) (uint##B##_t)1)Y)X)?1:0)
+#define IMPSisSet(B,X,Y) (uint##B##_t)1)Y)X) != 0)
#define IMPSmod2(X,Y)((X)((Y)-1))
#endif /* GDK_IMPS_H */
diff --git a/geom/monetdb5/geom.c b/geom/monetdb5/geom.c
--- a/geom/monetdb5/geom.c
+++ b/geom/monetdb5/geom.c
@@ -257,12 +257,12 @@ mbrCOMP(mbr *l, mbr *r)
/* simple lexicographical ordering on (x,y) */
int res;
if (l-xmin == r-xmin)
- res = (l-ymin r-ymin) ? -1 : (l-ymin == r-ymin) ? 0 : 1;
+ res = (l-ymin r-ymin) ? -1 : (l-ymin != r-ymin);
else
res = (l-xmin r-xmin) ? -1 : 1;
if (res == 0) {
if (l-xmax == r-xmax)
- res = (l-ymax r-ymax) ? -1 : (l-ymax == r-ymax) ?
0 : 1;
+ res = (l-ymax r-ymax) ? -1 : (l-ymax != r-ymax);
else
res = (l-xmax r-xmax) ? -1 : 1;
}
diff --git a/monetdb5/modules/kernel/algebra.c
b/monetdb5/modules/kernel/algebra.c
--- a/monetdb5/modules/kernel/algebra.c
+++ b/monetdb5/modules/kernel/algebra.c
@@ -2202,7 +2202,7 @@ ALGexist(bit *ret, int *bid, ptr val)
}
derefStr(b, h, val);
q = BUNfnd(BATmirror(b), val);
- *ret = (q != BUN_NONE) ? 1 : 0;
+ *ret = (q != BUN_NONE);
BBPreleaseref(b-batCacheid);
return MAL_SUCCEED;
}
diff --git
MonetDB: Oct2014 - Approve test after changeset b373303ee299.
Changeset: a402a8a3d157 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a402a8a3d157 Modified Files: monetdb5/tests/gdkTests/Tests/firstn.stable.out Branch: Oct2014 Log Message: Approve test after changeset b373303ee299. diffs (truncated from 426 to 300 lines): diff --git a/monetdb5/tests/gdkTests/Tests/firstn.stable.out b/monetdb5/tests/gdkTests/Tests/firstn.stable.out --- a/monetdb5/tests/gdkTests/Tests/firstn.stable.out +++ b/monetdb5/tests/gdkTests/Tests/firstn.stable.out @@ -54,334 +54,334 @@ function user.main():void; bat.append(c,6@0); bat.append(c,7@0); bat.append(c,8@0); -x1 := algebra.firstn(a,0:wrd,true); +x1 := algebra.firstn(a,0:wrd,true,false); io.print(x1); a1 := algebra.leftfetchjoin(x1,a); io.print(a1); -x1 := algebra.firstn(a,1:wrd,true); +x1 := algebra.firstn(a,1:wrd,true,false); io.print(x1); a1 := algebra.leftfetchjoin(x1,a); io.print(a1); -x1 := algebra.firstn(a,2:wrd,true); +x1 := algebra.firstn(a,2:wrd,true,false); io.print(x1); a1 := algebra.leftfetchjoin(x1,a); io.print(a1); -x1 := algebra.firstn(a,3:wrd,true); +x1 := algebra.firstn(a,3:wrd,true,false); io.print(x1); a1 := algebra.leftfetchjoin(x1,a); io.print(a1); -x1 := algebra.firstn(a,4:wrd,true); +x1 := algebra.firstn(a,4:wrd,true,false); io.print(x1); a1 := algebra.leftfetchjoin(x1,a); io.print(a1); -x1 := algebra.firstn(a,5:wrd,true); +x1 := algebra.firstn(a,5:wrd,true,false); io.print(x1); a1 := algebra.leftfetchjoin(x1,a); io.print(a1); -x1 := algebra.firstn(a,6:wrd,true); +x1 := algebra.firstn(a,6:wrd,true,false); io.print(x1); a1 := algebra.leftfetchjoin(x1,a); io.print(a1); -x1 := algebra.firstn(a,7:wrd,true); +x1 := algebra.firstn(a,7:wrd,true,false); io.print(x1); a1 := algebra.leftfetchjoin(x1,a); io.print(a1); -x1 := algebra.firstn(a,8:wrd,true); +x1 := algebra.firstn(a,8:wrd,true,false); io.print(x1); a1 := algebra.leftfetchjoin(x1,a); io.print(a1); -x1 := algebra.firstn(a,9:wrd,true); +x1 := algebra.firstn(a,9:wrd,true,false); io.print(x1); a1 := algebra.leftfetchjoin(x1,a); io.print(a1); -x1 := algebra.firstn(a,10:wrd,true); +x1 := algebra.firstn(a,10:wrd,true,false); io.print(x1); a1 := algebra.leftfetchjoin(x1,a); io.print(a1); -x1 := algebra.firstn(a,0:wrd,false); +x1 := algebra.firstn(a,0:wrd,false,false); io.print(x1); a1 := algebra.leftfetchjoin(x1,a); io.print(a1); -x1 := algebra.firstn(a,1:wrd,false); +x1 := algebra.firstn(a,1:wrd,false,false); io.print(x1); a1 := algebra.leftfetchjoin(x1,a); io.print(a1); -x1 := algebra.firstn(a,2:wrd,false); +x1 := algebra.firstn(a,2:wrd,false,false); io.print(x1); a1 := algebra.leftfetchjoin(x1,a); io.print(a1); -x1 := algebra.firstn(a,3:wrd,false); +x1 := algebra.firstn(a,3:wrd,false,false); io.print(x1); a1 := algebra.leftfetchjoin(x1,a); io.print(a1); -x1 := algebra.firstn(a,4:wrd,false); +x1 := algebra.firstn(a,4:wrd,false,false); io.print(x1); a1 := algebra.leftfetchjoin(x1,a); io.print(a1); -x1 := algebra.firstn(a,5:wrd,false); +x1 := algebra.firstn(a,5:wrd,false,false); io.print(x1); a1 := algebra.leftfetchjoin(x1,a); io.print(a1); -x1 := algebra.firstn(a,6:wrd,false); +x1 := algebra.firstn(a,6:wrd,false,false); io.print(x1); a1 := algebra.leftfetchjoin(x1,a); io.print(a1); -x1 := algebra.firstn(a,7:wrd,false); +x1 := algebra.firstn(a,7:wrd,false,false); io.print(x1); a1 := algebra.leftfetchjoin(x1,a); io.print(a1); -x1 := algebra.firstn(a,8:wrd,false); +x1 := algebra.firstn(a,8:wrd,false,false); io.print(x1); a1 := algebra.leftfetchjoin(x1,a); io.print(a1); -x1 := algebra.firstn(a,9:wrd,false); +x1 := algebra.firstn(a,9:wrd,false,false); io.print(x1); a1 := algebra.leftfetchjoin(x1,a); io.print(a1); -x1 := algebra.firstn(a,10:wrd,false); +x1 := algebra.firstn(a,10:wrd,false,false); io.print(x1); a1 := algebra.leftfetchjoin(x1,a); io.print(a1); -(x1,x2) := algebra.firstn(a,0:wrd,true); +(x1,x2) := algebra.firstn(a,0:wrd,true,false); io.print(x1); io.print(x2); -y1 := algebra.firstn(b,x1,x2,0:wrd,true); +y1 := algebra.firstn(b,x1,x2,0:wrd,true,false); io.print(y1); a1 := algebra.leftfetchjoin(y1,a); b1 := algebra.leftfetchjoin(y1,b); io.print(a1,b1); -(y1,y2) := algebra.firstn(b,x1,x2,0:wrd,true); +(y1,y2) := algebra.firstn(b,x1,x2,0:wrd,true,false); io.print(y1); io.print(y2); -(x1,x2) := algebra.firstn(a,1:wrd,true); +(x1,x2) := algebra.firstn(a,1:wrd,true,false); io.print(x1); io.print(x2); -y1 :=
MonetDB: default - Merge with Oct2014 branch.
Changeset: 9a614d7e7d39 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9a614d7e7d39
Modified Files:
clients/mapiclient/dump.c
common/utils/msabaoth.c
gdk/gdk_firstn.c
gdk/gdk_imprints.h
geom/monetdb5/geom.c
monetdb5/modules/kernel/algebra.c
monetdb5/modules/kernel/bat5.c
monetdb5/modules/mal/clients.c
monetdb5/optimizer/opt_mergetable.c
monetdb5/tests/gdkTests/Tests/firstn.stable.out
sql/backends/monet5/datacell/sensor.c
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_statement.h
sql/benchmarks/tpch/Tests/02-explain.stable.out
sql/benchmarks/tpch/Tests/03-explain.stable.out
sql/benchmarks/tpch/Tests/10-explain.stable.out
sql/benchmarks/tpch/Tests/18-explain.stable.out
sql/benchmarks/tpch/Tests/21-explain.stable.out
sql/server/rel_planner.c
sql/server/rel_schema.c
sql/server/rel_updates.c
sql/server/sql_decimal.c
sql/server/sql_env.c
sql/storage/store.c
sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
testing/difflib.c
Branch: default
Log Message:
Merge with Oct2014 branch.
diffs (truncated from 1177 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
@@ -1286,7 +1286,7 @@ dump_functions(Mapi mid, stream *toConso
if (schema)
free(schema);
mapi_close_handle(hdl);
- return mnstr_errnr(toConsole) ? 1 : 0;
+ return mnstr_errnr(toConsole) != 0;
bailout:
if (schema)
diff --git a/common/utils/msabaoth.c b/common/utils/msabaoth.c
--- a/common/utils/msabaoth.c
+++ b/common/utils/msabaoth.c
@@ -804,7 +804,7 @@ msab_getUplogInfo(sabuplog *ret, const s
memmove(avg10[0], avg10[1],
sizeof(int) * 9);
memmove(avg30[0], avg30[1],
sizeof(int) * 29);
avg10[9] = avg30[29] = ret-crashavg1 =
- (start != 0 ? 1 : 0);
+ (start != 0);
*p = '\0';
ret-laststart = start =
(time_t)atol(data);
p = data;
@@ -834,9 +834,9 @@ msab_getUplogInfo(sabuplog *ret, const s
memmove(avg10[0], avg10[1], sizeof(int) * 9);
memmove(avg30[0], avg30[1], sizeof(int) * 29);
avg10[9] = avg30[29] = ret-crashavg1 =
- (start != 0 ? (db-state != SABdbRunning ? 1 : 0) : 0);
+ (start != 0 ? (db-state != SABdbRunning) : 0);
ret-crashcntr =
- ret-startcntr - (db-state == SABdbRunning ? 1 : 0) -
+ ret-startcntr - (db-state == SABdbRunning) -
ret-stopcntr;
for (i = 0; i 10; i++)
ret-crashavg10 += avg10[i];
diff --git a/gdk/gdk_firstn.c b/gdk/gdk_firstn.c
--- a/gdk/gdk_firstn.c
+++ b/gdk/gdk_firstn.c
@@ -472,7 +472,6 @@ BATfirstn_grouped(BAT **topn, BAT **gids
} *groups;
assert(topn);
- assert(gids);
CANDINIT(b, s, start, end, cnt, cand, candend);
@@ -651,15 +650,18 @@ BATfirstn_grouped(BAT **topn, BAT **gids
bn-T-nil = 0;
bn-T-nonil = 1;
}
- BATsetcount(gn, ncnt);
- BATseqbase(gn, 0);
- gn-tkey = ncnt == top;
- gn-tsorted = ncnt = 1;
- gn-trevsorted = ncnt = 1;
- gn-T-nil = 0;
- gn-T-nonil = 1;
+ if (gids) {
+ BATsetcount(gn, ncnt);
+ BATseqbase(gn, 0);
+ gn-tkey = ncnt == top;
+ gn-tsorted = ncnt = 1;
+ gn-trevsorted = ncnt = 1;
+ gn-T-nil = 0;
+ gn-T-nonil = 1;
+ *gids = gn;
+ } else
+ BBPreclaim(gn);
*topn = bn;
- *gids = gn;
return GDK_SUCCEED;
}
@@ -747,20 +749,20 @@ BATfirstn_grouped_with_groups(BAT **topn
} *groups;
assert(topn);
- assert(gids);
if (BATtdense(g)) {
/* trivial: g determines ordering, return initial
* slice of s */
bn = BATslice(s, 0, n);
- gn = BATslice(g, 0, n);
- if (bn == NULL || gn == NULL) {
+ gn = gids ? BATslice(g, 0, n) : NULL;
+ if (bn == NULL || (gids != NULL gn == NULL)) {
BBPreclaim(bn);
BBPreclaim(gn);
return GDK_FAIL;
}
*topn = bn;
- *gids = gn;
+ if
MonetDB: geo - Merge with default branch.
Changeset: 00120937b22b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=00120937b22b
Modified Files:
clients/mapiclient/dump.c
common/utils/msabaoth.c
gdk/gdk_firstn.c
gdk/gdk_imprints.h
geom/monetdb5/geom.c
monetdb5/modules/kernel/algebra.c
monetdb5/modules/kernel/bat5.c
monetdb5/modules/mal/clients.c
monetdb5/optimizer/opt_mergetable.c
monetdb5/tests/gdkTests/Tests/firstn.stable.out
sql/backends/monet5/datacell/basket.c
sql/backends/monet5/datacell/emitter.c
sql/backends/monet5/datacell/sensor.c
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_statement.h
sql/benchmarks/tpch/Tests/02-explain.stable.out
sql/benchmarks/tpch/Tests/03-explain.stable.out
sql/benchmarks/tpch/Tests/10-explain.stable.out
sql/benchmarks/tpch/Tests/18-explain.stable.out
sql/benchmarks/tpch/Tests/21-explain.stable.out
sql/server/rel_planner.c
sql/server/rel_schema.c
sql/server/rel_updates.c
sql/server/sql_decimal.c
sql/server/sql_env.c
sql/storage/store.c
sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
sql/test/pg_regress/Tests/All
testing/difflib.c
Branch: geo
Log Message:
Merge with default branch.
diffs (truncated from 1219 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
@@ -1286,7 +1286,7 @@ dump_functions(Mapi mid, stream *toConso
if (schema)
free(schema);
mapi_close_handle(hdl);
- return mnstr_errnr(toConsole) ? 1 : 0;
+ return mnstr_errnr(toConsole) != 0;
bailout:
if (schema)
diff --git a/common/utils/msabaoth.c b/common/utils/msabaoth.c
--- a/common/utils/msabaoth.c
+++ b/common/utils/msabaoth.c
@@ -804,7 +804,7 @@ msab_getUplogInfo(sabuplog *ret, const s
memmove(avg10[0], avg10[1],
sizeof(int) * 9);
memmove(avg30[0], avg30[1],
sizeof(int) * 29);
avg10[9] = avg30[29] = ret-crashavg1 =
- (start != 0 ? 1 : 0);
+ (start != 0);
*p = '\0';
ret-laststart = start =
(time_t)atol(data);
p = data;
@@ -834,9 +834,9 @@ msab_getUplogInfo(sabuplog *ret, const s
memmove(avg10[0], avg10[1], sizeof(int) * 9);
memmove(avg30[0], avg30[1], sizeof(int) * 29);
avg10[9] = avg30[29] = ret-crashavg1 =
- (start != 0 ? (db-state != SABdbRunning ? 1 : 0) : 0);
+ (start != 0 ? (db-state != SABdbRunning) : 0);
ret-crashcntr =
- ret-startcntr - (db-state == SABdbRunning ? 1 : 0) -
+ ret-startcntr - (db-state == SABdbRunning) -
ret-stopcntr;
for (i = 0; i 10; i++)
ret-crashavg10 += avg10[i];
diff --git a/gdk/gdk_firstn.c b/gdk/gdk_firstn.c
--- a/gdk/gdk_firstn.c
+++ b/gdk/gdk_firstn.c
@@ -472,7 +472,6 @@ BATfirstn_grouped(BAT **topn, BAT **gids
} *groups;
assert(topn);
- assert(gids);
CANDINIT(b, s, start, end, cnt, cand, candend);
@@ -651,15 +650,18 @@ BATfirstn_grouped(BAT **topn, BAT **gids
bn-T-nil = 0;
bn-T-nonil = 1;
}
- BATsetcount(gn, ncnt);
- BATseqbase(gn, 0);
- gn-tkey = ncnt == top;
- gn-tsorted = ncnt = 1;
- gn-trevsorted = ncnt = 1;
- gn-T-nil = 0;
- gn-T-nonil = 1;
+ if (gids) {
+ BATsetcount(gn, ncnt);
+ BATseqbase(gn, 0);
+ gn-tkey = ncnt == top;
+ gn-tsorted = ncnt = 1;
+ gn-trevsorted = ncnt = 1;
+ gn-T-nil = 0;
+ gn-T-nonil = 1;
+ *gids = gn;
+ } else
+ BBPreclaim(gn);
*topn = bn;
- *gids = gn;
return GDK_SUCCEED;
}
@@ -747,20 +749,20 @@ BATfirstn_grouped_with_groups(BAT **topn
} *groups;
assert(topn);
- assert(gids);
if (BATtdense(g)) {
/* trivial: g determines ordering, return initial
* slice of s */
bn = BATslice(s, 0, n);
- gn = BATslice(g, 0, n);
- if (bn == NULL || gn == NULL) {
+ gn = gids ? BATslice(g, 0, n) : NULL;
+ if (bn == NULL || (gids != NULL gn == NULL)) {
BBPreclaim(bn);
BBPreclaim(gn);
MonetDB: transaction-replication - Merge with default branch.
Changeset: a2bb2f0faa1e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a2bb2f0faa1e
Modified Files:
clients/mapiclient/dump.c
common/utils/msabaoth.c
gdk/gdk_firstn.c
gdk/gdk_imprints.h
geom/monetdb5/geom.c
monetdb5/modules/kernel/algebra.c
monetdb5/modules/kernel/bat5.c
monetdb5/modules/mal/clients.c
monetdb5/optimizer/opt_mergetable.c
monetdb5/tests/gdkTests/Tests/firstn.stable.out
sql/backends/monet5/datacell/basket.c
sql/backends/monet5/datacell/emitter.c
sql/backends/monet5/datacell/sensor.c
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_statement.h
sql/benchmarks/tpch/Tests/02-explain.stable.out
sql/benchmarks/tpch/Tests/03-explain.stable.out
sql/benchmarks/tpch/Tests/10-explain.stable.out
sql/benchmarks/tpch/Tests/18-explain.stable.out
sql/benchmarks/tpch/Tests/21-explain.stable.out
sql/server/rel_planner.c
sql/server/rel_schema.c
sql/server/rel_updates.c
sql/server/sql_decimal.c
sql/server/sql_env.c
sql/storage/store.c
sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
sql/test/pg_regress/Tests/All
testing/difflib.c
Branch: transaction-replication
Log Message:
Merge with default branch.
diffs (truncated from 1219 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
@@ -1286,7 +1286,7 @@ dump_functions(Mapi mid, stream *toConso
if (schema)
free(schema);
mapi_close_handle(hdl);
- return mnstr_errnr(toConsole) ? 1 : 0;
+ return mnstr_errnr(toConsole) != 0;
bailout:
if (schema)
diff --git a/common/utils/msabaoth.c b/common/utils/msabaoth.c
--- a/common/utils/msabaoth.c
+++ b/common/utils/msabaoth.c
@@ -804,7 +804,7 @@ msab_getUplogInfo(sabuplog *ret, const s
memmove(avg10[0], avg10[1],
sizeof(int) * 9);
memmove(avg30[0], avg30[1],
sizeof(int) * 29);
avg10[9] = avg30[29] = ret-crashavg1 =
- (start != 0 ? 1 : 0);
+ (start != 0);
*p = '\0';
ret-laststart = start =
(time_t)atol(data);
p = data;
@@ -834,9 +834,9 @@ msab_getUplogInfo(sabuplog *ret, const s
memmove(avg10[0], avg10[1], sizeof(int) * 9);
memmove(avg30[0], avg30[1], sizeof(int) * 29);
avg10[9] = avg30[29] = ret-crashavg1 =
- (start != 0 ? (db-state != SABdbRunning ? 1 : 0) : 0);
+ (start != 0 ? (db-state != SABdbRunning) : 0);
ret-crashcntr =
- ret-startcntr - (db-state == SABdbRunning ? 1 : 0) -
+ ret-startcntr - (db-state == SABdbRunning) -
ret-stopcntr;
for (i = 0; i 10; i++)
ret-crashavg10 += avg10[i];
diff --git a/gdk/gdk_firstn.c b/gdk/gdk_firstn.c
--- a/gdk/gdk_firstn.c
+++ b/gdk/gdk_firstn.c
@@ -472,7 +472,6 @@ BATfirstn_grouped(BAT **topn, BAT **gids
} *groups;
assert(topn);
- assert(gids);
CANDINIT(b, s, start, end, cnt, cand, candend);
@@ -651,15 +650,18 @@ BATfirstn_grouped(BAT **topn, BAT **gids
bn-T-nil = 0;
bn-T-nonil = 1;
}
- BATsetcount(gn, ncnt);
- BATseqbase(gn, 0);
- gn-tkey = ncnt == top;
- gn-tsorted = ncnt = 1;
- gn-trevsorted = ncnt = 1;
- gn-T-nil = 0;
- gn-T-nonil = 1;
+ if (gids) {
+ BATsetcount(gn, ncnt);
+ BATseqbase(gn, 0);
+ gn-tkey = ncnt == top;
+ gn-tsorted = ncnt = 1;
+ gn-trevsorted = ncnt = 1;
+ gn-T-nil = 0;
+ gn-T-nonil = 1;
+ *gids = gn;
+ } else
+ BBPreclaim(gn);
*topn = bn;
- *gids = gn;
return GDK_SUCCEED;
}
@@ -747,20 +749,20 @@ BATfirstn_grouped_with_groups(BAT **topn
} *groups;
assert(topn);
- assert(gids);
if (BATtdense(g)) {
/* trivial: g determines ordering, return initial
* slice of s */
bn = BATslice(s, 0, n);
- gn = BATslice(g, 0, n);
- if (bn == NULL || gn == NULL) {
+ gn = gids ? BATslice(g, 0, n) : NULL;
+ if (bn == NULL || (gids != NULL gn == NULL)) {
BBPreclaim(bn);
MonetDB: mosaic - Merge with default branch.
Changeset: 54c45b0895fc for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=54c45b0895fc
Modified Files:
clients/mapiclient/dump.c
common/utils/msabaoth.c
gdk/gdk_firstn.c
gdk/gdk_imprints.h
geom/monetdb5/geom.c
monetdb5/modules/kernel/algebra.c
monetdb5/modules/kernel/bat5.c
monetdb5/modules/mal/clients.c
monetdb5/optimizer/opt_mergetable.c
monetdb5/tests/gdkTests/Tests/firstn.stable.out
sql/backends/monet5/datacell/basket.c
sql/backends/monet5/datacell/emitter.c
sql/backends/monet5/datacell/sensor.c
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_statement.h
sql/benchmarks/tpch/Tests/02-explain.stable.out
sql/benchmarks/tpch/Tests/03-explain.stable.out
sql/benchmarks/tpch/Tests/10-explain.stable.out
sql/benchmarks/tpch/Tests/18-explain.stable.out
sql/benchmarks/tpch/Tests/21-explain.stable.out
sql/server/rel_planner.c
sql/server/rel_schema.c
sql/server/rel_updates.c
sql/server/sql_decimal.c
sql/server/sql_env.c
sql/storage/store.c
sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
sql/test/pg_regress/Tests/All
testing/difflib.c
Branch: mosaic
Log Message:
Merge with default branch.
diffs (truncated from 1219 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
@@ -1286,7 +1286,7 @@ dump_functions(Mapi mid, stream *toConso
if (schema)
free(schema);
mapi_close_handle(hdl);
- return mnstr_errnr(toConsole) ? 1 : 0;
+ return mnstr_errnr(toConsole) != 0;
bailout:
if (schema)
diff --git a/common/utils/msabaoth.c b/common/utils/msabaoth.c
--- a/common/utils/msabaoth.c
+++ b/common/utils/msabaoth.c
@@ -804,7 +804,7 @@ msab_getUplogInfo(sabuplog *ret, const s
memmove(avg10[0], avg10[1],
sizeof(int) * 9);
memmove(avg30[0], avg30[1],
sizeof(int) * 29);
avg10[9] = avg30[29] = ret-crashavg1 =
- (start != 0 ? 1 : 0);
+ (start != 0);
*p = '\0';
ret-laststart = start =
(time_t)atol(data);
p = data;
@@ -834,9 +834,9 @@ msab_getUplogInfo(sabuplog *ret, const s
memmove(avg10[0], avg10[1], sizeof(int) * 9);
memmove(avg30[0], avg30[1], sizeof(int) * 29);
avg10[9] = avg30[29] = ret-crashavg1 =
- (start != 0 ? (db-state != SABdbRunning ? 1 : 0) : 0);
+ (start != 0 ? (db-state != SABdbRunning) : 0);
ret-crashcntr =
- ret-startcntr - (db-state == SABdbRunning ? 1 : 0) -
+ ret-startcntr - (db-state == SABdbRunning) -
ret-stopcntr;
for (i = 0; i 10; i++)
ret-crashavg10 += avg10[i];
diff --git a/gdk/gdk_firstn.c b/gdk/gdk_firstn.c
--- a/gdk/gdk_firstn.c
+++ b/gdk/gdk_firstn.c
@@ -472,7 +472,6 @@ BATfirstn_grouped(BAT **topn, BAT **gids
} *groups;
assert(topn);
- assert(gids);
CANDINIT(b, s, start, end, cnt, cand, candend);
@@ -651,15 +650,18 @@ BATfirstn_grouped(BAT **topn, BAT **gids
bn-T-nil = 0;
bn-T-nonil = 1;
}
- BATsetcount(gn, ncnt);
- BATseqbase(gn, 0);
- gn-tkey = ncnt == top;
- gn-tsorted = ncnt = 1;
- gn-trevsorted = ncnt = 1;
- gn-T-nil = 0;
- gn-T-nonil = 1;
+ if (gids) {
+ BATsetcount(gn, ncnt);
+ BATseqbase(gn, 0);
+ gn-tkey = ncnt == top;
+ gn-tsorted = ncnt = 1;
+ gn-trevsorted = ncnt = 1;
+ gn-T-nil = 0;
+ gn-T-nonil = 1;
+ *gids = gn;
+ } else
+ BBPreclaim(gn);
*topn = bn;
- *gids = gn;
return GDK_SUCCEED;
}
@@ -747,20 +749,20 @@ BATfirstn_grouped_with_groups(BAT **topn
} *groups;
assert(topn);
- assert(gids);
if (BATtdense(g)) {
/* trivial: g determines ordering, return initial
* slice of s */
bn = BATslice(s, 0, n);
- gn = BATslice(g, 0, n);
- if (bn == NULL || gn == NULL) {
+ gn = gids ? BATslice(g, 0, n) : NULL;
+ if (bn == NULL || (gids != NULL gn == NULL)) {
BBPreclaim(bn);
BBPreclaim(gn);
MonetDB: Oct2014 - use batcalc.between were possible
Changeset: a75afbec2a01 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a75afbec2a01
Modified Files:
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql_gencode.c
sql/include/sql_catalog.h
sql/server/rel_dump.c
sql/server/rel_select.c
Branch: Oct2014
Log Message:
use batcalc.between were possible
diffs (133 lines):
diff --git a/sql/backends/monet5/rel_bin.c b/sql/backends/monet5/rel_bin.c
--- a/sql/backends/monet5/rel_bin.c
+++ b/sql/backends/monet5/rel_bin.c
@@ -690,7 +690,7 @@ exp_bin(mvc *sql, sql_exp *e, stmt *left
s = stmt_binop(sql-sa,
stmt_binop(sql-sa, l, r, lf),
stmt_binop(sql-sa, l, r2, rf),
a);
- } else if (l-nrcols 0 r-nrcols 0
r2-nrcols 0) {
+ } else if (((e-flag3) != 3) /* both sides
closed use between implementation */ l-nrcols 0 r-nrcols 0
r2-nrcols 0) {
s = stmt_uselect(sql-sa, l, r,
range2lcompare(e-flag),
stmt_uselect(sql-sa, l, r2,
range2rcompare(e-flag), sel));
} else {
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
@@ -1371,7 +1371,7 @@ static int
return -1;
if ((s-op2-nrcols 0 || s-op3-nrcols) (s-type
== st_uselect2)) {
- int k;
+ int k, symmetric = s-flagCMP_SYMMETRIC;
char *mod = calcRef;
char *op1 = , *op2 = ;
@@ -1385,17 +1385,28 @@ static int
if (s-flag 2)
op2 = =;
- if ((q = multiplex2(mb, mod,
convertOperator(op1), l, r1, TYPE_bit)) == NULL)
- return -1;
+ if (s-flag1 s-flag2) {
+ if (symmetric)
+ p = newStmt1(mb, batcalcRef,
between_symmetric);
+ else
+ p = newStmt1(mb, batcalcRef,
between);
+ p = pushArgument(mb, p, l);
+ p = pushArgument(mb, p, r1);
+ p = pushArgument(mb, p, r2);
+ k = getDestVar(p);
+ } else {
+ if ((q = multiplex2(mb, mod,
convertOperator(op1), l, r1, TYPE_bit)) == NULL)
+ return -1;
- if ((r = multiplex2(mb, mod,
convertOperator(op2), l, r2, TYPE_bit)) == NULL)
- return -1;
- p = newStmt1(mb, batcalcRef, and);
- p = pushArgument(mb, p, getDestVar(q));
- p = pushArgument(mb, p, getDestVar(r));
- if (p == NULL)
- return -1;
- k = getDestVar(p);
+ if ((r = multiplex2(mb, mod,
convertOperator(op2), l, r2, TYPE_bit)) == NULL)
+ return -1;
+ p = newStmt1(mb, batcalcRef, and);
+ p = pushArgument(mb, p, getDestVar(q));
+ p = pushArgument(mb, p, getDestVar(r));
+ if (p == NULL)
+ return -1;
+ k = getDestVar(p);
+ }
q = newStmt1(mb, algebraRef, subselect);
q = pushArgument(mb, q, k);
diff --git a/sql/include/sql_catalog.h b/sql/include/sql_catalog.h
--- a/sql/include/sql_catalog.h
+++ b/sql/include/sql_catalog.h
@@ -147,6 +147,9 @@ typedef enum comp_type {
cmp_equal_nil = 14 /* special case equi join, with nil =
nil */
} comp_type;
+/* for ranges we keep the requirment for symmetric */
+#define CMP_SYMMETRIC 8
+
#define is_theta_exp(e) ((e) == cmp_gt || (e) == cmp_gte || (e) == cmp_lte ||\
(e) == cmp_lt || (e) == cmp_equal || (e) ==
cmp_notequal)
diff --git a/sql/server/rel_dump.c b/sql/server/rel_dump.c
--- a/sql/server/rel_dump.c
+++ b/sql/server/rel_dump.c
@@ -177,6 +177,8 @@ exp_print(mvc *sql, stream *fout, sql_ex
MonetDB: Oct2014 - Only call truncate on path if path is not NULL.
Changeset: afb446321a2c for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=afb446321a2c Modified Files: gdk/gdk_posix.c Branch: Oct2014 Log Message: Only call truncate on path if path is not NULL. diffs (12 lines): diff --git a/gdk/gdk_posix.c b/gdk/gdk_posix.c --- a/gdk/gdk_posix.c +++ b/gdk/gdk_posix.c @@ -400,7 +400,7 @@ MT_mremap(const char *path, int mode, vo fprintf(stderr, = %s:%d: MT_mremap(%s,PTRFMT,SZFMT,SZFMT): munmap() failed\n, __FILE__, __LINE__, path?path:NULL, PTRFMTCAST old_address, old_size, *new_size); return NULL; } - if (truncate(path, *new_size) 0) + if (path truncate(path, *new_size) 0) fprintf(stderr, #MT_mremap(%s): truncate failed\n, path); #ifdef MMAP_DEBUG fprintf(stderr, MT_mremap(%s,PTRFMT,SZFMT,SZFMT) - shrinking\n, path?path:NULL, PTRFMTCAST old_address, old_size, *new_size); ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Oct2014 - Hopefully better calculation of imprints size.
Changeset: e531a7ed2240 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e531a7ed2240
Modified Files:
gdk/gdk_imprints.c
Branch: Oct2014
Log Message:
Hopefully better calculation of imprints size.
Coverity rightly says that sizeof of an expression is suspect.
diffs (12 lines):
diff --git a/gdk/gdk_imprints.c b/gdk/gdk_imprints.c
--- a/gdk/gdk_imprints.c
+++ b/gdk/gdk_imprints.c
@@ -819,7 +819,7 @@ IMPSimprintsize(BAT *b)
{
lng sz=0;
if( b-T-imprints){
- sz = b-T-imprints-impcnt * sizeof(IMPS_PAGE/8);
+ sz = b-T-imprints-impcnt * b-T-imprints-bits / 8;
sz += b-T-imprints-dictcnt * sizeof(cchdc_t);
}
return sz;
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Oct2014 - We don't mind calling rand() for sampling.
Changeset: 2bb4e8a94a6e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2bb4e8a94a6e
Modified Files:
gdk/gdk_sample.c
Branch: Oct2014
Log Message:
We don't mind calling rand() for sampling.
diffs (11 lines):
diff --git a/gdk/gdk_sample.c b/gdk/gdk_sample.c
--- a/gdk/gdk_sample.c
+++ b/gdk/gdk_sample.c
@@ -182,6 +182,7 @@ BATsample(BAT *b, BUN n) {
struct oidtreenode* ttree;
do {
/* generate a new random OID */
+ /* coverity[dont_call] */
candoid = (BUN) (minoid + DRAND * (maxoid -
minoid));
/* if that candidate OID was already generated,
try again */
} while (OIDTreeLookup(tree, candoid));
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Oct2014 - If we check that path is not NULL, we don't n...
Changeset: 5fe5d109a991 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5fe5d109a991
Modified Files:
gdk/gdk_posix.c
Branch: Oct2014
Log Message:
If we check that path is not NULL, we don't need to keep doing that.
diffs (36 lines):
diff --git a/gdk/gdk_posix.c b/gdk/gdk_posix.c
--- a/gdk/gdk_posix.c
+++ b/gdk/gdk_posix.c
@@ -420,12 +420,12 @@ MT_mremap(const char *path, int mode, vo
/* normal memory map */
if ((fd = open(path, O_RDWR)) 0) {
- fprintf(stderr, = %s:%d:
MT_mremap(%s,PTRFMT,SZFMT,SZFMT): open() failed\n, __FILE__, __LINE__,
path?path:NULL, PTRFMTCAST old_address, old_size, *new_size);
+ fprintf(stderr, = %s:%d:
MT_mremap(%s,PTRFMT,SZFMT,SZFMT): open() failed\n, __FILE__, __LINE__,
path, PTRFMTCAST old_address, old_size, *new_size);
return NULL;
}
if (GDKextendf(fd, *new_size, path) 0) {
close(fd);
- fprintf(stderr, = %s:%d:
MT_mremap(%s,PTRFMT,SZFMT,SZFMT): GDKextendf() failed\n, __FILE__,
__LINE__, path?path:NULL, PTRFMTCAST old_address, old_size, *new_size);
+ fprintf(stderr, = %s:%d:
MT_mremap(%s,PTRFMT,SZFMT,SZFMT): GDKextendf() failed\n, __FILE__,
__LINE__, path, PTRFMTCAST old_address, old_size, *new_size);
return NULL;
}
#ifdef HAVE_MREMAP
@@ -535,7 +535,7 @@ MT_mremap(const char *path, int mode, vo
MONETDB_MODE);
free(p);
if (fd 0) {
- fprintf(stderr, = %s:%d:
MT_mremap(%s,PTRFMT,SZFMT,SZFMT): fd 0\n, __FILE__, __LINE__,
path?path:NULL, PTRFMTCAST old_address, old_size, *new_size);
+ fprintf(stderr, = %s:%d:
MT_mremap(%s,PTRFMT,SZFMT,SZFMT): fd 0\n, __FILE__, __LINE__, path,
PTRFMTCAST old_address, old_size, *new_size);
return NULL;
}
if (write(fd, old_address,
@@ -563,7 +563,7 @@ MT_mremap(const char *path, int mode, vo
#else
ftruncate()
#endif
-failed\n, __FILE__,
__LINE__, path?path:NULL, PTRFMTCAST old_address, old_size, *new_size);
+failed\n, __FILE__,
__LINE__, path, PTRFMTCAST old_address, old_size, *new_size);
return NULL;
}
p = mmap(NULL, *new_size, prot, flags,
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Oct2014 - Avoid time-of-check, time-of-use race.
Changeset: 4ba9bb8ed9dc for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4ba9bb8ed9dc
Modified Files:
gdk/gdk_bbp.c
Branch: Oct2014
Log Message:
Avoid time-of-check, time-of-use race.
diffs (22 lines):
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -1004,12 +1004,14 @@ BBPaddfarm(const char *dirname, int role
if (rolemask == 0 || (rolemask 1 BBPfarms[0].dirname != NULL)) {
GDKfatal(BBPaddfarm: bad rolemask\n);
}
- if (stat(dirname, st) == -1) {
- if (mkdir(dirname, 0755) 0) {
+ if (mkdir(dirname, 0755) 0) {
+ if (errno == EEXIST) {
+ if (stat(dirname, st) == -1 || !S_ISDIR(st.st_mode)) {
+ GDKfatal(BBPaddfarm: %s: not a directory\n,
dirname);
+ }
+ } else {
GDKfatal(BBPaddfarm: %s: cannot create directory\n,
dirname);
}
- } else if (!S_ISDIR(st.st_mode)) {
- GDKfatal(BBPaddfarm: %s: not a directory\n, dirname);
}
for (i = 0; i MAXFARMS; i++) {
if (BBPfarms[i].dirname == NULL) {
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Oct2014 - Overwriting the pointer is ok.
Changeset: 993b4c7780d7 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=993b4c7780d7 Modified Files: gdk/gdk_heap.c Branch: Oct2014 Log Message: Overwriting the pointer is ok. diffs (11 lines): diff --git a/gdk/gdk_heap.c b/gdk/gdk_heap.c --- a/gdk/gdk_heap.c +++ b/gdk/gdk_heap.c @@ -268,6 +268,7 @@ HEAPextend(Heap *h, size_t size, int may HEAPfree(bak); return 0; } + /* coverity[assigned_pointer] */ failure = h-storage == STORE_MEM can_map !h-base; } fd = GDKfdlocate(h-farmid, nme, wb, ext); ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Oct2014 - added an other push groupby down rewrite step.
Changeset: a4374e43f2d4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a4374e43f2d4
Modified Files:
sql/backends/monet5/rel_bin.c
sql/benchmarks/tpch/Tests/02-explain.stable.out
sql/benchmarks/tpch/Tests/02-plan.stable.out
sql/benchmarks/tpch/Tests/10-plan.stable.out
sql/benchmarks/tpch/Tests/17-explain.stable.out
sql/benchmarks/tpch/Tests/17-plan.stable.out
sql/benchmarks/tpch/Tests/18-plan.stable.out
sql/benchmarks/tpch/Tests/20-explain.stable.out
sql/benchmarks/tpch/Tests/20-plan.stable.out
sql/benchmarks/tpch/Tests/21-plan.stable.out
sql/server/rel_exp.c
sql/server/rel_exp.h
sql/server/rel_optimizer.c
Branch: Oct2014
Log Message:
added an other push groupby down rewrite step.
When a groupby follows a join, and the group by is
grouped over a unique column of one of the joined tables
(and all aggregates are done on this table), it can be
pushed down. This pattern happens a lot after apply
rewrites (ie of correlated subqueries).
One thing to remember is when pushed down 'outer' joins
we should mark 'count' aggregates as the outer join should
after the rewrite fill in '0' and not 'null' when rows
are missing.
diffs (truncated from 1342 to 300 lines):
diff --git a/sql/backends/monet5/rel_bin.c b/sql/backends/monet5/rel_bin.c
--- a/sql/backends/monet5/rel_bin.c
+++ b/sql/backends/monet5/rel_bin.c
@@ -28,6 +28,8 @@
#include rel_optimizer.h
#include sql_env.h
+#define OUTER_ZERO 64
+
static stmt * subrel_bin(mvc *sql, sql_rel *rel, list *refs);
static stmt *
@@ -526,6 +528,8 @@ exp_bin(mvc *sql, sql_exp *e, stmt *left
}
}
s = stmt_aggr(sql-sa, as, grp, ext, a, 1, need_no_nil(e) /*
ignore nil*/ );
+ if (find_prop(e-p, PROP_COUNT)) /* propagate count == 0 ipv
NULL in outer joins */
+ s-flag |= OUTER_ZERO;
/* HACK: correct cardinality for window functions */
if (e-card CARD_AGGR)
s-nrcols = 2;
@@ -1083,6 +1087,7 @@ stmt_rename(mvc *sql, sql_rel *rel, sql_
{
char *name = exp-name;
char *rname = exp-rname;
+ stmt *o = s;
(void)rel;
if (!name exp-type == e_column exp-r)
@@ -1094,6 +1099,8 @@ stmt_rename(mvc *sql, sql_rel *rel, sql_
if (!rname)
rname = table_name(sql-sa, s);
s = stmt_alias(sql-sa, s, rname, name);
+ if (o-flag OUTER_ZERO)
+ s-flag |= OUTER_ZERO;
return s;
}
@@ -1645,7 +1652,7 @@ rel2bin_join( mvc *sql, sql_rel *rel, li
if (rel-op == op_left || rel-op == op_full)
s = stmt_append(sql-sa, s, stmt_project(sql-sa, ld,
c));
if (rel-op == op_right || rel-op == op_full)
- s = stmt_append(sql-sa, s, stmt_const(sql-sa, rd,
stmt_atom(sql-sa, atom_general(sql-sa, tail_type(c), NULL;
+ s = stmt_append(sql-sa, s, stmt_const(sql-sa, rd,
(c-flagOUTER_ZERO)?stmt_atom_wrd(sql-sa, 0):stmt_atom(sql-sa,
atom_general(sql-sa, tail_type(c), NULL;
s = stmt_alias(sql-sa, s, rnme, nme);
list_append(l, s);
@@ -1660,7 +1667,7 @@ rel2bin_join( mvc *sql, sql_rel *rel, li
if (rel-op == op_left || rel-op == op_full || rel-op ==
op_right)
s = Column(sql-sa, s);
if (rel-op == op_left || rel-op == op_full)
- s = stmt_append(sql-sa, s, stmt_const(sql-sa, ld,
stmt_atom(sql-sa, atom_general(sql-sa, tail_type(c), NULL;
+ s = stmt_append(sql-sa, s, stmt_const(sql-sa, ld,
(c-flagOUTER_ZERO)?stmt_atom_wrd(sql-sa, 0):stmt_atom(sql-sa,
atom_general(sql-sa, tail_type(c), NULL;
if (rel-op == op_right || rel-op == op_full)
s = stmt_append(sql-sa, s, stmt_project(sql-sa, rd,
c));
diff --git a/sql/benchmarks/tpch/Tests/02-explain.stable.out
b/sql/benchmarks/tpch/Tests/02-explain.stable.out
--- a/sql/benchmarks/tpch/Tests/02-explain.stable.out
+++ b/sql/benchmarks/tpch/Tests/02-explain.stable.out
@@ -67,168 +67,167 @@ Ready.
% 823 # length
function user.s2_1{autoCommit=true}(A0:int,A1:str,A2:str,A3:str):void;
X_6 := sql.mvc();
-X_7:bat[:oid,:oid] := sql.tid(X_6,sys,nation);
-X_10 := sql.bind_idxbat(X_6,sys,nation,nation_n_regionkey_fkey,0);
-(X_13,r1_13) :=
sql.bind_idxbat(X_6,sys,nation,nation_n_regionkey_fkey,2);
-X_16 := sql.bind_idxbat(X_6,sys,nation,nation_n_regionkey_fkey,1);
-X_18 := sql.projectdelta(X_7,X_10,X_13,r1_13,X_16);
-X_21 := sql.bind(X_6,sys,region,r_name,0);
-X_19:bat[:oid,:oid] := sql.tid(X_6,sys,region);
-X_337 := algebra.subselect(X_21,X_19,A3,A3,true,true,false);
-(X_23,r1_24) := sql.bind(X_6,sys,region,r_name,2);
-X_338 := algebra.subselect(r1_24,A3,A3,true,true,false);
-X_25 :=
