Changeset: 52111ef072a8 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/52111ef072a8
Modified Files:
sql/server/rel_optimizer.c
Branch: properties
Log Message:
Merged with default
diffs (truncated from 255345 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -830,3 +830,5 @@ 34d6df33e954fe8fbee1cb3d4e2bde0bbd903d74
9fbec5dab8167d2189582fbe75e5f9c8bef82380 Jan2022_5
34d6df33e954fe8fbee1cb3d4e2bde0bbd903d74 Jan2022_release
9fbec5dab8167d2189582fbe75e5f9c8bef82380 Jan2022_release
+9fbec5dab8167d2189582fbe75e5f9c8bef82380 Jan2022_release
+9fbec5dab8167d2189582fbe75e5f9c8bef82380 Jan2022_release
diff --git a/sql/server/rel_optimizer.c b/sql/server/rel_optimizer.c
--- a/sql/server/rel_optimizer.c
+++ b/sql/server/rel_optimizer.c
@@ -1109,7 +1109,8 @@ can_push_func(sql_exp *e, sql_rel *rel,
case e_cmp: {
sql_exp *l = e->l, *r = e->r, *f = e->f;
- if (e->flag == cmp_or || e->flag == cmp_in || e->flag ==
cmp_notin || e->flag == cmp_filter)
+ /* don't push down functions inside attribute joins */
+ if (e->flag == cmp_or || e->flag == cmp_in || e->flag ==
cmp_notin || e->flag == cmp_filter || (is_join(rel->op) && (e->flag == mark_in
|| e->flag == mark_notin)))
return 0;
if (depth > 0) { /* for comparisons under the top ones, they
become functions */
int lmust = 0;
@@ -1168,15 +1169,16 @@ exps_can_push_func(list *exps, sql_rel *
}
static int
-exp_needs_push_down(sql_exp *e)
+exp_needs_push_down(sql_rel *rel, sql_exp *e)
{
switch(e->type) {
case e_cmp:
- if (e->flag == cmp_or || e->flag == cmp_in || e->flag ==
cmp_notin || e->flag == cmp_filter)
+ /* don't push down functions inside attribute joins */
+ if (e->flag == cmp_or || e->flag == cmp_in || e->flag ==
cmp_notin || e->flag == cmp_filter || (is_join(rel->op) && (e->flag == mark_in
|| e->flag == mark_notin)))
return 0;
- return exp_needs_push_down(e->l) || exp_needs_push_down(e->r)
|| (e->f && exp_needs_push_down(e->f));
+ return exp_needs_push_down(rel, e->l) ||
exp_needs_push_down(rel, e->r) || (e->f && exp_needs_push_down(rel, e->f));
case e_convert:
- return exp_needs_push_down(e->l);
+ return exp_needs_push_down(rel, e->l);
case e_aggr:
case e_func:
if (!e->l || exps_are_atoms(e->l))
@@ -1193,10 +1195,10 @@ exp_needs_push_down(sql_exp *e)
}
static int
-exps_need_push_down( list *exps )
+exps_need_push_down(sql_rel *rel, list *exps )
{
for(node *n = exps->h; n; n = n->next)
- if (exp_needs_push_down(n->data))
+ if (exp_needs_push_down(rel, n->data))
return 1;
return 0;
}
@@ -1293,7 +1295,7 @@ rel_push_func_down(visitor *v, sql_rel *
/* only push down when is useful */
if ((is_select(rel->op) && list_length(rel->exps) <= 1) ||
rel_is_ref(l) || (is_joinop(rel->op) && rel_is_ref(r)))
return rel;
- if (exps_can_push_func(rel->exps, rel) &&
exps_need_push_down(rel->exps) && !exps_push_single_func_down(v, rel, l, r,
rel->exps, 0))
+ if (exps_can_push_func(rel->exps, rel) &&
exps_need_push_down(rel, rel->exps) && !exps_push_single_func_down(v, rel, l,
r, rel->exps, 0))
return NULL;
if (v->changes > changes) /* once we get a better join order,
we can try to remove this projection */
return rel_project(v->sql->sa, rel,
rel_projections(v->sql, rel, NULL, 1, 1));
diff --git a/sql/test/SQLancer/Tests/sqlancer17.test
b/sql/test/SQLancer/Tests/sqlancer17.test
--- a/sql/test/SQLancer/Tests/sqlancer17.test
+++ b/sql/test/SQLancer/Tests/sqlancer17.test
@@ -609,3 +609,22 @@ query I nosort
statement ok
ROLLBACK
+
+statement ok
+START TRANSACTION
+
+statement ok
+CREATE TABLE tz (c0 INT)
+
+statement ok
+create or replace view vy(vc0) as (values (1))
+
+statement ok
+create or replace view vx(vc0, vc1) as (select 2, 3 from vy)
+
+query I nosort
+SELECT 1 FROM tz, vx WHERE (vx.vc1 + tz.c0) <> ALL(VALUES (4)) AND vx.vc0 <>
ALL(VALUES (5))
+----
+
+statement ok
+ROLLBACK
diff --git
a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
---
a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
+++
b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
@@ -37,5085 +37,4112 @@ insert into sys.types values (34, '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 (30, 'length', 'nitems', 'blob', 0, 1, false,
false, false, 2000, true, false);
-insert into sys.args values (41396, 30, 'res_0', 'int', 32, 0, 0, 0);
-insert into sys.args values (41397, 30, 'arg_1', 'blob', 0, 0, 1, 1);
+insert into sys.args values (44808, 30, 'res_0', 'int', 32, 0, 0, 0);
+insert into sys.args values (44809, 30, 'arg_1', 'blob', 0, 0, 1, 1);
insert into sys.functions values (31, 'octet_length', 'nitems', 'blob', 0, 1,
false, false, false, 2000, true, false);
-insert into sys.args values (41398, 31, 'res_0', 'int', 32, 0, 0, 0);
-insert into sys.args values (41399, 31, 'arg_1', 'blob', 0, 0, 1, 1);
+insert into sys.args values (44810, 31, 'res_0', 'int', 32, 0, 0, 0);
+insert into sys.args values (44811, 31, 'arg_1', 'blob', 0, 0, 1, 1);
insert into sys.functions values (35, 'mbr_overlap', 'mbrOverlaps', 'geom', 0,
1, false, false, false, 2000, true, true);
-insert into sys.args values (41400, 35, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (41401, 35, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (41402, 35, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (44812, 35, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (44813, 35, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (44814, 35, 'arg_2', 'geometry', 0, 0, 1, 2);
insert into sys.functions values (36, 'mbr_overlap', 'mbrOverlaps', 'geom', 0,
1, false, false, false, 2000, true, true);
-insert into sys.args values (41403, 36, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (41404, 36, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (41405, 36, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (44815, 36, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (44816, 36, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (44817, 36, 'arg_2', 'mbr', 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 (41406, 37, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (41407, 37, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (41408, 37, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (44818, 37, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (44819, 37, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (44820, 37, 'arg_2', 'geometry', 0, 0, 1, 2);
insert into sys.functions values (38, 'mbr_above', 'mbrAbove', 'geom', 0, 1,
false, false, false, 2000, true, true);
-insert into sys.args values (41409, 38, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (41410, 38, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (41411, 38, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (44821, 38, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (44822, 38, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (44823, 38, 'arg_2', 'mbr', 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 (41412, 39, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (41413, 39, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (41414, 39, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (44824, 39, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (44825, 39, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (44826, 39, 'arg_2', 'geometry', 0, 0, 1, 2);
insert into sys.functions values (40, 'mbr_below', 'mbrBelow', 'geom', 0, 1,
false, false, false, 2000, true, true);
-insert into sys.args values (41415, 40, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (41416, 40, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (41417, 40, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (44827, 40, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (44828, 40, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (44829, 40, 'arg_2', 'mbr', 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 (41418, 41, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (41419, 41, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (41420, 41, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (44830, 41, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (44831, 41, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (44832, 41, 'arg_2', 'geometry', 0, 0, 1, 2);
insert into sys.functions values (42, 'mbr_right', 'mbrRight', 'geom', 0, 1,
false, false, false, 2000, true, true);
-insert into sys.args values (41421, 42, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (41422, 42, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (41423, 42, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (44833, 42, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (44834, 42, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (44835, 42, 'arg_2', 'mbr', 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 (41424, 43, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (41425, 43, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (41426, 43, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (44836, 43, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (44837, 43, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (44838, 43, 'arg_2', 'geometry', 0, 0, 1, 2);
insert into sys.functions values (44, 'mbr_left', 'mbrLeft', 'geom', 0, 1,
false, false, false, 2000, true, true);
-insert into sys.args values (41427, 44, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (41428, 44, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (41429, 44, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (44839, 44, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (44840, 44, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (44841, 44, 'arg_2', 'mbr', 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 (41430, 45, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (41431, 45, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (41432, 45, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (44842, 45, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (44843, 45, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (44844, 45, 'arg_2', 'geometry', 0, 0, 1, 2);
insert into sys.functions values (46, 'mbr_overlap_or_above',
'mbrOverlapOrAbove', 'geom', 0, 1, false, false, false, 2000, true, true);
-insert into sys.args values (41433, 46, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (41434, 46, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (41435, 46, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (44845, 46, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (44846, 46, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (44847, 46, 'arg_2', 'mbr', 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 (41436, 47, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (41437, 47, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (41438, 47, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (44848, 47, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (44849, 47, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (44850, 47, 'arg_2', 'geometry', 0, 0, 1, 2);
insert into sys.functions values (48, 'mbr_overlap_or_below',
'mbrOverlapOrBelow', 'geom', 0, 1, false, false, false, 2000, true, true);
-insert into sys.args values (41439, 48, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (41440, 48, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (41441, 48, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (44851, 48, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (44852, 48, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (44853, 48, 'arg_2', 'mbr', 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 (41442, 49, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (41443, 49, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (41444, 49, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (44854, 49, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (44855, 49, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (44856, 49, 'arg_2', 'geometry', 0, 0, 1, 2);
insert into sys.functions values (50, 'mbr_overlap_or_right',
'mbrOverlapOrRight', 'geom', 0, 1, false, false, false, 2000, true, true);
-insert into sys.args values (41445, 50, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (41446, 50, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (41447, 50, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (44857, 50, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (44858, 50, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (44859, 50, 'arg_2', 'mbr', 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 (41448, 51, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (41449, 51, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (41450, 51, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (44860, 51, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (44861, 51, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (44862, 51, 'arg_2', 'geometry', 0, 0, 1, 2);
insert into sys.functions values (52, 'mbr_overlap_or_left',
'mbrOverlapOrLeft', 'geom', 0, 1, false, false, false, 2000, true, true);
-insert into sys.args values (41451, 52, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (41452, 52, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (41453, 52, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (44863, 52, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (44864, 52, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (44865, 52, 'arg_2', 'mbr', 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 (41454, 53, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (41455, 53, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (41456, 53, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (44866, 53, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (44867, 53, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (44868, 53, 'arg_2', 'geometry', 0, 0, 1, 2);
insert into sys.functions values (54, 'mbr_contains', 'mbrContains', 'geom',
0, 1, false, false, false, 2000, true, true);
-insert into sys.args values (41457, 54, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (41458, 54, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (41459, 54, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (44869, 54, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (44870, 54, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (44871, 54, 'arg_2', 'mbr', 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 (41460, 55, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (41461, 55, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (41462, 55, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (44872, 55, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (44873, 55, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (44874, 55, 'arg_2', 'geometry', 0, 0, 1, 2);
insert into sys.functions values (56, 'mbr_contained', 'mbrContained', 'geom',
0, 1, false, false, false, 2000, true, true);
-insert into sys.args values (41463, 56, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (41464, 56, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (41465, 56, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (44875, 56, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (44876, 56, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (44877, 56, 'arg_2', 'mbr', 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 (41466, 57, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (41467, 57, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (41468, 57, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (44878, 57, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (44879, 57, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (44880, 57, 'arg_2', 'geometry', 0, 0, 1, 2);
insert into sys.functions values (58, 'mbr_equal', 'mbrEqual', 'geom', 0, 1,
false, false, false, 2000, true, true);
-insert into sys.args values (41469, 58, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (41470, 58, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (41471, 58, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (44881, 58, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (44882, 58, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (44883, 58, 'arg_2', 'mbr', 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 (41472, 59, 'res_0', 'double', 53, 0, 0, 0);
-insert into sys.args values (41473, 59, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (41474, 59, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (44884, 59, 'res_0', 'double', 53, 0, 0, 0);
+insert into sys.args values (44885, 59, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (44886, 59, 'arg_2', 'geometry', 0, 0, 1, 2);
insert into sys.functions values (60, 'mbr_distance', 'mbrDistance', 'geom',
0, 1, false, false, false, 2000, true, true);
-insert into sys.args values (41475, 60, 'res_0', 'double', 53, 0, 0, 0);
-insert into sys.args values (41476, 60, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (41477, 60, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (44887, 60, 'res_0', 'double', 53, 0, 0, 0);
+insert into sys.args values (44888, 60, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (44889, 60, 'arg_2', 'mbr', 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 (41478, 61, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (41479, 61, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (41480, 61, 'arg_2', 'geometry', 0, 0, 1, 2);
+insert into sys.args values (44890, 61, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (44891, 61, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (44892, 61, 'arg_2', 'geometry', 0, 0, 1, 2);
insert into sys.functions values (62, 'left_shift', 'mbrLeft', 'geom', 0, 1,
false, false, false, 2000, true, true);
-insert into sys.args values (41481, 62, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (41482, 62, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (41483, 62, 'arg_2', 'mbr', 0, 0, 1, 2);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
