Changeset: f27f119a1453 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f27f119a1453 Branch: default Log Message:
Merged with Oct2020 diffs (70 lines): diff --git a/sql/test/merge-partitions/Tests/mergepart30.sql b/sql/test/merge-partitions/Tests/mergepart30.sql --- a/sql/test/merge-partitions/Tests/mergepart30.sql +++ b/sql/test/merge-partitions/Tests/mergepart30.sql @@ -106,10 +106,16 @@ ALTER TABLE table1 ADD TABLE another3 AS ALTER TABLE table1 ADD TABLE another4 AS PARTITION FOR NULL VALUES; ALTER TABLE table1 ADD TABLE another5 AS PARTITION FROM -100 TO -1; --error, conflicts with another1 +ALTER TABLE table1 ADD TABLE another5 AS PARTITION FROM RANGE MINVALUE TO -1; --error, conflicts with another1 +ALTER TABLE table1 ADD TABLE another5 AS PARTITION FROM RANGE MINVALUE TO 0; --error, conflicts with another1 +ALTER TABLE table1 ADD TABLE another5 AS PARTITION FROM RANGE MINVALUE TO RANGE MAXVALUE; --error, conflicts with another1 ALTER TABLE table1 ADD TABLE another5 AS PARTITION FROM 0 TO 0; --error, conflicts with another1 ALTER TABLE table1 ADD TABLE another5 AS PARTITION FROM 10 TO 10; --error, conflicts with another2 ALTER TABLE table1 ADD TABLE another5 AS PARTITION FROM 10 TO 11; --error, conflicts with another2 +ALTER TABLE table1 ADD TABLE another5 AS PARTITION FROM 10 TO RANGE MAXVALUE; --error, conflicts with another2 +ALTER TABLE table1 ADD TABLE another5 AS PARTITION FROM 20 TO RANGE MAXVALUE; --error, conflicts with another2 ALTER TABLE table1 ADD TABLE another5 AS PARTITION FROM 9 TO 10; --error, conflicts with another3 +ALTER TABLE table1 ADD TABLE another5 AS PARTITION FROM 9 TO 10 WITH NULL VALUES; --error, conflicts with another3 ALTER TABLE table1 ADD TABLE another5 AS PARTITION FOR NULL VALUES; --error, conflicts with another4 ALTER TABLE table1 DROP TABLE another1; diff --git a/sql/test/merge-partitions/Tests/mergepart30.stable.err b/sql/test/merge-partitions/Tests/mergepart30.stable.err --- a/sql/test/merge-partitions/Tests/mergepart30.stable.err +++ b/sql/test/merge-partitions/Tests/mergepart30.stable.err @@ -109,7 +109,19 @@ MAPI = (monetdb) /var/tmp/mtest-99796/. QUERY = ALTER TABLE table1 ADD TABLE another5 AS PARTITION FROM -100 TO -1; --error, conflicts with another1 ERROR = !ALTER TABLE: conflicting partitions: -100 to -1 and absolute min value to 0 from table sys.another1 CODE = 42000 -MAPI = (monetdb) /var/tmp/mtest-131881/.s.monetdb.39742 +MAPI = (monetdb) /var/tmp/mtest-158968/.s.monetdb.39045 +QUERY = ALTER TABLE table1 ADD TABLE another5 AS PARTITION FROM RANGE MINVALUE TO -1; --error, conflicts with another1 +ERROR = !ALTER TABLE: conflicting partitions: absolute min value to -1 and absolute min value to 0 from table sys.another1 +CODE = 42000 +MAPI = (monetdb) /var/tmp/mtest-158968/.s.monetdb.39045 +QUERY = ALTER TABLE table1 ADD TABLE another5 AS PARTITION FROM RANGE MINVALUE TO 0; --error, conflicts with another1 +ERROR = !ALTER TABLE: conflicting partitions: absolute min value to 0 and absolute min value to 0 from table sys.another1 +CODE = 42000 +MAPI = (monetdb) /var/tmp/mtest-158968/.s.monetdb.39045 +QUERY = ALTER TABLE table1 ADD TABLE another5 AS PARTITION FROM RANGE MINVALUE TO RANGE MAXVALUE; --error, conflicts with another1 +ERROR = !ALTER TABLE: conflicting partitions: absolute min value to absolute max value and absolute min value to 0 from table sys.another1 +CODE = 42000 +MAPI = (monetdb) /var/tmp/mtest-158968/.s.monetdb.39045 QUERY = ALTER TABLE table1 ADD TABLE another5 AS PARTITION FROM 0 TO 0; --error, conflicts with another1 ERROR = !ALTER TABLE: conflicting partitions: 0 to 0 and absolute min value to 0 from table sys.another1 CODE = 42000 @@ -121,11 +133,23 @@ MAPI = (monetdb) /var/tmp/mtest-127940/ QUERY = ALTER TABLE table1 ADD TABLE another5 AS PARTITION FROM 10 TO 11; --error, conflicts with another2 ERROR = !ALTER TABLE: conflicting partitions: 10 to 11 and 10 to absolute max value from table sys.another2 CODE = 42000 -MAPI = (monetdb) /var/tmp/mtest-111127/.s.monetdb.37141 +MAPI = (monetdb) /var/tmp/mtest-158968/.s.monetdb.39045 +QUERY = ALTER TABLE table1 ADD TABLE another5 AS PARTITION FROM 10 TO RANGE MAXVALUE; --error, conflicts with another2 +ERROR = !ALTER TABLE: conflicting partitions: 10 to absolute max value and 10 to absolute max value from table sys.another2 +CODE = 42000 +MAPI = (monetdb) /var/tmp/mtest-158968/.s.monetdb.39045 +QUERY = ALTER TABLE table1 ADD TABLE another5 AS PARTITION FROM 20 TO RANGE MAXVALUE; --error, conflicts with another2 +ERROR = !ALTER TABLE: conflicting partitions: 20 to absolute max value and 10 to absolute max value from table sys.another2 +CODE = 42000 +MAPI = (monetdb) /var/tmp/mtest-158968/.s.monetdb.39045 QUERY = ALTER TABLE table1 ADD TABLE another5 AS PARTITION FROM 9 TO 10; --error, conflicts with another3 ERROR = !ALTER TABLE: conflicting partitions: 9 to 10 and 0 to 10 from table sys.another3 CODE = 42000 -MAPI = (monetdb) /var/tmp/mtest-99796/.s.monetdb.30680 +MAPI = (monetdb) /var/tmp/mtest-159240/.s.monetdb.30908 +QUERY = ALTER TABLE table1 ADD TABLE another5 AS PARTITION FROM 9 TO 10 WITH NULL VALUES; --error, conflicts with another3 +ERROR = !ALTER TABLE: conflicting partitions: 9 to 10 and 0 to 10 from table sys.another3 +CODE = 42000 +MAPI = (monetdb) /var/tmp/mtest-159240/.s.monetdb.30908 QUERY = ALTER TABLE table1 ADD TABLE another5 AS PARTITION FOR NULL VALUES; --error, conflicts with another4 ERROR = !ALTER TABLE: conflicting partitions: table sys.another4 stores null values and only one partition can store null values at the time CODE = 42000 _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
