Changeset: d78285903f33 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d78285903f33
Added Files:
sql/test/BugTracker-2015/Tests/string_split.Bug-3564.sql
sql/test/BugTracker-2015/Tests/string_split.Bug-3564.stable.err
sql/test/BugTracker-2015/Tests/string_split.Bug-3564.stable.out
sql/test/BugTracker-2015/Tests/true_or_predicate.Bug-3733.sql
sql/test/BugTracker-2015/Tests/true_or_predicate.Bug-3733.stable.err
sql/test/BugTracker-2015/Tests/true_or_predicate.Bug-3733.stable.out
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/SQL-dump.stable.out
clients/Tests/SQL-dump.stable.out.int128
clients/Tests/exports.stable.out
gdk/gdk_bbp.c
gdk/gdk_logger.c
geom/monetdb5/geom.c
geom/monetdb5/geom.mal
geom/sql/40_geom.sql
monetdb5/modules/atoms/str.c
monetdb5/modules/atoms/str.h
monetdb5/modules/atoms/str.mal
monetdb5/optimizer/opt_remap.c
sql/backends/monet5/Tests/rapi12.sql
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql.mal
sql/backends/monet5/sql_scenario.c
sql/common/sql_backend.c
sql/common/sql_types.c
sql/include/sql_catalog.h
sql/server/sql_atom.c
sql/server/sql_parser.y
sql/server/sql_scan.c
sql/storage/bat/bat_storage.c
sql/storage/bat/bat_table.c
sql/storage/bat/bat_utils.c
sql/storage/sql_storage.h
sql/storage/store.c
sql/test/BugTracker-2015/Tests/All
sql/test/Tests/systemfunctions.stable.out
sql/test/Tests/systemfunctions.stable.out.int128
Branch: partioned-hash
Log Message:
Merge with default branch.
diffs (truncated from 6661 to 300 lines):
diff --git a/clients/Tests/MAL-signatures.stable.out
b/clients/Tests/MAL-signatures.stable.out
--- a/clients/Tests/MAL-signatures.stable.out
+++ b/clients/Tests/MAL-signatures.stable.out
@@ -2735,6 +2735,10 @@ command batsql.round(v:bat[:oid,:bte],d:
address bte_bat_round_wrap;
comment round off the decimal v(d,s) to r digits behind the dot (if r < 0,
before the dot)
+command
batgeom.Contains(a:wkb,px:bat[:oid,:dbl],py:bat[:oid,:dbl]):bat[:oid,:bit]
+address wkbContains_point_bat;
+comment Returns true if the Geometry-BAT a 'spatially contains' Geometry-B b
+
command batgeom.point(x:bat[:oid,:dbl],y:bat[:oid,:dbl]):bat[:oid,:wkb]
address wkbcreatepoint_bat;
comment Construct a point-BAT from two geometry-BATs
@@ -38076,6 +38080,10 @@ command geom.ConvexHull(a:wkb):wkb
address wkbConvexHull;
comment Returns a geometry that represents the convex hull of this geometry.
+command geom.Contains(a:wkb,x:dbl,y:dbl):bit
+address wkbContains_point;
+comment Returns true if the Geometry a 'spatially contains' Geometry b
+
command geom.Contains(a:wkb,b:wkb):bit
address wkbContains;
comment Returns true if the Geometry a 'spatially contains' Geometry b
@@ -41107,6 +41115,10 @@ command str.substitute(s:str,src:str,dst
address STRSubstitute;
comment Substitute first occurrence of 'src' by 'dst'. Iff repeated =
true this is repeated while 'src' can be found in the result string.
In order to prevent recursion and result strings of unlimited size,
repeating is only done iff src is not a substring of dst.
+command str.splitpart(s:str,needle:str,field:int):str
+address STRsplitpart;
+comment Split string on delimiter. Returns given field (counting from
one.)
+
command str.search(s:str,c:str):int
address STRstrSearch;
comment Search for a substring. Returns position, -1 if not found.
diff --git a/clients/Tests/MAL-signatures.stable.out.int128
b/clients/Tests/MAL-signatures.stable.out.int128
--- a/clients/Tests/MAL-signatures.stable.out.int128
+++ b/clients/Tests/MAL-signatures.stable.out.int128
@@ -3258,6 +3258,10 @@ command batsql.round(v:bat[:oid,:bte],d:
address bte_bat_round_wrap;
comment round off the decimal v(d,s) to r digits behind the dot (if r < 0,
before the dot)
+command
batgeom.Contains(a:wkb,px:bat[:oid,:dbl],py:bat[:oid,:dbl]):bat[:oid,:bit]
+address wkbContains_point_bat;
+comment Returns true if the Geometry-BAT a 'spatially contains' Geometry-B b
+
command batgeom.point(x:bat[:oid,:dbl],y:bat[:oid,:dbl]):bat[:oid,:wkb]
address wkbcreatepoint_bat;
comment Construct a point-BAT from two geometry-BATs
@@ -48995,6 +48999,10 @@ command geom.ConvexHull(a:wkb):wkb
address wkbConvexHull;
comment Returns a geometry that represents the convex hull of this geometry.
+command geom.Contains(a:wkb,x:dbl,y:dbl):bit
+address wkbContains_point;
+comment Returns true if the Geometry a 'spatially contains' Geometry b
+
command geom.Contains(a:wkb,b:wkb):bit
address wkbContains;
comment Returns true if the Geometry a 'spatially contains' Geometry b
@@ -52050,6 +52058,10 @@ command str.substitute(s:str,src:str,dst
address STRSubstitute;
comment Substitute first occurrence of 'src' by 'dst'. Iff repeated =
true this is repeated while 'src' can be found in the result string.
In order to prevent recursion and result strings of unlimited size,
repeating is only done iff src is not a substring of dst.
+command str.splitpart(s:str,needle:str,field:int):str
+address STRsplitpart;
+comment Split string on delimiter. Returns given field (counting from
one.)
+
command str.search(s:str,c:str):int
address STRstrSearch;
comment Search for a substring. Returns position, -1 if not found.
diff --git a/clients/Tests/SQL-dump.stable.out
b/clients/Tests/SQL-dump.stable.out
--- a/clients/Tests/SQL-dump.stable.out
+++ b/clients/Tests/SQL-dump.stable.out
@@ -528,6 +528,7 @@ begin
end case;
end;
create function contains(a geometry, b geometry) returns boolean external name
geom."Contains";
+create function contains(a geometry, x double, y double) returns boolean
external name geom."Contains";
create function convexhull(a geometry) returns geometry external name
geom."ConvexHull";
create aggregate corr(e1 tinyint, e2 tinyint) returns tinyint
external name "aggr"."corr";
diff --git a/clients/Tests/SQL-dump.stable.out.int128
b/clients/Tests/SQL-dump.stable.out.int128
--- a/clients/Tests/SQL-dump.stable.out.int128
+++ b/clients/Tests/SQL-dump.stable.out.int128
@@ -524,6 +524,7 @@ begin
end case;
end;
create function contains(a geometry, b geometry) returns boolean external name
geom."Contains";
+create function contains(a geometry, x double, y double) returns boolean
external name geom."Contains";
create function convexhull(a geometry) returns geometry external name
geom."ConvexHull";
create aggregate corr(e1 tinyint, e2 tinyint) returns tinyint
external name "aggr"."corr";
@@ -1509,231 +1510,231 @@ 2149 "statement" "varchar" 2048 0
2139 N
2151 "id" "int" 32 0 2150 NULL true 0 NULL
2152 "name" "varchar" 1024 0 2150 NULL true 1
NULL
2153 "nr" "int" 32 0 2150 NULL true 2 NULL
-5655 "id" "int" 32 0 5654 NULL true 0 NULL
-5656 "name" "varchar" 1024 0 5654 NULL true 1
NULL
-5657 "schema_id" "int" 32 0 5654 NULL true 2
NULL
-5658 "query" "varchar" 2048 0 5654 NULL true 3
NULL
-5659 "type" "smallint" 16 0 5654 NULL true 4
NULL
-5660 "system" "boolean" 1 0 5654 NULL true
5 NULL
-5661 "commit_action" "smallint" 16 0 5654 NULL true
6 NULL
-5662 "access" "smallint" 16 0 5654 NULL true
7 NULL
-5663 "temporary" "smallint" 16 0 5654 NULL true
8 NULL
-5664 "table_type" "smallint" 16 0 5654 NULL true
9 NULL
-5666 "id" "int" 32 0 5665 NULL true 0 NULL
-5667 "name" "varchar" 1024 0 5665 NULL true 1
NULL
-5668 "type" "varchar" 1024 0 5665 NULL true 2
NULL
-5669 "type_digits" "int" 32 0 5665 NULL true 3
NULL
-5670 "type_scale" "int" 32 0 5665 NULL true 4
NULL
-5671 "table_id" "int" 32 0 5665 NULL true 5
NULL
-5672 "default" "varchar" 2048 0 5665 NULL true
6 NULL
-5673 "null" "boolean" 1 0 5665 NULL true 7
NULL
-5674 "number" "int" 32 0 5665 NULL true 8
NULL
-5675 "storage" "varchar" 2048 0 5665 NULL true
9 NULL
-5682 "name" "varchar" 1024 0 5681 NULL true 0
NULL
-5683 "fullname" "varchar" 2048 0 5681 NULL true
1 NULL
-5684 "default_schema" "int" 9 0 5681 NULL true
2 NULL
-5688 "name" "varchar" 1024 0 5687 NULL true 0
NULL
-5689 "fullname" "varchar" 2024 0 5687 NULL true
1 NULL
-5690 "default_schema" "int" 9 0 5687 NULL true
2 NULL
-5692 "login_id" "int" 32 0 5691 NULL true 0
NULL
-5693 "role_id" "int" 32 0 5691 NULL true 1
NULL
-5695 "id" "int" 32 0 5694 NULL true 0 NULL
-5696 "name" "varchar" 1024 0 5694 NULL true 1
NULL
-5697 "grantor" "int" 32 0 5694 NULL true 2
NULL
-5699 "obj_id" "int" 32 0 5698 NULL true 0
NULL
-5700 "auth_id" "int" 32 0 5698 NULL true 1
NULL
-5701 "privileges" "int" 32 0 5698 NULL true 2
NULL
-5702 "grantor" "int" 32 0 5698 NULL true 3
NULL
-5703 "grantable" "int" 32 0 5698 NULL true 4
NULL
-5912 "id" "oid" 63 0 5920 NULL true 0 NULL
-5913 "owner" "clob" 0 0 5920 NULL true 1 NULL
-5914 "defined" "timestamp" 7 0 5920 NULL true
2 NULL
-5915 "query" "clob" 0 0 5920 NULL true 3 NULL
-5916 "pipe" "clob" 0 0 5920 NULL true 4 NULL
-5917 "plan" "clob" 0 0 5920 NULL true 5 NULL
-5918 "mal" "int" 32 0 5920 NULL true 6 NULL
-5919 "optimize" "bigint" 64 0 5920 NULL true
7 NULL
-5922 "id" "oid" 63 0 5931 NULL true 0 NULL
-5923 "start" "timestamp" 7 0 5931 NULL true 1
NULL
-5924 "stop" "timestamp" 7 0 5931 NULL true 2
NULL
-5925 "arguments" "clob" 0 0 5931 NULL true 3
NULL
-5926 "tuples" "wrd" 64 0 5931 NULL true 4
NULL
-5927 "run" "bigint" 64 0 5931 NULL true 5
NULL
-5928 "ship" "bigint" 64 0 5931 NULL true 6
NULL
-5929 "cpu" "int" 32 0 5931 NULL true 7 NULL
-5930 "io" "int" 32 0 5931 NULL true 8 NULL
-5933 "id" "oid" 63 0 5949 NULL true 0 NULL
-5934 "owner" "clob" 0 0 5949 NULL true 1 NULL
-5935 "defined" "timestamp" 7 0 5949 NULL true
2 NULL
-5936 "query" "clob" 0 0 5949 NULL true 3 NULL
-5937 "pipe" "clob" 0 0 5949 NULL true 4 NULL
-5938 "plan" "clob" 0 0 5949 NULL true 5 NULL
-5939 "mal" "int" 32 0 5949 NULL true 6 NULL
-5940 "optimize" "bigint" 64 0 5949 NULL true
7 NULL
-5941 "start" "timestamp" 7 0 5949 NULL true 8
NULL
-5942 "stop" "timestamp" 7 0 5949 NULL true 9
NULL
-5943 "arguments" "clob" 0 0 5949 NULL true 10
NULL
-5944 "tuples" "wrd" 64 0 5949 NULL true 11
NULL
-5945 "run" "bigint" 64 0 5949 NULL true 12
NULL
-5946 "ship" "bigint" 64 0 5949 NULL true 13
NULL
-5947 "cpu" "int" 32 0 5949 NULL true 14 NULL
-5948 "io" "int" 32 0 5949 NULL true 15 NULL
-5975 "event" "int" 32 0 5988 NULL true 0 NULL
-5976 "clk" "varchar" 20 0 5988 NULL true 1
NULL
-5977 "pc" "varchar" 50 0 5988 NULL true 2
NULL
-5978 "thread" "int" 32 0 5988 NULL true 3
NULL
-5979 "ticks" "bigint" 64 0 5988 NULL true 4
NULL
-5980 "rrsmb" "bigint" 64 0 5988 NULL true 5
NULL
-5981 "vmmb" "bigint" 64 0 5988 NULL true 6
NULL
-5982 "reads" "bigint" 64 0 5988 NULL true 7
NULL
-5983 "writes" "bigint" 64 0 5988 NULL true
8 NULL
-5984 "minflt" "bigint" 64 0 5988 NULL true
9 NULL
-5985 "majflt" "bigint" 64 0 5988 NULL true
10 NULL
-5986 "nvcsw" "bigint" 64 0 5988 NULL true 11
NULL
-5987 "stmt" "clob" 0 0 5988 NULL true 12 NULL
-6118 "user" "clob" 0 0 6124 NULL true 0 NULL
-6119 "login" "timestamp" 7 0 6124 NULL true 1
NULL
-6120 "sessiontimeout" "bigint" 64 0 6124 NULL
true 2 NULL
-6121 "lastcommand" "timestamp" 7 0 6124 NULL true
3 NULL
-6122 "querytimeout" "bigint" 64 0 6124 NULL true
4 NULL
-6123 "active" "boolean" 1 0 6124 NULL true
5 NULL
-6201 "name" "clob" 0 0 6204 NULL true 0 NULL
-6202 "def" "clob" 0 0 6204 NULL true 1 NULL
-6203 "status" "clob" 0 0 6204 NULL true 2
NULL
-6210 "name" "clob" 0 0 6212 NULL true 0 NULL
-6211 "value" "clob" 0 0 6212 NULL true 1 NULL
-6242 "qtag" "bigint" 64 0 6250 NULL true 0
NULL
-6243 "user" "clob" 0 0 6250 NULL true 1 NULL
-6244 "started" "timestamp" 7 0 6250 NULL true
2 NULL
-6245 "estimate" "timestamp" 7 0 6250 NULL true
3 NULL
-6246 "progress" "int" 32 0 6250 NULL true 4
NULL
-6247 "status" "clob" 0 0 6250 NULL true 5
NULL
-6248 "tag" "oid" 63 0 6250 NULL true 6 NULL
-6249 "query" "clob" 0 0 6250 NULL true 7 NULL
-6915 "keyword" "varchar" 40 0 6918 NULL false
0 NULL
-6920 "table_type_id" "smallint" 16 0 6926 NULL false
0 NULL
-6923 "table_type_name" "varchar" 25 0 6926 NULL
false 1 NULL
-6928 "dependency_type_id" "smallint" 16 0 6934 NULL
false 0 NULL
-6931 "dependency_type_name" "varchar" 15 0 6934 NULL
false 1 NULL
-6949 "file_id" "int" 32 0 6951 NULL true 0
NULL
-6950 "location" "char" 256 0 6951 NULL true 1
NULL
-6953 "dim_id" "int" 32 0 6957 NULL true 0
NULL
-6954 "file_id" "int" 32 0 6957 NULL true 1
NULL
-6955 "name" "varchar" 64 0 6957 NULL true 2
NULL
-6956 "length" "int" 32 0 6957 NULL true 3
NULL
-6959 "var_id" "int" 32 0 6965 NULL true 0
NULL
-6960 "file_id" "int" 32 0 6965 NULL true 1
NULL
-6961 "name" "varchar" 64 0 6965 NULL true 2
NULL
-6962 "vartype" "varchar" 64 0 6965 NULL true
3 NULL
-6963 "ndim" "int" 32 0 6965 NULL true 4 NULL
-6964 "coord_dim_id" "int" 32 0 6965 NULL true 5
NULL
-6967 "var_id" "int" 32 0 6971 NULL true 0
NULL
-6968 "dim_id" "int" 32 0 6971 NULL true 1
NULL
-6969 "file_id" "int" 32 0 6971 NULL true 2
NULL
-6970 "dimpos" "int" 32 0 6971 NULL true 3
NULL
-6973 "obj_name" "varchar" 256 0 6979 NULL true
0 NULL
-6974 "att_name" "varchar" 256 0 6979 NULL true
1 NULL
-6975 "att_type" "varchar" 64 0 6979 NULL true
2 NULL
-6976 "value" "clob" 0 0 6979 NULL true 3 NULL
-6977 "file_id" "int" 32 0 6979 NULL true 4
NULL
-6978 "gr_name" "varchar" 256 0 6979 NULL true
5 NULL
-7004 "schema" "clob" 0 0 7018 NULL true 0
NULL
-7005 "table" "clob" 0 0 7018 NULL true 1 NULL
-7006 "column" "clob" 0 0 7018 NULL true 2
NULL
-7007 "type" "clob" 0 0 7018 NULL true 3 NULL
-7008 "mode" "clob" 0 0 7018 NULL true 4 NULL
-7009 "location" "clob" 0 0 7018 NULL true 5
NULL
-7010 "count" "bigint" 64 0 7018 NULL true 6
NULL
-7011 "typewidth" "int" 32 0 7018 NULL true 7
NULL
-7012 "columnsize" "bigint" 64 0 7018 NULL true
8 NULL
-7013 "heapsize" "bigint" 64 0 7018 NULL true
9 NULL
-7014 "hashes" "bigint" 64 0 7018 NULL true
10 NULL
-7015 "phash" "boolean" 1 0 7018 NULL true 11
NULL
-7016 "imprints" "bigint" 64 0 7018 NULL true
12 NULL
-7017 "sorted" "boolean" 1 0 7018 NULL true
13 NULL
-7020 "schema" "clob" 0 0 7030 NULL true 0
NULL
-7021 "table" "clob" 0 0 7030 NULL true 1 NULL
-7022 "column" "clob" 0 0 7030 NULL true 2
NULL
-7023 "type" "clob" 0 0 7030 NULL true 3 NULL
-7024 "typewidth" "int" 32 0 7030 NULL true 4
NULL
-7025 "count" "bigint" 64 0 7030 NULL true 5
NULL
-7026 "distinct" "bigint" 64 0 7030 NULL true
6 NULL
-7027 "atomwidth" "int" 32 0 7030 NULL true 7
NULL
-7028 "reference" "boolean" 1 0 7030 NULL true
8 NULL
-7029 "sorted" "boolean" 1 0 7030 NULL true
9 NULL
-7068 "schema" "clob" 0 0 7078 NULL true 0
NULL
-7069 "table" "clob" 0 0 7078 NULL true 1 NULL
-7070 "column" "clob" 0 0 7078 NULL true 2
NULL
-7071 "type" "clob" 0 0 7078 NULL true 3 NULL
-7072 "count" "bigint" 64 0 7078 NULL true 4
NULL
-7073 "columnsize" "bigint" 64 0 7078 NULL true
5 NULL
-7074 "heapsize" "bigint" 64 0 7078 NULL true
6 NULL
-7075 "hashes" "bigint" 64 0 7078 NULL true
7 NULL
-7076 "imprints" "bigint" 64 0 7078 NULL true
8 NULL
-7077 "sorted" "boolean" 1 0 7078 NULL true
9 NULL
-7080 "schema" "clob" 0 0 7088 NULL true 0
NULL
-7081 "table" "clob" 0 0 7088 NULL true 1 NULL
-7082 "count" "bigint" 64 0 7088 NULL true 2
NULL
-7083 "columnsize" "hugeint" 128 0 7088 NULL true
3 NULL
-7084 "heapsize" "hugeint" 128 0 7088 NULL true
4 NULL
-7085 "hashes" "hugeint" 128 0 7088 NULL true
5 NULL
-7086 "imprints" "hugeint" 128 0 7088 NULL true
6 NULL
-7087 "auxiliary" "hugeint" 128 0 7088 NULL true
7 NULL
-7090 "column_id" "int" 32 0 7101 NULL true 0
NULL
-7091 "type" "clob" 0 0 7101 NULL true 1 NULL
-7092 "width" "int" 32 0 7101 NULL true 2 NULL
-7093 "stamp" "timestamp" 7 0 7101 NULL true 3
NULL
-7094 "sample" "bigint" 64 0 7101 NULL true
4 NULL
-7095 "count" "bigint" 64 0 7101 NULL true 5
NULL
-7096 "unique" "bigint" 64 0 7101 NULL true
6 NULL
-7097 "nils" "bigint" 64 0 7101 NULL true 7
NULL
-7098 "minval" "clob" 0 0 7101 NULL true 8
NULL
-7099 "maxval" "clob" 0 0 7101 NULL true 9
NULL
-7100 "sorted" "boolean" 1 0 7101 NULL true
10 NULL
-7191 "file_id" "bigint" 64 0 7199 NULL false
0 NULL
-7192 "file_location" "clob" 0 0 7199 NULL false 1
NULL
-7193 "dbschema" "smallint" 16 0 7199 NULL false
2 NULL
-7194 "format_version" "varchar" 7 0 7199 NULL
true 3 NULL
-7195 "sorting_order" "varchar" 10 0 7199 NULL true
4 NULL
-7196 "comments" "clob" 0 0 7199 NULL true 5
NULL
-7201 "sn" "clob" 0 0 7212 NULL false 0 NULL
-7202 "file_id" "bigint" 64 0 7212 NULL false
1 NULL
-7203 "ln" "int" 32 0 7212 NULL true 2 NULL
-7204 "as" "int" 32 0 7212 NULL true 3 NULL
-7205 "m5" "clob" 0 0 7212 NULL true 4 NULL
-7206 "sp" "clob" 0 0 7212 NULL true 5 NULL
-7207 "ur" "clob" 0 0 7212 NULL true 6 NULL
-7214 "id" "clob" 0 0 7231 NULL false 0 NULL
-7215 "file_id" "bigint" 64 0 7231 NULL false
1 NULL
-7216 "cn" "clob" 0 0 7231 NULL true 2 NULL
-7217 "ds" "clob" 0 0 7231 NULL true 3 NULL
-7218 "dt" "timestamp" 7 0 7231 NULL true 4
NULL
-7219 "fo" "clob" 0 0 7231 NULL true 5 NULL
-7220 "ks" "clob" 0 0 7231 NULL true 6 NULL
-7221 "lb" "clob" 0 0 7231 NULL true 7 NULL
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
