Changeset: a964bf319dab for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a964bf319dab
Modified Files:
sql/test/testdb-upgrade-hge/Tests/dump.stable.out.int128
sql/test/testdb-upgrade/Tests/dump.stable.out
Branch: Jun2020
Log Message:
Approve new dump output from new base line.
diffs (178 lines):
diff --git a/sql/test/testdb-upgrade-hge/Tests/dump.stable.out.int128
b/sql/test/testdb-upgrade-hge/Tests/dump.stable.out.int128
--- a/sql/test/testdb-upgrade-hge/Tests/dump.stable.out.int128
+++ b/sql/test/testdb-upgrade-hge/Tests/dump.stable.out.int128
@@ -101320,6 +101320,26 @@ CREATE TABLE "testschema"."subtable3" (
"a" INTEGER,
"b" VARCHAR(32)
);
+CREATE MERGE TABLE "testschema"."testme2" (
+ "a" INTEGER,
+ "b" VARCHAR(32)
+) PARTITION BY RANGE ON (a);
+CREATE TABLE "testschema"."subtable4" (
+ "a" INTEGER,
+ "b" VARCHAR(32)
+);
+CREATE TABLE "testschema"."subtable5" (
+ "a" INTEGER,
+ "b" VARCHAR(32)
+);
+CREATE MERGE TABLE "testschema"."testme3" (
+ "a" INTEGER,
+ "b" VARCHAR(32)
+) PARTITION BY RANGE ON (a);
+CREATE TABLE "testschema"."subtable6" (
+ "a" INTEGER,
+ "b" VARCHAR(32)
+);
CREATE MERGE TABLE "testschema"."testvaluespartitions" (
"a" INTEGER,
"b" VARCHAR(32)
@@ -101355,6 +101375,48 @@ 8 "attempt"
CREATE TABLE "testschema"."""" (
"""" INTEGER
);
+CREATE FUNCTION "testschema"."pyapi01"("i" INTEGER) RETURNS TABLE ("i"
INTEGER, "d" DOUBLE) LANGUAGE PYTHON
+{
+ x = range(1, i + 1)
+ y = [42.0] * i
+ return([x,y])
+};
+CREATE FUNCTION "testschema"."pyapi02"("i" INTEGER, "j" INTEGER, "z" INTEGER)
RETURNS INTEGER LANGUAGE PYTHON3
+{
+ x = i * sum(j) * z
+ return x
+};
+CREATE FUNCTION "testschema"."rapi01"("i" INTEGER) RETURNS TABLE ("i" INTEGER,
"d" DOUBLE) LANGUAGE R
+{
+ return(data.frame(i=seq(1,i),d=42.0));
+};
+CREATE FUNCTION "testschema"."rapi02"("i" INTEGER, "j" INTEGER, "z" INTEGER)
RETURNS INTEGER LANGUAGE R
+{
+ return(i*sum(j)*z);
+};
+CREATE FUNCTION "testschema"."capi00"("inp" INTEGER) RETURNS INTEGER LANGUAGE C
+{
+ size_t i;
+ result->initialize(result, inp.count);
+ for(i = 0; i < inp.count; i++) {
+ result->data[i] = inp.data[i] * 2;
+ }
+};
+CREATE AGGREGATE "testschema"."aggrmedian"("val" INTEGER) RETURNS INTEGER
LANGUAGE PYTHON
+{
+ if 'aggr_group' in locals():
+ unique = numpy.unique(aggr_group)
+ x = numpy.zeros(shape=(unique.size))
+ for i in range(0,unique.size):
+ x[i] =
numpy.median(val[numpy.where(aggr_group==unique[i])])
+ return(x)
+ else:
+ return(numpy.median(val))
+};
+CREATE FUNCTION "testschema"."pyapi10_mult"("i" INTEGER, "j" INTEGER) RETURNS
INTEGER LANGUAGE PYTHON_MAP
+{
+ return(i*j)
+};
CREATE TABLE "testschema"."geomtest" (
"p" GEOMETRY(POINT),
"c" GEOMETRY(LINESTRING),
@@ -101376,6 +101438,9 @@ NULL NULL NULL NULL NULL NULL NULL
NULL
ALTER TABLE "testschema"."testme" ADD TABLE "testschema"."subtable1" AS
PARTITION FROM RANGE MINVALUE TO '11' WITH NULL VALUES;
ALTER TABLE "testschema"."testme" ADD TABLE "testschema"."subtable2" AS
PARTITION FROM '11' TO '20';
ALTER TABLE "testschema"."testme" ADD TABLE "testschema"."subtable3" AS
PARTITION FROM '21' TO RANGE MAXVALUE;
+ALTER TABLE "testschema"."testme2" ADD TABLE "testschema"."subtable4" AS
PARTITION FROM RANGE MINVALUE TO RANGE MAXVALUE;
+ALTER TABLE "testschema"."testme2" ADD TABLE "testschema"."subtable5" AS
PARTITION FOR NULL VALUES;
+ALTER TABLE "testschema"."testme3" ADD TABLE "testschema"."subtable6" AS
PARTITION FROM RANGE MINVALUE TO RANGE MAXVALUE WITH NULL VALUES;
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');
diff --git a/sql/test/testdb-upgrade/Tests/dump.stable.out
b/sql/test/testdb-upgrade/Tests/dump.stable.out
--- a/sql/test/testdb-upgrade/Tests/dump.stable.out
+++ b/sql/test/testdb-upgrade/Tests/dump.stable.out
@@ -101315,6 +101315,26 @@ CREATE TABLE "testschema"."subtable3" (
"a" INTEGER,
"b" VARCHAR(32)
);
+CREATE MERGE TABLE "testschema"."testme2" (
+ "a" INTEGER,
+ "b" VARCHAR(32)
+) PARTITION BY RANGE ON (a);
+CREATE TABLE "testschema"."subtable4" (
+ "a" INTEGER,
+ "b" VARCHAR(32)
+);
+CREATE TABLE "testschema"."subtable5" (
+ "a" INTEGER,
+ "b" VARCHAR(32)
+);
+CREATE MERGE TABLE "testschema"."testme3" (
+ "a" INTEGER,
+ "b" VARCHAR(32)
+) PARTITION BY RANGE ON (a);
+CREATE TABLE "testschema"."subtable6" (
+ "a" INTEGER,
+ "b" VARCHAR(32)
+);
CREATE MERGE TABLE "testschema"."testvaluespartitions" (
"a" INTEGER,
"b" VARCHAR(32)
@@ -101350,6 +101370,48 @@ 8 "attempt"
CREATE TABLE "testschema"."""" (
"""" INTEGER
);
+CREATE FUNCTION "testschema"."pyapi01"("i" INTEGER) RETURNS TABLE ("i"
INTEGER, "d" DOUBLE) LANGUAGE PYTHON
+{
+ x = range(1, i + 1)
+ y = [42.0] * i
+ return([x,y])
+};
+CREATE FUNCTION "testschema"."pyapi02"("i" INTEGER, "j" INTEGER, "z" INTEGER)
RETURNS INTEGER LANGUAGE PYTHON3
+{
+ x = i * sum(j) * z
+ return x
+};
+CREATE FUNCTION "testschema"."rapi01"("i" INTEGER) RETURNS TABLE ("i" INTEGER,
"d" DOUBLE) LANGUAGE R
+{
+ return(data.frame(i=seq(1,i),d=42.0));
+};
+CREATE FUNCTION "testschema"."rapi02"("i" INTEGER, "j" INTEGER, "z" INTEGER)
RETURNS INTEGER LANGUAGE R
+{
+ return(i*sum(j)*z);
+};
+CREATE FUNCTION "testschema"."capi00"("inp" INTEGER) RETURNS INTEGER LANGUAGE C
+{
+ size_t i;
+ result->initialize(result, inp.count);
+ for(i = 0; i < inp.count; i++) {
+ result->data[i] = inp.data[i] * 2;
+ }
+};
+CREATE AGGREGATE "testschema"."aggrmedian"("val" INTEGER) RETURNS INTEGER
LANGUAGE PYTHON
+{
+ if 'aggr_group' in locals():
+ unique = numpy.unique(aggr_group)
+ x = numpy.zeros(shape=(unique.size))
+ for i in range(0,unique.size):
+ x[i] =
numpy.median(val[numpy.where(aggr_group==unique[i])])
+ return(x)
+ else:
+ return(numpy.median(val))
+};
+CREATE FUNCTION "testschema"."pyapi10_mult"("i" INTEGER, "j" INTEGER) RETURNS
INTEGER LANGUAGE PYTHON_MAP
+{
+ return(i*j)
+};
CREATE TABLE "testschema"."geomtest" (
"p" GEOMETRY(POINT),
"c" GEOMETRY(LINESTRING),
@@ -101371,6 +101433,9 @@ NULL NULL NULL NULL NULL NULL NULL
NULL
ALTER TABLE "testschema"."testme" ADD TABLE "testschema"."subtable1" AS
PARTITION FROM RANGE MINVALUE TO '11' WITH NULL VALUES;
ALTER TABLE "testschema"."testme" ADD TABLE "testschema"."subtable2" AS
PARTITION FROM '11' TO '20';
ALTER TABLE "testschema"."testme" ADD TABLE "testschema"."subtable3" AS
PARTITION FROM '21' TO RANGE MAXVALUE;
+ALTER TABLE "testschema"."testme2" ADD TABLE "testschema"."subtable4" AS
PARTITION FROM RANGE MINVALUE TO RANGE MAXVALUE;
+ALTER TABLE "testschema"."testme2" ADD TABLE "testschema"."subtable5" AS
PARTITION FOR NULL VALUES;
+ALTER TABLE "testschema"."testme3" ADD TABLE "testschema"."subtable6" AS
PARTITION FROM RANGE MINVALUE TO RANGE MAXVALUE WITH NULL VALUES;
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');
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
