Changeset: 327514dab3c0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=327514dab3c0
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:
NT/monetdb_config.h.in
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
configure.ag
gdk/gdk.h
gdk/gdk_bbp.c
gdk/gdk_calc_private.h
gdk/gdk_logger.c
gdk/gdk_search.c
gdk/gdk_search.h
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
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_types.c
sql/server/sql_atom.c
sql/server/sql_parser.y
sql/server/sql_scan.c
sql/storage/bat/bat_utils.c
sql/test/BugTracker-2015/Tests/All
sql/test/Tests/systemfunctions.stable.out
sql/test/Tests/systemfunctions.stable.out.int128
Branch: leftmart
Log Message:
Merge with default
diffs (truncated from 3024 to 300 lines):
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@ -1036,19 +1036,23 @@ typedef unsigned __int64 uint64_t;
#ifdef HAVE_LONG_LONG
typedef long long lng;
+typedef unsigned long long ulng;
# define SIZEOF_LNG SIZEOF_LONG_LONG
#else
typedef __int64 lng;
+typedef unsigned __int64 ulng;
# define SIZEOF_LNG SIZEOF___INT64
#endif
#ifdef HAVE___INT128
typedef __int128 hge;
+typedef unsigned __int128 uhge;
# define HAVE_HGE 1
# define SIZEOF_HGE SIZEOF___INT128
#else
# if defined(HAVE___INT128_T) && defined(HAVE___UINT128_T)
typedef __int128_t hge;
+typedef __uint128_t uhge;
# define HAVE_HGE 1
# define SIZEOF_HGE SIZEOF___INT128_T
# endif
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
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
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";
@@ -1610,130 +1611,130 @@ 6246 "progress" "int" 32 0 6250
NULL tru
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
-7222 "pg" "clob" 0 0 7231 NULL true 8 NULL
-7223 "pi" "int" 32 0 7231 NULL true 9 NULL
-7224 "pl" "clob" 0 0 7231 NULL true 10 NULL
-7225 "pu" "clob" 0 0 7231 NULL true 11 NULL
-7226 "sm" "clob" 0 0 7231 NULL true 12 NULL
-7233 "id" "clob" 0 0 7243 NULL false 0 NULL
-7234 "file_id" "bigint" 64 0 7243 NULL false
1 NULL
-7235 "pn" "clob" 0 0 7243 NULL true 2 NULL
-7236 "cl" "clob" 0 0 7243 NULL true 3 NULL
-7237 "pp" "clob" 0 0 7243 NULL true 4 NULL
-7238 "vn" "clob" 0 0 7243 NULL true 5 NULL
-7245 "qname" "clob" 0 0 7256 NULL false 0 NULL
-7246 "flag" "smallint" 16 0 7256 NULL false 1
NULL
-7247 "rname" "clob" 0 0 7256 NULL false 2 NULL
-7248 "pos" "int" 32 0 7256 NULL false 3 NULL
-7249 "mapq" "smallint" 16 0 7256 NULL false 4
NULL
-7250 "cigar" "clob" 0 0 7256 NULL false 5 NULL
-7251 "rnext" "clob" 0 0 7256 NULL false 6 NULL
-7252 "pnext" "int" 32 0 7256 NULL false 7 NULL
-7253 "tlen" "int" 32 0 7256 NULL false 8 NULL
-7254 "seq" "clob" 0 0 7256 NULL false 9 NULL
-7255 "qual" "clob" 0 0 7256 NULL false 10 NULL
-7337 "function_id" "int" 32 0 7338 NULL true 0
NULL
+6921 "keyword" "varchar" 40 0 6924 NULL false
0 NULL
+6926 "table_type_id" "smallint" 16 0 6932 NULL false
0 NULL
+6929 "table_type_name" "varchar" 25 0 6932 NULL
false 1 NULL
+6934 "dependency_type_id" "smallint" 16 0 6940 NULL
false 0 NULL
+6937 "dependency_type_name" "varchar" 15 0 6940 NULL
false 1 NULL
+6955 "file_id" "int" 32 0 6957 NULL true 0
NULL
+6956 "location" "char" 256 0 6957 NULL true 1
NULL
+6959 "dim_id" "int" 32 0 6963 NULL true 0
NULL
+6960 "file_id" "int" 32 0 6963 NULL true 1
NULL
+6961 "name" "varchar" 64 0 6963 NULL true 2
NULL
+6962 "length" "int" 32 0 6963 NULL true 3
NULL
+6965 "var_id" "int" 32 0 6971 NULL true 0
NULL
+6966 "file_id" "int" 32 0 6971 NULL true 1
NULL
+6967 "name" "varchar" 64 0 6971 NULL true 2
NULL
+6968 "vartype" "varchar" 64 0 6971 NULL true
3 NULL
+6969 "ndim" "int" 32 0 6971 NULL true 4 NULL
+6970 "coord_dim_id" "int" 32 0 6971 NULL true 5
NULL
+6973 "var_id" "int" 32 0 6977 NULL true 0
NULL
+6974 "dim_id" "int" 32 0 6977 NULL true 1
NULL
+6975 "file_id" "int" 32 0 6977 NULL true 2
NULL
+6976 "dimpos" "int" 32 0 6977 NULL true 3
NULL
+6979 "obj_name" "varchar" 256 0 6985 NULL true
0 NULL
+6980 "att_name" "varchar" 256 0 6985 NULL true
1 NULL
+6981 "att_type" "varchar" 64 0 6985 NULL true
2 NULL
+6982 "value" "clob" 0 0 6985 NULL true 3 NULL
+6983 "file_id" "int" 32 0 6985 NULL true 4
NULL
+6984 "gr_name" "varchar" 256 0 6985 NULL true
5 NULL
+7010 "schema" "clob" 0 0 7024 NULL true 0
NULL
+7011 "table" "clob" 0 0 7024 NULL true 1 NULL
+7012 "column" "clob" 0 0 7024 NULL true 2
NULL
+7013 "type" "clob" 0 0 7024 NULL true 3 NULL
+7014 "mode" "clob" 0 0 7024 NULL true 4 NULL
+7015 "location" "clob" 0 0 7024 NULL true 5
NULL
+7016 "count" "bigint" 64 0 7024 NULL true 6
NULL
+7017 "typewidth" "int" 32 0 7024 NULL true 7
NULL
+7018 "columnsize" "bigint" 64 0 7024 NULL true
8 NULL
+7019 "heapsize" "bigint" 64 0 7024 NULL true
9 NULL
+7020 "hashes" "bigint" 64 0 7024 NULL true
10 NULL
+7021 "phash" "boolean" 1 0 7024 NULL true 11
NULL
+7022 "imprints" "bigint" 64 0 7024 NULL true
12 NULL
+7023 "sorted" "boolean" 1 0 7024 NULL true
13 NULL
+7026 "schema" "clob" 0 0 7036 NULL true 0
NULL
+7027 "table" "clob" 0 0 7036 NULL true 1 NULL
+7028 "column" "clob" 0 0 7036 NULL true 2
NULL
+7029 "type" "clob" 0 0 7036 NULL true 3 NULL
+7030 "typewidth" "int" 32 0 7036 NULL true 4
NULL
+7031 "count" "bigint" 64 0 7036 NULL true 5
NULL
+7032 "distinct" "bigint" 64 0 7036 NULL true
6 NULL
+7033 "atomwidth" "int" 32 0 7036 NULL true 7
NULL
+7034 "reference" "boolean" 1 0 7036 NULL true
8 NULL
+7035 "sorted" "boolean" 1 0 7036 NULL true
9 NULL
+7074 "schema" "clob" 0 0 7084 NULL true 0
NULL
+7075 "table" "clob" 0 0 7084 NULL true 1 NULL
+7076 "column" "clob" 0 0 7084 NULL true 2
NULL
+7077 "type" "clob" 0 0 7084 NULL true 3 NULL
+7078 "count" "bigint" 64 0 7084 NULL true 4
NULL
+7079 "columnsize" "bigint" 64 0 7084 NULL true
5 NULL
+7080 "heapsize" "bigint" 64 0 7084 NULL true
6 NULL
+7081 "hashes" "bigint" 64 0 7084 NULL true
7 NULL
+7082 "imprints" "bigint" 64 0 7084 NULL true
8 NULL
+7083 "sorted" "boolean" 1 0 7084 NULL true
9 NULL
+7086 "schema" "clob" 0 0 7094 NULL true 0
NULL
+7087 "table" "clob" 0 0 7094 NULL true 1 NULL
+7088 "count" "bigint" 64 0 7094 NULL true 2
NULL
+7089 "columnsize" "hugeint" 128 0 7094 NULL true
3 NULL
+7090 "heapsize" "hugeint" 128 0 7094 NULL true
4 NULL
+7091 "hashes" "hugeint" 128 0 7094 NULL true
5 NULL
+7092 "imprints" "hugeint" 128 0 7094 NULL true
6 NULL
+7093 "auxiliary" "hugeint" 128 0 7094 NULL true
7 NULL
+7096 "column_id" "int" 32 0 7107 NULL true 0
NULL
+7097 "type" "clob" 0 0 7107 NULL true 1 NULL
+7098 "width" "int" 32 0 7107 NULL true 2 NULL
+7099 "stamp" "timestamp" 7 0 7107 NULL true 3
NULL
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
