Changeset: bd3e21f74a4f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bd3e21f74a4f
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
monetdb5/modules/atoms/blob.c
monetdb5/modules/atoms/mtime.c
sql/server/rel_exp.c
sql/server/rel_exp.h
sql/server/rel_select.c
sql/server/rel_unnest.c
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.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.powerpc64
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.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/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.32bit
sql/test/emptydb/Tests/check.stable.out.int128
sql/test/miscellaneous/Tests/simple_plans.sql
sql/test/miscellaneous/Tests/simple_plans.stable.out
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/dump.stable.out.int128
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/dump.stable.out
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: unlock
Log Message:
merged
diffs (truncated from 136604 to 300 lines):
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
@@ -1567,7 +1567,7 @@ str MTIMEdaytime_extract_minutes(int *re
str MTIMEdaytime_extract_minutes_bulk(bat *ret, const bat *bid);
str MTIMEdaytime_extract_sql_seconds(int *ret, const daytime *src);
str MTIMEdaytime_extract_sql_seconds_bulk(bat *ret, const bat *bid);
-str MTIMEdaytime_fromseconds(daytime *ret, const const lng *src);
+str MTIMEdaytime_fromseconds(daytime *ret, const lng *src);
str MTIMEdaytime_fromseconds_bulk(bat *ret, const bat *bid);
str MTIMEdaytime_fromstr(daytime *ret, const str *src);
str MTIMEdaytime_fromstr_bulk(bat *ret, const bat *bid);
diff --git a/monetdb5/modules/atoms/blob.c b/monetdb5/modules/atoms/blob.c
--- a/monetdb5/modules/atoms/blob.c
+++ b/monetdb5/modules/atoms/blob.c
@@ -207,7 +207,7 @@ BLOBnitems_bulk(bat *ret, const bat *bid
BATiter bi;
if ((b = BATdescriptor(*bid)) == NULL) {
- throw(MAL, "blob.nitems_bulk", SQLSTATE(HY002)
RUNTIME_OBJECT_MISSING);
+ msg = createException(MAL, "blob.nitems_bulk", SQLSTATE(HY002)
RUNTIME_OBJECT_MISSING);
goto bailout;
}
n = BATcount(b);
diff --git a/monetdb5/modules/atoms/mtime.c b/monetdb5/modules/atoms/mtime.c
--- a/monetdb5/modules/atoms/mtime.c
+++ b/monetdb5/modules/atoms/mtime.c
@@ -616,7 +616,7 @@ daytime_fromseconds(daytime *ret, const
*ret = (daytime) (secs * 1000000);
return MAL_SUCCEED;
}
-func1(MTIMEdaytime_fromseconds, MTIMEdaytime_fromseconds_bulk,
"daytime_fromseconds", const lng, daytime, daytime_fromseconds, COPYFLAGS,
func1_except, \
+func1(MTIMEdaytime_fromseconds, MTIMEdaytime_fromseconds_bulk,
"daytime_fromseconds", lng, daytime, daytime_fromseconds, COPYFLAGS,
func1_except, \
DEC_INT, DEC_INT, INIT_INT, INIT_INT, GET_NEXT_INT)
func1(MTIMEtimestamp_extract_daytime, MTIMEtimestamp_extract_daytime_bulk,
"timestamp_extract_daytime", timestamp, daytime, timestamp_daytime, SETFLAGS,
func1_noexcept, \
diff --git a/sql/server/rel_exp.c b/sql/server/rel_exp.c
--- a/sql/server/rel_exp.c
+++ b/sql/server/rel_exp.c
@@ -1325,6 +1325,19 @@ exp_match_exp( sql_exp *e1, sql_exp *e2)
return 0;
}
+sql_exp *
+exps_any_match(list *l, sql_exp *e)
+{
+ if (!l)
+ return NULL;
+ for (node *n = l->h; n ; n = n->next) {
+ sql_exp *ne = (sql_exp *) n->data;
+ if (exp_match_exp(ne, e))
+ return ne;
+ }
+ return NULL;
+}
+
static int
exps_are_joins( list *l )
{
diff --git a/sql/server/rel_exp.h b/sql/server/rel_exp.h
--- a/sql/server/rel_exp.h
+++ b/sql/server/rel_exp.h
@@ -131,6 +131,7 @@ extern int exp_refers( sql_exp *p, sql_e
extern int exp_match( sql_exp *e1, sql_exp *e2);
extern sql_exp* exps_find_exp( list *l, sql_exp *e);
extern int exp_match_exp( sql_exp *e1, sql_exp *e2);
+extern sql_exp* exps_any_match(list *l, sql_exp *e);
/* match just the column (cmp equality) expressions */
extern int exp_match_col_exps( sql_exp *e, list *l);
extern int exps_match_col_exps( sql_exp *e1, sql_exp *e2);
diff --git a/sql/server/rel_select.c b/sql/server/rel_select.c
--- a/sql/server/rel_select.c
+++ b/sql/server/rel_select.c
@@ -4454,7 +4454,7 @@ rel_order_by_column_exp(sql_query *query
{
mvc *sql = query->sql;
sql_rel *r = *R, *p = NULL;
- sql_exp *e = NULL;
+ sql_exp *e = NULL, *found = NULL;
exp_kind ek = {type_value, card_column, FALSE};
if (!r)
@@ -4472,15 +4472,19 @@ rel_order_by_column_exp(sql_query *query
else if (r)
p->l = r;
if (e && p) {
- e = rel_project_add_exp(sql, p, e);
- for (node *n = p->exps->h ; n ; n = n->next) {
- sql_exp *ee = n->data;
-
- if (ee->card > r->card) {
- if (exp_name(ee))
- return sql_error(sql, ERR_GROUPBY,
SQLSTATE(42000) "SELECT: cannot use non GROUP BY column '%s' in query results
without an aggregate function", exp_name(ee));
- else
- return sql_error(sql, ERR_GROUPBY,
SQLSTATE(42000) "SELECT: cannot use non GROUP BY column in query results
without an aggregate function");
+ if (is_project(p->op) && (found = exps_any_match(p->exps, e)))
{ /* if one of the projections matches, return a reference to it */
+ e = exp_ref(sql, found);
+ } else {
+ e = rel_project_add_exp(sql, p, e);
+ for (node *n = p->exps->h ; n ; n = n->next) {
+ sql_exp *ee = n->data;
+
+ if (ee->card > r->card) {
+ if (exp_name(ee))
+ return sql_error(sql,
ERR_GROUPBY, SQLSTATE(42000) "SELECT: cannot use non GROUP BY column '%s' in
query results without an aggregate function", exp_name(ee));
+ else
+ return sql_error(sql,
ERR_GROUPBY, SQLSTATE(42000) "SELECT: cannot use non GROUP BY column in query
results without an aggregate function");
+ }
}
}
return e;
diff --git a/sql/server/rel_unnest.c b/sql/server/rel_unnest.c
--- a/sql/server/rel_unnest.c
+++ b/sql/server/rel_unnest.c
@@ -1640,13 +1640,14 @@ rewrite_empty_project(mvc *sql, sql_rel
}
static sql_exp *
-exp_reset_card(mvc *sql, sql_rel *rel, sql_exp *e, int depth, int *changes)
+exp_reset_card_and_freevar(mvc *sql, sql_rel *rel, sql_exp *e, int depth, int
*changes)
{
(void)sql;
(void)depth;
(void)changes;
- if (!e || !rel || !rel->l)
+ reset_freevar(e); /* unnesting is done, we can remove the freevar flag
*/
+ if (!rel->l)
return e;
if (is_groupby(rel->op)) {
switch(e->type) {
@@ -3162,6 +3163,6 @@ rel_unnest(mvc *sql, sql_rel *rel)
rel = rel_visitor_bottomup(sql, rel, &rewrite_groupings, &changes);
/* transform group combinations into union of group relations */
rel = rel_visitor_bottomup(sql, rel, &rewrite_empty_project, &changes);
// needed again!
- rel = rel_exp_visitor_bottomup(sql, rel, &exp_reset_card, &changes);
+ rel = rel_exp_visitor_bottomup(sql, rel, &exp_reset_card_and_freevar,
&changes);
return rel;
}
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
@@ -18,6400 +18,6 @@ stdout of test 'upgrade` in directory 's
# MonetDB/GIS module loaded
Running database upgrade commands:
set schema "sys";
-delete from sys.dependencies where id < 2000;
-delete from sys.types where id < 2000;
-insert into sys.types values (0, 'void', 'any', 0, 0, 0, 0, 2000);
-insert into sys.types values (1, 'bat', 'table', 0, 0, 0, 1, 2000);
-insert into sys.types values (2, 'ptr', 'ptr', 0, 0, 0, 1, 2000);
-insert into sys.types values (3, 'bit', 'boolean', 1, 0, 2, 2, 2000);
-insert into sys.types values (4, 'str', 'char', 0, 0, 0, 3, 2000);
-insert into sys.types values (5, 'str', 'varchar', 0, 0, 0, 4, 2000);
-insert into sys.types values (6, 'str', 'clob', 0, 0, 0, 4, 2000);
-insert into sys.types values (7, 'oid', 'oid', 63, 0, 2, 6, 2000);
-insert into sys.types values (8, 'bte', 'tinyint', 8, 1, 2, 7, 2000);
-insert into sys.types values (9, 'sht', 'smallint', 16, 1, 2, 7, 2000);
-insert into sys.types values (10, 'int', 'int', 32, 1, 2, 7, 2000);
-insert into sys.types values (11, 'lng', 'bigint', 64, 1, 2, 7, 2000);
-insert into sys.types values (12, 'hge', 'hugeint', 128, 1, 2, 7, 2000);
-insert into sys.types values (13, 'bte', 'decimal', 2, 1, 10, 10, 2000);
-insert into sys.types values (14, 'sht', 'decimal', 4, 1, 10, 10, 2000);
-insert into sys.types values (15, 'int', 'decimal', 9, 1, 10, 10, 2000);
-insert into sys.types values (16, 'lng', 'decimal', 18, 1, 10, 10, 2000);
-insert into sys.types values (17, 'hge', 'decimal', 38, 1, 10, 10, 2000);
-insert into sys.types values (18, 'flt', 'real', 24, 2, 2, 11, 2000);
-insert into sys.types values (19, 'dbl', 'double', 53, 2, 2, 11, 2000);
-insert into sys.types values (20, 'int', 'month_interval', 32, 0, 2, 8, 2000);
-insert into sys.types values (21, 'lng', 'sec_interval', 13, 1, 10, 9, 2000);
-insert into sys.types values (22, 'daytime', 'time', 7, 0, 0, 12, 2000);
-insert into sys.types values (23, 'daytime', 'timetz', 7, 1, 0, 13, 2000);
-insert into sys.types values (24, 'date', 'date', 0, 0, 0, 14, 2000);
-insert into sys.types values (25, 'timestamp', 'timestamp', 7, 0, 0, 15, 2000);
-insert into sys.types values (26, 'timestamp', 'timestamptz', 7, 1, 0, 16,
2000);
-insert into sys.types values (27, 'blob', 'blob', 0, 0, 0, 5, 2000);
-insert into sys.types values (30, 'wkb', 'geometry', 0, 0, 0, 17, 2000);
-insert into sys.types values (31, 'wkba', 'geometrya', 0, 0, 0, 18, 2000);
-insert into sys.types values (32, 'mbr', 'mbr', 0, 0, 0, 18, 2000);
-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 (28, 'length', 'nitems', 'blob', 0, 1, false,
false, false, 2000, true, false);
-insert into sys.args values (29782, 28, 'res_0', 'int', 32, 0, 0, 0);
-insert into sys.args values (29783, 28, 'arg_1', 'blob', 0, 0, 1, 1);
-insert into sys.functions values (29, 'octet_length', 'nitems', 'blob', 0, 1,
false, false, false, 2000, true, false);
-insert into sys.args values (29784, 29, 'res_0', 'int', 32, 0, 0, 0);
-insert into sys.args values (29785, 29, 'arg_1', 'blob', 0, 0, 1, 1);
-insert into sys.functions values (33, 'mbr_overlap', 'mbrOverlaps', 'geom', 0,
1, false, false, false, 2000, true, true);
-insert into sys.args values (29786, 33, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (29787, 33, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (29788, 33, 'arg_2', 'geometry', 0, 0, 1, 2);
-insert into sys.functions values (34, 'mbr_overlap', 'mbrOverlaps', 'geom', 0,
1, false, false, false, 2000, true, true);
-insert into sys.args values (29789, 34, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (29790, 34, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (29791, 34, 'arg_2', 'mbr', 0, 0, 1, 2);
-insert into sys.functions values (35, 'mbr_above', 'mbrAbove', 'geom', 0, 1,
false, false, false, 2000, true, true);
-insert into sys.args values (29792, 35, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (29793, 35, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (29794, 35, 'arg_2', 'geometry', 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 (29795, 36, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (29796, 36, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (29797, 36, 'arg_2', 'mbr', 0, 0, 1, 2);
-insert into sys.functions values (37, 'mbr_below', 'mbrBelow', 'geom', 0, 1,
false, false, false, 2000, true, true);
-insert into sys.args values (29798, 37, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (29799, 37, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (29800, 37, 'arg_2', 'geometry', 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 (29801, 38, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (29802, 38, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (29803, 38, 'arg_2', 'mbr', 0, 0, 1, 2);
-insert into sys.functions values (39, 'mbr_right', 'mbrRight', 'geom', 0, 1,
false, false, false, 2000, true, true);
-insert into sys.args values (29804, 39, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (29805, 39, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (29806, 39, 'arg_2', 'geometry', 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 (29807, 40, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (29808, 40, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (29809, 40, 'arg_2', 'mbr', 0, 0, 1, 2);
-insert into sys.functions values (41, 'mbr_left', 'mbrLeft', 'geom', 0, 1,
false, false, false, 2000, true, true);
-insert into sys.args values (29810, 41, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (29811, 41, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (29812, 41, 'arg_2', 'geometry', 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 (29813, 42, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (29814, 42, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (29815, 42, 'arg_2', 'mbr', 0, 0, 1, 2);
-insert into sys.functions values (43, 'mbr_overlap_or_above',
'mbrOverlapOrAbove', 'geom', 0, 1, false, false, false, 2000, true, true);
-insert into sys.args values (29816, 43, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (29817, 43, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (29818, 43, 'arg_2', 'geometry', 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 (29819, 44, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (29820, 44, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (29821, 44, 'arg_2', 'mbr', 0, 0, 1, 2);
-insert into sys.functions values (45, 'mbr_overlap_or_below',
'mbrOverlapOrBelow', 'geom', 0, 1, false, false, false, 2000, true, true);
-insert into sys.args values (29822, 45, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (29823, 45, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (29824, 45, 'arg_2', 'geometry', 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 (29825, 46, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (29826, 46, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (29827, 46, 'arg_2', 'mbr', 0, 0, 1, 2);
-insert into sys.functions values (47, 'mbr_overlap_or_right',
'mbrOverlapOrRight', 'geom', 0, 1, false, false, false, 2000, true, true);
-insert into sys.args values (29828, 47, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (29829, 47, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (29830, 47, 'arg_2', 'geometry', 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 (29831, 48, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (29832, 48, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (29833, 48, 'arg_2', 'mbr', 0, 0, 1, 2);
-insert into sys.functions values (49, 'mbr_overlap_or_left',
'mbrOverlapOrLeft', 'geom', 0, 1, false, false, false, 2000, true, true);
-insert into sys.args values (29834, 49, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (29835, 49, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (29836, 49, 'arg_2', 'geometry', 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 (29837, 50, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (29838, 50, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (29839, 50, 'arg_2', 'mbr', 0, 0, 1, 2);
-insert into sys.functions values (51, 'mbr_contains', 'mbrContains', 'geom',
0, 1, false, false, false, 2000, true, true);
-insert into sys.args values (29840, 51, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (29841, 51, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (29842, 51, 'arg_2', 'geometry', 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 (29843, 52, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (29844, 52, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (29845, 52, 'arg_2', 'mbr', 0, 0, 1, 2);
-insert into sys.functions values (53, 'mbr_contained', 'mbrContained', 'geom',
0, 1, false, false, false, 2000, true, true);
-insert into sys.args values (29846, 53, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (29847, 53, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (29848, 53, 'arg_2', 'geometry', 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 (29849, 54, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (29850, 54, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (29851, 54, 'arg_2', 'mbr', 0, 0, 1, 2);
-insert into sys.functions values (55, 'mbr_equal', 'mbrEqual', 'geom', 0, 1,
false, false, false, 2000, true, true);
-insert into sys.args values (29852, 55, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (29853, 55, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (29854, 55, 'arg_2', 'geometry', 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 (29855, 56, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (29856, 56, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (29857, 56, 'arg_2', 'mbr', 0, 0, 1, 2);
-insert into sys.functions values (57, 'mbr_distance', 'mbrDistance', 'geom',
0, 1, false, false, false, 2000, true, true);
-insert into sys.args values (29858, 57, 'res_0', 'double', 53, 0, 0, 0);
-insert into sys.args values (29859, 57, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (29860, 57, 'arg_2', 'geometry', 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 (29861, 58, 'res_0', 'double', 53, 0, 0, 0);
-insert into sys.args values (29862, 58, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (29863, 58, 'arg_2', 'mbr', 0, 0, 1, 2);
-insert into sys.functions values (59, 'left_shift', 'mbrLeft', 'geom', 0, 1,
false, false, false, 2000, true, true);
-insert into sys.args values (29864, 59, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (29865, 59, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (29866, 59, 'arg_2', 'geometry', 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 (29867, 60, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (29868, 60, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (29869, 60, 'arg_2', 'mbr', 0, 0, 1, 2);
-insert into sys.functions values (61, 'right_shift', 'mbrRight', 'geom', 0, 1,
false, false, false, 2000, true, true);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
