Changeset: f4da1c161169 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/f4da1c161169 Modified Files: clients/Tests/MAL-signatures-hge.test clients/Tests/MAL-signatures.test clients/Tests/exports.stable.out sql/test/emptydb/Tests/check.stable.out sql/test/emptydb/Tests/check.stable.out.int128 Branch: nilmask Log Message:
Work in progress: some approvals. diffs (93 lines): diff --git a/clients/Tests/MAL-signatures-hge.test b/clients/Tests/MAL-signatures-hge.test --- a/clients/Tests/MAL-signatures-hge.test +++ b/clients/Tests/MAL-signatures-hge.test @@ -43990,7 +43990,7 @@ sht_dec2second_interval; cast sht decimal to a second_interval calc sha256 -command calc.sha256(X_0:str):sha256 +command calc.sha256(X_0:str):sha256 SHA256_fromstr; Convert a string to an sha256 calc @@ -48605,7 +48605,7 @@ mvc_append_wrap; Append to the column tname.cname (possibly optimized to replace the insert bat of tname.cname. Returns sequence number for order dependence. sql append -pattern sql.append(X_0:int, X_1:str, X_2:str, X_3:str, X_4:oid, X_5:bat[:oid], X_6:msk, X_7:any):int +pattern sql.append(X_0:int, X_1:str, X_2:str, X_3:str, X_4:oid, X_5:bat[:oid], X_6:msk, X_7:any):int mvc_append_wrap; Append to the column tname.cname (possibly optimized to replace the insert bat of tname.cname. Returns sequence number for order dependence. sql diff --git a/clients/Tests/MAL-signatures.test b/clients/Tests/MAL-signatures.test --- a/clients/Tests/MAL-signatures.test +++ b/clients/Tests/MAL-signatures.test @@ -32570,7 +32570,7 @@ sht_dec2second_interval; cast sht decimal to a second_interval calc sha256 -command calc.sha256(X_0:str):sha256 +command calc.sha256(X_0:str):sha256 SHA256_fromstr; Convert a string to an sha256 calc @@ -37085,7 +37085,7 @@ mvc_append_wrap; Append to the column tname.cname (possibly optimized to replace the insert bat of tname.cname. Returns sequence number for order dependence. sql append -pattern sql.append(X_0:int, X_1:str, X_2:str, X_3:str, X_4:oid, X_5:bat[:oid], X_6:msk, X_7:any):int +pattern sql.append(X_0:int, X_1:str, X_2:str, X_3:str, X_4:oid, X_5:bat[:oid], X_6:msk, X_7:any):int mvc_append_wrap; Append to the column tname.cname (possibly optimized to replace the insert bat of tname.cname. Returns sequence number for order dependence. sql 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 @@ -1210,6 +1210,7 @@ InstrPtr pushHge(MalBlkPtr mb, InstrPtr void pushInstruction(MalBlkPtr mb, InstrPtr p); InstrPtr pushInt(MalBlkPtr mb, InstrPtr q, int val); InstrPtr pushLng(MalBlkPtr mb, InstrPtr q, lng val); +InstrPtr pushMsk(MalBlkPtr mb, InstrPtr q, bit val); InstrPtr pushNil(MalBlkPtr mb, InstrPtr q, int tpe); InstrPtr pushNilBat(MalBlkPtr mb, InstrPtr q); InstrPtr pushNilType(MalBlkPtr mb, InstrPtr q, char *tpe); @@ -1634,7 +1635,7 @@ str mvc_commit(mvc *c, int chain, const int mvc_create_column(sql_column **col, mvc *m, sql_table *t, const char *name, sql_subtype *tpe); int mvc_create_table(sql_table **t, mvc *m, sql_schema *s, const char *name, int tt, bit system, int persistence, int commit_action, int sz, bit properties); void mvc_query_processed(mvc *m); -int mvc_result_column(backend *be, const char *tn, const char *name, const char *typename, int digits, int scale, BAT *b); +int mvc_result_column(backend *be, const char *tn, const char *name, const char *typename, int digits, int scale, BAT *b, BAT *mask); int mvc_result_table(backend *be, oid query_id, int nr_cols, mapi_query_t type); str mvc_rollback(mvc *c, int chain, const char *name, bool disabling_auto_commit); str number2name(str s, int len, int i); diff --git a/sql/test/emptydb/Tests/check.stable.out b/sql/test/emptydb/Tests/check.stable.out --- a/sql/test/emptydb/Tests/check.stable.out +++ b/sql/test/emptydb/Tests/check.stable.out @@ -5142,7 +5142,11 @@ select 'null in fkeys.delete_action', de [ "sys.types", "sys", "str", "varchar", 0, 0, 0, "STRING" ] [ "sys.types", "sys", "timestamp", "timestamp", 7, 0, 0, "TIMESTAMP" ] [ "sys.types", "sys", "timestamp", "timestamptz", 7, 1, 0, "TIMESTAMP_TZ" ] +[ "sys.types", "sys", "ubte", "utinyint", 8, 1, 2, "NUM" ] +[ "sys.types", "sys", "uint", "uint", 32, 1, 2, "NUM" ] +[ "sys.types", "sys", "ulng", "ubigint", 64, 1, 2, "NUM" ] [ "sys.types", "sys", "url", "url", 0, 0, 0, "EXTERNAL" ] +[ "sys.types", "sys", "usht", "usmallint", 16, 1, 2, "NUM" ] [ "sys.types", "sys", "uuid", "uuid", 0, 0, 0, "EXTERNAL" ] [ "sys.types", "sys", "void", "any", 0, 0, 0, "ANY" ] [ "sys.types", "sys", "wkb", "geometry", 0, 0, 0, "GEOM" ] diff --git a/sql/test/emptydb/Tests/check.stable.out.int128 b/sql/test/emptydb/Tests/check.stable.out.int128 --- a/sql/test/emptydb/Tests/check.stable.out.int128 +++ b/sql/test/emptydb/Tests/check.stable.out.int128 @@ -5285,7 +5285,12 @@ select 'null in fkeys.delete_action', de [ "sys.types", "sys", "str", "varchar", 0, 0, 0, "STRING" ] [ "sys.types", "sys", "timestamp", "timestamp", 7, 0, 0, "TIMESTAMP" ] [ "sys.types", "sys", "timestamp", "timestamptz", 7, 1, 0, "TIMESTAMP_TZ" ] +[ "sys.types", "sys", "ubte", "utinyint", 8, 1, 2, "NUM" ] +[ "sys.types", "sys", "uhge", "uhugeint", 128, 1, 2, "NUM" ] +[ "sys.types", "sys", "uint", "uint", 32, 1, 2, "NUM" ] +[ "sys.types", "sys", "ulng", "ubigint", 64, 1, 2, "NUM" ] [ "sys.types", "sys", "url", "url", 0, 0, 0, "EXTERNAL" ] +[ "sys.types", "sys", "usht", "usmallint", 16, 1, 2, "NUM" ] [ "sys.types", "sys", "uuid", "uuid", 0, 0, 0, "EXTERNAL" ] [ "sys.types", "sys", "void", "any", 0, 0, 0, "ANY" ] [ "sys.types", "sys", "wkb", "geometry", 0, 0, 0, "GEOM" ] _______________________________________________ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
