Changeset: 88da4ae2e78f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=88da4ae2e78f
Modified Files:
sql/backends/monet5/sql_optimizer.c
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128
sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade/Tests/upgrade.stable.out
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
Branch: default
Log Message:
Merge with Oct2020 branch.
diffs (truncated from 139923 to 300 lines):
diff --git a/sql/backends/monet5/sql_optimizer.c
b/sql/backends/monet5/sql_optimizer.c
--- a/sql/backends/monet5/sql_optimizer.c
+++ b/sql/backends/monet5/sql_optimizer.c
@@ -29,33 +29,17 @@ static lng
SQLgetColumnSize(sql_trans *tr, sql_column *c, int access)
{
lng size = 0;
- BAT *b;
+
switch(access){
- case 0:
- b= store_funcs.bind_col(tr, c, RDONLY);
- if (b) {
- size += getBatSpace(b);
- BBPunfix(b->batCacheid);
- }
+ case 0: /* Read only */
+ size = store_funcs.count_col(tr, c, 1);
break;
- case 1:
- b = store_funcs.bind_col(tr, c, RD_INS);
- if (b) {
- size+= getBatSpace(b);
- BBPunfix(b->batCacheid);
- }
+ case 1: /* inserts */
+ size = store_funcs.count_col(tr, c, 0);
break;
- case 2:
- b = store_funcs.bind_col(tr, c, RD_UPD_VAL);
- if (b) {
- size += getBatSpace(b);
- BBPunfix(b->batCacheid);
- }
- b = store_funcs.bind_col(tr, c, RD_UPD_ID);
- if (b) {
- size+= getBatSpace(b);
- BBPunfix(b->batCacheid);
- }
+ case 2: /* updates */
+ size = store_funcs.count_col_upd(tr, c);
+ break;
}
return size;
}
@@ -118,24 +102,16 @@ SQLgetSpace(mvc *m, MalBlkPtr mb, int pr
char *idxname = getVarConstant(mb, getArg(p, 3 +
p->retc)).val.sval;
int access = getVarConstant(mb, getArg(p, 4 +
p->retc)).val.ival;
sql_schema *s = mvc_bind_schema(m, sname);
- BAT *b;
if (getFunctionId(p) == bindidxRef) {
sql_idx *i = mvc_bind_idx(m, s, idxname);
if (i && (!isRemote(i->t) &&
!isMergeTable(i->t))) {
- b = store_funcs.bind_idx(tr, i, RDONLY);
- if (b) {
- space += (size =getBatSpace(b));
- if (!size) {
- sql_column *c =
i->t->columns.set->h->data;
- size =
SQLgetColumnSize(tr, c, access);
- }
+ sql_column *c =
i->t->columns.set->h->data;
+ size = SQLgetColumnSize(tr, c, access);
- if( !prepare && size == 0 && !
i->t->system){
- setFunctionId(p,
emptybindidxRef);
- }
- BBPunfix(b->batCacheid);
+ if( !prepare && size == 0 && !
i->t->system){
+ setFunctionId(p,
emptybindidxRef);
}
}
}
diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
@@ -55,4653 +55,4248 @@ insert into sys.types values (33, 'mbr',
delete from sys.functions where id < 2000;
delete from sys.args where func_id not in (select id from sys.functions);
insert into sys.functions values (29, 'length', 'nitems', 'blob', 0, 1, false,
false, false, 2000, true, false);
-insert into sys.args values (34778, 29, 'res_0', 'int', 32, 0, 0, 0);
-insert into sys.args values (34779, 29, 'arg_1', 'blob', 0, 0, 1, 1);
+insert into sys.args values (38214, 29, 'res_0', 'int', 32, 0, 0, 0);
+insert into sys.args values (38215, 29, 'arg_1', 'blob', 0, 0, 1, 1);
insert into sys.functions values (30, 'octet_length', 'nitems', 'blob', 0, 1,
false, false, false, 2000, true, false);
-insert into sys.args values (34780, 30, 'res_0', 'int', 32, 0, 0, 0);
-insert into sys.args values (34781, 30, 'arg_1', 'blob', 0, 0, 1, 1);
+insert into sys.args values (38216, 30, 'res_0', 'int', 32, 0, 0, 0);
+insert into sys.args values (38217, 30, 'arg_1', 'blob', 0, 0, 1, 1);
insert into sys.functions values (34, 'mbr_overlap', 'mbrOverlaps', 'geom', 0,
1, false, false, false, 2000, true, true);
-insert into sys.args values (34782, 34, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (34783, 34, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (34784, 34, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (38218, 34, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (38219, 34, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (38220, 34, 'arg_2', 'geometry', 0, 0, 1, 2);
insert into sys.functions values (35, 'mbr_overlap', 'mbrOverlaps', 'geom', 0,
1, false, false, false, 2000, true, true);
-insert into sys.args values (34785, 35, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (34786, 35, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (34787, 35, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (38221, 35, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (38222, 35, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (38223, 35, 'arg_2', 'mbr', 0, 0, 1, 2);
insert into sys.functions values (36, 'mbr_above', 'mbrAbove', 'geom', 0, 1,
false, false, false, 2000, true, true);
-insert into sys.args values (34788, 36, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (34789, 36, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (34790, 36, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (38224, 36, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (38225, 36, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (38226, 36, 'arg_2', 'geometry', 0, 0, 1, 2);
insert into sys.functions values (37, 'mbr_above', 'mbrAbove', 'geom', 0, 1,
false, false, false, 2000, true, true);
-insert into sys.args values (34791, 37, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (34792, 37, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (34793, 37, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (38227, 37, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (38228, 37, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (38229, 37, 'arg_2', 'mbr', 0, 0, 1, 2);
insert into sys.functions values (38, 'mbr_below', 'mbrBelow', 'geom', 0, 1,
false, false, false, 2000, true, true);
-insert into sys.args values (34794, 38, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (34795, 38, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (34796, 38, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (38230, 38, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (38231, 38, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (38232, 38, 'arg_2', 'geometry', 0, 0, 1, 2);
insert into sys.functions values (39, 'mbr_below', 'mbrBelow', 'geom', 0, 1,
false, false, false, 2000, true, true);
-insert into sys.args values (34797, 39, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (34798, 39, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (34799, 39, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (38233, 39, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (38234, 39, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (38235, 39, 'arg_2', 'mbr', 0, 0, 1, 2);
insert into sys.functions values (40, 'mbr_right', 'mbrRight', 'geom', 0, 1,
false, false, false, 2000, true, true);
-insert into sys.args values (34800, 40, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (34801, 40, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (34802, 40, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (38236, 40, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (38237, 40, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (38238, 40, 'arg_2', 'geometry', 0, 0, 1, 2);
insert into sys.functions values (41, 'mbr_right', 'mbrRight', 'geom', 0, 1,
false, false, false, 2000, true, true);
-insert into sys.args values (34803, 41, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (34804, 41, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (34805, 41, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (38239, 41, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (38240, 41, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (38241, 41, 'arg_2', 'mbr', 0, 0, 1, 2);
insert into sys.functions values (42, 'mbr_left', 'mbrLeft', 'geom', 0, 1,
false, false, false, 2000, true, true);
-insert into sys.args values (34806, 42, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (34807, 42, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (34808, 42, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (38242, 42, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (38243, 42, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (38244, 42, 'arg_2', 'geometry', 0, 0, 1, 2);
insert into sys.functions values (43, 'mbr_left', 'mbrLeft', 'geom', 0, 1,
false, false, false, 2000, true, true);
-insert into sys.args values (34809, 43, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (34810, 43, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (34811, 43, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (38245, 43, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (38246, 43, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (38247, 43, 'arg_2', 'mbr', 0, 0, 1, 2);
insert into sys.functions values (44, 'mbr_overlap_or_above',
'mbrOverlapOrAbove', 'geom', 0, 1, false, false, false, 2000, true, true);
-insert into sys.args values (34812, 44, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (34813, 44, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (34814, 44, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (38248, 44, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (38249, 44, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (38250, 44, 'arg_2', 'geometry', 0, 0, 1, 2);
insert into sys.functions values (45, 'mbr_overlap_or_above',
'mbrOverlapOrAbove', 'geom', 0, 1, false, false, false, 2000, true, true);
-insert into sys.args values (34815, 45, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (34816, 45, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (34817, 45, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (38251, 45, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (38252, 45, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (38253, 45, 'arg_2', 'mbr', 0, 0, 1, 2);
insert into sys.functions values (46, 'mbr_overlap_or_below',
'mbrOverlapOrBelow', 'geom', 0, 1, false, false, false, 2000, true, true);
-insert into sys.args values (34818, 46, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (34819, 46, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (34820, 46, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (38254, 46, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (38255, 46, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (38256, 46, 'arg_2', 'geometry', 0, 0, 1, 2);
insert into sys.functions values (47, 'mbr_overlap_or_below',
'mbrOverlapOrBelow', 'geom', 0, 1, false, false, false, 2000, true, true);
-insert into sys.args values (34821, 47, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (34822, 47, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (34823, 47, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (38257, 47, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (38258, 47, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (38259, 47, 'arg_2', 'mbr', 0, 0, 1, 2);
insert into sys.functions values (48, 'mbr_overlap_or_right',
'mbrOverlapOrRight', 'geom', 0, 1, false, false, false, 2000, true, true);
-insert into sys.args values (34824, 48, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (34825, 48, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (34826, 48, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (38260, 48, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (38261, 48, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (38262, 48, 'arg_2', 'geometry', 0, 0, 1, 2);
insert into sys.functions values (49, 'mbr_overlap_or_right',
'mbrOverlapOrRight', 'geom', 0, 1, false, false, false, 2000, true, true);
-insert into sys.args values (34827, 49, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (34828, 49, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (34829, 49, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (38263, 49, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (38264, 49, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (38265, 49, 'arg_2', 'mbr', 0, 0, 1, 2);
insert into sys.functions values (50, 'mbr_overlap_or_left',
'mbrOverlapOrLeft', 'geom', 0, 1, false, false, false, 2000, true, true);
-insert into sys.args values (34830, 50, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (34831, 50, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (34832, 50, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (38266, 50, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (38267, 50, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (38268, 50, 'arg_2', 'geometry', 0, 0, 1, 2);
insert into sys.functions values (51, 'mbr_overlap_or_left',
'mbrOverlapOrLeft', 'geom', 0, 1, false, false, false, 2000, true, true);
-insert into sys.args values (34833, 51, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (34834, 51, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (34835, 51, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (38269, 51, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (38270, 51, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (38271, 51, 'arg_2', 'mbr', 0, 0, 1, 2);
insert into sys.functions values (52, 'mbr_contains', 'mbrContains', 'geom',
0, 1, false, false, false, 2000, true, true);
-insert into sys.args values (34836, 52, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (34837, 52, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (34838, 52, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (38272, 52, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (38273, 52, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (38274, 52, 'arg_2', 'geometry', 0, 0, 1, 2);
insert into sys.functions values (53, 'mbr_contains', 'mbrContains', 'geom',
0, 1, false, false, false, 2000, true, true);
-insert into sys.args values (34839, 53, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (34840, 53, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (34841, 53, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (38275, 53, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (38276, 53, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (38277, 53, 'arg_2', 'mbr', 0, 0, 1, 2);
insert into sys.functions values (54, 'mbr_contained', 'mbrContained', 'geom',
0, 1, false, false, false, 2000, true, true);
-insert into sys.args values (34842, 54, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (34843, 54, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (34844, 54, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (38278, 54, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (38279, 54, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (38280, 54, 'arg_2', 'geometry', 0, 0, 1, 2);
insert into sys.functions values (55, 'mbr_contained', 'mbrContained', 'geom',
0, 1, false, false, false, 2000, true, true);
-insert into sys.args values (34845, 55, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (34846, 55, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (34847, 55, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (38281, 55, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (38282, 55, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (38283, 55, 'arg_2', 'mbr', 0, 0, 1, 2);
insert into sys.functions values (56, 'mbr_equal', 'mbrEqual', 'geom', 0, 1,
false, false, false, 2000, true, true);
-insert into sys.args values (34848, 56, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (34849, 56, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (34850, 56, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (38284, 56, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (38285, 56, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (38286, 56, 'arg_2', 'geometry', 0, 0, 1, 2);
insert into sys.functions values (57, 'mbr_equal', 'mbrEqual', 'geom', 0, 1,
false, false, false, 2000, true, true);
-insert into sys.args values (34851, 57, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (34852, 57, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (34853, 57, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (38287, 57, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (38288, 57, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (38289, 57, 'arg_2', 'mbr', 0, 0, 1, 2);
insert into sys.functions values (58, 'mbr_distance', 'mbrDistance', 'geom',
0, 1, false, false, false, 2000, true, true);
-insert into sys.args values (34854, 58, 'res_0', 'double', 53, 0, 0, 0);
-insert into sys.args values (34855, 58, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (34856, 58, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (38290, 58, 'res_0', 'double', 53, 0, 0, 0);
+insert into sys.args values (38291, 58, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (38292, 58, 'arg_2', 'geometry', 0, 0, 1, 2);
insert into sys.functions values (59, 'mbr_distance', 'mbrDistance', 'geom',
0, 1, false, false, false, 2000, true, true);
-insert into sys.args values (34857, 59, 'res_0', 'double', 53, 0, 0, 0);
-insert into sys.args values (34858, 59, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (34859, 59, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (38293, 59, 'res_0', 'double', 53, 0, 0, 0);
+insert into sys.args values (38294, 59, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (38295, 59, 'arg_2', 'mbr', 0, 0, 1, 2);
insert into sys.functions values (60, 'left_shift', 'mbrLeft', 'geom', 0, 1,
false, false, false, 2000, true, true);
-insert into sys.args values (34860, 60, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (34861, 60, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (34862, 60, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (38296, 60, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (38297, 60, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (38298, 60, 'arg_2', 'geometry', 0, 0, 1, 2);
insert into sys.functions values (61, 'left_shift', 'mbrLeft', 'geom', 0, 1,
false, false, false, 2000, true, true);
-insert into sys.args values (34863, 61, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (34864, 61, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (34865, 61, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (38299, 61, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (38300, 61, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (38301, 61, 'arg_2', 'mbr', 0, 0, 1, 2);
insert into sys.functions values (62, 'right_shift', 'mbrRight', 'geom', 0, 1,
false, false, false, 2000, true, true);
-insert into sys.args values (34866, 62, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (34867, 62, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (34868, 62, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (38302, 62, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (38303, 62, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (38304, 62, 'arg_2', 'geometry', 0, 0, 1, 2);
insert into sys.functions values (63, 'right_shift', 'mbrRight', 'geom', 0, 1,
false, false, false, 2000, true, true);
-insert into sys.args values (34869, 63, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (34870, 63, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (34871, 63, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (38305, 63, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (38306, 63, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (38307, 63, 'arg_2', 'mbr', 0, 0, 1, 2);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
