Changeset: 3fd7fe46a130 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3fd7fe46a130
Removed Files:
monetdb5/modules/mal/Tests/radix.mal
monetdb5/modules/mal/Tests/radix.stable.err
monetdb5/modules/mal/Tests/radix.stable.out
monetdb5/tests/BugTracker/Tests/batcalc-convert_on_void_view.SF-1573060.mal
monetdb5/tests/BugTracker/Tests/batcalc-convert_on_void_view.SF-1573060.stable.err
monetdb5/tests/BugTracker/Tests/batcalc-convert_on_void_view.SF-1573060.stable.out
monetdb5/tests/BugTracker/Tests/merge-join_properties.SF-2952191.malC
monetdb5/tests/BugTracker/Tests/merge-join_properties.SF-2952191.stable.err
monetdb5/tests/BugTracker/Tests/merge-join_properties.SF-2952191.stable.out
monetdb5/tests/gdkTests/Tests/subgroup.mal
monetdb5/tests/gdkTests/Tests/subgroup.stable.err
monetdb5/tests/gdkTests/Tests/subgroup.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
monetdb5/mal/Tests/recycle05.stable.out
monetdb5/mal/Tests/recycle07.stable.out
monetdb5/mal/Tests/tst253.mal
monetdb5/mal/Tests/tst253.stable.out
monetdb5/modules/kernel/Tests/TriBool.malC
monetdb5/modules/kernel/algebra.c
monetdb5/modules/kernel/algebra.h
monetdb5/modules/kernel/algebra.mal
monetdb5/modules/mal/Tests/inspect05.stable.out
monetdb5/modules/mal/Tests/mapi03.mal
monetdb5/modules/mal/Tests/remote08.mal
monetdb5/modules/mal/Tests/remote08.stable.out
monetdb5/modules/mal/Tests/remote09.mal
monetdb5/modules/mal/Tests/remote09.stable.out
monetdb5/modules/mal/remote.c
monetdb5/optimizer/Tests/DCexample.mal
monetdb5/optimizer/Tests/ESexample.mal
monetdb5/optimizer/Tests/ESexample.stable.out
monetdb5/optimizer/Tests/common.mal
monetdb5/optimizer/Tests/common.stable.out
monetdb5/optimizer/Tests/dataflow3.mal
monetdb5/optimizer/Tests/dataflow3.stable.out
monetdb5/optimizer/Tests/emptyset01.mal
monetdb5/optimizer/Tests/emptyset01.stable.out
monetdb5/optimizer/Tests/inliners.mal
monetdb5/optimizer/Tests/mapreduce00.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_cluster.c
monetdb5/optimizer/opt_mapreduce.c
monetdb5/optimizer/opt_octopus.c
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_prelude.h
monetdb5/tests/BugReports/Tests/no.100.mal
monetdb5/tests/BugReports/Tests/no.100.stable.out
monetdb5/tests/BugReports/Tests/no.119.mal
monetdb5/tests/BugTracker/Tests/All
monetdb5/tests/BugsViaSourgeforce/Tests/ID.1023816.mal
monetdb5/tests/BugsViaSourgeforce/Tests/ID.1023816.stable.out
monetdb5/tests/BugsViaSourgeforce/Tests/ID.605953.mal
monetdb5/tests/BugsViaSourgeforce/Tests/ID.605953.stable.out
monetdb5/tests/gdkTests/Tests/All
monetdb5/tests/gdkTests/Tests/cross.mal
monetdb5/tests/gdkTests/Tests/cross.stable.out
monetdb5/tests/gdkTests/Tests/scanselect.mal
monetdb5/tests/gdkTests/Tests/scanselect.stable.out
monetdb5/tests/gdkTests/Tests/void.mal
monetdb5/tests/gdkTests/Tests/void.stable.out
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_rank.mal
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_sort.mal
Branch: Oct2014
Log Message:
markT() and makH() handled.
markH has been removed from the interface.
markT() is renamed to mark()
diffs (truncated from 4492 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
@@ -2553,15 +2553,15 @@ command algebra.markH(b:bat[:any_1,:any_
address ALGmarkHead_default;
comment Produces a BAT with fresh OIDs in the head starting at 0@0.
-command
algebra.markT(b:bat[:any_1,:any_2],nr_parts:int,part_nr:int):bat[:any_1,:oid]
+command
algebra.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 algebra.markT(b:bat[:any_1,:any_2]):bat[:any_1,:oid]
+command algebra.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 algebra.markT(b:bat[:any_1,:any_2],base:oid):bat[:any_1,:oid]
+command algebra.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] ).
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
@@ -2554,15 +2554,15 @@ command algebra.markH(b:bat[:any_1,:any_
address ALGmarkHead_default;
comment Produces a BAT with fresh OIDs in the head starting at 0@0.
-command
algebra.markT(b:bat[:any_1,:any_2],nr_parts:int,part_nr:int):bat[:any_1,:oid]
+command
algebra.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 algebra.markT(b:bat[:any_1,:any_2]):bat[:any_1,:oid]
+command algebra.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 algebra.markT(b:bat[:any_1,:any_2],base:oid):bat[:any_1,:oid]
+command algebra.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] ).
diff --git a/clients/Tests/MAL-signatures_geom.stable.out
b/clients/Tests/MAL-signatures_geom.stable.out
--- a/clients/Tests/MAL-signatures_geom.stable.out
+++ b/clients/Tests/MAL-signatures_geom.stable.out
@@ -2554,15 +2554,15 @@ command algebra.markH(b:bat[:any_1,:any_
address ALGmarkHead_default;
comment Produces a BAT with fresh OIDs in the head starting at 0@0.
-command
algebra.markT(b:bat[:any_1,:any_2],nr_parts:int,part_nr:int):bat[:any_1,:oid]
+command
algebra.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 algebra.markT(b:bat[:any_1,:any_2]):bat[:any_1,:oid]
+command algebra.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 algebra.markT(b:bat[:any_1,:any_2],base:oid):bat[:any_1,:oid]
+command algebra.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] ).
diff --git a/clients/Tests/MAL-signatures_none.stable.out
b/clients/Tests/MAL-signatures_none.stable.out
--- a/clients/Tests/MAL-signatures_none.stable.out
+++ b/clients/Tests/MAL-signatures_none.stable.out
@@ -2553,15 +2553,15 @@ command algebra.markH(b:bat[:any_1,:any_
address ALGmarkHead_default;
comment Produces a BAT with fresh OIDs in the head starting at 0@0.
-command
algebra.markT(b:bat[:any_1,:any_2],nr_parts:int,part_nr:int):bat[:any_1,:oid]
+command
algebra.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 algebra.markT(b:bat[:any_1,:any_2]):bat[:any_1,:oid]
+command algebra.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 algebra.markT(b:bat[:any_1,:any_2],base:oid):bat[:any_1,:oid]
+command algebra.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] ).
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -2525,7 +2525,7 @@ void mal_unquote(char *msg);
str manifoldRef;
str mapiRef;
str markHRef;
-str markTRef;
+str markRef;
str mark_grpRef;
str matRef;
str maxRef;
diff --git a/monetdb5/mal/Tests/recycle05.stable.out
b/monetdb5/mal/Tests/recycle05.stable.out
--- a/monetdb5/mal/Tests/recycle05.stable.out
+++ b/monetdb5/mal/Tests/recycle05.stable.out
@@ -117,10 +117,10 @@ end main;
# 1 730063 3 799 1 4 _1 :=
user.bind("schema","table","column",0);
# 2 729919 1 43 4 1 _6 :=
algebra.select(<tmp_20>,100,120);
# 3 729971 1 17 4 1 _10 :=
algebra.select(<tmp_20>,700,710);
-# 4 729983 1 11 1 1 _13 :=
algebra.markT(<tmp_23>,0@0);
+# 4 729983 1 11 1 1 _13 :=
algebra.mark(<tmp_23>,0@0);
# 5 729988 1 5 1 1 _14 :=
bat.reverse(<tmp_24>);
# 6 730097 1 34 4 2 _15 :=
algebra.select(<tmp_20>,400,700);
-# 7 730121 1 24 2 1 _17 :=
algebra.markT(<tmp_25>,0@0);
+# 7 730121 1 24 2 1 _17 :=
algebra.mark(<tmp_25>,0@0);
# 8 730136 1 15 1 1 _18 :=
bat.reverse(<tmp_26>);
# 15:54:58 >
diff --git a/monetdb5/mal/Tests/recycle07.stable.out
b/monetdb5/mal/Tests/recycle07.stable.out
--- a/monetdb5/mal/Tests/recycle07.stable.out
+++ b/monetdb5/mal/Tests/recycle07.stable.out
@@ -54,7 +54,7 @@ end qry;
#qry(100,250);
#qry(700,710);
#recycle.dump();
-## The next query should evict the cheapest, although more recently used markT
leaf ( #5)
+## The next query should evict the cheapest, although more recently used mark
leaf ( #5)
#qry(400,700);
#recycle.dump();
#
@@ -68,7 +68,7 @@ function user.main():void;
user.qry(100,250);
user.qry(700,710);
recycle.dump();
-# The next query should evict the cheapest, although more recently used markT
leaf ( #4)
+# The next query should evict the cheapest, although more recently used mark
leaf ( #4)
user.qry(400,700);
recycle.dump();
end main;
@@ -107,10 +107,10 @@ end main;
# CL lru cnt ticks rd wr Instr
# 1 996861 5 802 1 4 _1 :=
user.bind("schema","table","column",0);
# 2 996790 2 50 4 1 _6 :=
algebra.select(<tmp_20>,100,250);
-# 3 996791 2 19 1 1 _9 :=
algebra.markT(<tmp_21>,0@0);
+# 3 996791 2 19 1 1 _9 :=
algebra.mark(<tmp_21>,0@0);
# 4 996796 2 17 4 1 _11 :=
algebra.select(<tmp_20>,700,710);
# 5 996894 1 34 4 2 _14 :=
algebra.select(<tmp_20>,400,700);
-# 6 996915 1 21 2 1 _16 :=
algebra.markT(<tmp_25>,0@0);
+# 6 996915 1 21 2 1 _16 :=
algebra.mark(<tmp_25>,0@0);
# 15:54:59 >
# 15:54:59 > Done.
diff --git a/monetdb5/mal/Tests/tst253.mal b/monetdb5/mal/Tests/tst253.mal
--- a/monetdb5/mal/Tests/tst253.mal
+++ b/monetdb5/mal/Tests/tst253.mal
@@ -9,10 +9,5 @@ io.print(b);
c:= bat.reverse(b);
io.print(c);
-
-d:= algebra.markT(c);
+d:= algebra.mark(c);
io.print(d);
-
-#perform header marking
-f:= algebra.markH(b);
-io.print(f);
diff --git a/monetdb5/mal/Tests/tst253.stable.out
b/monetdb5/mal/Tests/tst253.stable.out
--- a/monetdb5/mal/Tests/tst253.stable.out
+++ b/monetdb5/mal/Tests/tst253.stable.out
@@ -5,30 +5,19 @@ stdout of test 'tst253` in directory 'mo
# 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-2014 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://vienna.ins.cwi.nl: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
-
-# Monet Database Server V4.99.19
-# Copyright (c) 1993-2005, CWI. All rights reserved.
-# Compiled for x86_64-redhat-linux-gnu/64bit with 64bit OIDs; dynamically
linked.
-# config:/ufs/niels/scratch/Linux-x86_64/build-m5/etc/MonetDB5.conf
-# dbfarm:/ufs/niels/scratch/Linux-x86_64/build-m5/var/MonetDB5/dbfarm
-# dbname:mTests_src_mal
-# Visit http://monetdb.cwi.nl/ for further information.
-## testing void bats
-#b:= new(:void,:str);
-#insert(b,"hello");
-#insert(b,nil,"world");
-#print(b);
-#
-##materialize header
-#print(c);
-#d:= mark(c);
-#print(d);
-#
-##perform header marking
-#f:= algebra.markH(b);
-#io.print(f);
-#
function user.main():void;
# testing void bats
b := bat.new(:oid,:str);
@@ -38,39 +27,27 @@ function user.main():void;
#materialize header
c := bat.reverse(b);
io.print(c);
- d := algebra.markT(c);
+ d := algebra.mark(c);
io.print(d);
-#perform header marking
- f := algebra.markH(b);
- io.print(f);
end main;
-#-------------------------#
-# h tmp_4 # name
-# void str # type
-#-------------------------#
-[ nil, "hello" ]
-[ nil, "world" ]
-#-------------------------#
-# t tmp_4 # name
-# str void # type
-#-------------------------#
-[ "hello", nil ]
-[ "world", nil ]
-#---------------------------------#
-# h tmp_6 # name
-# str void # type
-#-------------------------#
-# h t # name
-# str void # type
-#-------------------------#
-[ "hello", 0@0 ]
-[ "world", 1@0 ]
-#-------------------------#
-# t h # name
-# void str # type
-#-------------------------#
-[ 0@0, "hello" ]
-[ 1@0, "world" ]
+#--------------------------#
+# h t # name
+# oid str # type
+#--------------------------#
+[ nil, "hello" ]
+[ nil, "world" ]
+#--------------------------#
+# t h # name
+# str oid # type
+#--------------------------#
+[ "hello", nil ]
+[ "world", nil ]
+#--------------------------#
+# h t # name
+# str void # type
+#--------------------------#
+[ "hello", 0@0 ]
+[ "world", 1@0 ]
# 11:28:42 >
# 11:28:42 > Done.
diff --git a/monetdb5/modules/kernel/Tests/TriBool.malC
b/monetdb5/modules/kernel/Tests/TriBool.malC
--- a/monetdb5/modules/kernel/Tests/TriBool.malC
+++ b/monetdb5/modules/kernel/Tests/TriBool.malC
@@ -1,24 +1,15 @@
t := true;
f := false;
n := nil:bit;
-b_ := bat.new(:oid,:bit);
-bl_ := bat.new(:oid,:bit);
-br_ := bat.new(:oid,:bit);
-bo_ := bat.new(:oid,:bit);
-ba_ := bat.new(:oid,:bit);
-bvo_ := bat.new(:oid,:bit);
-bva_ := bat.new(:oid,:bit);
-bov_ := bat.new(:oid,:bit);
-bav_ := bat.new(:oid,:bit);
-b := algebra.markH(b_,0@0);
-bl := algebra.markH(bl_,0@0);
-br := algebra.markH(br_,0@0);
-bo := algebra.markH(bo_,0@0);
-ba := algebra.markH(ba_,0@0);
-bvo := algebra.markH(bvo_,0@0);
-bva := algebra.markH(bva_,0@0);
-bov := algebra.markH(bov_,0@0);
-bav := algebra.markH(bav_,0@0);
+b := bat.new(:oid,:bit);
+bl := bat.new(:oid,:bit);
+br := bat.new(:oid,:bit);
+bo := bat.new(:oid,:bit);
+ba := bat.new(:oid,:bit);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
