Changeset: 4733c37efe10 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4733c37efe10
Removed Files:
monetdb5/optimizer/Tests/groups00.mal
monetdb5/optimizer/Tests/groups00.stable.err
monetdb5/optimizer/Tests/groups00.stable.out
monetdb5/optimizer/opt_groups.c
monetdb5/optimizer/opt_groups.h
Modified Files:
clients/Tests/exports.stable.out
monetdb5/optimizer/Makefile.ag
monetdb5/optimizer/Tests/All
monetdb5/optimizer/opt_pipes.c
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_prelude.h
monetdb5/optimizer/opt_support.c
monetdb5/optimizer/opt_support.h
monetdb5/optimizer/opt_wrapper.c
monetdb5/optimizer/optimizer.mal
sql/test/Tests/setoptimizer.stable.err
sql/test/Tests/setoptimizer.stable.out
Branch: default
Log Message:
Move the groups optimizer to the attic
diffs (truncated from 635 to 300 lines):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -1687,7 +1687,6 @@ int OPTevaluateImplementation(Client cnt
int OPTfactorizeImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
int OPTgarbageCollectorImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr
stk, InstrPtr pci);
int OPTgeneratorImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
-int OPTgroupsImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr p);
int OPTinlineImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr p);
int OPTisAlias(InstrPtr p);
int OPTjoinPathImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr p);
@@ -2285,7 +2284,6 @@ MalBlkPtr gotoMalBlkMarker(MalBlkPtr mb,
str grabRef;
str groupRef;
str groupbyRef;
-str groupsRef;
int hasCommonResults(InstrPtr p, InstrPtr q);
int hasSameArguments(MalBlkPtr mb, InstrPtr p, InstrPtr q);
int hasSameSignature(MalBlkPtr mb, InstrPtr p, InstrPtr q, int stop);
diff --git a/monetdb5/optimizer/Makefile.ag b/monetdb5/optimizer/Makefile.ag
--- a/monetdb5/optimizer/Makefile.ag
+++ b/monetdb5/optimizer/Makefile.ag
@@ -41,7 +41,6 @@ lib_optimizer = {
opt_factorize.c opt_factorize.h \
opt_garbageCollector.c opt_garbageCollector.h \
opt_generator.c opt_generator.h \
- opt_groups.c opt_groups.h \
opt_querylog.c opt_querylog.h \
opt_inline.c opt_inline.h \
opt_joinpath.c opt_joinpath.h \
diff --git a/monetdb5/optimizer/Tests/All b/monetdb5/optimizer/Tests/All
--- a/monetdb5/optimizer/Tests/All
+++ b/monetdb5/optimizer/Tests/All
@@ -59,7 +59,6 @@ manifold2
#joinpath calls for new joinpath optimizer
leftjoinpath
-groups00
ifthencst
#CXerror1 transaction primitives removed
diff --git a/monetdb5/optimizer/Tests/groups00.mal
b/monetdb5/optimizer/Tests/groups00.mal
deleted file mode 100644
--- a/monetdb5/optimizer/Tests/groups00.mal
+++ /dev/null
@@ -1,33 +0,0 @@
-function tst();
- b:= bat.new(:oid,:int);
- bat.append(b,1);
- bat.append(b,2);
- bat.append(b,3);
- c:= bat.new(:oid,:str);
- bat.append(c,"hello");
- bat.append(c,"hello");
- bat.append(c,"world");
- d:= bat.new(:oid,:flt);
- bat.append(d,3.14);
- bat.append(d,3.14);
- bat.append(d,3.14);
- (xd, ext1,grp1) := group.multicolumn(d);
- io.print(xd);
- io.print(ext1);
- io.print(grp1);
- (xc,ext2,grp2) := group.multicolumn(c,xd);
- io.print(xc);
- io.print(ext2);
- io.print(grp2);
- (xb,ext3,grp3) := group.multicolumn(b,xc);
- io.print(xb);
- io.print(ext3);
- io.print(grp3);
- (xb,ext3,grp3) := group.multicolumn(b,c,d);
- io.print(xb);
- io.print(ext3);
- io.print(grp3);
-end tst;
-optimizer.groups("user","tst");
-mdb.list("user","tst");
-tst();
diff --git a/monetdb5/optimizer/Tests/groups00.stable.err
b/monetdb5/optimizer/Tests/groups00.stable.err
deleted file mode 100644
--- a/monetdb5/optimizer/Tests/groups00.stable.err
+++ /dev/null
@@ -1,31 +0,0 @@
-stderr of test 'groups00` in directory 'monetdb5/optimizer` itself:
-
-
-# 12:47:43 >
-# 12:47:43 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/export/scratch1/mk/current//Linux/var/MonetDB" "--set"
"mapi_open=true" "--set" "mapi_port=39187" "--set" "monet_prompt=" "--trace"
"--forcemito" "--set" "mal_listing=2" "--dbname=mTests_optimizer" "groups00.mal"
-# 12:47:43 >
-
-# builtin opt gdk_dbname = demo
-# builtin opt gdk_dbfarm =
/export/scratch1/mk/current//Linux/var/monetdb5/dbfarm
-# builtin opt gdk_debug = 0
-# builtin opt gdk_alloc_map = no
-# builtin opt gdk_vmtrim = yes
-# builtin opt monet_prompt = >
-# builtin opt monet_daemon = no
-# builtin opt mapi_port = 50000
-# 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 gdk_dbfarm = /export/scratch1/mk/current//Linux/var/MonetDB
-# cmdline opt mapi_open = true
-# cmdline opt mapi_port = 39187
-# cmdline opt monet_prompt =
-# cmdline opt mal_listing = 2
-# cmdline opt gdk_dbname = mTests_optimizer
-
-# 12:47:43 >
-# 12:47:43 > "Done."
-# 12:47:43 >
-
diff --git a/monetdb5/optimizer/Tests/groups00.stable.out
b/monetdb5/optimizer/Tests/groups00.stable.out
deleted file mode 100644
--- a/monetdb5/optimizer/Tests/groups00.stable.out
+++ /dev/null
@@ -1,165 +0,0 @@
-stdout of test 'groups00` in directory 'monetdb5/optimizer` itself:
-
-
-# 12:47:43 >
-# 12:47:43 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/export/scratch1/mk/current//Linux/var/MonetDB" "--set"
"mapi_open=true" "--set" "mapi_port=39187" "--set" "monet_prompt=" "--trace"
"--forcemito" "--set" "mal_listing=2" "--dbname=mTests_optimizer" "groups00.mal"
-# 12:47:43 >
-
-# MonetDB 5 server v11.10.0
-# This is an unreleased version
-# Serving database 'mTests_optimizer', using 8 threads
-# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
-# Found 15.630 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:39187/
-# MonetDB/GIS module loaded
-# MonetDB/SQL module loaded
-function user.tst():void;
- b := bat.new(:oid,:int);
- bat.append(b,1);
- bat.append(b,2);
- bat.append(b,3);
- c := bat.new(:oid,:str);
- bat.append(c,"hello");
- bat.append(c,"hello");
- bat.append(c,"world");
- d := bat.new(:oid,:flt);
- bat.append(d,3.1400001);
- bat.append(d,3.1400001);
- bat.append(d,3.1400001);
- (xd,ext1,grp1) := group.multicolumn(d);
- io.print(xd);
- io.print(ext1);
- io.print(grp1);
- (xc,ext2,grp2) := group.multicolumn(c,xd);
- io.print(xc);
- io.print(ext2);
- io.print(grp2);
- (xb,ext3,grp3) := group.multicolumn(b,xc);
- io.print(xb);
- io.print(ext3);
- io.print(grp3);
- (xb,ext3,grp3) := group.multicolumn(b,c,d);
- io.print(xb);
- io.print(ext3);
- io.print(grp3);
-end user.tst;
-function user.main():void;
- mdb.list("user","tst");
- user.tst();
-end user.main;
-function user.tst():void;
- b := bat.new(:oid,:int);
- bat.append(b,1);
- bat.append(b,2);
- bat.append(b,3);
- c := bat.new(:oid,:str);
- bat.append(c,"hello");
- bat.append(c,"hello");
- bat.append(c,"world");
- d := bat.new(:oid,:flt);
- bat.append(d,3.1400001);
- bat.append(d,3.1400001);
- bat.append(d,3.1400001);
- (xd,ext1,grp1) := group.multicolumn(d);
- io.print(xd);
- io.print(ext1);
- io.print(grp1);
- (xc,ext2,grp2) := group.multicolumn(c,xd);
- io.print(xc);
- io.print(ext2);
- io.print(grp2);
- (xb,ext3,grp3) := group.multicolumn(b,xc);
- io.print(xb);
- io.print(ext3);
- io.print(grp3);
- (xb,ext3,grp3) := group.multicolumn(b,c,d);
- io.print(xb);
- io.print(ext3);
- io.print(grp3);
-end user.tst;
-#--------------------------#
-# h t # name
-# void wrd # type
-#-----------------#
-[ 0@0, 0@0 ]
-[ 1@0, 0@0 ]
-[ 2@0, 0@0 ]
-#-----------------#
-# h t # name
-# void void # type
-#-----------------#
-[ 0@0, 0@0 ]
-#-----------------#
-# h t # name
-# void wrd # type
-#-----------------#
-[ 0@0, 3 ]
-#-----------------#
-# h t # name
-# void oid # type
-#-----------------#
-[ 0@0, 0@0 ]
-[ 1@0, 0@0 ]
-[ 2@0, 1@0 ]
-#-----------------#
-# h t # name
-# void oid # type
-#-----------------#
-[ 0@0, 0@0 ]
-[ 1@0, 2@0 ]
-#-----------------#
-# h t # name
-# void wrd # type
-#-----------------#
-[ 0@0, 2 ]
-[ 1@0, 1 ]
-#-----------------#
-# h t # name
-# void void # type
-#-----------------#
-[ 0@0, 0@0 ]
-[ 1@0, 1@0 ]
-[ 2@0, 2@0 ]
-#-----------------#
-# h t # name
-# void void # type
-#-----------------#
-[ 0@0, 0@0 ]
-[ 1@0, 1@0 ]
-[ 2@0, 2@0 ]
-#-----------------#
-# h t # name
-# void wrd # type
-#-----------------#
-[ 0@0, 1 ]
-[ 1@0, 1 ]
-[ 2@0, 1 ]
-#-----------------#
-# h t # name
-# void void # type
-#-----------------#
-[ 0@0, 0@0 ]
-[ 1@0, 1@0 ]
-[ 2@0, 2@0 ]
-#-----------------#
-# h t # name
-# void void # type
-#-----------------#
-[ 0@0, 0@0 ]
-[ 1@0, 1@0 ]
-[ 2@0, 2@0 ]
-#-----------------#
-# h t # name
-# void wrd # type
-#-----------------#
-[ 0@0, 1 ]
-[ 1@0, 1 ]
-[ 2@0, 1 ]
-
-# 12:47:43 >
-# 12:47:43 > "Done."
-# 12:47:43 >
-
diff --git a/monetdb5/optimizer/opt_groups.c b/monetdb5/optimizer/opt_groups.c
deleted file mode 100644
--- a/monetdb5/optimizer/opt_groups.c
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * The contents of this file are subject to the MonetDB Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.monetdb.org/Legal/MonetDBLicense
- *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific language governing rights and limitations
- * under the License.
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
