Changeset: 7412a48eb02f for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7412a48eb02f Modified Files: sql/ChangeLog.Apr2019 sql/common/sql_types.c sql/test/Tests/systemfunctions.stable.out sql/test/Tests/systemfunctions.stable.out.int128 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/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 sql/test/testdb-upgrade/Tests/upgrade.stable.out.powerpc64.int128 Branch: Apr2019 Log Message:
Implemented octet_length for blobs. diffs (truncated from 195623 to 300 lines): diff --git a/sql/ChangeLog.Apr2019 b/sql/ChangeLog.Apr2019 --- a/sql/ChangeLog.Apr2019 +++ b/sql/ChangeLog.Apr2019 @@ -1,6 +1,11 @@ # ChangeLog file for sql # This file is updated with Maddlog +* Wed Jan 23 2019 Sjoerd Mullender <[email protected]> +- Function octet_length now also accepts a BLOB argument and returns + the length of the BLOB (i.e. the same as length when called with a + BLOB argument). + * Tue Jan 22 2019 Sjoerd Mullender <[email protected]> - Implemented length(blob) and comparison between blobs. - Implemented a two argument function log which calculates the logarithm diff --git a/sql/common/sql_types.c b/sql/common/sql_types.c --- a/sql/common/sql_types.c +++ b/sql/common/sql_types.c @@ -1493,6 +1493,7 @@ sqltypeinit( sql_allocator *sa) BLOB = *t++ = sql_create_type(sa, "BLOB", 0, 0, 0, EC_BLOB, "blob"); sql_create_func(sa, "length", "blob", "nitems", BLOB, NULL, INT, SCALE_NONE); + sql_create_func(sa, "octet_length", "blob", "nitems", BLOB, NULL, INT, SCALE_NONE); if (geomcatalogfix_get() != NULL) { // the geom module is loaded diff --git a/sql/test/Tests/systemfunctions.stable.out b/sql/test/Tests/systemfunctions.stable.out --- a/sql/test/Tests/systemfunctions.stable.out +++ b/sql/test/Tests/systemfunctions.stable.out @@ -1344,6 +1344,8 @@ Ready. [ "sys", "ntile", 2, "bigint", "" ] [ "sys", "ntile", 3, "boolean", "" ] [ "sys", "ntile", 4, "boolean", "" ] +[ "sys", "octet_length", 0, "int", "nitems" ] +[ "sys", "octet_length", 1, "blob", "" ] [ "sys", "octet_length", 0, "int", "nbytes" ] [ "sys", "octet_length", 1, "char", "" ] [ "sys", "octet_length", 0, "int", "nbytes" ] diff --git a/sql/test/Tests/systemfunctions.stable.out.int128 b/sql/test/Tests/systemfunctions.stable.out.int128 --- a/sql/test/Tests/systemfunctions.stable.out.int128 +++ b/sql/test/Tests/systemfunctions.stable.out.int128 @@ -1434,6 +1434,8 @@ Ready. [ "sys", "ntile", 2, "hugeint", "" ] [ "sys", "ntile", 3, "boolean", "" ] [ "sys", "ntile", 4, "boolean", "" ] +[ "sys", "octet_length", 0, "int", "nitems" ] +[ "sys", "octet_length", 1, "blob", "" ] [ "sys", "octet_length", 0, "int", "nbytes" ] [ "sys", "octet_length", 1, "char", "" ] [ "sys", "octet_length", 0, "int", "nbytes" ] 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 @@ -81,5791 +81,5794 @@ insert into sys.types values (24, 'date' insert into sys.types values (25, 'timestamp', 'timestamp', 7, 0, 0, 14, 2000); insert into sys.types values (26, 'timestamp', 'timestamptz', 7, 1, 0, 14, 2000); insert into sys.types values (27, 'blob', 'blob', 0, 0, 0, 5, 2000); -insert into sys.types values (29, 'wkb', 'geometry', 0, 0, 0, 15, 2000); -insert into sys.types values (30, 'wkba', 'geometrya', 0, 0, 0, 16, 2000); -insert into sys.types values (31, 'mbr', 'mbr', 0, 0, 0, 16, 2000); +insert into sys.types values (30, 'wkb', 'geometry', 0, 0, 0, 15, 2000); +insert into sys.types values (31, 'wkba', 'geometrya', 0, 0, 0, 16, 2000); +insert into sys.types values (32, 'mbr', 'mbr', 0, 0, 0, 16, 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); insert into sys.args values (20679, 28, 'res_0', 'int', 32, 0, 0, 0); insert into sys.args values (20680, 28, 'arg_1', 'blob', 0, 0, 1, 1); -insert into sys.functions values (32, 'mbr_overlap', 'mbrOverlaps', 'geom', 0, 1, false, false, false, 2000, true); -insert into sys.args values (20681, 32, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (20682, 32, 'arg_1', 'geometry', 0, 0, 1, 1); -insert into sys.args values (20683, 32, 'arg_2', 'geometry', 0, 0, 1, 2); +insert into sys.functions values (29, 'octet_length', 'nitems', 'blob', 0, 1, false, false, false, 2000, true); +insert into sys.args values (20681, 29, 'res_0', 'int', 32, 0, 0, 0); +insert into sys.args values (20682, 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); -insert into sys.args values (20684, 33, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (20685, 33, 'arg_1', 'mbr', 0, 0, 1, 1); -insert into sys.args values (20686, 33, 'arg_2', 'mbr', 0, 0, 1, 2); -insert into sys.functions values (34, 'mbr_above', 'mbrAbove', 'geom', 0, 1, false, false, false, 2000, true); -insert into sys.args values (20687, 34, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (20688, 34, 'arg_1', 'geometry', 0, 0, 1, 1); -insert into sys.args values (20689, 34, 'arg_2', 'geometry', 0, 0, 1, 2); +insert into sys.args values (20683, 33, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (20684, 33, 'arg_1', 'geometry', 0, 0, 1, 1); +insert into sys.args values (20685, 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); +insert into sys.args values (20686, 34, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (20687, 34, 'arg_1', 'mbr', 0, 0, 1, 1); +insert into sys.args values (20688, 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); -insert into sys.args values (20690, 35, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (20691, 35, 'arg_1', 'mbr', 0, 0, 1, 1); -insert into sys.args values (20692, 35, 'arg_2', 'mbr', 0, 0, 1, 2); -insert into sys.functions values (36, 'mbr_below', 'mbrBelow', 'geom', 0, 1, false, false, false, 2000, true); -insert into sys.args values (20693, 36, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (20694, 36, 'arg_1', 'geometry', 0, 0, 1, 1); -insert into sys.args values (20695, 36, 'arg_2', 'geometry', 0, 0, 1, 2); +insert into sys.args values (20689, 35, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (20690, 35, 'arg_1', 'geometry', 0, 0, 1, 1); +insert into sys.args values (20691, 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); +insert into sys.args values (20692, 36, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (20693, 36, 'arg_1', 'mbr', 0, 0, 1, 1); +insert into sys.args values (20694, 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); -insert into sys.args values (20696, 37, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (20697, 37, 'arg_1', 'mbr', 0, 0, 1, 1); -insert into sys.args values (20698, 37, 'arg_2', 'mbr', 0, 0, 1, 2); -insert into sys.functions values (38, 'mbr_right', 'mbrRight', 'geom', 0, 1, false, false, false, 2000, true); -insert into sys.args values (20699, 38, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (20700, 38, 'arg_1', 'geometry', 0, 0, 1, 1); -insert into sys.args values (20701, 38, 'arg_2', 'geometry', 0, 0, 1, 2); +insert into sys.args values (20695, 37, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (20696, 37, 'arg_1', 'geometry', 0, 0, 1, 1); +insert into sys.args values (20697, 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); +insert into sys.args values (20698, 38, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (20699, 38, 'arg_1', 'mbr', 0, 0, 1, 1); +insert into sys.args values (20700, 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); -insert into sys.args values (20702, 39, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (20703, 39, 'arg_1', 'mbr', 0, 0, 1, 1); -insert into sys.args values (20704, 39, 'arg_2', 'mbr', 0, 0, 1, 2); -insert into sys.functions values (40, 'mbr_left', 'mbrLeft', 'geom', 0, 1, false, false, false, 2000, true); -insert into sys.args values (20705, 40, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (20706, 40, 'arg_1', 'geometry', 0, 0, 1, 1); -insert into sys.args values (20707, 40, 'arg_2', 'geometry', 0, 0, 1, 2); +insert into sys.args values (20701, 39, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (20702, 39, 'arg_1', 'geometry', 0, 0, 1, 1); +insert into sys.args values (20703, 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); +insert into sys.args values (20704, 40, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (20705, 40, 'arg_1', 'mbr', 0, 0, 1, 1); +insert into sys.args values (20706, 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); -insert into sys.args values (20708, 41, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (20709, 41, 'arg_1', 'mbr', 0, 0, 1, 1); -insert into sys.args values (20710, 41, 'arg_2', 'mbr', 0, 0, 1, 2); -insert into sys.functions values (42, 'mbr_overlap_or_above', 'mbrOverlapOrAbove', 'geom', 0, 1, false, false, false, 2000, true); -insert into sys.args values (20711, 42, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (20712, 42, 'arg_1', 'geometry', 0, 0, 1, 1); -insert into sys.args values (20713, 42, 'arg_2', 'geometry', 0, 0, 1, 2); +insert into sys.args values (20707, 41, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (20708, 41, 'arg_1', 'geometry', 0, 0, 1, 1); +insert into sys.args values (20709, 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); +insert into sys.args values (20710, 42, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (20711, 42, 'arg_1', 'mbr', 0, 0, 1, 1); +insert into sys.args values (20712, 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); -insert into sys.args values (20714, 43, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (20715, 43, 'arg_1', 'mbr', 0, 0, 1, 1); -insert into sys.args values (20716, 43, 'arg_2', 'mbr', 0, 0, 1, 2); -insert into sys.functions values (44, 'mbr_overlap_or_below', 'mbrOverlapOrBelow', 'geom', 0, 1, false, false, false, 2000, true); -insert into sys.args values (20717, 44, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (20718, 44, 'arg_1', 'geometry', 0, 0, 1, 1); -insert into sys.args values (20719, 44, 'arg_2', 'geometry', 0, 0, 1, 2); +insert into sys.args values (20713, 43, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (20714, 43, 'arg_1', 'geometry', 0, 0, 1, 1); +insert into sys.args values (20715, 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); +insert into sys.args values (20716, 44, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (20717, 44, 'arg_1', 'mbr', 0, 0, 1, 1); +insert into sys.args values (20718, 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); -insert into sys.args values (20720, 45, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (20721, 45, 'arg_1', 'mbr', 0, 0, 1, 1); -insert into sys.args values (20722, 45, 'arg_2', 'mbr', 0, 0, 1, 2); -insert into sys.functions values (46, 'mbr_overlap_or_right', 'mbrOverlapOrRight', 'geom', 0, 1, false, false, false, 2000, true); -insert into sys.args values (20723, 46, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (20724, 46, 'arg_1', 'geometry', 0, 0, 1, 1); -insert into sys.args values (20725, 46, 'arg_2', 'geometry', 0, 0, 1, 2); +insert into sys.args values (20719, 45, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (20720, 45, 'arg_1', 'geometry', 0, 0, 1, 1); +insert into sys.args values (20721, 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); +insert into sys.args values (20722, 46, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (20723, 46, 'arg_1', 'mbr', 0, 0, 1, 1); +insert into sys.args values (20724, 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); -insert into sys.args values (20726, 47, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (20727, 47, 'arg_1', 'mbr', 0, 0, 1, 1); -insert into sys.args values (20728, 47, 'arg_2', 'mbr', 0, 0, 1, 2); -insert into sys.functions values (48, 'mbr_overlap_or_left', 'mbrOverlapOrLeft', 'geom', 0, 1, false, false, false, 2000, true); -insert into sys.args values (20729, 48, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (20730, 48, 'arg_1', 'geometry', 0, 0, 1, 1); -insert into sys.args values (20731, 48, 'arg_2', 'geometry', 0, 0, 1, 2); +insert into sys.args values (20725, 47, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (20726, 47, 'arg_1', 'geometry', 0, 0, 1, 1); +insert into sys.args values (20727, 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); +insert into sys.args values (20728, 48, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (20729, 48, 'arg_1', 'mbr', 0, 0, 1, 1); +insert into sys.args values (20730, 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); -insert into sys.args values (20732, 49, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (20733, 49, 'arg_1', 'mbr', 0, 0, 1, 1); -insert into sys.args values (20734, 49, 'arg_2', 'mbr', 0, 0, 1, 2); -insert into sys.functions values (50, 'mbr_contains', 'mbrContains', 'geom', 0, 1, false, false, false, 2000, true); -insert into sys.args values (20735, 50, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (20736, 50, 'arg_1', 'geometry', 0, 0, 1, 1); -insert into sys.args values (20737, 50, 'arg_2', 'geometry', 0, 0, 1, 2); +insert into sys.args values (20731, 49, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (20732, 49, 'arg_1', 'geometry', 0, 0, 1, 1); +insert into sys.args values (20733, 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); +insert into sys.args values (20734, 50, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (20735, 50, 'arg_1', 'mbr', 0, 0, 1, 1); +insert into sys.args values (20736, 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); -insert into sys.args values (20738, 51, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (20739, 51, 'arg_1', 'mbr', 0, 0, 1, 1); -insert into sys.args values (20740, 51, 'arg_2', 'mbr', 0, 0, 1, 2); -insert into sys.functions values (52, 'mbr_contained', 'mbrContained', 'geom', 0, 1, false, false, false, 2000, true); -insert into sys.args values (20741, 52, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (20742, 52, 'arg_1', 'geometry', 0, 0, 1, 1); -insert into sys.args values (20743, 52, 'arg_2', 'geometry', 0, 0, 1, 2); +insert into sys.args values (20737, 51, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (20738, 51, 'arg_1', 'geometry', 0, 0, 1, 1); +insert into sys.args values (20739, 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); +insert into sys.args values (20740, 52, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (20741, 52, 'arg_1', 'mbr', 0, 0, 1, 1); +insert into sys.args values (20742, 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); -insert into sys.args values (20744, 53, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (20745, 53, 'arg_1', 'mbr', 0, 0, 1, 1); -insert into sys.args values (20746, 53, 'arg_2', 'mbr', 0, 0, 1, 2); -insert into sys.functions values (54, 'mbr_equal', 'mbrEqual', 'geom', 0, 1, false, false, false, 2000, true); -insert into sys.args values (20747, 54, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (20748, 54, 'arg_1', 'geometry', 0, 0, 1, 1); -insert into sys.args values (20749, 54, 'arg_2', 'geometry', 0, 0, 1, 2); +insert into sys.args values (20743, 53, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (20744, 53, 'arg_1', 'geometry', 0, 0, 1, 1); +insert into sys.args values (20745, 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); +insert into sys.args values (20746, 54, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (20747, 54, 'arg_1', 'mbr', 0, 0, 1, 1); +insert into sys.args values (20748, 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); -insert into sys.args values (20750, 55, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (20751, 55, 'arg_1', 'mbr', 0, 0, 1, 1); -insert into sys.args values (20752, 55, 'arg_2', 'mbr', 0, 0, 1, 2); -insert into sys.functions values (56, 'mbr_distance', 'mbrDistance', 'geom', 0, 1, false, false, false, 2000, true); -insert into sys.args values (20753, 56, 'res_0', 'double', 53, 0, 0, 0); -insert into sys.args values (20754, 56, 'arg_1', 'geometry', 0, 0, 1, 1); -insert into sys.args values (20755, 56, 'arg_2', 'geometry', 0, 0, 1, 2); +insert into sys.args values (20749, 55, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (20750, 55, 'arg_1', 'geometry', 0, 0, 1, 1); +insert into sys.args values (20751, 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); +insert into sys.args values (20752, 56, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (20753, 56, 'arg_1', 'mbr', 0, 0, 1, 1); +insert into sys.args values (20754, 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); -insert into sys.args values (20756, 57, 'res_0', 'double', 53, 0, 0, 0); -insert into sys.args values (20757, 57, 'arg_1', 'mbr', 0, 0, 1, 1); -insert into sys.args values (20758, 57, 'arg_2', 'mbr', 0, 0, 1, 2); -insert into sys.functions values (58, 'left_shift', 'mbrLeft', 'geom', 0, 1, false, false, false, 2000, true); -insert into sys.args values (20759, 58, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (20760, 58, 'arg_1', 'geometry', 0, 0, 1, 1); -insert into sys.args values (20761, 58, 'arg_2', 'geometry', 0, 0, 1, 2); +insert into sys.args values (20755, 57, 'res_0', 'double', 53, 0, 0, 0); +insert into sys.args values (20756, 57, 'arg_1', 'geometry', 0, 0, 1, 1); +insert into sys.args values (20757, 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); +insert into sys.args values (20758, 58, 'res_0', 'double', 53, 0, 0, 0); +insert into sys.args values (20759, 58, 'arg_1', 'mbr', 0, 0, 1, 1); +insert into sys.args values (20760, 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); -insert into sys.args values (20762, 59, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (20763, 59, 'arg_1', 'mbr', 0, 0, 1, 1); -insert into sys.args values (20764, 59, 'arg_2', 'mbr', 0, 0, 1, 2); -insert into sys.functions values (60, 'right_shift', 'mbrRight', 'geom', 0, 1, false, false, false, 2000, true); -insert into sys.args values (20765, 60, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (20766, 60, 'arg_1', 'geometry', 0, 0, 1, 1); -insert into sys.args values (20767, 60, 'arg_2', 'geometry', 0, 0, 1, 2); +insert into sys.args values (20761, 59, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (20762, 59, 'arg_1', 'geometry', 0, 0, 1, 1); +insert into sys.args values (20763, 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); +insert into sys.args values (20764, 60, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (20765, 60, 'arg_1', 'mbr', 0, 0, 1, 1); +insert into sys.args values (20766, 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); -insert into sys.args values (20768, 61, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (20769, 61, 'arg_1', 'mbr', 0, 0, 1, 1); -insert into sys.args values (20770, 61, 'arg_2', 'mbr', 0, 0, 1, 2); -insert into sys.functions values (63, 'not_uniques', 'not_uniques', 'sql', 0, 1, false, false, false, 2000, true); -insert into sys.args values (20771, 63, 'res_0', 'oid', 63, 0, 0, 0); -insert into sys.args values (20772, 63, 'arg_1', 'bigint', 64, 0, 1, 1); +insert into sys.args values (20767, 61, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (20768, 61, 'arg_1', 'geometry', 0, 0, 1, 1); +insert into sys.args values (20769, 61, 'arg_2', 'geometry', 0, 0, 1, 2); +insert into sys.functions values (62, 'right_shift', 'mbrRight', 'geom', 0, 1, false, false, false, 2000, true); +insert into sys.args values (20770, 62, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (20771, 62, 'arg_1', 'mbr', 0, 0, 1, 1); +insert into sys.args values (20772, 62, 'arg_2', 'mbr', 0, 0, 1, 2); insert into sys.functions values (64, 'not_uniques', 'not_uniques', 'sql', 0, 1, false, false, false, 2000, true); _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
