Changeset: 464e0fbfab62 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=464e0fbfab62
Modified Files:
monetdb5/extras/compiler/mal_compiler.mx
monetdb5/mal/base00.fig
monetdb5/mal/base00.pdf
monetdb5/modules/mal/Makefile.ag
monetdb5/modules/mal/inout.c
monetdb5/modules/mal/inout.h
monetdb5/modules/mal/inout.mal
monetdb5/modules/mal/mal_init.mal
monetdb5/modules/mal/mal_io.c
monetdb5/modules/mal/mal_io.h
monetdb5/modules/mal/mal_io.mal
monetdb5/modules/mal/tablet.c
monetdb5/modules/mal/tablet.mal
monetdb5/optimizer/Makefile.ag
monetdb5/optimizer/Tests/All
monetdb5/optimizer/Tests/partitions00.mal
monetdb5/optimizer/Tests/partitions00.stable.err
monetdb5/optimizer/Tests/partitions00.stable.out
monetdb5/optimizer/Tests/partitions01.mal
monetdb5/optimizer/Tests/partitions01.stable.err
monetdb5/optimizer/Tests/partitions01.stable.out
monetdb5/optimizer/Tests/partitions02.mal
monetdb5/optimizer/Tests/partitions02.stable.err
monetdb5/optimizer/Tests/partitions02.stable.out
monetdb5/optimizer/Tests/partitions03.mal
monetdb5/optimizer/Tests/partitions03.stable.err
monetdb5/optimizer/Tests/partitions03.stable.out
monetdb5/optimizer/Tests/partitions04.mal
monetdb5/optimizer/Tests/partitions04.stable.err
monetdb5/optimizer/Tests/partitions04.stable.out
monetdb5/optimizer/Tests/partitions05.mal
monetdb5/optimizer/Tests/partitions05.stable.err
monetdb5/optimizer/Tests/partitions05.stable.out
monetdb5/optimizer/Tests/partitions06.mal
monetdb5/optimizer/Tests/partitions06.stable.err
monetdb5/optimizer/Tests/partitions06.stable.out
monetdb5/optimizer/Tests/partitions07.mal
monetdb5/optimizer/Tests/partitions07.stable.err
monetdb5/optimizer/Tests/partitions07.stable.out
monetdb5/optimizer/opt_partitions.c
monetdb5/optimizer/opt_partitions.h
Branch: headless
Log Message:
Renamings and cleanup
mal_io turned into inout.c
Dropping some old stuff on partitions.
diffs (truncated from 2013 to 300 lines):
diff --git a/monetdb5/extras/compiler/mal_compiler.mx
b/monetdb5/extras/compiler/mal_compiler.mx
--- a/monetdb5/extras/compiler/mal_compiler.mx
+++ b/monetdb5/extras/compiler/mal_compiler.mx
@@ -190,7 +190,7 @@
"#include \"mal/factories.h\"\n",
"#include \"mal/inspect.h\"\n",
"#include \"mal/language.h\"\n",
- "#include \"mal/mal_io.h\"\n",
+ "#include \"mal/inout.h\"\n",
"#include \"mal/manual.h\"\n",
"#include \"mal/mat.h\"\n",
"#include \"mal/mdb.h\"\n",
diff --git a/monetdb5/mal/base00.fig b/monetdb5/mal/base00.fig
deleted file mode 100644
--- a/monetdb5/mal/base00.fig
+++ /dev/null
@@ -1,54 +0,0 @@
-#FIG 3.2
-Landscape
-Center
-Inches
-Letter
-100.00
-Single
--2
-1200 2
-6 2400 2550 4200 3450
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 2400 2550 4200 2550 4200 3000 2400 3000 2400 2550
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 2400 3000 4200 3000 4200 3450 2400 3450 2400 3000
-4 0 0 50 -1 0 12 0.0000 4 180 1245 2700 2925 MAL interpreter\001
-4 0 0 50 -1 0 12 0.0000 4 180 825 2700 3300 GDK layer\001
--6
-6 5400 2550 6450 3000
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 5400 2550 6450 2550 6450 3000 5400 3000 5400 2550
-4 0 0 50 -1 0 12 0.0000 4 180 780 5550 2850 mguardian\001
--6
-6 3000 3600 3900 4650
-1 2 0 1 0 7 50 -1 -1 0.000 1 0.0000 3450 4411 360 143 3090 4268 3810 4555
-1 2 0 1 0 7 50 -1 -1 0.000 1 0.0000 3450 3839 360 143 3090 3695 3810 3982
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
- 3090 3886 3090 4364
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
- 3810 3886 3810 4364
--6
-6 5550 3600 6450 4650
-1 2 0 1 0 7 50 -1 -1 0.000 1 0.0000 6000 4411 360 143 5640 4268 6360 4555
-1 2 0 1 0 7 50 -1 -1 0.000 1 0.0000 6000 3839 360 143 5640 3695 6360 3982
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
- 5640 3886 5640 4364
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
- 6360 3886 6360 4364
--6
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
- 0 0 1.00 60.00 120.00
- 3450 3450 3450 3900
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
- 0 0 1.00 60.00 120.00
- 6000 3000 6000 3900
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 1 2
- 0 0 1.00 60.00 120.00
- 0 0 1.00 60.00 120.00
- 4200 2850 5400 2850
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
- 4800 2400 4800 2850
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 4350 1950 5400 1950 5400 2400 4350 2400 4350 1950
-4 0 0 50 -1 0 12 0.0000 4 135 705 2400 2400 mserver5\001
-4 0 0 50 -1 0 12 0.0000 4 135 645 4500 2250 monetdb\001
diff --git a/monetdb5/mal/base00.pdf b/monetdb5/mal/base00.pdf
deleted file mode 100644
Binary file monetdb5/mal/base00.pdf has changed
diff --git a/monetdb5/modules/mal/Makefile.ag b/monetdb5/modules/mal/Makefile.ag
--- a/monetdb5/modules/mal/Makefile.ag
+++ b/monetdb5/modules/mal/Makefile.ag
@@ -37,7 +37,7 @@
histogram.c \
inspect.c \
language.c \
- mal_io.c \
+ inout.c \
manual.c \
mat.c \
mdb.c \
@@ -61,7 +61,7 @@
DIR = libdir/monetdb5
SOURCES = language.mal mal_init.mal cbp.mal \
profiler.c attach.mal extensions.mal \
- inspect.mal manual.mal mal_io.mal pqueue.mx mkey.mx \
+ inspect.mal manual.mal inout.mal pqueue.mx mkey.mx \
clients.mal \
factories.mal groupby.mal mdb.mal pcre.mal tablet.mx mat.mal
histogram.mal \
sabaoth.mal remote.c \
diff --git a/monetdb5/modules/mal/mal_io.c b/monetdb5/modules/mal/inout.c
rename from monetdb5/modules/mal/mal_io.c
rename to monetdb5/modules/mal/inout.c
--- a/monetdb5/modules/mal/mal_io.c
+++ b/monetdb5/modules/mal/inout.c
@@ -43,7 +43,7 @@
* allow for any type to be assigned.
*/
#include "monetdb_config.h"
-#include "mal_io.h"
+#include "inout.h"
#define MAXFORMAT 64*1024
diff --git a/monetdb5/modules/mal/mal_io.h b/monetdb5/modules/mal/inout.h
rename from monetdb5/modules/mal/mal_io.h
rename to monetdb5/modules/mal/inout.h
diff --git a/monetdb5/modules/mal/mal_io.mal b/monetdb5/modules/mal/inout.mal
rename from monetdb5/modules/mal/mal_io.mal
rename to monetdb5/modules/mal/inout.mal
diff --git a/monetdb5/modules/mal/mal_init.mal
b/monetdb5/modules/mal/mal_init.mal
--- a/monetdb5/modules/mal/mal_init.mal
+++ b/monetdb5/modules/mal/mal_init.mal
@@ -42,8 +42,7 @@
include alarm;
include mmath;
include streams;
-# @-
-# The kernel stuff to make it work
+
include column;
include extensions;
include algebra;
@@ -56,7 +55,6 @@
include pqueue;
include mkey;
-# @-
# Atom extensions
include blob;
include color;
@@ -66,7 +64,6 @@
include inet;
include identifier;
-# @-
# The hardwired multiplex extensions
include colmmath;
include colcalc;
@@ -76,7 +73,6 @@
include colstr;
include colcolor;
-# @-
# MAL related extensions
include sabaoth;
include pcrelib;
@@ -84,22 +80,21 @@
include attach;
include cbp;
include box;
-include mal_io;
+include inout;
include tablet;
include factories;
include recycle;
include remote;
-include trader; # experimental
+include trader;
-include mat; # experimental
-include histogram; # experimental
+include mat;
+include histogram;
include inspect;
include manual;
include language;
include mal_mapi;
include profiler;
-include statistics; # experimental
include optimizer;
include opt_support;
@@ -129,7 +124,6 @@
include opt_mitosis;
include opt_reorder;
include opt_octopus;
-include opt_partitions;
include opt_peephole;
include opt_prejoin;
include opt_qep;
@@ -153,30 +147,16 @@
include replication;
include zorder;
-# @-
-# library logger;
-# include logger;
-include transaction;
-
-# @-
# scheduler components
include run_isolate;
include run_memo;
include run_octopus;
include run_tarantula;
-# @-
# Cracker schemes, disabled by default
-# @-
# library crackers;
# include opt_crack;
# include opt_selcrack;
# include opt_sidcrack;
# include opt_joinselect;
# include crackers;
-#
-# @-
-# Any extensions (MAL scripts) that should be automatically loaded upon
-# startup can be placed in the autoload directory. One typically finds
-# the SQL module in here, but it can also be used to load custom scripts.
-include autoload;
diff --git a/monetdb5/modules/mal/tablet.c b/monetdb5/modules/mal/tablet.c
--- a/monetdb5/modules/mal/tablet.c
+++ b/monetdb5/modules/mal/tablet.c
@@ -90,10 +90,6 @@
* tablet.page(100,nil,B1,...,Bn); #starts printing at tuple 100 until end
* @end verbatim
*
- * A paging system also provides the commands tablet.firstPage(),
- * tablet.nextPage(), tablet.prevPage(), and tablet.lastPage() using
- * a user controlled tablet size tablet.setPagesize(L).
- *
* The tablet display operations use a client (thread) specific formatting
* structure. This structure is initialized using either
* tablet.setFormat(B1,...,Bn) or tablet.setFormat(S1,...,Sn) (Bi is a BAT, Si
a scalar).
@@ -180,9 +176,6 @@
* @end verbatim
*
*
- * All other formatted printing should be done with the printf() operations
- * contained in the module @sc{io}.
- *
* Tablet dump/restore
*
* Dump and restore operations are abstractions over sequence of tablet
commands.
@@ -389,16 +382,6 @@
}
str
-TABdump(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
-{
- (void) cntxt;
- (void) mb;
- (void) stk;
- (void) pci; /* fool compiler */
- throw(MAL, "tablet.report", PROGRAM_NYI);
-}
-
-str
TABfinishReport(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{
int rnr = (int)(cntxt - mal_clients);
@@ -476,16 +459,6 @@
}
str
-TABsetColumn(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
-{
- (void) cntxt;
- (void) mb;
- (void) stk;
- (void) pci; /* fool compiler */
- throw(MAL, "tablet.setColumn", PROGRAM_NYI);
-}
-
-str
TABsetColumnName(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{
int *idx= (int *) getArgReference(stk,pci,1);
@@ -621,49 +594,6 @@
return MAL_SUCCEED;
}
-str
-TABfirstPage(int *ret)
-{
- (void) ret; /* fool compiler */
- throw(MAL, "tablet.firstPage", PROGRAM_NYI);
-}
-
-str
-TABlastPage(int *ret)
-{
- (void) ret; /* fool compiler */
- throw(MAL, "tablet.lastPage", PROGRAM_NYI);
-}
-
-str
-TABnextPage(int *ret)
-{
- (void) ret; /* fool compiler */
- throw(MAL, "tablet.nextPage", PROGRAM_NYI);
-}
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
