Changeset: 3498eaa2c57e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3498eaa2c57e
Modified Files:
MonetDB.spec
clients/Tests/All
clients/Tests/MAL-signatures_all.stable.out
clients/Tests/MAL-signatures_all.stable.out.int128
clients/Tests/MAL-signatures_fits_geom.stable.out
clients/Tests/MAL-signatures_fits_geom.stable.out.int128
clients/Tests/MAL-signatures_geom.stable.out
clients/Tests/MAL-signatures_geom.stable.out.int128
clients/Tests/MAL-signatures_none.stable.out
clients/Tests/MAL-signatures_none.stable.out.int128
clients/Tests/exports.stable.out
geom/monetdb5/geom.c
sql/backends/monet5/rest/rest_jsonstore_handle_get.c
sql/backends/monet5/vaults/Makefile.ag
sql/backends/monet5/vaults/mseed.c
sql/server/rel_optimizer.c
sql/server/rel_updates.c
sql/test/BugTracker-2015/Tests/All
sql/test/BugTracker-2015/Tests/row-value-constructor-crash.Bug-3662.sql
sql/test/BugTracker-2015/Tests/row-value-constructor-crash.Bug-3662.stable.out
sql/test/pg_regress/Tests/numeric.stable.err
sql/test/pg_regress/Tests/oid.sql
sql/test/pg_regress/Tests/oid.stable.err
sql/test/pg_regress/Tests/oid.stable.out
sql/test/pg_regress/Tests/stats.sql
sql/test/pg_regress/Tests/time.stable.err
sql/test/pg_regress/Tests/timetz.stable.err
sql/test/pg_regress/postgresql2sql99.sh
Branch: resultset
Log Message:
Merge with default.
diffs (truncated from 1498 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -574,6 +574,7 @@ format.
%defattr(-,root,root)
%{_libdir}/monetdb5/fits.mal
%{_libdir}/monetdb5/autoload/*_fits.mal
+%{_libdir}/monetdb5/createdb/*_fits.sql
%{_libdir}/monetdb5/lib_fits.so
%endif
@@ -624,6 +625,9 @@ fi
%dir %{_libdir}/monetdb5/autoload
%if %{?with_fits:1}%{!?with_fits:0}
%exclude %{_libdir}/monetdb5/fits.mal
+%exclude %{_libdir}/monetdb5/autoload/*_fits.mal
+%exclude %{_libdir}/monetdb5/createdb/*_fits.sql
+%exclude %{_libdir}/monetdb5/lib_fits.so
%endif
%if %{?with_geos:1}%{!?with_geos:0}
%exclude %{_libdir}/monetdb5/geom.mal
@@ -635,9 +639,6 @@ fi
# %exclude %{_libdir}/monetdb5/rdf.mal
%exclude %{_libdir}/monetdb5/sql.mal
%{_libdir}/monetdb5/*.mal
-%if %{?with_fits:1}%{!?with_fits:0}
-%exclude %{_libdir}/monetdb5/autoload/*_fits.mal
-%endif
%if %{?with_geos:1}%{!?with_geos:0}
%exclude %{_libdir}/monetdb5/autoload/*_geom.mal
%endif
@@ -648,9 +649,6 @@ fi
# %exclude %{_libdir}/monetdb5/autoload/*_rdf.mal
%exclude %{_libdir}/monetdb5/autoload/*_sql.mal
%{_libdir}/monetdb5/autoload/*.mal
-%if %{?with_fits:1}%{!?with_fits:0}
-%exclude %{_libdir}/monetdb5/lib_fits.so
-%endif
%if %{?with_geos:1}%{!?with_geos:0}
%exclude %{_libdir}/monetdb5/lib_geom.so
%endif
diff --git a/clients/Tests/All b/clients/Tests/All
--- a/clients/Tests/All
+++ b/clients/Tests/All
@@ -1,8 +1,8 @@
exports
-HAVE_CFITSIO&HAVE_GEOM&HAVE_GSL&HAVE_LIBR&HAVE_SAMTOOLS&HAVE_SPHINXCLIENT&!ENABLE_DATACELL?MAL-signatures_all
-HAVE_CFITSIO&HAVE_GEOM&!HAVE_GSL&!HAVE_LIBR&!HAVE_SAMTOOLS&!HAVE_SPHINXCLIENT&!ENABLE_DATACELL?MAL-signatures_fits_geom
-!HAVE_CFITSIO&HAVE_GEOM&!HAVE_GSL&!HAVE_LIBR&!HAVE_SAMTOOLS&!HAVE_SPHINXCLIENT&!ENABLE_DATACELL?MAL-signatures_geom
-!HAVE_CFITSIO&!HAVE_GEOM&!HAVE_GSL&!HAVE_LIBR&!HAVE_SAMTOOLS&!HAVE_SPHINXCLIENT&!ENABLE_DATACELL?MAL-signatures_none
+HAVE_CFITSIO&HAVE_GEOM&HAVE_GSL&HAVE_LIBR&HAVE_SAMTOOLS&HAVE_SPHINXCLIENT&!ENABLE_DATACELL&!HAVE_JSONSTORE?MAL-signatures_all
+HAVE_CFITSIO&HAVE_GEOM&!HAVE_GSL&!HAVE_LIBR&!HAVE_SAMTOOLS&!HAVE_SPHINXCLIENT&!ENABLE_DATACELL&!HAVE_JSONSTORE?MAL-signatures_fits_geom
+!HAVE_CFITSIO&HAVE_GEOM&!HAVE_GSL&!HAVE_LIBR&!HAVE_SAMTOOLS&!HAVE_SPHINXCLIENT&!ENABLE_DATACELL&!HAVE_JSONSTORE?MAL-signatures_geom
+!HAVE_CFITSIO&!HAVE_GEOM&!HAVE_GSL&!HAVE_LIBR&!HAVE_SAMTOOLS&!HAVE_SPHINXCLIENT&!ENABLE_DATACELL&!HAVE_JSONSTORE?MAL-signatures_none
HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS&!ENABLE_DATACELL&!BITS32?SQL-dump_all
HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS&!ENABLE_DATACELL?SQL-dump_geom
!HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS&!ENABLE_DATACELL&!BITS32?SQL-dump_none
diff --git a/clients/Tests/MAL-signatures_all.stable.out
b/clients/Tests/MAL-signatures_all.stable.out
--- a/clients/Tests/MAL-signatures_all.stable.out
+++ b/clients/Tests/MAL-signatures_all.stable.out
@@ -38884,11 +38884,7 @@ command lsst.xmatchsubselect(l:bat[:oid,
address LSSTxmatchsubselect;
comment Return the HtmID's that lie within the same triangle as r at level
depth
-command lsst.xmatch(l:bat[:oid,:lng],r:bat[:oid,:lng],depth:int,anti:bit):bit
-address LSSTxmatch;
-comment Return the HtmID pairs that lie within the same triangle at level depth
-
-command lsst.xmatch(l:lng,r:lng,depth:int,anti:bit):bit
+command lsst.xmatch(l:lng,r:lng,depth:int):bit
address LSSTxmatch;
comment Return true when the HtmID pairs that lie within the same triangle at
level depth
diff --git a/clients/Tests/MAL-signatures_all.stable.out.int128
b/clients/Tests/MAL-signatures_all.stable.out.int128
--- a/clients/Tests/MAL-signatures_all.stable.out.int128
+++ b/clients/Tests/MAL-signatures_all.stable.out.int128
@@ -49811,11 +49811,7 @@ command lsst.xmatchsubselect(l:bat[:oid,
address LSSTxmatchsubselect;
comment Return the HtmID's that lie within the same triangle as r at level
depth
-command lsst.xmatch(l:bat[:oid,:lng],r:bat[:oid,:lng],depth:int,anti:bit):bit
-address LSSTxmatch;
-comment Return the HtmID pairs that lie within the same triangle at level depth
-
-command lsst.xmatch(l:lng,r:lng,depth:int,anti:bit):bit
+command lsst.xmatch(l:lng,r:lng,depth:int):bit
address LSSTxmatch;
comment Return true when the HtmID pairs that lie within the same triangle at
level depth
diff --git a/clients/Tests/MAL-signatures_fits_geom.stable.out
b/clients/Tests/MAL-signatures_fits_geom.stable.out
--- a/clients/Tests/MAL-signatures_fits_geom.stable.out
+++ b/clients/Tests/MAL-signatures_fits_geom.stable.out
@@ -38801,11 +38801,7 @@ command lsst.xmatchsubselect(l:bat[:oid,
address LSSTxmatchsubselect;
comment Return the HtmID's that lie within the same triangle as r at level
depth
-command lsst.xmatch(l:bat[:oid,:lng],r:bat[:oid,:lng],depth:int,anti:bit):bit
-address LSSTxmatch;
-comment Return the HtmID pairs that lie within the same triangle at level depth
-
-command lsst.xmatch(l:lng,r:lng,depth:int,anti:bit):bit
+command lsst.xmatch(l:lng,r:lng,depth:int):bit
address LSSTxmatch;
comment Return true when the HtmID pairs that lie within the same triangle at
level depth
diff --git a/clients/Tests/MAL-signatures_fits_geom.stable.out.int128
b/clients/Tests/MAL-signatures_fits_geom.stable.out.int128
--- a/clients/Tests/MAL-signatures_fits_geom.stable.out.int128
+++ b/clients/Tests/MAL-signatures_fits_geom.stable.out.int128
@@ -49733,11 +49733,7 @@ command lsst.xmatchsubselect(l:bat[:oid,
address LSSTxmatchsubselect;
comment Return the HtmID's that lie within the same triangle as r at level
depth
-command lsst.xmatch(l:bat[:oid,:lng],r:bat[:oid,:lng],depth:int,anti:bit):bit
-address LSSTxmatch;
-comment Return the HtmID pairs that lie within the same triangle at level depth
-
-command lsst.xmatch(l:lng,r:lng,depth:int,anti:bit):bit
+command lsst.xmatch(l:lng,r:lng,depth:int):bit
address LSSTxmatch;
comment Return true when the HtmID pairs that lie within the same triangle at
level depth
diff --git a/clients/Tests/MAL-signatures_geom.stable.out
b/clients/Tests/MAL-signatures_geom.stable.out
--- a/clients/Tests/MAL-signatures_geom.stable.out
+++ b/clients/Tests/MAL-signatures_geom.stable.out
@@ -38777,11 +38777,7 @@ command lsst.xmatchsubselect(l:bat[:oid,
address LSSTxmatchsubselect;
comment Return the HtmID's that lie within the same triangle as r at level
depth
-command lsst.xmatch(l:bat[:oid,:lng],r:bat[:oid,:lng],depth:int,anti:bit):bit
-address LSSTxmatch;
-comment Return the HtmID pairs that lie within the same triangle at level depth
-
-command lsst.xmatch(l:lng,r:lng,depth:int,anti:bit):bit
+command lsst.xmatch(l:lng,r:lng,depth:int):bit
address LSSTxmatch;
comment Return true when the HtmID pairs that lie within the same triangle at
level depth
diff --git a/clients/Tests/MAL-signatures_geom.stable.out.int128
b/clients/Tests/MAL-signatures_geom.stable.out.int128
--- a/clients/Tests/MAL-signatures_geom.stable.out.int128
+++ b/clients/Tests/MAL-signatures_geom.stable.out.int128
@@ -49709,11 +49709,7 @@ command lsst.xmatchsubselect(l:bat[:oid,
address LSSTxmatchsubselect;
comment Return the HtmID's that lie within the same triangle as r at level
depth
-command lsst.xmatch(l:bat[:oid,:lng],r:bat[:oid,:lng],depth:int,anti:bit):bit
-address LSSTxmatch;
-comment Return the HtmID pairs that lie within the same triangle at level depth
-
-command lsst.xmatch(l:lng,r:lng,depth:int,anti:bit):bit
+command lsst.xmatch(l:lng,r:lng,depth:int):bit
address LSSTxmatch;
comment Return true when the HtmID pairs that lie within the same triangle at
level depth
diff --git a/clients/Tests/MAL-signatures_none.stable.out
b/clients/Tests/MAL-signatures_none.stable.out
--- a/clients/Tests/MAL-signatures_none.stable.out
+++ b/clients/Tests/MAL-signatures_none.stable.out
@@ -38610,11 +38610,7 @@ command lsst.xmatchsubselect(l:bat[:oid,
address LSSTxmatchsubselect;
comment Return the HtmID's that lie within the same triangle as r at level
depth
-command lsst.xmatch(l:bat[:oid,:lng],r:bat[:oid,:lng],depth:int,anti:bit):bit
-address LSSTxmatch;
-comment Return the HtmID pairs that lie within the same triangle at level depth
-
-command lsst.xmatch(l:lng,r:lng,depth:int,anti:bit):bit
+command lsst.xmatch(l:lng,r:lng,depth:int):bit
address LSSTxmatch;
comment Return true when the HtmID pairs that lie within the same triangle at
level depth
diff --git a/clients/Tests/MAL-signatures_none.stable.out.int128
b/clients/Tests/MAL-signatures_none.stable.out.int128
--- a/clients/Tests/MAL-signatures_none.stable.out.int128
+++ b/clients/Tests/MAL-signatures_none.stable.out.int128
@@ -49541,11 +49541,7 @@ command lsst.xmatchsubselect(l:bat[:oid,
address LSSTxmatchsubselect;
comment Return the HtmID's that lie within the same triangle as r at level
depth
-command lsst.xmatch(l:bat[:oid,:lng],r:bat[:oid,:lng],depth:int,anti:bit):bit
-address LSSTxmatch;
-comment Return the HtmID pairs that lie within the same triangle at level depth
-
-command lsst.xmatch(l:lng,r:lng,depth:int,anti:bit):bit
+command lsst.xmatch(l:lng,r:lng,depth:int):bit
address LSSTxmatch;
comment Return true when the HtmID pairs that lie within the same triangle at
level depth
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
@@ -2512,6 +2512,7 @@ str mnstr_write_stringwrap(void *ret, St
char monet_cwd[PATHLENGTH];
size_t monet_memory;
void moveInstruction(MalBlkPtr mb, int pc, int target);
+int mtProp;
str mtimeRef;
str mulRef;
str multicolumnRef;
diff --git a/geom/monetdb5/geom.c b/geom/monetdb5/geom.c
--- a/geom/monetdb5/geom.c
+++ b/geom/monetdb5/geom.c
@@ -139,15 +139,12 @@ mbr_isnil(mbr *m)
/* NULL: generic nil mbr. */
/* returns a pointer to a nil-mbr. */
+static mbr mbrNIL = {GDK_flt_min, GDK_flt_min, GDK_flt_min, GDK_flt_min};
+
mbr *
mbrNULL(void)
{
- static mbr mbrNIL;
- mbrNIL.xmin = flt_nil;
- mbrNIL.ymin = flt_nil;
- mbrNIL.xmax = flt_nil;
- mbrNIL.ymax = flt_nil;
- return (&mbrNIL);
+ return &mbrNIL;
}
/* FROMSTR: parse string to mbr. */
@@ -218,14 +215,16 @@ mbrFROMSTR(const char *src, int *len, mb
int
mbrTOSTR(char **dst, int *len, mbr *atom)
{
- static char tempWkt[MBR_WKTLEN];
- size_t dstStrLen = 3;
+ char tempWkt[MBR_WKTLEN];
+ size_t dstStrLen;
if (!mbr_isnil(atom)) {
- snprintf(tempWkt, MBR_WKTLEN, "BOX (%f %f, %f %f)",
+ snprintf(tempWkt, MBR_WKTLEN, "\"BOX (%f %f, %f %f)\"",
atom->xmin, atom->ymin, atom->xmax, atom->ymax);
- dstStrLen = strlen(tempWkt) + 2;
- assert(dstStrLen < GDK_int_max);
+ dstStrLen = strlen(tempWkt);
+ } else {
+ strcpy(tempWkt, "nil");
+ dstStrLen = 3;
}
if (*len < (int) dstStrLen + 1) {
@@ -235,7 +234,7 @@ mbrTOSTR(char **dst, int *len, mbr *atom
}
if (dstStrLen > 3)
- snprintf(*dst, *len, "\"%s\"", tempWkt);
+ snprintf(*dst, *len, "%s", tempWkt);
else
strcpy(*dst, "nil");
return (int) dstStrLen;
@@ -544,13 +543,12 @@ wkbCOMP(wkb *l, wkb *r)
return memcmp(l->data, r->data, len);
}
+static wkb nullval = {~0};
+
wkb *
wkbNULL(void)
{
- static wkb nullval;
-
- nullval.len = ~0;
- return (&nullval);
+ return &nullval;
}
str
diff --git a/sql/backends/monet5/rest/rest_jsonstore_handle_get.c
b/sql/backends/monet5/rest/rest_jsonstore_handle_get.c
--- a/sql/backends/monet5/rest/rest_jsonstore_handle_get.c
+++ b/sql/backends/monet5/rest/rest_jsonstore_handle_get.c
@@ -69,7 +69,7 @@ RESTsqlQuery(char **result, char * query
be = (backend*)c->sqlcontext;
be->output_format = OFMT_JSON;
- qmsg = SQLstatementIntern(c, &query, "rest", TRUE, TRUE);
+ qmsg = SQLstatementIntern(c, &query, "rest", TRUE, TRUE, NULL);
if (qmsg == MAL_SUCCEED) {
resultstring = buffer_get_buf(resultbuffer);
*result = GDKstrdup(resultstring);
diff --git a/sql/backends/monet5/vaults/Makefile.ag
b/sql/backends/monet5/vaults/Makefile.ag
--- a/sql/backends/monet5/vaults/Makefile.ag
+++ b/sql/backends/monet5/vaults/Makefile.ag
@@ -16,47 +16,28 @@
# All Rights Reserved.
INCLUDES = ../../../include \
- ../../../common \
- ../../../storage \
- ../../../server .. \
- ../../../../monetdb5/modules/atoms \
- ../../../../monetdb5/modules/kernel \
- ../../../../monetdb5/mal \
- ../../../../monetdb5/modules/mal \
- ../../../../monetdb5/optimizer \
- ../../../../monetdb5/scheduler \
- ../../../../clients/mapilib \
- ../../../../common/options \
- ../../../../common/stream \
- ../../../../common/utils \
- ../../../../gdk \
- $(READLINE_INCS) $(MSEED_CFLAGS) $(cfitsio_CFLAGS)
$(curl_CFLAGS)
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
