Changeset: 45a1a5ba4fd4 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/45a1a5ba4fd4
Modified Files:
clients/Tests/MAL-signatures-hge.test
clients/Tests/exports.stable.out
sql/storage/bat/bat_logger.c
sql/test/emptydb/Tests/check.stable.out.int128
Branch: nested
Log Message:
Fix upgrade code.
diffs (truncated from 2146 to 300 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
@@ -33769,6 +33769,11 @@ unsafe pattern batsql.next_value(X_0:lng
mvc_next_value_bulk
return the next value of the sequence
batsql
+next_value_ms
+pattern batsql.next_value_ms(X_0:bat[:any_1], X_1:str, X_2:str):bat[:lng]
+mvc_next_value_bulk;
+return the next value of the sequence
+batsql
nth_value
pattern batsql.nth_value(X_0:bat?[:any_1], X_1:bat?[:lng], X_2:bat?[:bit],
X_3:bat?[:bit], X_4:int, X_5:bat?[:oid], X_6:bat?[:oid]):bat[:any_1]
SQLnth_value
@@ -33849,6 +33854,11 @@ pattern batsql.rank(X_0:bat[:any_1], X_1
SQLrank
return the ranked groups
batsql
+renumber
+pattern batsql.renumber(X_0:bat[:int], X_1:bat[:int], X_2:bat[:int]):bat[:int]
+mvc_renumber_bulk;
+return the input b renumbered using values from base
+batsql
row_number
pattern batsql.row_number(X_0:bat[:any_1], X_1:bat?[:bit],
X_2:bat?[:bit]):bat[:int]
SQLrow_number
@@ -48590,6 +48600,11 @@ SQLany_cmp
if cmp then true, (nl or nr) nil then nil, else false
sql
append
+pattern sql.append(X_0:int, X_1:str, X_2:str, X_3:int, X_4:oid, X_5:bat[:oid],
X_6:any):int
+mvc_append_wrap;
+Append to the column tname.col_id (possibly optimized to replace the insert
bat of tname.col_id. 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: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.
@@ -48680,6 +48695,26 @@ SQLavginteger
return the average of groups
sql
bind
+pattern sql.bind(X_0:int, X_1:str, X_2:str, X_3:int, X_4:int) (X_5:bat[:oid],
X_6:bat[:any_1])
+mvc_bind_wrap;
+Bind the 'schema.table.column' BAT with access kind:@0 - base table@1 -
inserts@2 - updates
+sql
+bind
+pattern sql.bind(X_0:int, X_1:str, X_2:str, X_3:int, X_4:int):bat[:any_1]
+mvc_bind_wrap;
+Bind the 'schema.table.column' BAT with access kind:@0 - base table@1 -
inserts@2 - updates
+sql
+bind
+pattern sql.bind(X_0:int, X_1:str, X_2:str, X_3:int, X_4:int, X_5:int,
X_6:int) (X_7:bat[:oid], X_8:bat[:any_1])
+mvc_bind_wrap;
+Bind the 'schema.table.column' BAT with access kind:@0 - base table@1 -
inserts@2 - updates
+sql
+bind
+pattern sql.bind(X_0:int, X_1:str, X_2:str, X_3:int, X_4:int, X_5:int,
X_6:int):bat[:any_1]
+mvc_bind_wrap;
+Bind the 'schema.table.column' BAT partition with access kind:@0 - base
table@1 - inserts@2 - updates
+sql
+bind
pattern sql.bind(X_0:int, X_1:str, X_2:str, X_3:str, X_4:int) (X_5:bat[:oid],
X_6:bat[:any_1])
mvc_bind_wrap
Bind the 'schema.table.column' BAT with access kind:@0 - base table@1 -
inserts@2 - updates
@@ -48980,6 +49015,26 @@ dump_trace
dump the trace statistics
sql
emptybind
+pattern sql.emptybind(X_0:int, X_1:str, X_2:str, X_3:int, X_4:int)
(X_5:bat[:oid], X_6:bat[:any_1])
+mvc_bind_wrap;
+(empty)
+sql
+emptybind
+pattern sql.emptybind(X_0:int, X_1:str, X_2:str, X_3:int, X_4:int):bat[:any_1]
+mvc_bind_wrap;
+(empty)
+sql
+emptybind
+pattern sql.emptybind(X_0:int, X_1:str, X_2:str, X_3:int, X_4:int, X_5:int,
X_6:int) (X_7:bat[:oid], X_8:bat[:any_1])
+mvc_bind_wrap;
+(empty)
+sql
+emptybind
+pattern sql.emptybind(X_0:int, X_1:str, X_2:str, X_3:int, X_4:int, X_5:int,
X_6:int):bat[:any_1]
+mvc_bind_wrap;
+(empty)
+sql
+emptybind
pattern sql.emptybind(X_0:int, X_1:str, X_2:str, X_3:str, X_4:int)
(X_5:bat[:oid], X_6:bat[:any_1])
mvc_bind_wrap
(empty)
@@ -49089,6 +49144,11 @@ pattern sql.first_value(X_0:any_1, X_1:b
SQLfirst_value
return the first value of groups
sql
+from_json
+pattern sql.from_json(X_0:json, X_1:ptr):bat[:any]...
+SQLfrom_json;
+Reads json string into table of nested structures
+sql
getVariable
pattern sql.getVariable(X_0:int, X_1:str, X_2:str):any_1
getVariable
@@ -49199,6 +49259,11 @@ unsafe pattern sql.next_value(X_0:str, X
mvc_next_value
return the next value of the sequence
sql
+next_value_ms
+pattern sql.next_value_ms(X_0:any_1, X_1:str, X_2:str):lng
+mvc_next_value;
+return the next value of the sequence
+sql
nth_value
pattern sql.nth_value(X_0:any_1, X_1:lng, X_2:bit, X_3:bit, X_4:int, X_5:oid,
X_6:oid):any_1
SQLnth_value
@@ -49374,6 +49439,11 @@ unsafe pattern sql.register(X_0:str, X_1
RAstatement2
Compile the relational statement (rel_smt) and register it as mal function,
mod.fname(signature)
sql
+renumber
+pattern sql.renumber(X_0:int, X_1:int, X_2:int):int
+mvc_renumber;
+return the input b renumbered using values from base
+sql
restart
unsafe pattern sql.restart(X_0:str, X_1:str, X_2:lng):lng
mvc_restart_seq
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
@@ -1426,6 +1426,7 @@ str VLTgenerator_rangejoin(Client cntxt,
str VLTgenerator_subselect(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
str VLTgenerator_table(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
str VLTgenerator_thetasubselect(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
+sql_alias *a_create(allocator *sa, const char *name);
str append_to_table_from_emit(Client cntxt, char *sname, char *tname,
sql_emit_col *columns, size_t ncols);
str batbte_dec2_bte(bat *res, const int *s1, const bat *v, const bat *sid);
str batbte_dec2_dbl(bat *res, const int *s1, const bat *v, const bat *sid);
diff --git a/sql/storage/bat/bat_logger.c b/sql/storage/bat/bat_logger.c
--- a/sql/storage/bat/bat_logger.c
+++ b/sql/storage/bat/bat_logger.c
@@ -880,162 +880,6 @@ bl_postversion(void *Store, logger *lg)
}
}
bat_destroy(funcs);
-
- /* new TINYINT column sys._columns.column_type */
- b = log_temp_descriptor(log_find_bat(lg, 2077)); /*
sys._columns.id */
- if (b == NULL)
- return GDK_FAIL;
- bte ct = 0;
- BAT *coltype = BATconstant(b->hseqbase, TYPE_bte, &ct,
BATcount(b), PERSISTENT);
- bat_destroy(b);
- if (coltype == NULL)
- return GDK_FAIL;
- /* First add 2 rows for sys._columns.column_type and
tmp._columns.column_type */
- if (BUNappend(coltype, &ct, true) != GDK_SUCCEED ||
- BUNappend(coltype, &ct, true) != GDK_SUCCEED ||
- ((coltype = BATsetaccess(coltype, BAT_READ)) == NULL ||
- /* 2168 is sys._columns.column_type */
- BUNappend(lg->catalog_id, &(int) {2168}, true)
!= GDK_SUCCEED ||
- BUNappend(lg->catalog_bid,
&coltype->batCacheid, true) != GDK_SUCCEED ||
- BUNappend(lg->catalog_lid, &lng_nil, false) !=
GDK_SUCCEED ||
- BUNappend(lg->catalog_cnt,
&(lng){BATcount(coltype)}, false) != GDK_SUCCEED
- )) {
- bat_destroy(coltype);
- return GDK_FAIL;
- }
- BBPretain(coltype->batCacheid);
- bat_destroy(coltype);
-
- /* new TINYINT column sys._columns.multiset */
- b = log_temp_descriptor(log_find_bat(lg, 2077)); /*
sys._columns.id */
- if (b == NULL)
- return GDK_FAIL;
- ct = MS_VALUE;
- BAT *multiset = BATconstant(b->hseqbase, TYPE_bte, &ct,
BATcount(b), PERSISTENT);
- bat_destroy(b);
- if (multiset == NULL)
- return GDK_FAIL;
- /* First add 2 rows for sys._columns.column_type and
tmp._columns.column_type */
- if (BUNappend(multiset, &ct, true) != GDK_SUCCEED ||
- BUNappend(multiset, &ct, true) != GDK_SUCCEED ||
- ((multiset = BATsetaccess(multiset, BAT_READ)) == NULL ||
- /* 2170 is sys._columns.multiset */
- BUNappend(lg->catalog_id, &(int) {2170}, true)
!= GDK_SUCCEED ||
- BUNappend(lg->catalog_bid,
&multiset->batCacheid, true) != GDK_SUCCEED ||
- BUNappend(lg->catalog_lid, &lng_nil, false) !=
GDK_SUCCEED ||
- BUNappend(lg->catalog_cnt,
&(lng){BATcount(multiset)}, false) != GDK_SUCCEED
- )) {
- bat_destroy(multiset);
- return GDK_FAIL;
- }
- BBPretain(multiset->batCacheid);
- bat_destroy(multiset);
-
- /* new TINYINT column sys._columns.multiset */
- b = log_temp_descriptor(log_find_bat(lg, 2029)); /* sys.args.id
*/
- if (b == NULL)
- return GDK_FAIL;
- ct = MS_VALUE;
- multiset = BATconstant(b->hseqbase, TYPE_bte, &ct, BATcount(b),
PERSISTENT);
- bat_destroy(b);
- if (multiset == NULL)
- return GDK_FAIL;
- /* First add 2 rows for sys._columns.column_type and
tmp._columns.column_type */
- if (BUNappend(multiset, &ct, true) != GDK_SUCCEED ||
- BUNappend(multiset, &ct, true) != GDK_SUCCEED ||
- ((multiset = BATsetaccess(multiset, BAT_READ)) == NULL ||
- /* 2172 is sys.args.multiset */
- BUNappend(lg->catalog_id, &(int) {2172}, true)
!= GDK_SUCCEED ||
- BUNappend(lg->catalog_bid,
&multiset->batCacheid, true) != GDK_SUCCEED ||
- BUNappend(lg->catalog_lid, &lng_nil, false) !=
GDK_SUCCEED ||
- BUNappend(lg->catalog_cnt,
&(lng){BATcount(multiset)}, false) != GDK_SUCCEED
- )) {
- bat_destroy(multiset);
- return GDK_FAIL;
- }
- BBPretain(multiset->batCacheid);
- bat_destroy(multiset);
-
- if (tabins(lg,
- 2076, &(msk) {false}, /* sys._columns
*/
- /* 2168 is sys._columns.column_type */
- 2077, &(int) {2168}, /*
sys._columns.id */
- 2078, "column_type",
/* sys._columns.name */
- 2079, "tinyint",
/* sys._columns.type */
- 2080, &(int) {7}, /*
sys._columns.type_digits */
- 2081, &(int) {0}, /*
sys._columns.type_scale */
- /* 2076 is sys._columns */
- 2082, &(int) {2076}, /*
sys._columns.table_id */
- 2083, str_nil, /*
sys._columns.default */
- 2084, &(bit) {TRUE}, /*
sys._columns.null */
- 2085, &(int) {6}, /*
sys._columns.number */
- 2086, str_nil, /*
sys._columns.storage */
- 0) != GDK_SUCCEED)
- return GDK_FAIL;
- if (tabins(lg,
- 2076, &(msk) {false}, /* sys._columns
*/
- /* 2169 is tmp._columns.column_type */
- 2077, &(int) {2169}, /*
sys._columns.id */
- 2078, "column_type",
/* sys._columns.name */
- 2079, "tinyint",
/* sys._columns.type */
- 2080, &(int) {7}, /*
sys._columns.type_digits */
- 2081, &(int) {0}, /*
sys._columns.type_scale */
- /* 2124 is tmp._columns */
- 2082, &(int) {2124}, /*
sys._columns.table_id */
- 2083, str_nil, /*
sys._columns.default */
- 2084, &(bit) {TRUE}, /*
sys._columns.null */
- 2085, &(int) {6}, /*
sys._columns.number */
- 2086, str_nil, /*
sys._columns.storage */
- 0) != GDK_SUCCEED)
- return GDK_FAIL;
- if (tabins(lg,
- 2076, &(msk) {false}, /* sys._columns
*/
- /* 2170 is sys._columns.multiset */
- 2077, &(int) {2170}, /*
sys._columns.id */
- 2078, "multiset",
/* sys._columns.name */
- 2079, "tinyint",
/* sys._columns.type */
- 2080, &(int) {7}, /*
sys._columns.type_digits */
- 2081, &(int) {0}, /*
sys._columns.type_scale */
- /* 2076 is sys._columns */
- 2082, &(int) {2076}, /*
sys._columns.table_id */
- 2083, str_nil, /*
sys._columns.default */
- 2084, &(bit) {TRUE}, /*
sys._columns.null */
- 2085, &(int) {6}, /*
sys._columns.number */
- 2086, str_nil, /*
sys._columns.storage */
- 0) != GDK_SUCCEED)
- return GDK_FAIL;
- if (tabins(lg,
- 2076, &(msk) {false}, /* sys._columns
*/
- /* 2171 is tmp._columns.multiset */
- 2077, &(int) {2171}, /*
sys._columns.id */
- 2078, "multiset",
/* sys._columns.name */
- 2079, "tinyint",
/* sys._columns.type */
- 2080, &(int) {7}, /*
sys._columns.type_digits */
- 2081, &(int) {0}, /*
sys._columns.type_scale */
- /* 2124 is tmp._columns */
- 2082, &(int) {2124}, /*
sys._columns.table_id */
- 2083, str_nil, /*
sys._columns.default */
- 2084, &(bit) {TRUE}, /*
sys._columns.null */
- 2085, &(int) {6}, /*
sys._columns.number */
- 2086, str_nil, /*
sys._columns.storage */
- 0) != GDK_SUCCEED)
- return GDK_FAIL;
- if (tabins(lg,
- 2076, &(msk) {false}, /* sys._columns
*/
- /* 2172 is sy.args.multiset */
- 2077, &(int) {2172}, /*
sys._columns.id */
- 2078, "multiset",
/* sys._columns.name */
- 2079, "tinyint",
/* sys._columns.type */
- 2080, &(int) {7}, /*
sys._columns.type_digits */
- 2081, &(int) {0}, /*
sys._columns.type_scale */
- /* 2048 is sy.args */
- 2082, &(int) {2048}, /*
sys._columns.table_id */
- 2083, str_nil, /*
sys._columns.default */
- 2084, &(bit) {TRUE}, /*
sys._columns.null */
- 2085, &(int) {6}, /*
sys._columns.number */
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
