Changeset: 5c777bd1d738 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5c777bd1d738
Removed Files:
sql/test/mergetables/Tests/forex.stable.err
Modified Files:
monetdb5/modules/kernel/bat5.c
monetdb5/modules/kernel/bat5.h
monetdb5/modules/kernel/bat5.mal
monetdb5/modules/mal/Tests/inspect05.stable.out.int128
sql/test/mergetables/Tests/forex.sql
sql/test/mergetables/Tests/mergekey.sql
Branch: resultset
Log Message:
Merge with default
diffs (206 lines):
diff --git a/monetdb5/modules/kernel/bat5.c b/monetdb5/modules/kernel/bat5.c
--- a/monetdb5/modules/kernel/bat5.c
+++ b/monetdb5/modules/kernel/bat5.c
@@ -1534,19 +1534,6 @@ BKCunload(bit *res, const char * const *
}
str
-BKCisCached(bit *res, const bat *bid)
-{
- BAT *b;
-
- if ((b = BATdescriptor(*bid)) == NULL) {
- throw(MAL, "bat.isCached", RUNTIME_OBJECT_MISSING);
- }
- *res = 0;
- BBPreleaseref(b->batCacheid);
- throw(MAL, "bat.isCached", PROGRAM_NYI);
-}
-
-str
BKCload(bat *res, const char * const *input)
{
bat bid = BBPindex(*input);
@@ -1560,7 +1547,7 @@ BKCload(bat *res, const char * const *in
}
str
-BKCcoldBAT(void *res, const bat *bid)
+BKCsetColdBAT(void *res, const bat *bid)
{
BAT *b;
@@ -1574,17 +1561,7 @@ BKCcoldBAT(void *res, const bat *bid)
}
str
-BKCheat(lng *res, const bat *bid)
-{
- bat b = BBPcheck(*bid, "BKCheat");
- if (b) {
- *res = BBPLASTUSED(BBP_lastused(b));
- }
- throw(MAL, "bat", PROGRAM_NYI);
-}
-
-str
-BKChotBAT(void *res, const bat *bid)
+BKCsetHotBAT(void *res, const bat *bid)
{
BAT *b;
diff --git a/monetdb5/modules/kernel/bat5.h b/monetdb5/modules/kernel/bat5.h
--- a/monetdb5/modules/kernel/bat5.h
+++ b/monetdb5/modules/kernel/bat5.h
@@ -88,11 +88,9 @@ bat5_export str BKCsetColumns(void *r, c
bat5_export str BKCsetName(void *r, const bat *bid, const char * const *s);
bat5_export str BKCgetBBPname(str *ret, const bat *bid);
bat5_export str BKCunload(bit *res, const char * const *input);
-bat5_export str BKCisCached(bit *res, const bat *bid);
bat5_export str BKCload(bat *res, const char * const *input);
-bat5_export str BKCcoldBAT(void *res, const bat *bid);
-bat5_export str BKCheat(lng *res, const bat *bid);
-bat5_export str BKChotBAT(void *res, const bat *bid);
+bat5_export str BKCsetColdBAT(void *res, const bat *bid);
+bat5_export str BKCsetHotBAT(void *res, const bat *bid);
bat5_export str BKCsave(bit *res, const char * const *input);
bat5_export str BKCsave2(void *r, const bat *bid);
bat5_export str BKCmmap(bit *res, const bat *bid, const int *hbns, const int
*tbns, const int *hhp, const int *thp);
diff --git a/monetdb5/modules/kernel/bat5.mal b/monetdb5/modules/kernel/bat5.mal
--- a/monetdb5/modules/kernel/bat5.mal
+++ b/monetdb5/modules/kernel/bat5.mal
@@ -155,13 +155,13 @@ command append(i:bat[:oid,:any_1], u:any
address BKCappend_val_wrap
comment "append the value u to i";
-command append(i:bat[:void,:any_1], u:any_1):bat[:void,:any_1]
-address BKCappend_val_wrap
-comment "append the value u to i";
+#command append(i:bat[:void,:any_1], u:any_1):bat[:void,:any_1]
+#address BKCappend_val_wrap
+#comment "append the value u to i";
-command append(i:bat[:any_1,:void], u:any_1):bat[:any_1,:void]
-address BKCappend_reverse_val_wrap
-comment "append the value u to i";
+#command append(i:bat[:any_1,:void], u:any_1):bat[:any_1,:void]
+#address BKCappend_reverse_val_wrap
+#comment "append the value u to i";
command append(i:bat[:any_1,:any_2], u:any_2, force:bit):bat[:any_1,:any_2]
address BKCappend_val_force_wrap
@@ -206,6 +206,7 @@ comment "Obtain the list of BUNs added";
command getDelta(b:bat[:any_1,:any_2]) :bat[:any_1,:any_2]
address BKCgetDelta
comment "Obtain the list of BUNs deleted";
+
command setName ( b:bat[:oid,:any_2] , s:str) :void
address BKCsetName
comment "Give a logical name to a BAT. ";
@@ -262,20 +263,12 @@ address BKCunload
comment "Swapout a BAT to disk. Transient BATs can also be swapped out.
Returns whether the unload indeed happened. ";
-command isCached(b:bat[:oid,:any_2]):bit
-address BKCisCached
-comment "Bat is stored in main memory.";
-
-command getHeat(b:bat[:oid,:any_2]) :lng
-address BKCheat
-comment "Return the current BBP heat (LRU stamp)";
-
command setCold(b:bat[:oid,:any_1]) :void
-address BKCcoldBAT
+address BKCsetColdBAT
comment "Makes a BAT very cold for the BBP. The chance of being choses
for swapout is big, afterwards.";
command setHot(b:bat[:oid,:any_2]) :void
-address BKChotBAT
+address BKCsetHotBAT
comment "Makes a BAT very hot for the BBP. The chance of being chosen for
swapout is small, afterwards.";
diff --git a/monetdb5/modules/mal/Tests/inspect05.stable.out.int128
b/monetdb5/modules/mal/Tests/inspect05.stable.out.int128
--- a/monetdb5/modules/mal/Tests/inspect05.stable.out.int128
+++ b/monetdb5/modules/mal/Tests/inspect05.stable.out.int128
@@ -35,8 +35,6 @@ end main;
# str str str str
str
# type
#---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------#
[ "append", "command", "bat",
"(i:bat[:any_1,:any_2],u:any_2,force:bit):bat[:any_1,:any_2] ",
"BKCappend_val_force_wrap;" ]
-[ "append", "command", "bat",
"(i:bat[:any_1,:void],u:any_1):bat[:any_1,:void] ",
"BKCappend_reverse_val_wrap;"
]
-[ "append", "command", "bat",
"(i:bat[:void,:any_1],u:any_1):bat[:void,:any_1] ",
"BKCappend_val_wrap;"
]
[ "append", "command", "bat",
"(i:bat[:oid,:any_1],u:any_1):bat[:oid,:any_1] ",
"BKCappend_val_wrap;"
]
[ "append", "command", "bat",
"(i:bat[:any_1,:any_2],u:bat[:any_1,:any_2],force:bit):bat[:any_1,:any_2] ",
"BKCappend_force_wrap;"
]
[ "append", "command", "bat",
"(i:bat[:any_1,:any_2],u:bat[:any_1,:any_2]):bat[:any_1,:any_2] ",
"BKCappend_wrap;"
]
@@ -52,7 +50,6 @@ end main;
[ "getColumnType", "command", "bat", "(b:bat[:oid,:any_2]):str ",
"BKCgetColumnType;" ]
[ "getDelta", "command", "bat",
"(b:bat[:any_1,:any_2]):bat[:any_1,:any_2] ",
"BKCgetDelta;" ]
[ "getHeadType", "command", "bat",
"(b:bat[:any_1,:any_2]):str ",
"BKCgetHeadType;" ]
-[ "getHeat", "command", "bat", "(b:bat[:oid,:any_2]):lng ",
"BKCheat;" ]
[ "getName", "command", "bat", "(b:bat[:oid,:any_2]):str ",
"BKCgetBBPname;" ]
[ "getRole", "command", "bat", "(bid:bat[:oid,:any_2]):str ",
"BKCgetRole;" ]
[ "getSequenceBase", "command", "bat",
"(b:bat[:oid,:any_1]):oid ",
"BKCgetSequenceBase;" ]
@@ -81,7 +78,6 @@ end main;
[ "insert", "command", "bat",
"(b:bat[:any_1,:any_2],src:bat[:any_1,:any_2],force:bit):bat[:any_1,:any_2] ",
"BKCinsert_bat_force;"
]
[ "insert", "command", "bat",
"(b:bat[:any_1,:any_2],src:bat[:any_1,:any_2]):bat[:any_1,:any_2] ",
"BKCinsert_bat;"
]
[ "intersectcand", "command", "bat",
"(a:bat[:oid,:oid],b:bat[:oid,:oid]):bat[:oid,:oid] ",
"BKCintersectcand;" ]
-[ "isCached", "command", "bat", "(b:bat[:oid,:any_2]):bit ",
"BKCisCached;" ]
[ "isPersistent", "command", "bat", "(b:bat[:oid,:any_2]):bit ",
"BKCisPersistent;" ]
[ "isSorted", "command", "bat", "(b:bat[:oid,:any_1]):bit ",
"BKCisSorted;" ]
[ "isSortedReverse", "command", "bat", "(b:bat[:oid,:any_1]):bit ",
"BKCisSortedReverse;" ]
@@ -115,11 +111,11 @@ end main;
[ "save", "command", "bat",
"(nme:str):bit ",
"BKCsave;" ]
[ "save", "command", "bat", "(nme:bat[:oid,:any_2]):void ",
"BKCsave2;" ]
[ "setAccess", "command", "bat",
"(b:bat[:oid,:any_1],mode:str):bat[:oid,:any_1] ", "BKCsetAccess;" ]
-[ "setCold", "command", "bat", "(b:bat[:oid,:any_1]):void ",
"BKCcoldBAT;" ]
+[ "setCold", "command", "bat", "(b:bat[:oid,:any_1]):void ",
"BKCsetColdBAT;" ]
[ "setColumn", "command", "bat", "(b:bat[:oid,:any_2],h:str,t:str):void
", "BKCsetColumns;" ]
[ "setColumn", "command", "bat", "(b:bat[:oid,:any_2],t:str):void ",
"BKCsetColumn;" ]
[ "setHash", "command", "bat", "(b:bat[:oid,:any_2]):bit ",
"BKCsetHash;" ]
-[ "setHot", "command", "bat", "(b:bat[:oid,:any_2]):void ",
"BKChotBAT;" ]
+[ "setHot", "command", "bat", "(b:bat[:oid,:any_2]):void ",
"BKCsetHotBAT;" ]
[ "setImprints", "command", "bat", "(b:bat[:oid,:any_2]):bit ",
"BKCsetImprints;" ]
[ "setKey", "command", "bat",
"(b:bat[:oid,:any_2],mode:bit):bat[:oid,:any_2] ", "BKCsetkey;" ]
[ "setMemoryMap", "command", "bat",
"(b:bat[:oid,:any_2],mode:int):bit ", "BKCmmap2;" ]
diff --git a/sql/test/mergetables/Tests/forex.stable.err
b/sql/test/mergetables/Tests/forex.stable.err
deleted file mode 100644
--- a/sql/test/mergetables/Tests/forex.stable.err
+++ /dev/null
@@ -1,37 +0,0 @@
-stderr of test 'forex` in directory 'sql/test/mergetables` itself:
-
-
-# 23:00:41 >
-# 23:00:41 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=38230" "--set"
"mapi_usock=/var/tmp/mtest-23198/.s.monetdb.38230" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/mk/current//Linux/var/MonetDB/mTests_sql_test_mergetables"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
-# 23:00:41 >
-
-# builtin opt gdk_dbpath =
/export/scratch1/mk/current//Linux/var/monetdb5/dbfarm/demo
-# builtin opt gdk_debug = 0
-# builtin opt gdk_vmtrim = no
-# 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 mapi_open = true
-# cmdline opt mapi_port = 38230
-# cmdline opt mapi_usock = /var/tmp/mtest-23198/.s.monetdb.38230
-# cmdline opt monet_prompt =
-# cmdline opt mal_listing = 2
-# cmdline opt gdk_dbpath =
/export/scratch1/mk/current//Linux/var/MonetDB/mTests_sql_test_mergetables
-# cmdline opt mal_listing = 0
-# cmdline opt embedded_r = yes
-# cmdline opt gdk_debug = 536870922
-
-# 23:00:42 >
-# 23:00:42 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-23198" "--port=38230"
-# 23:00:42 >
-
-
-# 23:00:42 >
-# 23:00:42 > "Done."
-# 23:00:42 >
-
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
