Changeset: 4afffacaefe9 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/4afffacaefe9
Modified Files:
clients/Tests/exports.stable.out
sql/backends/monet5/rel_bin.c
sql/backends/monet5/rel_predicates.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql_cat.c
sql/backends/monet5/sql_result.c
sql/backends/monet5/sql_statement.c
sql/backends/monet5/sql_statement.h
sql/backends/monet5/sql_upgrades.c
sql/backends/monet5/vaults/csv/csv.c
sql/common/sql_types.c
sql/include/sql_catalog.h
sql/include/sql_keyword.h
sql/include/sql_relation.h
sql/server/CMakeLists.txt
sql/server/rel_basetable.c
sql/server/rel_basetable.h
sql/server/rel_distribute.c
sql/server/rel_dump.c
sql/server/rel_exp.c
sql/server/rel_exp.h
sql/server/rel_optimize_others.c
sql/server/rel_optimize_proj.c
sql/server/rel_optimize_sel.c
sql/server/rel_optimizer.c
sql/server/rel_optimizer_private.h
sql/server/rel_propagate.c
sql/server/rel_psm.c
sql/server/rel_rel.c
sql/server/rel_rel.h
sql/server/rel_rewriter.c
sql/server/rel_rewriter.h
sql/server/rel_schema.c
sql/server/rel_select.c
sql/server/rel_statistics.c
sql/server/rel_unnest.c
sql/server/rel_updates.c
sql/server/sql_mvc.c
sql/server/sql_mvc.h
sql/server/sql_parser.y
sql/server/sql_partition.c
sql/server/sql_privileges.c
sql/server/sql_scan.c
sql/server/sql_scan.h
sql/server/sql_semantic.c
sql/server/sql_semantic.h
sql/server/sql_symbol.c
sql/server/sql_symbol.h
sql/server/sql_tokens.h
sql/storage/bat/bat_logger.c
sql/storage/bat/bat_storage.c
sql/storage/sql_catalog.c
sql/storage/sql_storage.h
sql/storage/store.c
tools/monetdbe/monetdbe.c
Branch: newjson
Log Message:
merge nested
diffs (truncated from 10210 to 300 lines):
diff --git a/clients/Tests/MAL-signatures-hge.test
b/clients/Tests/MAL-signatures-hge.test
--- a/clients/Tests/MAL-signatures-hge.test
+++ b/clients/Tests/MAL-signatures-hge.test
@@ -50000,6 +50000,11 @@ SQLcreate_trigger;
Catalog operation create_trigger
sqlcatalog
create_type
+pattern sqlcatalog.create_type(X_0:str, X_1:str, X_2:ptr):void
+SQLcreate_type;
+Catalog operation create_type
+sqlcatalog
+create_type
pattern sqlcatalog.create_type(X_0:str, X_1:str, X_2:str):void
SQLcreate_type;
Catalog operation create_type
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
@@ -1559,7 +1559,7 @@ sql_exp *exp_atom_lng(allocator *sa, lng
sql_exp *exp_atom_ptr(allocator *sa, void *s);
sql_exp *exp_atom_str(allocator *sa, const char *s, sql_subtype *st);
stmt *exp_bin(backend *be, sql_exp *e, stmt *left, stmt *right, stmt *grp,
stmt *ext, stmt *cnt, stmt *sel, int depth, int reduce, int push);
-sql_exp *exp_column(allocator *sa, const char *rname, const char *name,
sql_subtype *t, unsigned int card, int has_nils, int unique, int intern);
+sql_exp *exp_column(allocator *sa, sql_alias *parent, const char *name,
sql_subtype *t, unsigned int card, int has_nils, int unique, int intern);
sql_exp *exp_op(allocator *sa, list *l, sql_subfunc *f);
sql_table *find_table_or_view_on_scope(mvc *sql, sql_schema *s, const char
*sname, const char *tname, const char *error, bool isView);
int fl_register(char *name, fl_add_types_fptr add_types, fl_load_fptr fl_load);
diff --git a/geom/sql/functions/Tests/ST_DWithin.test
b/geom/sql/functions/Tests/ST_DWithin.test
--- a/geom/sql/functions/Tests/ST_DWithin.test
+++ b/geom/sql/functions/Tests/ST_DWithin.test
@@ -6,9 +6,9 @@ SELECT
geom
FROM geometries
WHERE
- [ST_POINT(10,10)]
- ST_DWITHIN
- [geom, 5]
+ ST_POINT(10,10)
+ ST_DWITHIN[5]
+ geom
----
POLYGON ((0 20, 10 20, 20 20, 20 10, 0 20))
POLYGON ((10 10, 20 10, 10 20, 10 10))
@@ -19,9 +19,9 @@ SELECT
geom
FROM geometries
WHERE
- [ST_POINT(15,10)]
- ST_DWITHIN
- [geom,5]
+ ST_POINT(15,10)
+ ST_DWITHIN[5]
+ geom
----
POLYGON ((0 20, 10 20, 20 20, 20 10, 0 20))
POLYGON ((10 10, 20 10, 10 20, 10 10))
@@ -33,9 +33,9 @@ SELECT
geom
FROM geometries
WHERE
- [ST_POINT(15,15)]
- ST_DWITHIN
- [geom,0]
+ ST_POINT(15,15)
+ ST_DWITHIN[0]
+ geom
----
POLYGON ((0 20, 10 20, 20 20, 20 10, 0 20))
POLYGON ((10 10, 20 10, 10 20, 10 10))
@@ -47,9 +47,9 @@ SELECT
geom
FROM geometries
WHERE
- [ST_POINT(17.5,17.5)]
- ST_DWITHIN
- [geom,2]
+ ST_POINT(17.5,17.5)
+ ST_DWITHIN[2]
+ geom
----
POLYGON ((0 20, 10 20, 20 20, 20 10, 0 20))
POLYGON ((10 10, 20 10, 20 20, 10 20, 10 10))
@@ -60,9 +60,9 @@ SELECT
geom
FROM geometries
WHERE
- [ST_POINT(5,15)]
- ST_DWITHIN
- [geom,3]
+ ST_POINT(5,15)
+ ST_DWITHIN[3]
+ geom
----
POLYGON ((0 20, 10 20, 20 20, 20 10, 0 20))
@@ -72,9 +72,9 @@ SELECT
geom
FROM geometries
WHERE
- [ST_GEOMFROMTEXT('LINESTRING (0 0, 15 15)')]
- ST_DWITHIN
- [geom,0]
+ ST_GEOMFROMTEXT('LINESTRING (0 0, 15 15)')
+ ST_DWITHIN[0]
+ geom
----
POLYGON ((0 20, 10 20, 20 20, 20 10, 0 20))
POLYGON ((10 10, 20 10, 10 20, 10 10))
@@ -86,9 +86,9 @@ SELECT
geom
FROM geometries
WHERE
- [ST_GEOMFROMTEXT('LINESTRING(5 5, 10 15)')]
- ST_DWITHIN
- [geom,4]
+ ST_GEOMFROMTEXT('LINESTRING(5 5, 10 15)')
+ ST_DWITHIN[4]
+ geom
----
POLYGON ((0 20, 10 20, 20 20, 20 10, 0 20))
POLYGON ((10 10, 20 10, 10 20, 10 10))
diff --git a/geom/sql/functions/Tests/ST_DWithinRTree.test
b/geom/sql/functions/Tests/ST_DWithinRTree.test
--- a/geom/sql/functions/Tests/ST_DWithinRTree.test
+++ b/geom/sql/functions/Tests/ST_DWithinRTree.test
@@ -6,9 +6,9 @@ SELECT
geom
FROM geometries_rtree
WHERE
- [ST_POINT(10,10)]
- ST_DWITHIN
- [geom, 5]
+ ST_POINT(10,10)
+ ST_DWITHIN[5]
+ geom
----
POLYGON ((0 20, 10 20, 20 20, 20 10, 0 20))
POLYGON ((10 10, 20 10, 10 20, 10 10))
@@ -19,9 +19,9 @@ SELECT
geom
FROM geometries_rtree
WHERE
- [ST_POINT(15,10)]
- ST_DWITHIN
- [geom,5]
+ ST_POINT(15,10)
+ ST_DWITHIN[5]
+ geom
----
POLYGON ((0 20, 10 20, 20 20, 20 10, 0 20))
POLYGON ((10 10, 20 10, 10 20, 10 10))
@@ -33,9 +33,9 @@ SELECT
geom
FROM geometries_rtree
WHERE
- [ST_POINT(15,15)]
- ST_DWITHIN
- [geom,0]
+ ST_POINT(15,15)
+ ST_DWITHIN[0]
+ geom
----
POLYGON ((0 20, 10 20, 20 20, 20 10, 0 20))
POLYGON ((10 10, 20 10, 10 20, 10 10))
@@ -47,9 +47,9 @@ SELECT
geom
FROM geometries_rtree
WHERE
- [ST_POINT(17.5,17.5)]
- ST_DWITHIN
- [geom,2]
+ ST_POINT(17.5,17.5)
+ ST_DWITHIN[2]
+ geom
----
POLYGON ((0 20, 10 20, 20 20, 20 10, 0 20))
POLYGON ((10 10, 20 10, 20 20, 10 20, 10 10))
@@ -60,9 +60,9 @@ SELECT
geom
FROM geometries_rtree
WHERE
- [ST_POINT(5,15)]
- ST_DWITHIN
- [geom,3]
+ ST_POINT(5,15)
+ ST_DWITHIN[3]
+ geom
----
POLYGON ((0 20, 10 20, 20 20, 20 10, 0 20))
@@ -72,9 +72,9 @@ SELECT
geom
FROM geometries_rtree
WHERE
- [ST_GEOMFROMTEXT('LINESTRING (0 0, 15 15)')]
- ST_DWITHIN
- [geom,0]
+ ST_GEOMFROMTEXT('LINESTRING (0 0, 15 15)')
+ ST_DWITHIN[0]
+ geom
----
POLYGON ((0 20, 10 20, 20 20, 20 10, 0 20))
POLYGON ((10 10, 20 10, 10 20, 10 10))
@@ -86,9 +86,9 @@ SELECT
geom
FROM geometries_rtree
WHERE
- [ST_GEOMFROMTEXT('LINESTRING(5 5, 10 15)')]
- ST_DWITHIN
- [geom,4]
+ ST_GEOMFROMTEXT('LINESTRING(5 5, 10 15)')
+ ST_DWITHIN[4]
+ geom
----
POLYGON ((0 20, 10 20, 20 20, 20 10, 0 20))
POLYGON ((10 10, 20 10, 10 20, 10 10))
diff --git a/geom/sql/functions/Tests/ST_Intersects.test
b/geom/sql/functions/Tests/ST_Intersects.test
--- a/geom/sql/functions/Tests/ST_Intersects.test
+++ b/geom/sql/functions/Tests/ST_Intersects.test
@@ -6,9 +6,9 @@ SELECT
geom
FROM geometries
WHERE
- [ST_POINT(10,10)]
+ ST_POINT(10,10)
ST_INTERSECTS
- [geom]
+ geom
----
POLYGON ((10 10, 20 10, 10 20, 10 10))
POLYGON ((10 10, 20 10, 20 20, 10 20, 10 10))
@@ -18,9 +18,9 @@ SELECT
geom
FROM geometries
WHERE
- [ST_POINT(15,10)]
+ ST_POINT(15,10)
ST_INTERSECTS
- [geom]
+ geom
----
POLYGON ((10 10, 20 10, 10 20, 10 10))
POLYGON ((10 10, 20 10, 20 20, 10 20, 10 10))
@@ -30,9 +30,9 @@ SELECT
geom
FROM geometries
WHERE
- [ST_POINT(15,15)]
+ ST_POINT(15,15)
ST_INTERSECTS
- [geom]
+ geom
----
POLYGON ((0 20, 10 20, 20 20, 20 10, 0 20))
POLYGON ((10 10, 20 10, 10 20, 10 10))
@@ -44,9 +44,9 @@ SELECT
geom
FROM geometries
WHERE
- [ST_POINT(17.5,17.5)]
+ ST_POINT(17.5,17.5)
ST_INTERSECTS
- [geom]
+ geom
----
POLYGON ((0 20, 10 20, 20 20, 20 10, 0 20))
POLYGON ((10 10, 20 10, 20 20, 10 20, 10 10))
@@ -57,9 +57,9 @@ SELECT
geom
FROM geometries
WHERE
- [ST_POINT(5,15)]
+ ST_POINT(5,15)
ST_INTERSECTS
- [geom]
+ geom
----
## Line - Polygon
@@ -68,9 +68,9 @@ SELECT
geom
FROM geometries
WHERE
- [ST_GEOMFROMTEXT('LINESTRING (0 0, 15 15)')]
+ ST_GEOMFROMTEXT('LINESTRING (0 0, 15 15)')
ST_INTERSECTS
- [geom]
+ geom
----
POLYGON ((0 20, 10 20, 20 20, 20 10, 0 20))
POLYGON ((10 10, 20 10, 10 20, 10 10))
@@ -82,9 +82,9 @@ SELECT
geom
FROM geometries
WHERE
- [ST_GEOMFROMTEXT('LINESTRING(5 5, 10 15)')]
+ ST_GEOMFROMTEXT('LINESTRING(5 5, 10 15)')
ST_INTERSECTS
- [geom]
+ geom
----
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
