Changeset: 8a4588e70a5c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8a4588e70a5c
Added Files:
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
Removed Files:
sql/test/mergetables/Tests/forex.stable.err
sql/test/mergetables/Tests/forex.stable.out
Modified Files:
clients/Tests/MAL-signatures_all.stable.out
clients/Tests/MAL-signatures_all.stable.out.int128
clients/Tests/MAL-signatures_fits_geom.stable.out
clients/Tests/MAL-signatures_fits_geom.stable.out.int128
clients/Tests/MAL-signatures_geom.stable.out
clients/Tests/MAL-signatures_geom.stable.out.int128
clients/Tests/MAL-signatures_none.stable.out
clients/Tests/MAL-signatures_none.stable.out.int128
gdk/gdk_bbp.c
monetdb5/mal/Tests/tst049.mal
monetdb5/mal/Tests/tst049.stable.out
monetdb5/mal/Tests/tst285.mal
monetdb5/mal/Tests/tst285.stable.out
monetdb5/mal/Tests/tst960.mal
monetdb5/mal/Tests/tst960.stable.out
monetdb5/modules/kernel/bat5.c
monetdb5/modules/kernel/bat5.h
monetdb5/modules/kernel/bat5.mal
monetdb5/modules/mal/Tests/inspect05.stable.out.int128
sql/backends/monet5/sql_upgrades.c
sql/common/sql_types.c
sql/storage/bat/bat_logger.c
sql/test/mergetables/Tests/crash0.sql
sql/test/mergetables/Tests/forex.sql
sql/test/mergetables/Tests/mergekey.sql
sql/test/mergetables/Tests/mergequery.stable.out
sql/test/pg_regress/Tests/All
sql/test/pg_regress/Tests/geometry.sql
sql/test/pg_regress/Tests/path.sql
sql/test/pg_regress/Tests/path.stable.err
sql/test/pg_regress/Tests/path.stable.out
sql/test/pg_regress/postgresql2sql99.sh
Branch: mosaic
Log Message:
Merge with default
diffs (truncated from 1662 to 300 lines):
diff --git a/clients/Tests/MAL-signatures_all.stable.out
b/clients/Tests/MAL-signatures_all.stable.out
--- a/clients/Tests/MAL-signatures_all.stable.out
+++ b/clients/Tests/MAL-signatures_all.stable.out
@@ -39156,6 +39156,8 @@ command inet.broadcast(X_1:inet):inet
address INETbroadcast;
comment Returns the broadcast address for network
+command inet.#cmp():int
+address INETcompare;
command inet.#fromstr():void
address INETfromString;
comment Convert a string to an inet
diff --git a/clients/Tests/MAL-signatures_all.stable.out.int128
b/clients/Tests/MAL-signatures_all.stable.out.int128
--- a/clients/Tests/MAL-signatures_all.stable.out.int128
+++ b/clients/Tests/MAL-signatures_all.stable.out.int128
@@ -50123,6 +50123,8 @@ command inet.broadcast(X_1:inet):inet
address INETbroadcast;
comment Returns the broadcast address for network
+command inet.#cmp():int
+address INETcompare;
command inet.#fromstr():void
address INETfromString;
comment Convert a string to an inet
diff --git a/clients/Tests/MAL-signatures_fits_geom.stable.out
b/clients/Tests/MAL-signatures_fits_geom.stable.out
--- a/clients/Tests/MAL-signatures_fits_geom.stable.out
+++ b/clients/Tests/MAL-signatures_fits_geom.stable.out
@@ -39073,6 +39073,8 @@ command inet.broadcast(X_1:inet):inet
address INETbroadcast;
comment Returns the broadcast address for network
+command inet.#cmp():int
+address INETcompare;
command inet.#fromstr():void
address INETfromString;
comment Convert a string to an inet
diff --git a/clients/Tests/MAL-signatures_fits_geom.stable.out.int128
b/clients/Tests/MAL-signatures_fits_geom.stable.out.int128
--- a/clients/Tests/MAL-signatures_fits_geom.stable.out.int128
+++ b/clients/Tests/MAL-signatures_fits_geom.stable.out.int128
@@ -50045,6 +50045,8 @@ command inet.broadcast(X_1:inet):inet
address INETbroadcast;
comment Returns the broadcast address for network
+command inet.#cmp():int
+address INETcompare;
command inet.#fromstr():void
address INETfromString;
comment Convert a string to an inet
diff --git a/clients/Tests/MAL-signatures_geom.stable.out
b/clients/Tests/MAL-signatures_geom.stable.out
--- a/clients/Tests/MAL-signatures_geom.stable.out
+++ b/clients/Tests/MAL-signatures_geom.stable.out
@@ -39049,6 +39049,8 @@ command inet.broadcast(X_1:inet):inet
address INETbroadcast;
comment Returns the broadcast address for network
+command inet.#cmp():int
+address INETcompare;
command inet.#fromstr():void
address INETfromString;
comment Convert a string to an inet
diff --git a/clients/Tests/MAL-signatures_geom.stable.out.int128
b/clients/Tests/MAL-signatures_geom.stable.out.int128
--- a/clients/Tests/MAL-signatures_geom.stable.out.int128
+++ b/clients/Tests/MAL-signatures_geom.stable.out.int128
@@ -50021,6 +50021,8 @@ command inet.broadcast(X_1:inet):inet
address INETbroadcast;
comment Returns the broadcast address for network
+command inet.#cmp():int
+address INETcompare;
command inet.#fromstr():void
address INETfromString;
comment Convert a string to an inet
diff --git a/clients/Tests/MAL-signatures_none.stable.out
b/clients/Tests/MAL-signatures_none.stable.out
--- a/clients/Tests/MAL-signatures_none.stable.out
+++ b/clients/Tests/MAL-signatures_none.stable.out
@@ -38878,6 +38878,8 @@ command inet.broadcast(X_1:inet):inet
address INETbroadcast;
comment Returns the broadcast address for network
+command inet.#cmp():int
+address INETcompare;
command inet.#fromstr():void
address INETfromString;
comment Convert a string to an inet
diff --git a/clients/Tests/MAL-signatures_none.stable.out.int128
b/clients/Tests/MAL-signatures_none.stable.out.int128
--- a/clients/Tests/MAL-signatures_none.stable.out.int128
+++ b/clients/Tests/MAL-signatures_none.stable.out.int128
@@ -49849,6 +49849,8 @@ command inet.broadcast(X_1:inet):inet
address INETbroadcast;
comment Returns the broadcast address for network
+command inet.#cmp():int
+address INETcompare;
command inet.#fromstr():void
address INETfromString;
comment Convert a string to an inet
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -990,7 +990,7 @@ BBPheader(FILE *fp, oid *BBPoid, int *OI
"expected pointer size %d, got %d, expected OID size
%d, got %d.",
SIZEOF_SIZE_T, ptrsize, SIZEOF_OID, oidsize);
}
- if (intsize != SIZEOF_MAX_INT) {
+ if (intsize > SIZEOF_MAX_INT) {
GDKfatal("BBPinit: database created with incompatible server:\n"
"expected max. integer size %d, got %d.",
SIZEOF_MAX_INT, intsize);
diff --git a/monetdb5/mal/Tests/tst049.mal b/monetdb5/mal/Tests/tst049.mal
--- a/monetdb5/mal/Tests/tst049.mal
+++ b/monetdb5/mal/Tests/tst049.mal
@@ -30,7 +30,7 @@ io.print(i);
i:= str.like("trx","t_");
io.print(i);
-z:= batstr.like(b,"t_");
+z:= batalgebra.like(b,"t_");
io.print(z);
z:= mal.manifold("str","like",b,"%math%");
io.print(z);
diff --git a/monetdb5/mal/Tests/tst049.stable.out
b/monetdb5/mal/Tests/tst049.stable.out
--- a/monetdb5/mal/Tests/tst049.stable.out
+++ b/monetdb5/mal/Tests/tst049.stable.out
@@ -123,7 +123,7 @@ function user.main():void;
io.print(i);
i := str.like("trx","t_");
io.print(i);
- z := batstr.like(b,"t_");
+ z := batalgebra.like(b,"t_");
io.print(z);
z := mal.manifold("str","like",b,"%math%");
io.print(z);
diff --git a/monetdb5/mal/Tests/tst285.mal b/monetdb5/mal/Tests/tst285.mal
--- a/monetdb5/mal/Tests/tst285.mal
+++ b/monetdb5/mal/Tests/tst285.mal
@@ -1,11 +1,8 @@
b:= bat.new(:oid,:str);
bat.append(b,"hello");
bat.append(b,"goodbye");
-o:=bat.new(:oid,:oid);
-p:= bat.new(:oid,:str);
-bat.append(p,"%hel%");
+z0:= algebra.likesubselect(b,nil:bat,"%hel%",false);
+io.print(z0);
-(z0,z1):= algebra.likesubselect(b,p,"");
-io.print(z0,z1);
diff --git a/monetdb5/mal/Tests/tst285.stable.out
b/monetdb5/mal/Tests/tst285.stable.out
--- a/monetdb5/mal/Tests/tst285.stable.out
+++ b/monetdb5/mal/Tests/tst285.stable.out
@@ -26,17 +26,14 @@ function user.main():void;
b := bat.new(:oid,:str);
bat.append(b,"hello");
bat.append(b,"goodbye");
- o := bat.new(:oid,:oid);
- p := bat.new(:oid,:str);
- bat.append(p,"%hel%");
- (z0,z1) := algebra.likesubselect(b,p,"");
- io.print(z0,z1);
+ z0 := algebra.likesubselect(b,nil:BAT,"%hel%",false);
+ io.print(z0);
end main;
#--------------------------#
# t h h # name
# void oid oid # type
#--------------------------#
-[ 0@0, 0@0, 0@0 ]
+[ 0@0, 0@0 ]
# 08:01:12 >
# 08:01:12 > Done.
diff --git a/monetdb5/mal/Tests/tst960.mal b/monetdb5/mal/Tests/tst960.mal
--- a/monetdb5/mal/Tests/tst960.mal
+++ b/monetdb5/mal/Tests/tst960.mal
@@ -15,7 +15,7 @@ io.print(L);
B:= batcalc.==(S,"hello");
io.print(B);
-C:= batstr.like(S,"hello");
+C:= batalgebra.like(S,"hello");
io.print(C);
U:= batstr.toUpper(S);
diff --git a/monetdb5/mal/Tests/tst960.stable.out
b/monetdb5/mal/Tests/tst960.stable.out
--- a/monetdb5/mal/Tests/tst960.stable.out
+++ b/monetdb5/mal/Tests/tst960.stable.out
@@ -65,7 +65,7 @@ function user.main():void;
io.print(L);
B := batcalc.==(S,"hello");
io.print(B);
- C := batstr.like(S,"hello");
+ C := batalgebra.like(S,"hello");
io.print(C);
U := batstr.toUpper(S);
io.print(U);
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. ";
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
