Changeset: b85db7422061 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b85db7422061 Removed Files: monetdb5/mal/Tests/tst253.mal monetdb5/mal/Tests/tst253.stable.err monetdb5/mal/Tests/tst253.stable.out monetdb5/tests/BugReports/Tests/no.100.mal monetdb5/tests/BugReports/Tests/no.100.stable.err monetdb5/tests/BugReports/Tests/no.100.stable.out Modified Files: monetdb5/mal/Tests/All monetdb5/modules/kernel/algebra.mal monetdb5/optimizer/Tests/DCexample.mal monetdb5/tests/BugReports/Tests/All sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_statement.c sql/backends/monet5/sql_statement.h Branch: default Log Message:
Removing tmark() from the MAL interface - SQL does not directly rely on it anymore (except through algebra.subslice()) - MAL tests around it removed or patched diffs (truncated from 510 to 300 lines): diff --git a/monetdb5/mal/Tests/All b/monetdb5/mal/Tests/All --- a/monetdb5/mal/Tests/All +++ b/monetdb5/mal/Tests/All @@ -126,7 +126,6 @@ tst2505 tst2510 tst251 tst252 -tst253 tst255 tst2550 tst256 diff --git a/monetdb5/mal/Tests/tst253.mal b/monetdb5/mal/Tests/tst253.mal deleted file mode 100644 --- a/monetdb5/mal/Tests/tst253.mal +++ /dev/null @@ -1,13 +0,0 @@ -# testing void bats - -b:= bat.new(:oid,:str); -bat.append(b,"hello"); -bat.append(b,"world"); -io.print(b); - -#materialize header -c:= bat.reverse(b); -io.print(c); - -d:= algebra.mark(c); -io.print(d); diff --git a/monetdb5/mal/Tests/tst253.stable.err b/monetdb5/mal/Tests/tst253.stable.err deleted file mode 100644 --- a/monetdb5/mal/Tests/tst253.stable.err +++ /dev/null @@ -1,1 +0,0 @@ -stderr of test 'tst253` in directory 'monetdb5/mal` itself: diff --git a/monetdb5/mal/Tests/tst253.stable.out b/monetdb5/mal/Tests/tst253.stable.out deleted file mode 100644 --- a/monetdb5/mal/Tests/tst253.stable.out +++ /dev/null @@ -1,55 +0,0 @@ -stdout of test 'tst253` in directory 'monetdb5/mal` itself: - - -# 11:28:42 > -# 11:28:42 > Mtimeout -timeout 60 Mserver "--config=/ufs/mk/monet5/src/mal/Tests/All.conf" --debug=10 --set "monet_mod_path=/ufs/mk/monet5/Linux/lib/MonetDB5:/ufs/mk/opensource/MonetDB/Linux/lib/MonetDB" --set "gdk_dbfarm=/ufs/mk/opensource/MonetDB/Linux/var/MonetDB5/dbfarm" --set "sql_logdir=/ufs/mk/opensource/MonetDB/Linux/var/MonetDB5/log" --set mapi_port=43122 --set sql_port=57578 --set monet_prompt= --trace "--config=/ufs/mk/monet5/src/mal/Tests/All.conf" --dbname=mTests_src_mal tst253.mal </dev/null -# 11:28:42 > - -# MonetDB 5 server v11.19.0 -# This is an unreleased version -# Serving database 'mTests_monetdb5_mal', 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-2015 MonetDB B.V., all rights reserved -# Visit http://www.monetdb.org/ for further information -# Listening for connection requests on mapi:monetdb://vienna.ins.cwi.nl:37384/ -# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-32732/.s.monetdb.37384 -# MonetDB/GIS module loaded -# MonetDB/SQL module loaded - -function user.main():void; -# testing void bats - b := bat.new(:oid,:str); - bat.append(b,"hello"); - bat.append(b,"world"); - io.print(b); -#materialize header - c := bat.reverse(b); - io.print(c); - d := algebra.mark(c); - io.print(d); -end user.main; -#--------------------------# -# h t # name -# oid str # type -#--------------------------# -[ 0@0, "hello" ] -[ 1@0, "world" ] -#--------------------------# -# t h # name -# str oid # type -#--------------------------# -[ "hello", 0@0 ] -[ "world", 1@0 ] -#--------------------------# -# h t # name -# str void # type -#--------------------------# -[ "hello", 0@0 ] -[ "world", 1@0 ] - -# 11:28:42 > -# 11:28:42 > Done. -# 11:28:42 > - diff --git a/monetdb5/modules/kernel/algebra.mal b/monetdb5/modules/kernel/algebra.mal --- a/monetdb5/modules/kernel/algebra.mal +++ b/monetdb5/modules/kernel/algebra.mal @@ -320,25 +320,6 @@ pattern firstn(b:bat[:oid,:any], s:bat[: address ALGfirstn comment "Calculate first N values of B with candidate list S"; -# @+ OID Introducing Commands -# For relational processing, some operators are necessary to produce newly -# initiated OID columns, for representing n-ary (intermediary) relations. -command mark( b:bat[:any_1,:any_2], base:oid ) :bat[:any_1,:oid] -address ALGtmark -comment "Produces a BAT with fresh unique dense sequense of OIDs in - the tail that starts at base (i.e. [base,..base+b.count()-1] )."; - -command mark( b:bat[:any_1,:any_2] ) :bat[:any_1,:oid] -address ALGtmark_default -comment "Produces a BAT with fresh unique OIDs in the tail starting at 0@0."; - -command mark( b:bat[:any_1,:any_2], nr_parts:int, part_nr:int ) :bat[:any_1,:oid] -address ALGtmarkp -comment "Produces a BAT with fresh unique dense sequense of OIDs in - the tail that starts at base (i.e. [base,..base+b.count()-1] ). - The base is uniquely defined by the part_nr (ie we set the highest - bits based on the part_nr/nr_parts) "; - command reuse(b:bat[:oid,:any_1]):bat[:oid,:any_1] address ALGreuse comment "Reuse a temporary BAT if you can. Otherwise, diff --git a/monetdb5/optimizer/Tests/DCexample.mal b/monetdb5/optimizer/Tests/DCexample.mal --- a/monetdb5/optimizer/Tests/DCexample.mal +++ b/monetdb5/optimizer/Tests/DCexample.mal @@ -1,6 +1,6 @@ V7 := bat.new(:oid,:oid); V10 := bat.new(:oid,:oid); - V16 := algebra.mark(V7); + V16 := V7; (V17,V17b) := algebra.subjoin(V16,V7,nil:bat[:oid,:oid],nil:bat[:oid,:oid],true, 0:lng); V19 := bat.new(:oid,:oid); diff --git a/monetdb5/tests/BugReports/Tests/All b/monetdb5/tests/BugReports/Tests/All --- a/monetdb5/tests/BugReports/Tests/All +++ b/monetdb5/tests/BugReports/Tests/All @@ -8,7 +8,6 @@ no.016 no.031 no.062 -no.100 no.150 no.161 no.163 diff --git a/monetdb5/tests/BugReports/Tests/no.100.mal b/monetdb5/tests/BugReports/Tests/no.100.mal deleted file mode 100644 --- a/monetdb5/tests/BugReports/Tests/no.100.mal +++ /dev/null @@ -1,78 +0,0 @@ -# Monet Mil to Mal compiler -# Copyright (c) 2001-2004, CWI. All rights reserved. - -#Predefined code segment -#The compiler can not guarantee an accurate compilation, -#because MIL unlike MAL is a dynamically typed language. -#A few guidelines to maximize usefullness. -#- make the type of variables explicit, in particular 'nil' -#- upon advice of M2m to remap identifiers, change it in your program directly -#use the "mil_schema" for additional support routines -# io.print("# >Number: 100\n"); -# io.print("# >Category: MIL\n"); -# io.print("# >Synopsis: Virtual oids behave in a strange way.\n"); -# io.print("# >Confidential: no\n"); -# io.print("# >Severity: serious\n"); -# io.print("# >Priority: medium\n"); -# io.print("# >Responsible: boncz\n"); -# io.print("# >State: open\n"); -# io.print("# >Class: sw-bug\n"); -# io.print("# >Submitter-Id: unknown\n"); -# io.print("# >Arrival-Date: Mon Dec 15 11:47:39 1997\n"); -# io.print("# >Originator: quak\n"); -# io.print("# >Organization:\n"); -# io.print("# UvA\n"); -# io.print("# >Release: 971007\n"); -# io.print("# >Environment:\n"); -# io.print("# all\n"); -# io.print("# >Description:\n"); -# io.print("# Try this out:\n"); -# io.print("# > a := bat.new(int,str);\n"); -# io.print("# > a.insert(1,\"hello world\");\n"); -# io.print("# > a.seqbase(100@0);\n"); -# io.print("# > [oid]([a~]).reverse.print();\n"); -# io.print("# #-----------------#\n"); -# io.print("# # oid | tmp_92 #\n"); -# io.print("# #-----------------#\n"); -# io.print("# [ 100@0, 1 ]\n"); -# io.print("# > [oid]([a~]).reverse.copy.print();\n"); -# io.print("# #-----------------#\n"); -# io.print("# # oid | tmp_93 #\n"); -# io.print("# #-----------------#\n"); -# io.print("# [ 1@0, 100 ]\n"); -# io.print("# \n"); -# io.print("setoid(oid(20000000));"); - aa_a := calc.oid(20000000:lng); - ba_a := calc.setoid(aa_a); -# io.print("var a := bat.new(int,str);"); - a := bat.new(nil:oid,nil:str); -# io.print("a.insert(1,\"hello world\");"); - ca_a := bat.append(a,"hello world"); -# io.print("a.print();"); - da_a := io.print(a); -# io.print("a.mark(nil).print();"); - ea_a := algebra.mark(a); - fa_a := io.print(ea_a); -# io.print("a.mark(nil).reverse().print();"); - ga_a := algebra.mark(a); - ha_a := bat.reverse(ga_a); - ia_a := io.print(ha_a); -# io.print("[oid](a.mark(nil)).reverse().print();"); - ja_a := algebra.mark(a); - ka_a := batcalc.oid(ja_a); - la_a := bat.reverse(ka_a); - ma_a := io.print(la_a); -# io.print("a.seqbase(100@0);"); -# io.print("[oid](a.mark(nil)).reverse().print();"); - oa_a := algebra.mark(a); - pa_a := batcalc.oid(oa_a); - qa_a := bat.reverse(pa_a); - ra_a := io.print(qa_a); -# io.print("[oid](a.mark(nil)).reverse().copy().print();"); - sa_a := algebra.mark(a); - ta_a := batcalc.oid(sa_a); - ua_a := bat.reverse(ta_a); - va_a := algebra.copy(ua_a); - wa_a := io.print(va_a); -# io.print("quit();"); - xa_a := clients.quit(); diff --git a/monetdb5/tests/BugReports/Tests/no.100.stable.err b/monetdb5/tests/BugReports/Tests/no.100.stable.err deleted file mode 100644 --- a/monetdb5/tests/BugReports/Tests/no.100.stable.err +++ /dev/null @@ -1,12 +0,0 @@ -stderr of test 'no.100` in directory 'monetdb5/tests/BugReports` itself: - - -# 07:27:15 > -# 07:27:15 > Mtimeout -timeout 60 mserver5 "--config=/ufs/mk/monet5/Linux/etc/MonetDB5.conf" --debug=10 --set "monet_mod_path=/ufs/mk/monet5/Linux/lib/MonetDB5:/ufs/mk/opensource/MonetDB/Linux/lib/MonetDB" --set "gdk_dbfarm=/ufs/mk/monet5/Linux/var/MonetDB5/dbfarm" --set "sql_logdir=/ufs/mk/monet5/Linux/var/MonetDB5/dblogs" --set mapi_port=35545 --set monet_prompt= --trace --dbname=mTests_tests_BugReports no.100.mal < /dev/null -# 07:27:15 > - - -# 07:27:15 > -# 07:27:15 > Done. -# 07:27:15 > - diff --git a/monetdb5/tests/BugReports/Tests/no.100.stable.out b/monetdb5/tests/BugReports/Tests/no.100.stable.out deleted file mode 100644 --- a/monetdb5/tests/BugReports/Tests/no.100.stable.out +++ /dev/null @@ -1,129 +0,0 @@ -stdout of test 'no.100` in directory 'monetdb5/tests/BugReports` itself: - - -# 07:27:15 > -# 07:27:15 > Mtimeout -timeout 60 mserver5 "--config=/ufs/mk/monet5/Linux/etc/MonetDB5.conf" --debug=10 --set "monet_mod_path=/ufs/mk/monet5/Linux/lib/MonetDB5:/ufs/mk/opensource/MonetDB/Linux/lib/MonetDB" --set "gdk_dbfarm=/ufs/mk/monet5/Linux/var/MonetDB5/dbfarm" --set "sql_logdir=/ufs/mk/monet5/Linux/var/MonetDB5/dblogs" --set mapi_port=35545 --set monet_prompt= --trace --dbname=mTests_tests_BugReports no.100.mal < /dev/null -# 07:27:15 > - -# MonetDB Server v4.99.19 -# Copyright (c) 1993-2006 CWI, all rights reserved -# Compiled for x86_64-redhat-linux-gnu/64bit with 64bit OIDs dynamically linked -# config:/ufs/mk/monet5/Linux/etc/MonetDB5.conf -# dbfarm:/ufs/mk/monet5/Linux/var/MonetDB5/dbfarm -# dbname:mTests_tests_BugReports -# Visit http://monetdb.cwi.nl/ for further information -# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:30579/ -function user.main():void; -# Monet Mil to Mal compiler -# Copyright (c) 2001-2004, CWI. All rights reserved. -#Predefined code segment -#The compiler can not guarantee an accurate compilation, -#because MIL unlike MAL is a dynamically typed language. -#A few guidelines to maximize usefullness. -#- make the type of variables explicit, in particular 'nil' -#- upon advice of M2m to remap identifiers, change it in your program directly -#use the "mil_schema" for additional support routines -# io.print("# >Number: 100\n"); -# io.print("# >Category: MIL\n"); -# io.print("# >Synopsis: Virtual oids behave in a strange way.\n"); -# io.print("# >Confidential: no\n"); -# io.print("# >Severity: serious\n"); -# io.print("# >Priority: medium\n"); -# io.print("# >Responsible: boncz\n"); -# io.print("# >State: open\n"); -# io.print("# >Class: sw-bug\n"); -# io.print("# >Submitter-Id: unknown\n"); -# io.print("# >Arrival-Date: Mon Dec 15 11:47:39 1997\n"); -# io.print("# >Originator: quak\n"); -# io.print("# >Organization:\n"); -# io.print("# UvA\n"); -# io.print("# >Release: 971007\n"); -# io.print("# >Environment:\n"); -# io.print("# all\n"); -# io.print("# >Description:\n"); -# io.print("# Try this out:\n"); -# io.print("# > a := bat.new(int,str);\n"); -# io.print("# > a.insert(1,\"hello world\");\n"); -# io.print("# > a.seqbase(100@0);\n"); -# io.print("# > [oid]([a~]).reverse.print();\n"); -# io.print("# #-----------------#\n"); _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
