Changeset: edefe081229d for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=edefe081229d Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out sql/test/BugTracker-2017/Tests/crash_correlated_subqueries_in_select.Bug-6254.stable.out sql/test/BugTracker-2017/Tests/wrong_aggregation_count.Bug-6257.stable.out Branch: merge-partitions Log Message:
Approve outputs diffs (219 lines): diff --git a/clients/Tests/MAL-signatures.stable.out b/clients/Tests/MAL-signatures.stable.out --- a/clients/Tests/MAL-signatures.stable.out +++ b/clients/Tests/MAL-signatures.stable.out @@ -10954,7 +10954,9 @@ Ready. [ "sqlblob", "#tostr", "command sqlblob.#tostr():void ", "SQLBLOBtostr;", "" ] [ "sqlblob", "sqlblob", "command sqlblob.sqlblob(s:sqlblob):sqlblob ", "BLOBblob_blob;", "Noop routine." ] [ "sqlblob", "sqlblob", "command sqlblob.sqlblob(s:str):sqlblob ", "BLOBsqlblob_fromstr;", "" ] +[ "sqlcatalog", "alter_add_range_partition", "pattern sqlcatalog.alter_add_range_partition(sname:str, mtnme:str, psnme:str, ptnme:str, min:str, max:str, nills:int):void ", "SQLalter_add_range_partition;", "Catalog operation alter_add_range_partition" ] [ "sqlcatalog", "alter_add_table", "pattern sqlcatalog.alter_add_table(sname:str, mtnme:str, psnme:str, ptnme:str, action:int):void ", "SQLalter_add_table;", "Catalog operation alter_add_table" ] +[ "sqlcatalog", "alter_add_value_partition", "pattern sqlcatalog.alter_add_value_partition(sname:str, mtnme:str, psnme:str, ptnme:str, arg:str...):void ", "SQLalter_add_value_partition;", "Catalog operation alter_add_value_partition" ] [ "sqlcatalog", "alter_del_table", "pattern sqlcatalog.alter_del_table(sname:str, mtnme:str, psnme:str, ptnme:str, action:int):void ", "SQLalter_del_table;", "Catalog operation alter_del_table" ] [ "sqlcatalog", "alter_seq", "pattern sqlcatalog.alter_seq(sname:str, seqname:str, seq:ptr, val:lng):void ", "SQLalter_seq;", "Catalog operation alter_seq" ] [ "sqlcatalog", "alter_set_table", "pattern sqlcatalog.alter_set_table(sname:str, tnme:str, access:int):void ", "SQLalter_set_table;", "Catalog operation alter_set_table" ] @@ -11175,7 +11177,9 @@ Ready. [ "wkba", "#tostr", "command wkba.#tostr():void ", "wkbaTOSTR;", "" ] [ "wkba", "#write", "command wkba.#write():void ", "wkbaWRITE;", "" ] [ "wlc", "action", "pattern wlc.action(q:str):void ", "WLCaction;", "Keep the database changing queries for replay. " ] +[ "wlc", "alter_add_range_partition", "pattern wlc.alter_add_range_partition(sname:str, mtnme:str, psnme:str, ptnme:str, min:str, max:str, nills:int):void ", "WLCgeneric;", "Catalog operation alter_add_range_partition" ] [ "wlc", "alter_add_table", "pattern wlc.alter_add_table(sname:str, mtnme:str, psnme:str, ptnme:str, action:int):void ", "WLCgeneric;", "Catalog operation alter_add_table" ] +[ "wlc", "alter_add_value_partition", "pattern wlc.alter_add_value_partition(sname:str, mtnme:str, psnme:str, ptnme:str, arg:str...):void ", "WLCgeneric;", "Catalog operation alter_add_value_partition" ] [ "wlc", "alter_del_table", "pattern wlc.alter_del_table(sname:str, mtnme:str, psnme:str, ptnme:str, action:int):void ", "WLCgeneric;", "Catalog operation alter_del_table" ] [ "wlc", "alter_seq", "pattern wlc.alter_seq(sname:str, seqname:str, val:lng):void ", "WLCgeneric;", "Catalog operation alter_seq" ] [ "wlc", "alter_set_table", "pattern wlc.alter_set_table(sname:str, tnme:str, access:int):void ", "WLCgeneric;", "Catalog operation alter_set_table" ] @@ -11234,7 +11238,9 @@ Ready. [ "wlc", "transaction_rollback", "pattern wlc.transaction_rollback(chain:int, name:str):void ", "WLCgeneric;", "A transaction statement (type can be commit,release,rollback or start)" ] [ "wlc", "update", "pattern wlc.update(sname:str, tname:str, cname:str, tid:any, val:any):int ", "WLCupdate;", "Keep the update in the workload-capture-replay list" ] [ "wlr", "action", "pattern wlr.action(q:str):void ", "WLRaction;", "A query producing updates" ] +[ "wlr", "alter_add_range_partition", "pattern wlr.alter_add_range_partition(sname:str, mtnme:str, psnme:str, ptnme:str, min:str, max:str, nills:int):void ", "WLRgeneric;", "Catalog operation alter_add_range_partition" ] [ "wlr", "alter_add_table", "pattern wlr.alter_add_table(sname:str, mtnme:str, psnme:str, ptnme:str, action:int):void ", "WLRgeneric;", "Catalog operation alter_add_table" ] +[ "wlr", "alter_add_value_partition", "pattern wlr.alter_add_value_partition(sname:str, mtnme:str, psnme:str, ptnme:str, arg:str...):void ", "WLRgeneric;", "Catalog operation alter_add_value_partition" ] [ "wlr", "alter_del_table", "pattern wlr.alter_del_table(sname:str, mtnme:str, psnme:str, ptnme:str, action:int):void ", "WLRgeneric;", "Catalog operation alter_del_table" ] [ "wlr", "alter_seq", "pattern wlr.alter_seq(sname:str, seqname:str, val:lng):void ", "WLRgeneric;", "Catalog operation alter_seq" ] [ "wlr", "alter_set_table", "pattern wlr.alter_set_table(sname:str, tnme:str, access:int):void ", "WLRgeneric;", "Catalog operation alter_set_table" ] diff --git a/clients/Tests/MAL-signatures.stable.out.int128 b/clients/Tests/MAL-signatures.stable.out.int128 --- a/clients/Tests/MAL-signatures.stable.out.int128 +++ b/clients/Tests/MAL-signatures.stable.out.int128 @@ -15167,7 +15167,9 @@ Ready. [ "sqlblob", "#tostr", "command sqlblob.#tostr():void ", "SQLBLOBtostr;", "" ] [ "sqlblob", "sqlblob", "command sqlblob.sqlblob(s:sqlblob):sqlblob ", "BLOBblob_blob;", "Noop routine." ] [ "sqlblob", "sqlblob", "command sqlblob.sqlblob(s:str):sqlblob ", "BLOBsqlblob_fromstr;", "" ] +[ "sqlcatalog", "alter_add_range_partition", "pattern sqlcatalog.alter_add_range_partition(sname:str, mtnme:str, psnme:str, ptnme:str, min:str, max:str, nills:int):void ", "SQLalter_add_range_partition;", "Catalog operation alter_add_range_partition" ] [ "sqlcatalog", "alter_add_table", "pattern sqlcatalog.alter_add_table(sname:str, mtnme:str, psnme:str, ptnme:str, action:int):void ", "SQLalter_add_table;", "Catalog operation alter_add_table" ] +[ "sqlcatalog", "alter_add_value_partition", "pattern sqlcatalog.alter_add_value_partition(sname:str, mtnme:str, psnme:str, ptnme:str, arg:str...):void ", "SQLalter_add_value_partition;", "Catalog operation alter_add_value_partition" ] [ "sqlcatalog", "alter_del_table", "pattern sqlcatalog.alter_del_table(sname:str, mtnme:str, psnme:str, ptnme:str, action:int):void ", "SQLalter_del_table;", "Catalog operation alter_del_table" ] [ "sqlcatalog", "alter_seq", "pattern sqlcatalog.alter_seq(sname:str, seqname:str, seq:ptr, val:lng):void ", "SQLalter_seq;", "Catalog operation alter_seq" ] [ "sqlcatalog", "alter_set_table", "pattern sqlcatalog.alter_set_table(sname:str, tnme:str, access:int):void ", "SQLalter_set_table;", "Catalog operation alter_set_table" ] @@ -15389,7 +15391,9 @@ Ready. [ "wkba", "#tostr", "command wkba.#tostr():void ", "wkbaTOSTR;", "" ] [ "wkba", "#write", "command wkba.#write():void ", "wkbaWRITE;", "" ] [ "wlc", "action", "pattern wlc.action(q:str):void ", "WLCaction;", "Keep the database changing queries for replay. " ] +[ "wlc", "alter_add_range_partition", "pattern wlc.alter_add_range_partition(sname:str, mtnme:str, psnme:str, ptnme:str, min:str, max:str, nills:int):void ", "WLCgeneric;", "Catalog operation alter_add_range_partition" ] [ "wlc", "alter_add_table", "pattern wlc.alter_add_table(sname:str, mtnme:str, psnme:str, ptnme:str, action:int):void ", "WLCgeneric;", "Catalog operation alter_add_table" ] +[ "wlc", "alter_add_value_partition", "pattern wlc.alter_add_value_partition(sname:str, mtnme:str, psnme:str, ptnme:str, arg:str...):void ", "WLCgeneric;", "Catalog operation alter_add_value_partition" ] [ "wlc", "alter_del_table", "pattern wlc.alter_del_table(sname:str, mtnme:str, psnme:str, ptnme:str, action:int):void ", "WLCgeneric;", "Catalog operation alter_del_table" ] [ "wlc", "alter_seq", "pattern wlc.alter_seq(sname:str, seqname:str, val:lng):void ", "WLCgeneric;", "Catalog operation alter_seq" ] [ "wlc", "alter_set_table", "pattern wlc.alter_set_table(sname:str, tnme:str, access:int):void ", "WLCgeneric;", "Catalog operation alter_set_table" ] @@ -15448,7 +15452,9 @@ Ready. [ "wlc", "transaction_rollback", "pattern wlc.transaction_rollback(chain:int, name:str):void ", "WLCgeneric;", "A transaction statement (type can be commit,release,rollback or start)" ] [ "wlc", "update", "pattern wlc.update(sname:str, tname:str, cname:str, tid:any, val:any):int ", "WLCupdate;", "Keep the update in the workload-capture-replay list" ] [ "wlr", "action", "pattern wlr.action(q:str):void ", "WLRaction;", "A query producing updates" ] +[ "wlr", "alter_add_range_partition", "pattern wlr.alter_add_range_partition(sname:str, mtnme:str, psnme:str, ptnme:str, min:str, max:str, nills:int):void ", "WLRgeneric;", "Catalog operation alter_add_range_partition" ] [ "wlr", "alter_add_table", "pattern wlr.alter_add_table(sname:str, mtnme:str, psnme:str, ptnme:str, action:int):void ", "WLRgeneric;", "Catalog operation alter_add_table" ] +[ "wlr", "alter_add_value_partition", "pattern wlr.alter_add_value_partition(sname:str, mtnme:str, psnme:str, ptnme:str, arg:str...):void ", "WLRgeneric;", "Catalog operation alter_add_value_partition" ] [ "wlr", "alter_del_table", "pattern wlr.alter_del_table(sname:str, mtnme:str, psnme:str, ptnme:str, action:int):void ", "WLRgeneric;", "Catalog operation alter_del_table" ] [ "wlr", "alter_seq", "pattern wlr.alter_seq(sname:str, seqname:str, val:lng):void ", "WLRgeneric;", "Catalog operation alter_seq" ] [ "wlr", "alter_set_table", "pattern wlr.alter_set_table(sname:str, tnme:str, access:int):void ", "WLRgeneric;", "Catalog operation alter_set_table" ] diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out --- a/clients/Tests/exports.stable.out +++ b/clients/Tests/exports.stable.out @@ -1951,7 +1951,9 @@ str affectedRowsRef; str aggrRef; str alarmRef; str algebraRef; +str alter_add_range_partitionRef; str alter_add_tableRef; +str alter_add_value_partitionRef; str alter_constraintRef; str alter_del_tableRef; str alter_functionRef; diff --git a/sql/test/BugTracker-2017/Tests/crash_correlated_subqueries_in_select.Bug-6254.stable.out b/sql/test/BugTracker-2017/Tests/crash_correlated_subqueries_in_select.Bug-6254.stable.out --- a/sql/test/BugTracker-2017/Tests/crash_correlated_subqueries_in_select.Bug-6254.stable.out +++ b/sql/test/BugTracker-2017/Tests/crash_correlated_subqueries_in_select.Bug-6254.stable.out @@ -40,6 +40,9 @@ Ready. % varchar, int, varchar, boolean, int # type % 3, 4, 34, 5, 2 # length [ "sys", 2000, "tables", true, 9 ] +[ "sys", 2000, "table_partitions", true, 4 ] +[ "sys", 2000, "range_partitions", true, 5 ] +[ "sys", 2000, "value_partitions", true, 3 ] [ "sys", 2000, "columns", true, 10 ] [ "sys", 2000, "users", true, 3 ] [ "sys", 2000, "querylog_catalog", true, 8 ] @@ -90,6 +93,9 @@ Ready. % varchar, int, varchar, boolean, int # type % 3, 4, 34, 5, 2 # length [ "sys", 2000, "tables", true, 9 ] +[ "sys", 2000, "table_partitions", true, 4 ] +[ "sys", 2000, "range_partitions", true, 5 ] +[ "sys", 2000, "value_partitions", true, 3 ] [ "sys", 2000, "columns", true, 10 ] [ "sys", 2000, "users", true, 3 ] [ "sys", 2000, "querylog_catalog", true, 8 ] diff --git a/sql/test/BugTracker-2017/Tests/wrong_aggregation_count.Bug-6257.stable.out b/sql/test/BugTracker-2017/Tests/wrong_aggregation_count.Bug-6257.stable.out --- a/sql/test/BugTracker-2017/Tests/wrong_aggregation_count.Bug-6257.stable.out +++ b/sql/test/BugTracker-2017/Tests/wrong_aggregation_count.Bug-6257.stable.out @@ -77,95 +77,95 @@ Ready. % name, authorization, owner, system, "# tables/views", "# system tables", "# user tables", "# system views", "# user views" # name % varchar, int, int, boolean, int, int, int, int, int # type % 8, 1, 1, 5, 1, 1, 1, 1, 1 # length -[ "tmp", 2, 3, true, 6, 6, 0, 0, 0 ] +[ "tmp", 2, 3, true, 9, 9, 0, 0, 0 ] [ "json", 3, 3, true, 0, 0, 0, 0, 0 ] [ "profiler", 3, 3, true, 0, 0, 0, 0, 0 ] #SELECT count(*) as "# tmp tables/views" FROM sys.tables WHERE schema_id IN (SELECT id FROM sys.schemas WHERE name = 'tmp'); -% .L50 # table_name +% .L44 # table_name % "# tmp tables/views" # name % bigint # type % 1 # length -[ 6 ] +[ 9 ] #SELECT count(*) as "# json tables/views" FROM sys.tables WHERE schema_id IN (SELECT id FROM sys.schemas WHERE name = 'json'); -% .L50 # table_name +% .L44 # table_name % "# json tables/views" # name % bigint # type % 1 # length [ 0 ] #SELECT count(*) as "# profiler tables/views" FROM sys.tables WHERE schema_id IN (SELECT id FROM sys.schemas WHERE name = 'profiler'); -% .L50 # table_name +% .L44 # table_name % "# profiler tables/views" # name % bigint # type % 1 # length [ 0 ] #SELECT count(*) as "# tmp system tables" FROM sys.tables WHERE schema_id IN (SELECT id FROM sys.schemas WHERE name = 'tmp') AND system AND query is NULL; -% .L50 # table_name +% .L44 # table_name % "# tmp system tables" # name % bigint # type % 1 # length -[ 6 ] +[ 9 ] #SELECT count(*) as "# json system tables" FROM sys.tables WHERE schema_id IN (SELECT id FROM sys.schemas WHERE name = 'json') AND system AND query is NULL; -% .L50 # table_name +% .L44 # table_name % "# json system tables" # name % bigint # type % 1 # length [ 0 ] #SELECT count(*) as "# profiler system tables" FROM sys.tables WHERE schema_id IN (SELECT id FROM sys.schemas WHERE name = 'profiler') AND system AND query is NULL; -% .L50 # table_name +% .L44 # table_name % "# profiler system tables" # name % bigint # type % 1 # length [ 0 ] #SELECT count(*) as "# tmp user tables" FROM sys.tables WHERE schema_id IN (SELECT id FROM sys.schemas WHERE name = 'tmp') AND NOT system AND query is NULL; -% .L50 # table_name +% .L44 # table_name % "# tmp user tables" # name % bigint # type % 1 # length [ 0 ] #SELECT count(*) as "# json user tables" FROM sys.tables WHERE schema_id IN (SELECT id FROM sys.schemas WHERE name = 'json') AND NOT system AND query is NULL; -% .L50 # table_name +% .L44 # table_name % "# json user tables" # name % bigint # type % 1 # length [ 0 ] #SELECT count(*) as "# profiler user tables" FROM sys.tables WHERE schema_id IN (SELECT id FROM sys.schemas WHERE name = 'profiler') AND NOT system AND query is NULL; -% .L50 # table_name +% .L44 # table_name % "# profiler user tables" # name % bigint # type % 1 # length [ 0 ] #SELECT count(*) as "# tmp system views" FROM sys.tables WHERE schema_id IN (SELECT id FROM sys.schemas WHERE name = 'tmp') AND system AND query is NOT NULL; -% .L50 # table_name +% .L44 # table_name % "# tmp system views" # name % bigint # type % 1 # length [ 0 ] #SELECT count(*) as "# json system views" FROM sys.tables WHERE schema_id IN (SELECT id FROM sys.schemas WHERE name = 'json') AND system AND query is NOT NULL; -% .L50 # table_name +% .L44 # table_name % "# json system views" # name % bigint # type % 1 # length [ 0 ] #SELECT count(*) as "# profiler system views" FROM sys.tables WHERE schema_id IN (SELECT id FROM sys.schemas WHERE name = 'profiler') AND system AND query is NOT NULL; -% .L50 # table_name +% .L44 # table_name % "# profiler system views" # name % bigint # type % 1 # length [ 0 ] #SELECT count(*) as "# tmp user views" FROM sys.tables WHERE schema_id IN (SELECT id FROM sys.schemas WHERE name = 'tmp') AND NOT system AND query is NOT NULL; -% .L50 # table_name +% .L44 # table_name % "# tmp user views" # name % bigint # type % 1 # length [ 0 ] #SELECT count(*) as "# json user views" FROM sys.tables WHERE schema_id IN (SELECT id FROM sys.schemas WHERE name = 'json') AND NOT system AND query is NOT NULL; -% .L50 # table_name +% .L44 # table_name % "# json user views" # name % bigint # type % 1 # length [ 0 ] #SELECT count(*) as "# profiler user views" FROM sys.tables WHERE schema_id IN (SELECT id FROM sys.schemas WHERE name = 'profiler') AND NOT system AND query is NOT NULL; -% .L50 # table_name +% .L44 # table_name % "# profiler user views" # name % bigint # type % 1 # length _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
