Changeset: b96ef1b89e9c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b96ef1b89e9c
Modified Files:
monetdb5/mal/Tests/tst023.stable.out
monetdb5/mal/Tests/tst620.mal
monetdb5/mal/Tests/tst620.stable.out
monetdb5/modules/mal/Tests/call00.stable.out
monetdb5/modules/mal/Tests/mapi01.mal
monetdb5/modules/mal/Tests/mapi01.stable.out
monetdb5/modules/mal/Tests/mapi02.mal
monetdb5/modules/mal/Tests/mapi04.mal
monetdb5/modules/mal/Tests/mapi04.stable.out
monetdb5/modules/mal/Tests/mapi05.mal
monetdb5/modules/mal/Tests/mapi05.stable.out
monetdb5/modules/mal/Tests/mapi06.mal
monetdb5/modules/mal/Tests/mapi06.stable.out
monetdb5/modules/mal/Tests/mapi07.mal
monetdb5/modules/mal/Tests/mapi07.stable.out
monetdb5/modules/mal/Tests/mserver00.mal
monetdb5/modules/mal/Tests/mserver00.stable.out
monetdb5/modules/mal/Tests/remote03.mal
monetdb5/modules/mal/Tests/remote03.stable.out
monetdb5/modules/mal/inspect.c
monetdb5/modules/mal/inspect.h
monetdb5/modules/mal/inspect.mal
sql/backends/monet5/sql.mx
Branch: default
Log Message:
Headless modification step
Use oid-headed bats only.
diffs (truncated from 738 to 300 lines):
diff --git a/monetdb5/mal/Tests/tst023.stable.out
b/monetdb5/mal/Tests/tst023.stable.out
--- a/monetdb5/mal/Tests/tst023.stable.out
+++ b/monetdb5/mal/Tests/tst023.stable.out
@@ -30,13 +30,13 @@ end main;
[ "added function to specific module" ]
#-----------------------------------------------------------------------------------------#
# view fcn
# name
-# str str
# type
-#-----------------------------------------------------------------------------------------#
-[ "transaction.help", "function transaction.help():void;"
]
-[ "transaction.help", " io.print(\"added function to specific
module\");" ]
-[ "transaction.help", " :=
inspect.getDefinition(\"transaction\",\"help\");" ]
-[ "transaction.help", " io.print(b);"
]
-[ "transaction.help", "end help;"
]
+# void str # type
+#-------------------------------------------------------------------------#
+[ 0@0, "function transaction.help():void;" ]
+[ 1@0, " io.print(\"added function to specific module\");" ]
+[ 2@0, " := inspect.getDefinition(\"transaction\",\"help\");" ]
+[ 3@0, " io.print(b);" ]
+[ 4@0, "end help;" ]
# 07:58:39 >
# 07:58:39 > Done.
diff --git a/monetdb5/mal/Tests/tst620.mal b/monetdb5/mal/Tests/tst620.mal
--- a/monetdb5/mal/Tests/tst620.mal
+++ b/monetdb5/mal/Tests/tst620.mal
@@ -6,15 +6,5 @@ end tst;
user.tst();
-f:= inspect.getSize("algebra");
-fs:lng:= aggr.sum(f);
-fs2:= fs/2;
-io.printf("#algebra size %d\n",fs2);
-
-z:= inspect.getSize("inspect");
-zs:lng:= aggr.sum(z);
-zs2:= zs/2;
-io.printf("#inspect size %d\n",zs2);
-
l:= inspect.getSize();
io.printf("#size %d\n",l);
diff --git a/monetdb5/mal/Tests/tst620.stable.out
b/monetdb5/mal/Tests/tst620.stable.out
--- a/monetdb5/mal/Tests/tst620.stable.out
+++ b/monetdb5/mal/Tests/tst620.stable.out
@@ -40,14 +40,6 @@ end tst;
function user.main():void;
#check the storage size
user.tst();
- f := inspect.getSize("algebra");
- fs:lng := aggr.sum(f);
- fs2 := calc./(fs,2);
- io.printf("#algebra size %d\n",fs2);
- z := inspect.getSize("inspect");
- zs:lng := aggr.sum(z);
- zs2 := calc./(zs,2);
- io.printf("#inspect size %d\n",zs2);
l := inspect.getSize();
io.printf("#size %d\n",l);
end main;
diff --git a/monetdb5/modules/mal/Tests/call00.stable.out
b/monetdb5/modules/mal/Tests/call00.stable.out
--- a/monetdb5/modules/mal/Tests/call00.stable.out
+++ b/monetdb5/modules/mal/Tests/call00.stable.out
@@ -39,18 +39,18 @@ function user.main():void;
end main;
#-----------------------------------------#
# view input # name
-# str str # type
-#-----------------------------------------#
-[ "user.tst", "(i:int,s:str):bit;" ]
+# void str # type
+#---------------------------------#
+[ 0@0, "(i:int,s:str):bit;" ]
[ 2 ]
hello world
[ "function user.tst(i:int,s:str):bit;\n j := calc.+(i,1);\n
io.print(j);\n# ignore comments \n format := \"hello %s\\n\";\n
io.printf(format,s);\n return tst := true;\nend tst;\n" ]
#-----------------------------------------#
# view input # name
-# str str # type
-#-----------------------------------------#
-[ "user.tst", "(i:int,s:str):bit;" ]
-[ "user.tst", "(i:int,s:str):bit;" ]
+# void str # type
+#---------------------------------#
+[ 0@0, "(i:int,s:str):bit;" ]
+[ 1@0, "(i:int,s:str):bit;" ]
# 23:57:54 >
# 23:57:54 > Done.
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
@@ -1,8 +1,7 @@
# First test of the remoteQueries optimizer
# we create a remote bat and fake a bind operation.
-cat:= inspect.getEnvironment();
-fs := algebra.find(cat,"mapi_port");
+fs:= inspect.getEnvironment("mapi_port");
port := calc.int(fs);
#io.printf("port %d\n",port);
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
@@ -16,8 +16,7 @@ stdout of test 'mapi01` in directory 'mo
function user.main():void;
# First test of the remoteQueries optimizer
# we create a remote bat and fake a bind operation.
- cat := inspect.getEnvironment();
- fs := algebra.find(cat,"mapi_port");
+ fs := inspect.getEnvironment("mapi_port");
port := calc.int(fs);
#io.printf("port %d\n",port);
mid := mapi.reconnect("localhost",port,"s0_0","monetdb","monetdb","mal");
diff --git a/monetdb5/modules/mal/Tests/mapi02.mal
b/monetdb5/modules/mal/Tests/mapi02.mal
--- a/monetdb5/modules/mal/Tests/mapi02.mal
+++ b/monetdb5/modules/mal/Tests/mapi02.mal
@@ -1,8 +1,7 @@
#An example for the SQL front-end
#The remote table is located
-cat:= inspect.getEnvironment();
-fs := algebra.find(cat,"mapi_port");
+fs:= inspect.getEnvironment("mapi_port");
port := calc.int(fs);
io.printf("port %d\n",port);
diff --git a/monetdb5/modules/mal/Tests/mapi04.mal
b/monetdb5/modules/mal/Tests/mapi04.mal
--- a/monetdb5/modules/mal/Tests/mapi04.mal
+++ b/monetdb5/modules/mal/Tests/mapi04.mal
@@ -1,6 +1,6 @@
# The easiest case, ship something and show result
-cat:= inspect.getEnvironment();
-fs := algebra.find(cat,"mapi_port");
+
+fs:= inspect.getEnvironment("mapi_port");
port := calc.int(fs);
#io.printf("port %d\n",port);
mid:= mapi.reconnect("localhost",port,"s0_0","monetdb","monetdb","mal");
diff --git a/monetdb5/modules/mal/Tests/mapi04.stable.out
b/monetdb5/modules/mal/Tests/mapi04.stable.out
--- a/monetdb5/modules/mal/Tests/mapi04.stable.out
+++ b/monetdb5/modules/mal/Tests/mapi04.stable.out
@@ -15,8 +15,7 @@ stdout of test 'mapi04` in directory 'mo
# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:32356/
function user.main():void;
# The easiest case, ship something and show result
- cat := inspect.getEnvironment();
- fs := algebra.find(cat,"mapi_port");
+ fs := inspect.getEnvironment("mapi_port");
port := calc.int(fs);
#io.printf("port %d\n",port);
mid := mapi.reconnect("localhost",port,"s0_0","monetdb","monetdb","mal");
diff --git a/monetdb5/modules/mal/Tests/mapi05.mal
b/monetdb5/modules/mal/Tests/mapi05.mal
--- a/monetdb5/modules/mal/Tests/mapi05.mal
+++ b/monetdb5/modules/mal/Tests/mapi05.mal
@@ -1,8 +1,7 @@
# Checking correctness of mapi library
# we expect an exception from this query
-cat:= inspect.getEnvironment();
-fs := algebra.find(cat,"mapi_port");
+fs:= inspect.getEnvironment("mapi_port");
port := calc.int(fs);
mid:= mapi.reconnect("localhost",port,"s0_0","monetdb","monetdb","mal");
#mapi.trace(mid,1);
diff --git a/monetdb5/modules/mal/Tests/mapi05.stable.out
b/monetdb5/modules/mal/Tests/mapi05.stable.out
--- a/monetdb5/modules/mal/Tests/mapi05.stable.out
+++ b/monetdb5/modules/mal/Tests/mapi05.stable.out
@@ -16,8 +16,7 @@ stdout of test 'mapi05` in directory 'mo
function user.main():void;
# Checking correctness of mapi library
# we expect an exception from this query
- cat := inspect.getEnvironment();
- fs := algebra.find(cat,"mapi_port");
+ fs := inspect.getEnvironment("mapi_port");
port := calc.int(fs);
mid := mapi.reconnect("localhost",port,"s0_0","monetdb","monetdb","mal");
#mapi.trace(mid,1);
diff --git a/monetdb5/modules/mal/Tests/mapi06.mal
b/monetdb5/modules/mal/Tests/mapi06.mal
--- a/monetdb5/modules/mal/Tests/mapi06.mal
+++ b/monetdb5/modules/mal/Tests/mapi06.mal
@@ -1,8 +1,7 @@
# Checking correctness of mapi library
# we expect an exception from this query
-cat:= inspect.getEnvironment();
-fs := algebra.find(cat,"mapi_port");
+fs:= inspect.getEnvironment("mapi_port");
port := calc.int(fs);
mid:= mapi.reconnect("localhost",port,"s0_0","monetdb","monetdb","mal");
#mapi.trace(mid,1);
diff --git a/monetdb5/modules/mal/Tests/mapi06.stable.out
b/monetdb5/modules/mal/Tests/mapi06.stable.out
--- a/monetdb5/modules/mal/Tests/mapi06.stable.out
+++ b/monetdb5/modules/mal/Tests/mapi06.stable.out
@@ -16,8 +16,7 @@ stdout of test 'mapi06` in directory 'mo
function user.main():void;
# Checking correctness of mapi library
# we expect an exception from this query
- cat := inspect.getEnvironment();
- fs := algebra.find(cat,"mapi_port");
+ fs := inspect.getEnvironment("mapi_port");
port := calc.int(fs);
mid := mapi.reconnect("localhost",port,"s0_0","monetdb","monetdb","mal");
#mapi.trace(mid,1);
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
@@ -1,8 +1,7 @@
# First test of the remoteQueries optimizer
# we create a remote bat and fake a bind operation.
-cat:= inspect.getEnvironment();
-fs := algebra.find(cat,"mapi_port");
+fs:= inspect.getEnvironment("mapi_port");
port := calc.int(fs);
#io.printf("port %d\n",port);
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
@@ -16,8 +16,7 @@ stdout of test 'mapi07` in directory 'mo
function user.main():void;
# First test of the remoteQueries optimizer
# we create a remote bat and fake a bind operation.
- cat := inspect.getEnvironment();
- fs := algebra.find(cat,"mapi_port");
+ fs := inspect.getEnvironment("mapi_port");
port := calc.int(fs);
#io.printf("port %d\n",port);
mid := mapi.reconnect("localhost",port,"s0_0","monetdb","monetdb","mal");
diff --git a/monetdb5/modules/mal/Tests/mserver00.mal
b/monetdb5/modules/mal/Tests/mserver00.mal
--- a/monetdb5/modules/mal/Tests/mserver00.mal
+++ b/monetdb5/modules/mal/Tests/mserver00.mal
@@ -1,8 +1,7 @@
# Attempt to establish a client connection to yourself.
-z:= inspect.getEnvironment();
-ps:= algebra.find(z,"mapi_port");
-port:= calc.int(ps);
+fs:= inspect.getEnvironment("mapi_port");
+port:= calc.int(fs);
#hs:= algebra.find(z,"host");
hs:= "localhost";
diff --git a/monetdb5/modules/mal/Tests/mserver00.stable.out
b/monetdb5/modules/mal/Tests/mserver00.stable.out
--- a/monetdb5/modules/mal/Tests/mserver00.stable.out
+++ b/monetdb5/modules/mal/Tests/mserver00.stable.out
@@ -14,9 +14,8 @@ stdout of test 'mserver00` in directory
# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:37931/
function user.main():void;
# Attempt to establish a client connection to yourself.
- z := inspect.getEnvironment();
- ps := algebra.find(z,"mapi_port");
- port := calc.int(ps);
+ fs := inspect.getEnvironment("mapi_port");
+ port := calc.int(fs);
#hs:= algebra.find(z,"host");
hs := "localhost";
# hardcoded, as access control currently works, and client.getInfo # doesn't
diff --git a/monetdb5/modules/mal/Tests/remote03.mal
b/monetdb5/modules/mal/Tests/remote03.mal
--- a/monetdb5/modules/mal/Tests/remote03.mal
+++ b/monetdb5/modules/mal/Tests/remote03.mal
@@ -12,7 +12,7 @@ catch SyntaxException:str;
exit SyntaxException;
# now do it with a function that returns something (a BAT in this case)
-bn:= bat.new(:int,:str);
+bn:= bat.new(:oid,:str);
b := remote.put(conn,bn);
catch MALException:str;
io.print("Received second init error from the remote site");
@@ -26,7 +26,7 @@ catch MALException:str;
exit MALException;
io.print(b);
-c:bat[:int,:str] := remote.get(conn, b);
+c:bat[:oid,:str] := remote.get(conn, b);
io.print(c);
catch MALException:str;
io.print("Received third error from the remote site");
diff --git a/monetdb5/modules/mal/Tests/remote03.stable.out
b/monetdb5/modules/mal/Tests/remote03.stable.out
--- a/monetdb5/modules/mal/Tests/remote03.stable.out
+++ b/monetdb5/modules/mal/Tests/remote03.stable.out
@@ -28,7 +28,7 @@ catch SyntaxException:str ;
io.printf("!%s\n",SyntaxException);
exit SyntaxException:str ;
# now do it with a function that returns something (a BAT in this case)
- bn := bat.new(:int,:str);
+ bn := bat.new(:oid,:str);
b := remote.put(conn,bn);
catch MALException:str ;
io.print("Received second init error from the remote site");
@@ -41,7 +41,7 @@ catch MALException:str ;
io.printf("!%s\n",MALException);
exit MALException:str ;
io.print(b);
- c:bat[:int,:str] := remote.get(conn,b);
+ c:bat[:oid,:str] := remote.get(conn,b);
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
