Changeset: 32f51b9386e7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=32f51b9386e7
Modified Files:
monetdb5/mal/Tests/All
monetdb5/modules/mal/Makefile.ag
monetdb5/modules/mal/Tests/inspect00.mal
monetdb5/modules/mal/Tests/inspect00.stable.out
monetdb5/modules/mal/Tests/mapi01.mal
monetdb5/modules/mal/Tests/mapi01.stable.out
monetdb5/modules/mal/Tests/mapi07.mal
monetdb5/modules/mal/Tests/mapi07.stable.out
monetdb5/modules/mal/batExtensions.mal
monetdb5/modules/mal/mal_io.mal
monetdb5/modules/mal/mal_mapi.mal
monetdb5/modules/mal/manual.mal
monetdb5/modules/mal/mdb.c
monetdb5/modules/mal/mdb.mal
monetdb5/modules/mal/pcre.mal
monetdb5/modules/mal/profiler.c
monetdb5/modules/mal/profiler.mal
monetdb5/modules/mal/remote.mal
monetdb5/tests/suite_00/Tests/test_15.stable.out
Branch: default
Log Message:
Operands should be :oid - headed
A bunch of modules whose operands are all :oid- headed.
diffs (truncated from 975 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
@@ -175,8 +175,6 @@ tst610
tst611
tst612
tst620
-tst654
-tst655
tst660
tst661
tst662
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
@@ -55,7 +55,6 @@ lib_mal = {
remote.c remote.h \
sabaoth.c sabaoth.h \
tablet.c tablet.h \
- tablet_sql.c \
tokenizer.c tokenizer.h \
trader.c trader.h \
transaction.c \
@@ -72,7 +71,7 @@ headers_mal = {
profiler.mal const.mal attach.mal batExtensions.mal \
inspect.mal manual.mal mal_io.mal pqueue.mal mkey.mal \
iterator.mal clients.mal \
- factories.mal groupby.mal mdb.mal pcre.mal tablet.mal mat.mal \
+ factories.mal groupby.mal mdb.mal pcre.mal mat.mal \
urlbox.mal transaction.mal \
mal_mapi.mal sabaoth.mal remote.mal \
txtsim.mal recycle.mal \
diff --git a/monetdb5/modules/mal/Tests/inspect00.mal
b/monetdb5/modules/mal/Tests/inspect00.mal
--- a/monetdb5/modules/mal/Tests/inspect00.mal
+++ b/monetdb5/modules/mal/Tests/inspect00.mal
@@ -3,14 +3,14 @@
function tst():void;
i:= mdb.getStackDepth();
io.printf("stack depth %d\n",i);
- t:= mdb.getStackTrace();
- io.print(t);
- b0:= mdb.getStackFrame(0);
- io.print(b0);
- b1:= mdb.getStackFrame(1);
- io.print(b1);
+ (h,t):= mdb.getStackTrace();
+ io.print(h,t);
+ (b0,b1):= mdb.getStackFrame(0);
+ io.print(b0,b1);
+ (c0,c1):= mdb.getStackFrame(1);
+ io.print(c0,c1);
# next one is illegal
- b1:= mdb.getStackFrame(2);
+ (d0,d1):= mdb.getStackFrame(2);
end tst;
user.tst();
diff --git a/monetdb5/modules/mal/Tests/inspect00.stable.out
b/monetdb5/modules/mal/Tests/inspect00.stable.out
--- a/monetdb5/modules/mal/Tests/inspect00.stable.out
+++ b/monetdb5/modules/mal/Tests/inspect00.stable.out
@@ -15,51 +15,56 @@ stdout of test 'inspect00` in directory
function user.tst():void;
i := mdb.getStackDepth();
io.printf("stack depth %d\n",i);
- t := mdb.getStackTrace();
- io.print(t);
- b0 := mdb.getStackFrame(0);
- io.print(b0);
- b1 := mdb.getStackFrame(1);
- io.print(b1);
+ (h,t) := mdb.getStackTrace();
+ io.print(h,t);
+ (b0,b1) := mdb.getStackFrame(0);
+ io.print(b0,b1);
+ (c0,c1) := mdb.getStackFrame(1);
+ io.print(c0,c1);
# next one is illegal
- b1 := mdb.getStackFrame(2);
+ (d0,d1) := mdb.getStackFrame(2);
end tst;
function user.main():void;
# test analysis of stack frames
user.tst();
end main;
stack depth 2
-#---------------------------------------------------------#
-# view stk # name
-# int str # type
-#---------------------------------------------------------#
-[ 0, " t := mdb.getStackTrace(); at user.tst[3]" ]
-[ 1, " user.tst(); at user.main[2]" ]
-#-----------------------------------------#
-# view stk # name
-# str str # type
-#-----------------------------------------#
-[ "tst", "0@0" ]
-[ "i", "2" ]
-[ "_2", "0@0" ]
-[ "_3", "\"stack depth %d\\n\"" ]
-[ "t", "<view_stk_trace>" ]
-[ "_5", "0@0" ]
-[ "b0", "<view_stk_frame>" ]
-[ "_7", "0" ]
-[ "_8", "0@0" ]
-[ "b1", "nil" ]
-[ "_10", "1" ]
-[ "_11", "0@0" ]
-[ "_12", "nil" ]
-[ "_13", "2" ]
-#-----------------#
-# view stk # name
-# str str # type
-#-----------------#
-[ "tst", "0@0" ]
-[ "i", "nil" ]
-[ "_2", "0@0" ]
+#-------------------------------------------------------------------------#
+# view stk stk # name
+# void int str # type
+#-------------------------------------------------------------------------#
+[ 0@0, 0, " (h,t) := mdb.getStackTrace(); at user.tst[3]" ]
+[ 1@0, 1, " user.tst(); at user.main[2]" ]
+#-------------------------------------------------#
+# view stk stk # name
+# void str str # type
+#-------------------------------------------------#
+[ 0@0, "tst", "0@0" ]
+[ 1@0, "i", "2" ]
+[ 2@0, "_2", "0@0" ]
+[ 3@0, "_3", "\"stack depth %d\\n\"" ]
+[ 4@0, "h", "<view_stk_trace>" ]
+[ 5@0, "t", "<view_stk_traceB>" ]
+[ 6@0, "_6", "0@0" ]
+[ 7@0, "b0", "<view_stk_frame>" ]
+[ 8@0, "b1", "<view_stk_frameB>" ]
+[ 9@0, "_9", "0" ]
+[ 10@0, "_10", "0@0" ]
+[ 11@0, "c0", "nil" ]
+[ 12@0, "c1", "nil" ]
+[ 13@0, "_13", "1" ]
+[ 14@0, "_14", "0@0" ]
+[ 15@0, "_15", "nil" ]
+[ 16@0, "d0", "nil" ]
+[ 17@0, "d1", "nil" ]
+[ 18@0, "_18", "2" ]
+#-------------------------#
+# view stk stk # name
+# void str str # type
+#-------------------------#
+[ 0@0, "tst", "0@0" ]
+[ 1@0, "i", "nil" ]
+[ 2@0, "_2", "0@0" ]
!MALException:mdb.getStackFrame:Illegal argument Illegal depth.
diff --git a/monetdb5/modules/mal/Tests/mapi01.mal
b/monetdb5/modules/mal/Tests/mapi01.mal
--- a/monetdb5/modules/mal/Tests/mapi01.mal
+++ b/monetdb5/modules/mal/Tests/mapi01.mal
@@ -13,10 +13,10 @@ mapi.rpc(mid,"bat.append(rb,5);");
mapi.rpc(mid,"bat.append(rb,6);");
mapi.rpc(mid,"bat.append(rb,7);");
mapi.rpc(mid,"c:=algebra.select(rb,0,12);");
-c:bat[:int,:int]:= mapi.rpc(mid, "io.print(c);");
+c:bat[:oid,:int]:= mapi.rpc(mid, "io.print(c);");
io.print(c);
mapi.rpc(mid,"c:=algebra.select(rb,0,4);");
-c:bat[:int,:int]:= mapi.rpc(mid, "io.print(c);");
+c:bat[:oid,:int]:= mapi.rpc(mid, "io.print(c);");
io.print(c);
b:bat[:oid,:int]:= mapi.bind(mid,"rbat");
@@ -30,7 +30,7 @@ mapi.rpc(mid,"e:=algebra.select(d,low,7)
mapi.rpc(mid,"i:=aggr.count(d);");
i:lng:= mapi.rpc(mid,"io.print(i);");
io.printf(" count %d\n",i);
-d:bat[:int,:int]:= mapi.rpc(mid,"io.print(d);");
+d:bat[:oid,:int]:= mapi.rpc(mid,"io.print(d);");
io.print(d);
mapi.disconnect(mid);
#optimizer.remoteQueries();
diff --git a/monetdb5/modules/mal/Tests/mapi01.stable.out
b/monetdb5/modules/mal/Tests/mapi01.stable.out
--- a/monetdb5/modules/mal/Tests/mapi01.stable.out
+++ b/monetdb5/modules/mal/Tests/mapi01.stable.out
@@ -27,10 +27,10 @@ function user.main():void;
mapi.rpc(mid,"bat.append(rb,6);");
mapi.rpc(mid,"bat.append(rb,7);");
mapi.rpc(mid,"c:=algebra.select(rb,0,12);");
- c:bat[:int,:int] := mapi.rpc(mid,"io.print(c);");
+ c:bat[:oid,:int] := mapi.rpc(mid,"io.print(c);");
io.print(c);
mapi.rpc(mid,"c:=algebra.select(rb,0,4);");
- c:bat[:int,:int] := mapi.rpc(mid,"io.print(c);");
+ c:bat[:oid,:int] := mapi.rpc(mid,"io.print(c);");
io.print(c);
b:bat[:oid,:int] := mapi.bind(mid,"rbat");
io.print(b);
@@ -42,7 +42,7 @@ function user.main():void;
mapi.rpc(mid,"i:=aggr.count(d);");
i:lng := mapi.rpc(mid,"io.print(i);");
io.printf(" count %d\n",i);
- d:bat[:int,:int] := mapi.rpc(mid,"io.print(d);");
+ d:bat[:oid,:int] := mapi.rpc(mid,"io.print(d);");
io.print(d);
mapi.disconnect(mid);
#optimizer.remoteQueries();
@@ -51,26 +51,26 @@ end main;
# h t # name
# int int # type
#-----------------#
-[ 0, 1 ]
-[ 1, 3 ]
-[ 2, 5 ]
-[ 3, 6 ]
-[ 4, 7 ]
+[ 0@0, 1 ]
+[ 1@0, 3 ]
+[ 2@0, 5 ]
+[ 3@0, 6 ]
+[ 4@0, 7 ]
#-----------------#
# h t # name
# int int # type
#-----------------#
-[ 0, 1 ]
-[ 1, 3 ]
+[ 0@0, 1 ]
+[ 1@0, 3 ]
[ nil ]
count 3
#-----------------#
# h t # name
# int int # type
#-----------------#
-[ 2, 5 ]
-[ 3, 6 ]
-[ 4, 7 ]
+[ 2@0, 5 ]
+[ 3@0, 6 ]
+[ 4@0, 7 ]
# 09:12:08 >
# 09:12:08 > Done.
diff --git a/monetdb5/modules/mal/Tests/mapi07.mal
b/monetdb5/modules/mal/Tests/mapi07.mal
--- a/monetdb5/modules/mal/Tests/mapi07.mal
+++ b/monetdb5/modules/mal/Tests/mapi07.mal
@@ -18,7 +18,7 @@ low:= 5+1;
mapi.put(mid,"low",low);
i:lng:= mapi.rpc(mid,"e:=algebra.select(rb,low,7); i:=aggr.count(e);
io.print(i);");
io.printf(" count %d\n",i);
-d:bat[:int,:int]:= mapi.rpc(mid,"io.print(i);");
+d:bat[:oid,:int]:= mapi.rpc(mid,"io.print(i);");
io.print(d);
mapi.disconnect(mid);
optimizer.remoteQueries();
diff --git a/monetdb5/modules/mal/Tests/mapi07.stable.out
b/monetdb5/modules/mal/Tests/mapi07.stable.out
--- a/monetdb5/modules/mal/Tests/mapi07.stable.out
+++ b/monetdb5/modules/mal/Tests/mapi07.stable.out
@@ -31,7 +31,7 @@ function user.main():void;
mapi.put(mid,"low",low);
i:lng := mapi.rpc(mid,"e:=algebra.select(rb,low,7); i:=aggr.count(e);
io.print(i);");
io.printf(" count %d\n",i);
- d:bat[:int,:int] := mapi.rpc(mid,"io.print(i);");
+ d:bat[:oid,:int] := mapi.rpc(mid,"io.print(i);");
io.print(d);
mapi.disconnect(mid);
end main;
@@ -40,7 +40,7 @@ end main;
# h t # name
# int int # type
#-----------------#
-[ 2, nil ]
+[ 2@0, nil ]
# 09:12:08 >
# 09:12:08 > Done.
diff --git a/monetdb5/modules/mal/batExtensions.mal
b/monetdb5/modules/mal/batExtensions.mal
--- a/monetdb5/modules/mal/batExtensions.mal
+++ b/monetdb5/modules/mal/batExtensions.mal
@@ -15,11 +15,6 @@
# Copyright August 2008-2012 MonetDB B.V.
# All Rights Reserved.
-
-#pattern bat.new(ht:oid, tt:any_2, b:bat[:oid,:any_4]) :bat[:oid,:any_2]
-#address CMDBATclone
-#comment "Creates a new empty transient BAT by cloning another.";
-
pattern bat.new(ht:oid, tt:any_1) :bat[:oid,:any_1]
address CMDBATnew
comment "Creates a new empty transient BAT, with head- and tail-types as
indicated.";
diff --git a/monetdb5/modules/mal/mal_io.mal b/monetdb5/modules/mal/mal_io.mal
--- a/monetdb5/modules/mal/mal_io.mal
+++ b/monetdb5/modules/mal/mal_io.mal
@@ -13,7 +13,7 @@ pattern print(val:any_1,lst:any...):void
address IOprint_val
comment "Print a MAL value tuple .";
-pattern print(b1:bat[:any_1,:any]...):void
+pattern print(b1:bat[:oid,:any]...):void
address IOtable
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
