Changeset: 089263ed5f2f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/089263ed5f2f
Modified Files:
gdk/gdk_batop.c
Branch: default
Log Message:
Merge with Aug2024 branch.
diffs (130 lines):
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -2443,7 +2443,7 @@ BATsort(BAT **sorted, BAT **order, BAT *
if (groups) {
if (BATtkey(b)) {
/* singleton groups */
- gn = BATdense(0, 0, BATcount(b));
+ gn = BATdense(b->hseqbase, 0, BATcount(b));
if (gn == NULL)
goto error;
} else {
@@ -2451,7 +2451,7 @@ BATsort(BAT **sorted, BAT **order, BAT *
const oid *o = 0;
assert(BATcount(b) == 1 ||
(b->tsorted && b->trevsorted));
- gn = BATconstant(0, TYPE_oid, &o, BATcount(b),
TRANSIENT);
+ gn = BATconstant(b->hseqbase, TYPE_oid, &o,
BATcount(b), TRANSIENT);
if (gn == NULL)
goto error;
}
diff --git a/monetdb5/ChangeLog.Aug2024 b/monetdb5/ChangeLog.Aug2024
--- a/monetdb5/ChangeLog.Aug2024
+++ b/monetdb5/ChangeLog.Aug2024
@@ -1,3 +1,7 @@
# ChangeLog file for MonetDB5
# This file is updated with Maddlog
+* Mon Oct 14 2024 stefanos mavros <[email protected]>
+- The server prints out an informative message for the case of a graceful
+ termination.
+
diff --git a/monetdb5/mal/mal.c b/monetdb5/mal/mal.c
--- a/monetdb5/mal/mal.c
+++ b/monetdb5/mal/mal.c
@@ -164,6 +164,7 @@ mal_reset(void)
void
mal_exit(int status)
{
+ printf("# mserver5 exiting\n");
mal_reset();
exit(status); /* properly end GDK */
}
diff --git a/sql/test/testdb/Tests/dump-nogeom.stable.out
b/sql/test/testdb/Tests/dump-nogeom.stable.out
--- a/sql/test/testdb/Tests/dump-nogeom.stable.out
+++ b/sql/test/testdb/Tests/dump-nogeom.stable.out
@@ -101344,6 +101344,18 @@ 7 "another"
9 "to"
9 "pass"
8 "attempt"
+CREATE MERGE TABLE "testschema"."testme_exp" (
+ "a" INTEGER,
+ "b" VARCHAR(32)
+) PARTITION BY RANGE USING ("sys"."md5"("a"));
+CREATE TABLE "testschema"."subtable_exp1" (
+ "a" INTEGER,
+ "b" VARCHAR(32)
+);
+CREATE TABLE "testschema"."subtable_exp2" (
+ "a" INTEGER,
+ "b" VARCHAR(32)
+);
CREATE REMOTE TABLE "testschema"."remotetable" (
"i" INTEGER
) ON 'mapi:monetdb://remote.host.url:50000/dbname' WITH USER 'bob' ENCRYPTED
PASSWORD
'f8e3183d38e6c51889582cb260ab825252f395b4ac8fb0e6b13e9a71f7c10a80d5301e4a949f2783cb0c20205f1d850f87045f4420ad2271c8fd5f0cd8944be3';
@@ -101441,6 +101453,8 @@ ALTER TABLE "testschema"."testme3" ADD T
ALTER TABLE "testschema"."testvaluespartitions" ADD TABLE
"testschema"."sublimits1" AS PARTITION IN ('1', '2', '3');
ALTER TABLE "testschema"."testvaluespartitions" ADD TABLE
"testschema"."sublimits2" AS PARTITION IN ('4', '5', '6') WITH NULL VALUES;
ALTER TABLE "testschema"."testvaluespartitions" ADD TABLE
"testschema"."sublimits3" AS PARTITION IN ('7', '8', '9');
+ALTER TABLE "testschema"."testme_exp" ADD TABLE "testschema"."subtable_exp1"
AS PARTITION FROM '00000000000000000000000000000000' TO
'7fffffffffffffffffffffffffffffff';
+ALTER TABLE "testschema"."testme_exp" ADD TABLE "testschema"."subtable_exp2"
AS PARTITION FROM '80000000000000000000000000000000' TO
'ffffffffffffffffffffffffffffffff';
ALTER TABLE "testschema"."mt3" ADD TABLE "testschema"."mt1";
ALTER TABLE "testschema"."mt3" ADD TABLE "testschema"."t4";
ALTER TABLE "testschema"."mt2" ADD TABLE "testschema"."t1";
diff --git a/sql/test/testdb/Tests/dump.stable.out
b/sql/test/testdb/Tests/dump.stable.out
--- a/sql/test/testdb/Tests/dump.stable.out
+++ b/sql/test/testdb/Tests/dump.stable.out
@@ -101344,6 +101344,18 @@ 7 "another"
9 "to"
9 "pass"
8 "attempt"
+CREATE MERGE TABLE "testschema"."testme_exp" (
+ "a" INTEGER,
+ "b" VARCHAR(32)
+) PARTITION BY RANGE USING ("sys"."md5"("a"));
+CREATE TABLE "testschema"."subtable_exp1" (
+ "a" INTEGER,
+ "b" VARCHAR(32)
+);
+CREATE TABLE "testschema"."subtable_exp2" (
+ "a" INTEGER,
+ "b" VARCHAR(32)
+);
CREATE REMOTE TABLE "testschema"."remotetable" (
"i" INTEGER
) ON 'mapi:monetdb://remote.host.url:50000/dbname' WITH USER 'bob' ENCRYPTED
PASSWORD
'f8e3183d38e6c51889582cb260ab825252f395b4ac8fb0e6b13e9a71f7c10a80d5301e4a949f2783cb0c20205f1d850f87045f4420ad2271c8fd5f0cd8944be3';
@@ -101459,6 +101471,8 @@ ALTER TABLE "testschema"."testme3" ADD T
ALTER TABLE "testschema"."testvaluespartitions" ADD TABLE
"testschema"."sublimits1" AS PARTITION IN ('1', '2', '3');
ALTER TABLE "testschema"."testvaluespartitions" ADD TABLE
"testschema"."sublimits2" AS PARTITION IN ('4', '5', '6') WITH NULL VALUES;
ALTER TABLE "testschema"."testvaluespartitions" ADD TABLE
"testschema"."sublimits3" AS PARTITION IN ('7', '8', '9');
+ALTER TABLE "testschema"."testme_exp" ADD TABLE "testschema"."subtable_exp1"
AS PARTITION FROM '00000000000000000000000000000000' TO
'7fffffffffffffffffffffffffffffff';
+ALTER TABLE "testschema"."testme_exp" ADD TABLE "testschema"."subtable_exp2"
AS PARTITION FROM '80000000000000000000000000000000' TO
'ffffffffffffffffffffffffffffffff';
ALTER TABLE "testschema"."mt3" ADD TABLE "testschema"."mt1";
ALTER TABLE "testschema"."mt3" ADD TABLE "testschema"."t4";
ALTER TABLE "testschema"."mt2" ADD TABLE "testschema"."t1";
diff --git a/sql/test/testdb/Tests/load.test b/sql/test/testdb/Tests/load.test
--- a/sql/test/testdb/Tests/load.test
+++ b/sql/test/testdb/Tests/load.test
@@ -101509,6 +101509,21 @@ statement ok
INSERT INTO testschema.sublimits3 VALUES (8, 'attempt')
statement ok
+CREATE MERGE TABLE testme_exp (a int, b varchar(32)) PARTITION BY RANGE USING
(sys.md5(a))
+
+statement ok
+CREATE TABLE subtable_exp1 (a int, b varchar(32))
+
+statement ok
+CREATE TABLE subtable_exp2 (a int, b varchar(32))
+
+statement ok
+ALTER TABLE testme_exp ADD TABLE subtable_exp1 AS PARTITION FROM
'00000000000000000000000000000000' TO '7fffffffffffffffffffffffffffffff'
+
+statement ok
+ALTER TABLE testme_exp ADD TABLE subtable_exp2 AS PARTITION FROM
'80000000000000000000000000000000' TO 'ffffffffffffffffffffffffffffffff'
+
+statement ok
CREATE REMOTE TABLE testschema.remotetable (i INTEGER) ON
'mapi:monetdb://remote.host.url:50000/dbname' WITH USER 'bob' ENCRYPTED
PASSWORD
'f8e3183d38e6c51889582cb260ab825252f395b4ac8fb0e6b13e9a71f7c10a80d5301e4a949f2783cb0c20205f1d850f87045f4420ad2271c8fd5f0cd8944be3'
statement ok
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
