Changeset: f5c20c354d4e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f5c20c354d4e
Added Files:
sql/test/BugTracker-2019/Tests/sequence-first-next-value.Bug-6743.sql
sql/test/BugTracker-2019/Tests/sequence-first-next-value.Bug-6743.stable.err
sql/test/BugTracker-2019/Tests/sequence-first-next-value.Bug-6743.stable.out
sql/test/BugTracker-2019/Tests/sequences-defaults.Bug-6744.sql
sql/test/BugTracker-2019/Tests/sequences-defaults.Bug-6744.stable.err
sql/test/BugTracker-2019/Tests/sequences-defaults.Bug-6744.stable.out
sql/test/BugTracker-2019/Tests/sequences-types.Bug-6745.sql
sql/test/BugTracker-2019/Tests/sequences-types.Bug-6745.stable.err
sql/test/BugTracker-2019/Tests/sequences-types.Bug-6745.stable.out
Modified Files:
.hgtags
MonetDB.spec
NT/monetdb_config.h.in
NT/rules.msc
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
common/utils/msabaoth.c
common/utils/msabaoth.h
configure.ag
debian/changelog
embedded/monetdb_embedded.c
gdk/gdk_join.c
gdk/gdk_orderidx.c
gdk/gdk_select.c
gdk/libbat.rc
monetdb5/mal/mal.c
monetdb5/mal/mal_profiler.c
monetdb5/modules/atoms/batxml.c
monetdb5/modules/atoms/uuid.c
monetdb5/modules/atoms/uuid.mal
monetdb5/modules/atoms/xml.c
monetdb5/modules/atoms/xml.h
monetdb5/modules/atoms/xml.mal
monetdb5/tools/libmonetdb5.rc
sql/backends/monet5/sql.c
sql/backends/monet5/sql_cat.c
sql/server/rel_dump.c
sql/server/rel_propagate.c
sql/server/rel_schema.c
sql/server/rel_sequence.c
sql/server/rel_updates.c
sql/server/rel_updates.h
sql/server/sql_parser.y
sql/server/sql_scan.c
sql/storage/bat/bat_storage.c
sql/storage/store.c
sql/test/BugTracker-2018/Tests/remote-table-where-is-null.Bug-6601.stable.out
sql/test/BugTracker-2018/Tests/remote-table-where-not-equal.Bug-6621.stable.out
sql/test/BugTracker-2019/Tests/All
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/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/wlcr/Tests/wlc01.py
sql/test/wlcr/Tests/wlc01.stable.out
sql/test/wlcr/Tests/wlc100.py
sql/test/wlcr/Tests/wlc100.stable.out
sql/test/wlcr/Tests/wlc20.py
sql/test/wlcr/Tests/wlc20.stable.out
sql/test/wlcr/Tests/wlc21.py
sql/test/wlcr/Tests/wlc21.stable.out
sql/test/wlcr/Tests/wlc30.py
sql/test/wlcr/Tests/wlc30.stable.out
sql/test/wlcr/Tests/wlc40.py
sql/test/wlcr/Tests/wlc40.stable.out
sql/test/wlcr/Tests/wlc50.py
sql/test/wlcr/Tests/wlc50.stable.out
sql/test/wlcr/Tests/wlc70.py
sql/test/wlcr/Tests/wlc70.stable.out
tools/mserver/mserver5.c
vertoo.data
Branch: cmake-monetdblite
Log Message:
Merge with cmake-fun
diffs (truncated from 3757 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -727,3 +727,6 @@ 643dfa328c71d7891c8358b4969aa9ebf81e0f4c
2c9089e1dde297caaf347bf27f88b10e5622a735 Apr2019_release
2366418b3d88b268117a6f981638c4da686497aa Apr2019_5
2366418b3d88b268117a6f981638c4da686497aa Apr2019_SP1_release
+02147798590c5f9d7c837bec07277313c1fa29cc Apr2019_7
+2366418b3d88b268117a6f981638c4da686497aa Apr2019_SP1_release
+02147798590c5f9d7c837bec07277313c1fa29cc Apr2019_SP1_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1061,6 +1061,9 @@ done
%postun -p /sbin/ldconfig
%changelog
+* Wed Aug 07 2019 Panagiotis Koutsourakis <kutsu...@monetdbsolutions.com> -
11.33.7-20190807
+- Rebuilt.
+
* Thu Aug 01 2019 Panagiotis Koutsourakis <kutsu...@monetdbsolutions.com> -
11.33.5-20190801
- Rebuilt.
- BZ#6697: Duplicate expressions not eliminated with long CASE statement
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+monetdb (11.33.7) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Panagiotis Koutsourakis <kutsu...@monetdbsolutions.com> Wed, 07 Aug 2019
13:35:13 +0200
+
monetdb (11.33.5) unstable; urgency=low
* Rebuilt.
diff --git a/embedded/monetdb_embedded.c b/embedded/monetdb_embedded.c
--- a/embedded/monetdb_embedded.c
+++ b/embedded/monetdb_embedded.c
@@ -581,7 +581,6 @@ monetdb_append(monetdb_connection conn,
node *n;
size_t i;
sql_rel *rel;
- sql_query *query = query_create(m);
list *exps = sa_list(m->sa), *args = sa_list(m->sa), *col_types
= sa_list(m->sa);
sql_schema *s;
sql_table *t;
@@ -612,7 +611,7 @@ monetdb_append(monetdb_connection conn,
}
f->res = col_types;
- rel = rel_insert(query, rel_basetable(m, t, t->base.name),
rel_table_func(m->sa, NULL, exp_op(m->sa, args, f), exps, 1));
+ rel = rel_insert(m, rel_basetable(m, t, t->base.name),
rel_table_func(m->sa, NULL, exp_op(m->sa, args, f), exps, 1));
assert(rel);
m->scanner.rs = NULL;
m->errstr[0] = '\0';
diff --git a/gdk/gdk_join.c b/gdk/gdk_join.c
--- a/gdk/gdk_join.c
+++ b/gdk/gdk_join.c
@@ -524,11 +524,14 @@ mergejoin_void(BAT **r1p, BAT **r2p, BAT
r1 = mg;
if (r1 == NULL)
return GDK_FAIL;
+ } else {
+ BBPunfix(r2->batCacheid);
}
+ r2 = NULL;
}
*r1p = r1;
if (r2p == NULL)
- return GDK_SUCCEED;
+ goto doreturn2;
if (BATtdense(r1) && BATtdense(l)) {
r2 = BATdense(0, l->tseqbase + r1->tseqbase -
l->hseqbase + r->hseqbase - r->tseqbase, BATcount(r1));
if (r2 == NULL) {
diff --git a/gdk/gdk_orderidx.c b/gdk/gdk_orderidx.c
--- a/gdk/gdk_orderidx.c
+++ b/gdk/gdk_orderidx.c
@@ -87,12 +87,12 @@ BATcheckorderidx(BAT *b)
if (b == NULL)
return false;
+ ACCELDEBUG t = GDKusec();
assert(b->batCacheid > 0);
/* we don't need the lock just to read the value b->torderidx */
if (b->torderidx == (Heap *) 1) {
/* but when we want to change it, we need the lock */
assert(!GDKinmemory());
- ACCELDEBUG t = GDKusec();
MT_lock_set(&GDKhashLock(b->batCacheid));
if (b->torderidx == (Heap *) 1) {
Heap *hp;
diff --git a/gdk/gdk_select.c b/gdk/gdk_select.c
--- a/gdk/gdk_select.c
+++ b/gdk/gdk_select.c
@@ -329,7 +329,7 @@ hashselect(BAT *b, BAT *s, BAT *bn, cons
/* the following does work, however */ \
mask = (((((uint##B##_t) 1 << hbin) - 1) << 1) | 1) -
(((uint##B##_t) 1 << lbin) - 1); \
innermask = mask; \
- if (!b->tnonil || vl != minval) \
+ if (vl != minval) \
innermask = IMPSunsetBit(B, innermask, lbin); \
if (vh != maxval) \
innermask = IMPSunsetBit(B, innermask, hbin); \
@@ -338,6 +338,9 @@ hashselect(BAT *b, BAT *s, BAT *bn, cons
mask = ~innermask; \
innermask = ~tmp; \
} \
+ /* if there are nils, we may need to check bin 0 */ \
+ if (!b->tnonil) \
+ innermask = IMPSunsetBit(B, innermask, 0); \
\
if (BATcapacity(bn) < maximum) { \
impsloop(CAND, TEST, \
diff --git a/monetdb5/mal/mal_profiler.c b/monetdb5/mal/mal_profiler.c
--- a/monetdb5/mal/mal_profiler.c
+++ b/monetdb5/mal/mal_profiler.c
@@ -175,7 +175,7 @@ renderProfilerEvent(MalBlkPtr mb, MalStk
logadd("\"pc\":%d,%s", mb?getPC(mb,pci):0, prettify);
logadd("\"tag\":%d,%s", stk?stk->tag:0, prettify);
logadd("\"module\":\"%s\",%s", pci->modname ? pci->modname : "",
prettify);
- if (strcmp(pci->modname, "user") == 0) {
+ if (pci->modname && strcmp(pci->modname, "user") == 0) {
int caller_tag = 0;
if(stk && stk->up) {
caller_tag = stk->up->tag;
diff --git a/monetdb5/modules/atoms/batxml.c b/monetdb5/modules/atoms/batxml.c
--- a/monetdb5/modules/atoms/batxml.c
+++ b/monetdb5/modules/atoms/batxml.c
@@ -1452,82 +1452,82 @@ BATXMLxquery(bat *ret, const bat *bid, c
str BATXMLxml2str(bat *ret, const bat *bid) {
(void) ret;
(void) bid;
- return GDKstrdup(NO_LIBXML_FATAL);
+ return createException(MAL, "batxml.xml2str", SQLSTATE(HY005)
NO_LIBXML_FATAL);
}
str BATXMLxmltext(bat *ret, const bat *bid) {
(void) ret;
(void) bid;
- return GDKstrdup(NO_LIBXML_FATAL);
+ return createException(MAL, "batxml.xmltext", SQLSTATE(HY005)
NO_LIBXML_FATAL);
}
str BATXMLstr2xml(bat *ret, const bat *bid) {
(void) ret;
(void) bid;
- return GDKstrdup(NO_LIBXML_FATAL);
+ return createException(MAL, "batxml.str2xml", SQLSTATE(HY005)
NO_LIBXML_FATAL);
}
str BATXMLdocument(bat *ret, const bat *bid) {
(void) ret;
(void) bid;
- return GDKstrdup(NO_LIBXML_FATAL);
+ return createException(MAL, "batxml.document", SQLSTATE(HY005)
NO_LIBXML_FATAL);
}
str BATXMLcontent(bat *ret, const bat *bid) {
(void) ret;
(void) bid;
- return GDKstrdup(NO_LIBXML_FATAL);
+ return createException(MAL, "batxml.content", SQLSTATE(HY005)
NO_LIBXML_FATAL);
}
str BATXMLisdocument(bat *ret, const bat *bid) {
(void) ret;
(void) bid;
- return GDKstrdup(NO_LIBXML_FATAL);
+ return createException(MAL, "batxml.isdocument", SQLSTATE(HY005)
NO_LIBXML_FATAL);
}
str BATXMLelementSmall(bat *ret, const char * const *name, const bat *bid) {
(void) ret;
(void) name;
(void) bid;
- return GDKstrdup(NO_LIBXML_FATAL);
+ return createException(MAL, "batxml.elementSmall", SQLSTATE(HY005)
NO_LIBXML_FATAL);
}
str BATXMLoptions(bat *ret, const char * const *name, const char * const
*options, const bat *bid) {
(void) ret;
(void) name;
(void) options;
(void) bid;
- return GDKstrdup(NO_LIBXML_FATAL);
+ return createException(MAL, "batxml.options", SQLSTATE(HY005)
NO_LIBXML_FATAL);
}
str BATXMLcomment(bat *ret, const bat *bid) {
(void) ret;
(void) bid;
- return GDKstrdup(NO_LIBXML_FATAL);
+ return createException(MAL, "batxml.comment", SQLSTATE(HY005)
NO_LIBXML_FATAL);
}
str BATXMLparse(bat *ret, const char * const *doccont, const bat *bid, const
char * const *option) {
(void) ret;
(void) doccont;
(void) bid;
(void) option;
- return GDKstrdup(NO_LIBXML_FATAL);
+ return createException(MAL, "batxml.parse", SQLSTATE(HY005)
NO_LIBXML_FATAL);
}
str BATXMLxquery(bat *ret, const bat *bid, const char * const *expr) {
(void) ret;
(void) bid;
(void) expr;
- return GDKstrdup(NO_LIBXML_FATAL);
+ return createException(MAL, "batxml.xquery", SQLSTATE(HY005)
NO_LIBXML_FATAL);
}
str BATXMLpi(bat *ret, const char * const *tgt, const bat *bid) {
(void) ret;
(void) tgt;
(void) bid;
- return GDKstrdup(NO_LIBXML_FATAL);
+ return createException(MAL, "batxml.pi", SQLSTATE(HY005)
NO_LIBXML_FATAL);
}
str BATXMLroot(bat *ret, const bat *bid, const char * const *version, const
char * const *standalone) {
(void) ret;
(void) bid;
(void) version;
(void) standalone;
- return GDKstrdup(NO_LIBXML_FATAL);
+ return createException(MAL, "batxml.root", SQLSTATE(HY005)
NO_LIBXML_FATAL);
}
str BATXMLattribute(bat *ret, const char * const *name, const bat *bid) {
(void) ret;
(void) name;
(void) bid;
- return GDKstrdup(NO_LIBXML_FATAL);
+ return createException(MAL, "batxml.attribute", SQLSTATE(HY005)
NO_LIBXML_FATAL);
}
str BATXMLelement(bat *ret, const char * const *name, xml *ns, xml *attr,
const bat *bid) {
(void) ret;
@@ -1535,25 +1535,25 @@ str BATXMLelement(bat *ret, const char *
(void) ns;
(void) attr;
(void) bid;
- return GDKstrdup(NO_LIBXML_FATAL);
+ return createException(MAL, "batxml.element", SQLSTATE(HY005)
NO_LIBXML_FATAL);
}
str BATXMLconcat(bat *ret, const bat *bid, const bat *rid) {
(void) ret;
(void) bid;
(void) rid;
- return GDKstrdup(NO_LIBXML_FATAL);
+ return createException(MAL, "batxml.concat", SQLSTATE(HY005)
NO_LIBXML_FATAL);
}
str BATXMLforest(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p) {
(void) cntxt;
(void) mb;
(void) stk;
(void) p;
- return GDKstrdup(NO_LIBXML_FATAL);
+ return createException(MAL, "batxml.forest", SQLSTATE(HY005)
NO_LIBXML_FATAL);
}
str BATXMLgroup(xml *ret, const bat *bid) {
(void) ret;
(void) bid;
- return GDKstrdup(NO_LIBXML_FATAL);
+ return createException(MAL, "batxml.group", SQLSTATE(HY005)
NO_LIBXML_FATAL);
}
str AGGRsubxmlcand(bat *retval, const bat *bid, const bat *gid, const bat
*eid, const bat *sid, const bit *skip_nils) {
(void) retval;
@@ -1562,7 +1562,7 @@ str AGGRsubxmlcand(bat *retval, const ba
(void) eid;
(void) sid;
(void) skip_nils;
- return GDKstrdup(NO_LIBXML_FATAL);
+ return createException(MAL, "batxml.subxmlcand", SQLSTATE(HY005)
NO_LIBXML_FATAL);
}
str AGGRsubxml(bat *retval, const bat *bid, const bat *gid, const bat *eid,
const bit *skip_nils) {
(void) retval;
@@ -1570,7 +1570,7 @@ str AGGRsubxml(bat *retval, const bat *b
(void) gid;
(void) eid;
(void) skip_nils;
- return GDKstrdup(NO_LIBXML_FATAL);
+ return createException(MAL, "batxml.subxml", SQLSTATE(HY005)
NO_LIBXML_FATAL);
}
#endif
diff --git a/monetdb5/modules/atoms/xml.c b/monetdb5/modules/atoms/xml.c
--- a/monetdb5/modules/atoms/xml.c
+++ b/monetdb5/modules/atoms/xml.c
@@ -692,7 +692,7 @@ ssize_t XMLfromString(const char *src, s
(void) len;
(void) x;
(void) external;
- GDKerror("not implemented\n");
+ GDKerror("XMLfromString is not implemented\n");
return -1;
}
ssize_t XMLtoString(str *s, size_t *len, const char *src, bool external) {
@@ -700,74 +700,74 @@ ssize_t XMLtoString(str *s, size_t *len,
(void) len;
(void) src;
(void) external;
- GDKerror("not implemented\n");
+ GDKerror("XMLtoString is not implemented\n");
return -1;
}
str XMLxml2str(str *s, xml *x) {
(void) s;
(void) x;
- return GDKstrdup(NO_LIBXML_FATAL);
+ return createException(MAL, "xml.xml2str", SQLSTATE(HY005)
NO_LIBXML_FATAL);
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
