MonetDB: Oct2020 - A couple of fixes.
Changeset: b90cb314931c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b90cb314931c
Modified Files:
common/stream/stdio_stream.c
common/stream/stream.c
common/stream/stream_internal.h
Branch: Oct2020
Log Message:
A couple of fixes.
- no unused functions (use ifdef)
- fix memory leak in case of error
- remove file after failed create
diffs (129 lines):
diff --git a/common/stream/stdio_stream.c b/common/stream/stdio_stream.c
--- a/common/stream/stdio_stream.c
+++ b/common/stream/stdio_stream.c
@@ -165,6 +165,7 @@ file_fsetpos(stream *restrict s, fpos_t
/* convert a string from UTF-8 to wide characters; the return value is
* freshly allocated */
+#ifdef HAVE__WFOPEN
static wchar_t *
utf8towchar(const char *src)
{
@@ -246,6 +247,8 @@ utf8towchar(const char *src)
return dest;
}
+#else
+
static char *
cvfilename(const char *filename)
{
@@ -281,6 +284,7 @@ cvfilename(const char *filename)
* locale's encoding is not UTF-8) */
return strdup(filename);
}
+#endif
stream *
@@ -297,7 +301,6 @@ open_stream(const char *restrict filenam
{
wchar_t *wfname = utf8towchar(filename);
wchar_t *wflags = utf8towchar(flags);
- (void)cvfilename;
if (wfname != NULL && wflags != NULL)
fp = _wfopen(wfname, wflags);
else
@@ -310,7 +313,6 @@ open_stream(const char *restrict filenam
#else
{
char *fname = cvfilename(filename);
- (void)utf8towchar;
if (fname) {
fp = fopen(fname, flags);
free(fname);
@@ -498,3 +500,24 @@ getFileSize(stream *s)
return (size_t) stb.st_size;
return 0; /* unknown */
}
+
+int
+file_remove(const char *filename)
+{
+ int rc = -1;
+
+#ifdef HAVE__WFOPEN
+ wchar_t *wfname = utf8towchar(filename);
+ if (wfname != NULL) {
+ rc = _wremove(wfname);
+ free(wfname);
+ }
+#else
+ char *fname = cvfilename(filename);
+ if (fname) {
+ rc = remove(fname);
+ free(fname);
+ }
+#endif
+ return rc;
+}
diff --git a/common/stream/stream.c b/common/stream/stream.c
--- a/common/stream/stream.c
+++ b/common/stream/stream.c
@@ -851,7 +851,7 @@ open_rstream(const char *filename)
stream *c = compressed_stream(s, 0);
if (c == NULL)
- mnstr_close(s);
+ mnstr_destroy(s);
return c;
}
@@ -870,8 +870,10 @@ open_wstream(const char *filename)
return NULL;
stream *c = compressed_stream(s, 0);
- if (c == NULL)
- mnstr_close(s);
+ if (c == NULL) {
+ mnstr_destroy(s);
+ file_remove(filename);
+ }
return c;
}
@@ -890,7 +892,7 @@ open_rastream(const char *filename)
stream *t = create_text_stream(s);
if (t == NULL)
- mnstr_close(s);
+ mnstr_destroy(s);
return t;
}
@@ -908,8 +910,10 @@ open_wastream(const char *filename)
return NULL;
stream *t = create_text_stream(s);
- if (t == NULL)
- mnstr_close(s);
+ if (t == NULL) {
+ mnstr_destroy(s);
+ file_remove(filename);
+ }
return t;
}
diff --git a/common/stream/stream_internal.h b/common/stream/stream_internal.h
--- a/common/stream/stream_internal.h
+++ b/common/stream/stream_internal.h
@@ -207,6 +207,9 @@ stream *open_stream(const char *restrict
stream *file_stream(const char *name)
__attribute__((__visibility__("hidden")));
+int file_remove(const char *filename)
+ __attribute__((__visibility__("hidden")));
+
/* implementation detail of stdio_stream.c which must be public because
* for example bstream() special cases on it to provide a fast path for file
* i/o.
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: copybinary - Printf debugging how many imports run conc...
Changeset: 982967454e38 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=982967454e38
Modified Files:
sql/backends/monet5/sql_bincopyfrom2.c
Branch: copybinary
Log Message:
Printf debugging how many imports run concurrently?
diffs (24 lines):
diff --git a/sql/backends/monet5/sql_bincopyfrom2.c
b/sql/backends/monet5/sql_bincopyfrom2.c
--- a/sql/backends/monet5/sql_bincopyfrom2.c
+++ b/sql/backends/monet5/sql_bincopyfrom2.c
@@ -458,6 +458,10 @@ finish_mapi_file_upload(backend *be, boo
static str
importColumn(backend *be, bat *ret, lng *retcnt, str method, str path, int
onclient, lng nrows)
{
+ static ATOMIC_TYPE concurrent = ATOMIC_VAR_INIT(0);
+ int current_concurrent = ATOMIC_INC(&concurrent);
+ fprintf(stderr, "IMP start, %d running\n", current_concurrent);
+
// In this function we create the BAT and open the file, and tidy
// up when things go wrong. The actual work happens in load_column().
@@ -532,6 +536,9 @@ end:
*retcnt = 0;
}
+ current_concurrent = ATOMIC_DEC(&concurrent);
+ fprintf(stderr, "IMP done, %d running\n", current_concurrent);
+
return msg;
}
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: mtest - update notes
Changeset: 5e65845c3e42 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5e65845c3e42 Modified Files: testing/SQLogicConvertNotes Branch: mtest Log Message: update notes diffs (12 lines): diff --git a/testing/SQLogicConvertNotes b/testing/SQLogicConvertNotes --- a/testing/SQLogicConvertNotes +++ b/testing/SQLogicConvertNotes @@ -35,4 +35,7 @@ Converted folders progress: --- - sql/test/null/Tests pass - sql/test/json/Tests pass -- sql/test/Tests1 fail +- sql/test/Testspass +- sql/test/ADT2006 pass +- sql/test/broken_deletepass +- sql/test/astropass ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Oct2020 - On Windows, compile with lz4 support.
Changeset: fad7c1e666c8 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fad7c1e666c8
Modified Files:
NT/mksqlwxs.py
Branch: Oct2020
Log Message:
On Windows, compile with lz4 support.
diffs (11 lines):
diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py
--- a/NT/mksqlwxs.py
+++ b/NT/mksqlwxs.py
@@ -151,6 +151,7 @@ def main():
vcpkg.format(r'bin\libcharset.dll'), # for libiconv.dll
vcpkg.format(r'bin\libcrypto-1_1{}.dll'.format(libcrypto)),
vcpkg.format(r'bin\libxml2.dll'),
+ vcpkg.format(r'bin\lz4.dll'),
vcpkg.format(r'bin\lzma.dll'),
vcpkg.format(r'bin\pcre.dll'),
vcpkg.format(r'bin\zlib1.dll')])
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Oct2020 - Include missing .lib files.
Changeset: 4115d902d53e for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4115d902d53e Modified Files: NT/mksqlwxs.py Branch: Oct2020 Log Message: Include missing .lib files. diffs (16 lines): diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py --- a/NT/mksqlwxs.py +++ b/NT/mksqlwxs.py @@ -201,8 +201,12 @@ def main(): r'lib\stream.lib', vcpkg.format(r'lib\libiconv.lib'), vcpkg.format(r'lib\bz2.lib'), + vcpkg.format(r'lib\getopt.lib'), + vcpkg.format(r'lib\libcharset.lib'), vcpkg.format(r'lib\libcrypto.lib'), vcpkg.format(r'lib\libxml2.lib'), + vcpkg.format(r'lib\lz4.lib'), + vcpkg.format(r'lib\lzma.lib'), vcpkg.format(r'lib\pcre.lib'), vcpkg.format(r'lib\zlib.lib')]) print(r'') ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jun2020 - Avoid using large buffers on the stack.
Changeset: 6ed388bc827b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6ed388bc827b
Modified Files:
monetdb5/mal/mal_exception.c
Branch: Jun2020
Log Message:
Avoid using large buffers on the stack.
diffs (136 lines):
diff --git a/monetdb5/mal/mal_exception.c b/monetdb5/mal/mal_exception.c
--- a/monetdb5/mal/mal_exception.c
+++ b/monetdb5/mal/mal_exception.c
@@ -61,22 +61,39 @@ dupError(const char *err)
static str __attribute__((__format__(__printf__, 3, 0), __returns_nonnull__))
createExceptionInternal(enum malexception type, const char *fcn, const char
*format, va_list ap)
{
- char local[GDKMAXERRLEN];
+ size_t msglen;
int len;
+ char *msg;
+ va_list ap2;
#ifndef NDEBUG
// if there is an error we allow memory allocation once again
GDKsetmallocsuccesscount(-1);
#endif
- len = snprintf(local, GDKMAXERRLEN, "%s:%s:", exceptionNames[type],
fcn);
- len = vsnprintf(local + len, GDKMAXERRLEN - len, format, ap);
- if (len < 0)
+ va_copy(ap2, ap); /* we need to use it twice */
+ msglen = strlen(exceptionNames[type]) + strlen(fcn) + 2;
+ len = vsnprintf(NULL, 0, format, ap); /* count necessary length */
+ if (len < 0) {
TRC_CRITICAL(MAL_SERVER, "called with bad arguments");
- char *q = local;
- for (char *p = strchr(q, '\n'); p; q = p + 1, p = strchr(q, '\n'))
- TRC_ERROR(MAL_SERVER, "%.*s\n", (int) (p - q), q);
- if (*q)
- TRC_ERROR(MAL_SERVER, "%s\n", q);
- return dupError(local);
+ len = 0;
+ }
+ msg = GDKmalloc(msglen + len + 1);
+ if (msg != NULL) {
+ /* the calls below succeed: the arguments have already been
checked */
+ (void) strconcat_len(msg, msglen + 1,
+exceptionNames[type],
":", fcn, ":", NULL);
+ if (len > 0)
+ (void) vsnprintf(msg + msglen, len + 1, format, ap2);
+ va_end(ap2);
+ char *q = msg;
+ for (char *p = strchr(msg, '\n'); p; q = p + 1, p = strchr(q,
'\n'))
+ TRC_ERROR(MAL_SERVER, "%.*s\n", (int) (p - q), q);
+ if (*q)
+ TRC_ERROR(MAL_SERVER, "%s\n", q);
+ } else {
+ msg = M5OutOfMemory;
+ }
+ va_end(ap2);
+ return msg;
}
/**
@@ -145,38 +162,52 @@ freeException(str msg)
static str __attribute__((__format__(__printf__, 5, 0), __returns_nonnull__))
createMalExceptionInternal(MalBlkPtr mb, int pc, enum malexception type, char
*prev, const char *format, va_list ap)
{
- char buf[GDKMAXERRLEN];
- size_t i;
- str s, fcn;
+ bool addnl = false;
+ const char *s = mb ? getModName(mb) : "unknown";
+ const char *fcn = mb ? getFcnName(mb) : "unknown";
+ size_t msglen;
- s = mb ? getModName(mb) : "unknown";
- fcn = mb ? getFcnName(mb) : "unknown";
- i = 0;
-
- if (prev){
- if( *prev){
- i += snprintf(buf + i, GDKMAXERRLEN - 1 - i, "%s",
prev);
- if( buf[i-1] != '\n')
- buf[i++]= '\n';
+ if (prev) {
+ msglen = strlen(prev);
+ if (msglen > 0 && prev[msglen - 1] != '\n') {
+ addnl = true;
+ msglen++;
}
- i += snprintf(buf + i, GDKMAXERRLEN - 1 - i, "!%s:%s.%s[%d]:",
- exceptionNames[type], s, fcn, pc);
- freeException(prev);
- } else if( type == SYNTAX)
- i += snprintf(buf + i, GDKMAXERRLEN - 1 - i, "%s:",
- exceptionNames[type]);
- else
- i += snprintf(buf + i, GDKMAXERRLEN - 1 - i, "%s:%s.%s[%d]:",
- exceptionNames[type], s, fcn, pc);
- i += vsnprintf(buf + i, GDKMAXERRLEN - 1 - i, format, ap);
- if( buf[i-1] != '\n')
- buf[i++]= '\n';
- buf[i] = '\0';
-
- s = GDKstrdup(buf);
- if (s == NULL) /* make sure we always return
something */
- s = M5OutOfMemory;
- return s;
+ msglen += snprintf(NULL, 0, "!%s:%s.%s[%d]:",
+ exceptionNames[type], s,
fcn, pc);
+ } else if (type == SYNTAX) {
+ msglen = strlen(exceptionNames[type]) + 1;
+ } else {
+ msglen = snprintf(NULL, 0, "%s:%s.%s[%d]:",
+ exceptionNames[type], s, fcn,
pc);
+ }
+ va_list ap2;
+ va_copy(ap2, ap);
+ int len = vsnprintf(NULL, 0, format, ap);
+ if (len < 0)
+ len = 0;
+ char *msg = GDKmalloc(msglen + len + 1);
+ if (msg != NULL) {
+
MonetDB: Oct2020 - Merge with Jun2020 branch.
Changeset: 0e29b912d97a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0e29b912d97a
Branch: Oct2020
Log Message:
Merge with Jun2020 branch.
diffs (136 lines):
diff --git a/monetdb5/mal/mal_exception.c b/monetdb5/mal/mal_exception.c
--- a/monetdb5/mal/mal_exception.c
+++ b/monetdb5/mal/mal_exception.c
@@ -61,22 +61,39 @@ dupError(const char *err)
static str __attribute__((__format__(__printf__, 3, 0), __returns_nonnull__))
createExceptionInternal(enum malexception type, const char *fcn, const char
*format, va_list ap)
{
- char local[GDKMAXERRLEN];
+ size_t msglen;
int len;
+ char *msg;
+ va_list ap2;
#ifndef NDEBUG
// if there is an error we allow memory allocation once again
GDKsetmallocsuccesscount(-1);
#endif
- len = snprintf(local, GDKMAXERRLEN, "%s:%s:", exceptionNames[type],
fcn);
- len = vsnprintf(local + len, GDKMAXERRLEN - len, format, ap);
- if (len < 0)
+ va_copy(ap2, ap); /* we need to use it twice */
+ msglen = strlen(exceptionNames[type]) + strlen(fcn) + 2;
+ len = vsnprintf(NULL, 0, format, ap); /* count necessary length */
+ if (len < 0) {
TRC_CRITICAL(MAL_SERVER, "called with bad arguments");
- char *q = local;
- for (char *p = strchr(q, '\n'); p; q = p + 1, p = strchr(q, '\n'))
- TRC_ERROR(MAL_SERVER, "%.*s\n", (int) (p - q), q);
- if (*q)
- TRC_ERROR(MAL_SERVER, "%s\n", q);
- return dupError(local);
+ len = 0;
+ }
+ msg = GDKmalloc(msglen + len + 1);
+ if (msg != NULL) {
+ /* the calls below succeed: the arguments have already been
checked */
+ (void) strconcat_len(msg, msglen + 1,
+exceptionNames[type],
":", fcn, ":", NULL);
+ if (len > 0)
+ (void) vsnprintf(msg + msglen, len + 1, format, ap2);
+ va_end(ap2);
+ char *q = msg;
+ for (char *p = strchr(msg, '\n'); p; q = p + 1, p = strchr(q,
'\n'))
+ TRC_ERROR(MAL_SERVER, "%.*s\n", (int) (p - q), q);
+ if (*q)
+ TRC_ERROR(MAL_SERVER, "%s\n", q);
+ } else {
+ msg = M5OutOfMemory;
+ }
+ va_end(ap2);
+ return msg;
}
/**
@@ -145,38 +162,52 @@ freeException(str msg)
static str __attribute__((__format__(__printf__, 5, 0), __returns_nonnull__))
createMalExceptionInternal(MalBlkPtr mb, int pc, enum malexception type, char
*prev, const char *format, va_list ap)
{
- char buf[GDKMAXERRLEN];
- size_t i;
- str s, fcn;
+ bool addnl = false;
+ const char *s = mb ? getModName(mb) : "unknown";
+ const char *fcn = mb ? getFcnName(mb) : "unknown";
+ size_t msglen;
- s = mb ? getModName(mb) : "unknown";
- fcn = mb ? getFcnName(mb) : "unknown";
- i = 0;
-
- if (prev){
- if( *prev){
- i += snprintf(buf + i, GDKMAXERRLEN - 1 - i, "%s",
prev);
- if( buf[i-1] != '\n')
- buf[i++]= '\n';
+ if (prev) {
+ msglen = strlen(prev);
+ if (msglen > 0 && prev[msglen - 1] != '\n') {
+ addnl = true;
+ msglen++;
}
- i += snprintf(buf + i, GDKMAXERRLEN - 1 - i, "!%s:%s.%s[%d]:",
- exceptionNames[type], s, fcn, pc);
- freeException(prev);
- } else if( type == SYNTAX)
- i += snprintf(buf + i, GDKMAXERRLEN - 1 - i, "%s:",
- exceptionNames[type]);
- else
- i += snprintf(buf + i, GDKMAXERRLEN - 1 - i, "%s:%s.%s[%d]:",
- exceptionNames[type], s, fcn, pc);
- i += vsnprintf(buf + i, GDKMAXERRLEN - 1 - i, format, ap);
- if( buf[i-1] != '\n')
- buf[i++]= '\n';
- buf[i] = '\0';
-
- s = GDKstrdup(buf);
- if (s == NULL) /* make sure we always return
something */
- s = M5OutOfMemory;
- return s;
+ msglen += snprintf(NULL, 0, "!%s:%s.%s[%d]:",
+ exceptionNames[type], s,
fcn, pc);
+ } else if (type == SYNTAX) {
+ msglen = strlen(exceptionNames[type]) + 1;
+ } else {
+ msglen = snprintf(NULL, 0, "%s:%s.%s[%d]:",
+ exceptionNames[type], s, fcn,
pc);
+ }
+ va_list ap2;
+ va_copy(ap2, ap);
+ int len = vsnprintf(NULL, 0, format, ap);
+ if (len < 0)
+ len = 0;
+ char *msg = GDKmalloc(msglen + len + 1);
+ if (msg != NULL) {
+ /* the calls below succeed: the arguments have already been
ch
MonetDB: octbugs - Merge with Oct2020 branch.
Changeset: a9c95d2d4caa for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a9c95d2d4caa
Branch: octbugs
Log Message:
Merge with Oct2020 branch.
diffs (truncated from 310 to 300 lines):
diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py
--- a/NT/mksqlwxs.py
+++ b/NT/mksqlwxs.py
@@ -151,6 +151,7 @@ def main():
vcpkg.format(r'bin\libcharset.dll'), # for libiconv.dll
vcpkg.format(r'bin\libcrypto-1_1{}.dll'.format(libcrypto)),
vcpkg.format(r'bin\libxml2.dll'),
+ vcpkg.format(r'bin\lz4.dll'),
vcpkg.format(r'bin\lzma.dll'),
vcpkg.format(r'bin\pcre.dll'),
vcpkg.format(r'bin\zlib1.dll')])
@@ -200,8 +201,12 @@ def main():
r'lib\stream.lib',
vcpkg.format(r'lib\libiconv.lib'),
vcpkg.format(r'lib\bz2.lib'),
+ vcpkg.format(r'lib\getopt.lib'),
+ vcpkg.format(r'lib\libcharset.lib'),
vcpkg.format(r'lib\libcrypto.lib'),
vcpkg.format(r'lib\libxml2.lib'),
+ vcpkg.format(r'lib\lz4.lib'),
+ vcpkg.format(r'lib\lzma.lib'),
vcpkg.format(r'lib\pcre.lib'),
vcpkg.format(r'lib\zlib.lib')])
print(r'')
diff --git a/common/stream/stdio_stream.c b/common/stream/stdio_stream.c
--- a/common/stream/stdio_stream.c
+++ b/common/stream/stdio_stream.c
@@ -165,6 +165,7 @@ file_fsetpos(stream *restrict s, fpos_t
/* convert a string from UTF-8 to wide characters; the return value is
* freshly allocated */
+#ifdef HAVE__WFOPEN
static wchar_t *
utf8towchar(const char *src)
{
@@ -246,6 +247,8 @@ utf8towchar(const char *src)
return dest;
}
+#else
+
static char *
cvfilename(const char *filename)
{
@@ -281,6 +284,7 @@ cvfilename(const char *filename)
* locale's encoding is not UTF-8) */
return strdup(filename);
}
+#endif
stream *
@@ -297,7 +301,6 @@ open_stream(const char *restrict filenam
{
wchar_t *wfname = utf8towchar(filename);
wchar_t *wflags = utf8towchar(flags);
- (void)cvfilename;
if (wfname != NULL && wflags != NULL)
fp = _wfopen(wfname, wflags);
else
@@ -310,7 +313,6 @@ open_stream(const char *restrict filenam
#else
{
char *fname = cvfilename(filename);
- (void)utf8towchar;
if (fname) {
fp = fopen(fname, flags);
free(fname);
@@ -498,3 +500,24 @@ getFileSize(stream *s)
return (size_t) stb.st_size;
return 0; /* unknown */
}
+
+int
+file_remove(const char *filename)
+{
+ int rc = -1;
+
+#ifdef HAVE__WFOPEN
+ wchar_t *wfname = utf8towchar(filename);
+ if (wfname != NULL) {
+ rc = _wremove(wfname);
+ free(wfname);
+ }
+#else
+ char *fname = cvfilename(filename);
+ if (fname) {
+ rc = remove(fname);
+ free(fname);
+ }
+#endif
+ return rc;
+}
diff --git a/common/stream/stream.c b/common/stream/stream.c
--- a/common/stream/stream.c
+++ b/common/stream/stream.c
@@ -851,7 +851,7 @@ open_rstream(const char *filename)
stream *c = compressed_stream(s, 0);
if (c == NULL)
- mnstr_close(s);
+ mnstr_destroy(s);
return c;
}
@@ -870,8 +870,10 @@ open_wstream(const char *filename)
return NULL;
stream *c = compressed_stream(s, 0);
- if (c == NULL)
- mnstr_close(s);
+ if (c == NULL) {
+ mnstr_destroy(s);
+ file_remove(filename);
+ }
return c;
}
@@ -890,7 +892,7 @@ open_rastream(const char *filename)
stream *t = create_text_stream(s);
if (t == NULL)
- mnstr_close(s);
+ mnstr_destroy(s);
return t;
}
@@ -908,8 +910,10 @@ open_wastream(const char *filename)
return NULL;
stream *t = create_text_stream(s);
- if (t == NULL)
- mnstr_close(s);
+ if (t == NULL) {
+ mnstr_destroy(s);
+ file_remove(filename);
+ }
return t;
}
diff --git a/common/stream/stream_internal.h b/common/stream/stream_internal.h
--- a/common/stream/stream_internal.h
+++ b/common/stream/stream_internal.h
@@ -207,6 +207,9 @@ stream *open_stream(const char *restrict
stream *file_stream(const char *name)
__attribute__((__visibility__("hidden")));
+int file_remove(const char *filename)
+ __attribute__((__visibility__("hidden")));
+
/* implementation detail of stdio_stream.c which must be public because
* for example bstream() special cases on it to provide a fast path for file
* i/o.
diff --git a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
@@ -158,7 +158,
MonetDB: default - Merge with octbugs branch.
Changeset: 12f96719f26c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=12f96719f26c
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
sql/backends/monet5/sql.c
Branch: default
Log Message:
Merge with octbugs branch.
diffs (truncated from 698 to 300 lines):
diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py
--- a/NT/mksqlwxs.py
+++ b/NT/mksqlwxs.py
@@ -151,6 +151,7 @@ def main():
vcpkg.format(r'bin\libcharset.dll'), # for libiconv.dll
vcpkg.format(r'bin\libcrypto-1_1{}.dll'.format(libcrypto)),
vcpkg.format(r'bin\libxml2.dll'),
+ vcpkg.format(r'bin\lz4.dll'),
vcpkg.format(r'bin\lzma.dll'),
vcpkg.format(r'bin\pcre.dll'),
vcpkg.format(r'bin\zlib1.dll')])
@@ -200,8 +201,12 @@ def main():
r'lib\stream.lib',
vcpkg.format(r'lib\libiconv.lib'),
vcpkg.format(r'lib\bz2.lib'),
+ vcpkg.format(r'lib\getopt.lib'),
+ vcpkg.format(r'lib\libcharset.lib'),
vcpkg.format(r'lib\libcrypto.lib'),
vcpkg.format(r'lib\libxml2.lib'),
+ vcpkg.format(r'lib\lz4.lib'),
+ vcpkg.format(r'lib\lzma.lib'),
vcpkg.format(r'lib\pcre.lib'),
vcpkg.format(r'lib\zlib.lib')])
print(r'')
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
@@ -4717,9 +4717,6 @@ stdout of test 'MAL-signatures` in direc
[ "batcalc", "ifthenelse", "pattern batcalc.ifthenelse(X_1:bit, X_2:any_1,
X_3:bat[:any_1]):bat[:any_1] ", "CMDifthen;", "" ]
[ "batcalc", "ifthenelse", "pattern batcalc.ifthenelse(X_1:bit,
X_2:bat[:any_1], X_3:any_1):bat[:any_1] ", "CMDifthen;", "" ]
[ "batcalc", "ifthenelse", "pattern batcalc.ifthenelse(X_1:bit,
X_2:bat[:any_1], X_3:bat[:any_1]):bat[:any_1] ", "CMDifthen;", "" ]
-[ "batcalc", "index","command batcalc.index(X_1:bat[:str],
X_2:bit):bat[:bte] ", "BATSTRindex_bte;", "" ]
-[ "batcalc", "index","command batcalc.index(X_1:bat[:str],
X_2:bit):bat[:int] ", "BATSTRindex_int;", "" ]
-[ "batcalc", "index","command batcalc.index(X_1:bat[:str],
X_2:bit):bat[:sht] ", "BATSTRindex_sht;", "" ]
[ "batcalc", "int", "pattern batcalc.int(X_1:bat[:bit]):bat[:int] ",
"CMDconvertsignal_int;","" ]
[ "batcalc", "int", "pattern batcalc.int(X_1:bat[:bit],
X_2:bat[:oid]):bat[:int] ", "CMDconvertsignal_int;","" ]
[ "batcalc", "int", "pattern batcalc.int(X_1:bat[:bte]):bat[:int] ",
"CMDconvertsignal_int;","" ]
@@ -5750,7 +5747,6 @@ stdout of test 'MAL-signatures` in direc
[ "batcalc", "str", "pattern batcalc.str(X_1:int, X_2:int, X_3:int,
X_4:int, X_5:bat[:any_1], X_6:int):bat[:str] ", "SQLbatstr_cast;", ""
]
[ "batcalc", "str_noerror", "pattern
batcalc.str_noerror(X_1:bat[:any]):bat[:str] ","CMDconvert_str;",
"" ]
[ "batcalc", "str_noerror", "pattern batcalc.str_noerror(X_1:bat[:any],
X_2:bat[:oid]):bat[:str] ", "CMDconvert_str;", "" ]
-[ "batcalc", "strings", "command
batcalc.strings(X_1:bat[:str]):bat[:str] ","BATSTRstrings;", "" ]
[ "batcalc", "sub_noerror", "pattern batcalc.sub_noerror(X_1:bat[:bte],
X_2:bat[:bte], X_3:bat[:oid], X_4:bat[:oid]):bat[:bte] ", "CMDbatSUB;", ""
]
[ "batcalc", "sub_noerror", "pattern batcalc.sub_noerror(X_1:bat[:bte],
X_2:bat[:dbl], X_3:bat[:oid], X_4:bat[:oid]):bat[:dbl] ", "CMDbatSUB;", ""
]
[ "batcalc", "sub_noerror", "pattern batcalc.sub_noerror(X_1:bat[:bte],
X_2:bat[:flt], X_3:bat[:oid], X_4:bat[:oid]):bat[:flt] ", "CMDbatSUB;", ""
]
@@ -6340,6 +6336,9 @@ stdout of test 'MAL-signatures` in direc
[ "batsql","get_value","pattern batsql.get_value(X_1:bat[:str],
X_2:bat[:str]):bat[:lng] ","mvc_bat_get_value;", "" ]
[ "batsql","get_value","pattern batsql.get_value(X_1:bat[:str],
X_2:str):bat[:lng] ", "mvc_bat_get_value;", "" ]
[ "batsql","get_value","pattern batsql.get_value(X_1:str,
X_2:bat[:str]):bat[:lng] ", "mvc_bat_get_value;", "" ]
+[ "batsql","index","command batsql.index(X_1:bat[:str],
X_2:bit):bat[:bte] ", "BATSTRindex_bte;", "" ]
+[ "batsql","index","command batsql.index(X_1:bat[:str],
X_2:bit):bat[:int] ", "BATSTRindex_int;", "" ]
+[ "batsql","index","command batsql.index(X_1:bat[:str],
X_2:bit):bat[:sht] ", "BATSTRindex_sht;", "" ]
[ "batsql","lag", "pattern batsql.lag(X_1:any_1, X_2:any,
X_3:bat[:any_1], X_4:any_2, X_5:any_3):bat[:any_1] ", "SQLlag;", "
MonetDB: mtest - fix RELSRCPATH
Changeset: 1468ef87b46d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1468ef87b46d
Modified Files:
testing/Mz.py.in
Branch: mtest
Log Message:
fix RELSRCPATH
diffs (12 lines):
diff --git a/testing/Mz.py.in b/testing/Mz.py.in
--- a/testing/Mz.py.in
+++ b/testing/Mz.py.in
@@ -536,7 +536,7 @@ def PerformDir(env, testdir) :
skipped = 0
FdErr = F_SKIP
-TSTDIR = testdir.get('realpath')[len(TSTSRCBASE + os.sep):-len(TSTSUFF)]
+TSTDIR = testdir.get('realpath')[len(TSTSRCBASE + os.sep):-len(os.sep +
TSTSUFF)]
TSTSRCDIR = testdir.get('realpath')
TSTTRGDIR = os.path.normpath(os.path.join(TSTTRGBASE, TSTPREF, TSTDIR))
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Oct2020 - Always apply default gz compression level if ...
Changeset: b4607d01324c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b4607d01324c
Modified Files:
common/stream/gz_stream.c
Branch: Oct2020
Log Message:
Always apply default gz compression level if none specified
In some cases, deflateInit2 would get called with level==0
which means no compression.
diffs (27 lines):
diff --git a/common/stream/gz_stream.c b/common/stream/gz_stream.c
--- a/common/stream/gz_stream.c
+++ b/common/stream/gz_stream.c
@@ -141,6 +141,8 @@ gz_stream(stream *inner, int level)
gz->indeflateEnd = deflateEnd;
gz->strm.next_out = gz->buf;
gz->strm.avail_out = sizeof(gz->buf);
+ if (level == 0)
+ level = 6;
ret = deflateInit2(&gz->strm, level, Z_DEFLATED, 15 | 16, 8,
Z_DEFAULT_STRATEGY);
}
@@ -167,13 +169,12 @@ static stream *
open_gzstream(const char *restrict filename, const char *restrict flags)
{
stream *inner;
- int preset = 6;
inner = open_stream(filename, flags);
if (inner == NULL)
return NULL;
- return gz_stream(inner, preset);
+ return gz_stream(inner, 0);
}
stream *
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: octbugs - Merge with Oct2020 branch.
Changeset: 1a8305d559f3 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1a8305d559f3
Branch: octbugs
Log Message:
Merge with Oct2020 branch.
diffs (27 lines):
diff --git a/common/stream/gz_stream.c b/common/stream/gz_stream.c
--- a/common/stream/gz_stream.c
+++ b/common/stream/gz_stream.c
@@ -141,6 +141,8 @@ gz_stream(stream *inner, int level)
gz->indeflateEnd = deflateEnd;
gz->strm.next_out = gz->buf;
gz->strm.avail_out = sizeof(gz->buf);
+ if (level == 0)
+ level = 6;
ret = deflateInit2(&gz->strm, level, Z_DEFLATED, 15 | 16, 8,
Z_DEFAULT_STRATEGY);
}
@@ -167,13 +169,12 @@ static stream *
open_gzstream(const char *restrict filename, const char *restrict flags)
{
stream *inner;
- int preset = 6;
inner = open_stream(filename, flags);
if (inner == NULL)
return NULL;
- return gz_stream(inner, preset);
+ return gz_stream(inner, 0);
}
stream *
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with octbugs branch.
Changeset: 36912e422f2d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=36912e422f2d
Branch: default
Log Message:
Merge with octbugs branch.
diffs (27 lines):
diff --git a/common/stream/gz_stream.c b/common/stream/gz_stream.c
--- a/common/stream/gz_stream.c
+++ b/common/stream/gz_stream.c
@@ -141,6 +141,8 @@ gz_stream(stream *inner, int level)
gz->indeflateEnd = deflateEnd;
gz->strm.next_out = gz->buf;
gz->strm.avail_out = sizeof(gz->buf);
+ if (level == 0)
+ level = 6;
ret = deflateInit2(&gz->strm, level, Z_DEFLATED, 15 | 16, 8,
Z_DEFAULT_STRATEGY);
}
@@ -167,13 +169,12 @@ static stream *
open_gzstream(const char *restrict filename, const char *restrict flags)
{
stream *inner;
- int preset = 6;
inner = open_stream(filename, flags);
if (inner == NULL)
return NULL;
- return gz_stream(inner, preset);
+ return gz_stream(inner, 0);
}
stream *
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Oct2020 - Pre-release version number update.
Changeset: abd1c94f787b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=abd1c94f787b
Modified Files:
.bumpversion.cfg
MonetDB.spec
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
cmake/monetdb-versions.cmake
gdk/libbat.rc
monetdb5/tools/libmonetdb5.rc
Branch: Oct2020
Log Message:
Pre-release version number update.
diffs (189 lines):
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
[bumpversion]
-current_version = 11.39.4
+current_version = 11.39.5
commit = False
tag = False
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1,5 +1,5 @@
%global name MonetDB
-%global version 11.39.4
+%global version 11.39.5
%{!?buildno: %global buildno %(date +%Y%m%d)}
# Use bcond_with to add a --with option; i.e., "without" is default.
diff --git a/clients/mapilib/mapi.rc b/clients/mapilib/mapi.rc
--- a/clients/mapilib/mapi.rc
+++ b/clients/mapilib/mapi.rc
@@ -6,8 +6,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_U
#define sversion(major,minor,patch)#major "." #minor "." #patch "\0"
1 VERSIONINFO
- FILEVERSION version(11,39,4)
- PRODUCTVERSION version(11,39,4)
+ FILEVERSION version(11,39,5)
+ PRODUCTVERSION version(11,39,5)
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -21,14 +21,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "MonetDB B.V.\0"
VALUE "FileDescription", "MonetDB Application Interface DLL\0"
- VALUE "FileVersion", sversion(11,39,4)
+ VALUE "FileVersion", sversion(11,39,5)
VALUE "InternalName", "Mapi\0"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2020\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "Mapi.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB Client Libraries\0"
- VALUE "ProductVersion", sversion(11,39,4)
+ VALUE "ProductVersion", sversion(11,39,5)
VALUE "SpecialBuild", "\0"
END
END
diff --git a/clients/odbc/driver/driver.rc b/clients/odbc/driver/driver.rc
--- a/clients/odbc/driver/driver.rc
+++ b/clients/odbc/driver/driver.rc
@@ -6,8 +6,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_U
#define sversion(major,minor,patch)#major "." #minor "." #patch "\0"
1 VERSIONINFO
- FILEVERSION version(11,39,4)
- PRODUCTVERSION version(11,39,4)
+ FILEVERSION version(11,39,5)
+ PRODUCTVERSION version(11,39,5)
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -21,14 +21,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "MonetDB B.V.\0"
VALUE "FileDescription", "MonetDB ODBC Driver DLL\0"
- VALUE "FileVersion", sversion(11,39,4)
+ VALUE "FileVersion", sversion(11,39,5)
VALUE "InternalName", "libMonetODBC\0"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2020\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "libMonetODBC.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB SQL Server\0"
- VALUE "ProductVersion", sversion(11,39,4)
+ VALUE "ProductVersion", sversion(11,39,5)
VALUE "SpecialBuild", "\0"
END
END
diff --git a/clients/odbc/winsetup/setup.rc b/clients/odbc/winsetup/setup.rc
--- a/clients/odbc/winsetup/setup.rc
+++ b/clients/odbc/winsetup/setup.rc
@@ -65,8 +65,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION version(11,39,4)
- PRODUCTVERSION version(11,39,4)
+ FILEVERSION version(11,39,5)
+ PRODUCTVERSION version(11,39,5)
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -83,12 +83,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "MonetDB B.V."
VALUE "FileDescription", "MonetDB ODBC Setup DLL"
-VALUE "FileVersion", sversion(11,39,4)
+VALUE "FileVersion", sversion(11,39,5)
VALUE "InternalName", "libMonetODBCs.dll"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2020"
VALUE "OriginalFilename", "libMonetODBCs.dll"
VALUE "ProductName", "MonetDB SQL Server"
-VALUE "ProductVersion", sversion(11,39,4)
+VALUE "ProductVersion", sversion(11,39,5)
END
END
BLOCK "VarFileInfo"
diff --git a/cmake/monetdb-versions.cmake b/cmake/monetdb-versions.cmake
--- a/cmake/monetdb-versions.cmake
+++ b/cmake/monetdb-versions.cmake
@@ -8,10 +8,10 @@
set(MONETDB_VERSION_MAJOR "11")
set(MONETDB_VERSION_MINOR "39")
-set(MONETDB_VERSION_PATCH "4")
+set(MONETDB_VERSION_PATCH "5")
if(RELEASE_VERSION)
- set(MONETDB_RELEASE "unreleased")
+ set(MONETDB_RELEASE "Oct2020")
endif()
set(MONETDB_VERSION
"${MONETDB_VERSION_MAJOR}.${MONETDB_VERSION_MINOR}.${MONETDB_VERSION_PATCH}")
diff --git a/gdk/libbat.rc b/gdk/libbat.rc
--- a/gdk/libbat.rc
+++ b/gdk/libbat.rc
@@ -6,8 +6,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLIS
MonetDB: octbugs - Merge with Oct2020 branch.
Changeset: 81425f18ae31 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=81425f18ae31
Branch: octbugs
Log Message:
Merge with Oct2020 branch.
diffs (189 lines):
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
[bumpversion]
-current_version = 11.39.4
+current_version = 11.39.5
commit = False
tag = False
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1,5 +1,5 @@
%global name MonetDB
-%global version 11.39.4
+%global version 11.39.5
%{!?buildno: %global buildno %(date +%Y%m%d)}
# Use bcond_with to add a --with option; i.e., "without" is default.
diff --git a/clients/mapilib/mapi.rc b/clients/mapilib/mapi.rc
--- a/clients/mapilib/mapi.rc
+++ b/clients/mapilib/mapi.rc
@@ -6,8 +6,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_U
#define sversion(major,minor,patch)#major "." #minor "." #patch "\0"
1 VERSIONINFO
- FILEVERSION version(11,39,4)
- PRODUCTVERSION version(11,39,4)
+ FILEVERSION version(11,39,5)
+ PRODUCTVERSION version(11,39,5)
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -21,14 +21,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "MonetDB B.V.\0"
VALUE "FileDescription", "MonetDB Application Interface DLL\0"
- VALUE "FileVersion", sversion(11,39,4)
+ VALUE "FileVersion", sversion(11,39,5)
VALUE "InternalName", "Mapi\0"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2020\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "Mapi.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB Client Libraries\0"
- VALUE "ProductVersion", sversion(11,39,4)
+ VALUE "ProductVersion", sversion(11,39,5)
VALUE "SpecialBuild", "\0"
END
END
diff --git a/clients/odbc/driver/driver.rc b/clients/odbc/driver/driver.rc
--- a/clients/odbc/driver/driver.rc
+++ b/clients/odbc/driver/driver.rc
@@ -6,8 +6,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_U
#define sversion(major,minor,patch)#major "." #minor "." #patch "\0"
1 VERSIONINFO
- FILEVERSION version(11,39,4)
- PRODUCTVERSION version(11,39,4)
+ FILEVERSION version(11,39,5)
+ PRODUCTVERSION version(11,39,5)
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -21,14 +21,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "MonetDB B.V.\0"
VALUE "FileDescription", "MonetDB ODBC Driver DLL\0"
- VALUE "FileVersion", sversion(11,39,4)
+ VALUE "FileVersion", sversion(11,39,5)
VALUE "InternalName", "libMonetODBC\0"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2020\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "libMonetODBC.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB SQL Server\0"
- VALUE "ProductVersion", sversion(11,39,4)
+ VALUE "ProductVersion", sversion(11,39,5)
VALUE "SpecialBuild", "\0"
END
END
diff --git a/clients/odbc/winsetup/setup.rc b/clients/odbc/winsetup/setup.rc
--- a/clients/odbc/winsetup/setup.rc
+++ b/clients/odbc/winsetup/setup.rc
@@ -65,8 +65,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION version(11,39,4)
- PRODUCTVERSION version(11,39,4)
+ FILEVERSION version(11,39,5)
+ PRODUCTVERSION version(11,39,5)
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -83,12 +83,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "MonetDB B.V."
VALUE "FileDescription", "MonetDB ODBC Setup DLL"
-VALUE "FileVersion", sversion(11,39,4)
+VALUE "FileVersion", sversion(11,39,5)
VALUE "InternalName", "libMonetODBCs.dll"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2020"
VALUE "OriginalFilename", "libMonetODBCs.dll"
VALUE "ProductName", "MonetDB SQL Server"
-VALUE "ProductVersion", sversion(11,39,4)
+VALUE "ProductVersion", sversion(11,39,5)
END
END
BLOCK "VarFileInfo"
diff --git a/cmake/monetdb-versions.cmake b/cmake/monetdb-versions.cmake
--- a/cmake/monetdb-versions.cmake
+++ b/cmake/monetdb-versions.cmake
@@ -8,10 +8,10 @@
set(MONETDB_VERSION_MAJOR "11")
set(MONETDB_VERSION_MINOR "39")
-set(MONETDB_VERSION_PATCH "4")
+set(MONETDB_VERSION_PATCH "5")
if(RELEASE_VERSION)
- set(MONETDB_RELEASE "unreleased")
+ set(MONETDB_RELEASE "Oct2020")
endif()
set(MONETDB_VERSION
"${MONETDB_VERSION_MAJOR}.${MONETDB_VERSION_MINOR}.${MONETDB_VERSION_PATCH}")
diff --git a/gdk/libbat.rc b/gdk/libbat.rc
--- a/gdk/libbat.rc
+++ b/gdk/libbat.rc
@@ -6,8 +6,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_U
#define sversion(major,minor,patch)#major "." #minor "." #patch "\0"
1 VERSIONINFO
- FILEVERSION version(11,39,4)
- PRODUCTVERSION version(11,39,4)
+ FILEVERSION version(11,39,5)
+ PRODUCTVERSION version(11,39,5)
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS
MonetDB: default - Merge with octbugs branch, not changing any f...
Changeset: a80a065aea59 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a80a065aea59 Modified Files: .bumpversion.cfg MonetDB.spec clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc cmake/monetdb-versions.cmake gdk/libbat.rc monetdb5/tools/libmonetdb5.rc Branch: default Log Message: Merge with octbugs branch, not changing any files. ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Oct2020 - Updated library versions.
Changeset: 4cfbcf109bf7 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4cfbcf109bf7
Modified Files:
cmake/monetdb-versions.cmake
Branch: Oct2020
Log Message:
Updated library versions.
diffs (30 lines):
diff --git a/cmake/monetdb-versions.cmake b/cmake/monetdb-versions.cmake
--- a/cmake/monetdb-versions.cmake
+++ b/cmake/monetdb-versions.cmake
@@ -50,7 +50,7 @@ set(MONETDB_VERSION "${MONETDB_VERSION_M
# version of the GDK library (subdirectory gdk; also includes
# common/options and common/utils)
set(GDK_VERSION_CURRENT "21")
-set(GDK_VERSION_REVISION "1")
+set(GDK_VERSION_REVISION "2")
set(GDK_VERSION_AGE "0")
math(EXPR GDK_VERSION_MAJOR "${GDK_VERSION_CURRENT} - ${GDK_VERSION_AGE}")
set(GDK_VERSION
"${GDK_VERSION_MAJOR}.${GDK_VERSION_AGE}.${GDK_VERSION_REVISION}")
@@ -64,7 +64,7 @@ set(MAPI_VERSION "${MAPI_VERSION_MAJOR}.
# version of the MONETDB5 library (subdirectory monetdb5, not including extras
or sql)
set(MONETDB5_VERSION_CURRENT "30")
-set(MONETDB5_VERSION_REVISION "0")
+set(MONETDB5_VERSION_REVISION "1")
set(MONETDB5_VERSION_AGE "0")
math(EXPR MONETDB5_VERSION_MAJOR "${MONETDB5_VERSION_CURRENT} -
${MONETDB5_VERSION_AGE}")
set(MONETDB5_VERSION
"${MONETDB5_VERSION_MAJOR}.${MONETDB5_VERSION_AGE}.${MONETDB5_VERSION_REVISION}")
@@ -78,7 +78,7 @@ set(MONETDBE_VERSION "${MONETDBE_VERSION
# version of the STREAM library (subdirectory common/stream)
set(STREAM_VERSION_CURRENT "14")
-set(STREAM_VERSION_REVISION "0")
+set(STREAM_VERSION_REVISION "1")
set(STREAM_VERSION_AGE "0")
math(EXPR STREAM_VERSION_MAJOR "${STREAM_VERSION_CURRENT} -
${STREAM_VERSION_AGE}")
set(STREAM_VERSION
"${STREAM_VERSION_MAJOR}.${STREAM_VERSION_AGE}.${STREAM_VERSION_REVISION}")
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Oct2020 - Moved contents of ChangeLog.Oct2020 to MonetD...
Changeset: bd91504a0373 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bd91504a0373 Modified Files: MonetDB.spec clients/ChangeLog-Archive clients/ChangeLog.Oct2020 debian/changelog misc/packages/deb/changelog misc/packages/rpm/changelog Branch: Oct2020 Log Message: Moved contents of ChangeLog.Oct2020 to MonetDB.spec, debian/changelog and ChangeLog-Archive. diffs (96 lines): diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -860,6 +860,13 @@ fi %postun -p /sbin/ldconfig %changelog +* Tue Oct 13 2020 Sjoerd Mullender - 11.39.5-20201013 +- Rebuilt. + +* Mon Oct 12 2020 Sjoerd Mullender - 11.39.5-20201013 +- clients: mclient and msqldump now also look in $XDG_CONFIG_HOME for the monetdb + configuration file. + * Fri Oct 09 2020 Sjoerd Mullender - 11.39.3-20201009 - Rebuilt. diff --git a/clients/ChangeLog-Archive b/clients/ChangeLog-Archive --- a/clients/ChangeLog-Archive +++ b/clients/ChangeLog-Archive @@ -1,6 +1,10 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Mon Oct 12 2020 Sjoerd Mullender - 11.39.5-20201013 +- mclient and msqldump now also look in $XDG_CONFIG_HOME for the monetdb + configuration file. + * Mon Apr 20 2020 Sjoerd Mullender - 11.37.1-20200511 - The monetdb-client-tools (Debian/Ubuntu) and MonetDB-client-tools (Fedora/RH) containing the stethoscope, tachograph, and tomograph has diff --git a/clients/ChangeLog.Oct2020 b/clients/ChangeLog.Oct2020 --- a/clients/ChangeLog.Oct2020 +++ b/clients/ChangeLog.Oct2020 @@ -1,7 +1,3 @@ # ChangeLog file for clients # This file is updated with Maddlog -* Mon Oct 12 2020 Sjoerd Mullender -- mclient and msqldump now also look in $XDG_CONFIG_HOME for the monetdb - configuration file. - diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +monetdb (11.39.5) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender Tue, 13 Oct 2020 12:43:20 +0200 + +monetdb (11.39.5) unstable; urgency=low + + * clients: mclient and msqldump now also look in $XDG_CONFIG_HOME for the monetdb +configuration file. + + -- Sjoerd Mullender Mon, 12 Oct 2020 12:43:20 +0200 + monetdb (11.39.3) unstable; urgency=low * Rebuilt. diff --git a/misc/packages/deb/changelog b/misc/packages/deb/changelog --- a/misc/packages/deb/changelog +++ b/misc/packages/deb/changelog @@ -1,3 +1,16 @@ +monetdb (11.39.5) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender Tue, 13 Oct 2020 12:43:20 +0200 + +monetdb (11.39.5) unstable; urgency=low + + * clients: mclient and msqldump now also look in $XDG_CONFIG_HOME for the monetdb +configuration file. + + -- Sjoerd Mullender Mon, 12 Oct 2020 12:43:20 +0200 + monetdb (11.39.3) unstable; urgency=low * Rebuilt. diff --git a/misc/packages/rpm/changelog b/misc/packages/rpm/changelog --- a/misc/packages/rpm/changelog +++ b/misc/packages/rpm/changelog @@ -1,3 +1,10 @@ +* Tue Oct 13 2020 Sjoerd Mullender - 11.39.5-20201013 +- Rebuilt. + +* Mon Oct 12 2020 Sjoerd Mullender - 11.39.5-20201013 +- clients: mclient and msqldump now also look in $XDG_CONFIG_HOME for the monetdb + configuration file. + * Fri Oct 09 2020 Sjoerd Mullender - 11.39.3-20201009 - Rebuilt. ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Oct2020 - Setting tags Oct2020_5 and Oct2020_release fo...
Changeset: 07d3159034d8 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=07d3159034d8 Modified Files: .hgtags Branch: Oct2020 Log Message: Setting tags Oct2020_5 and Oct2020_release for the release build. diffs (10 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -786,3 +786,6 @@ 017e44827765fb819d31faefcdf9066dfe593f04 cb4b3f021774b60ffd84c3004d341ec04de736f3 Oct2020_3 017e44827765fb819d31faefcdf9066dfe593f04 Oct2020_release cb4b3f021774b60ffd84c3004d341ec04de736f3 Oct2020_release +bd91504a03736565fb2dff13cd4c94c738e81aa0 Oct2020_5 +cb4b3f021774b60ffd84c3004d341ec04de736f3 Oct2020_release +bd91504a03736565fb2dff13cd4c94c738e81aa0 Oct2020_release ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: octbugs - Merge with Oct2020 branch.
Changeset: 748438fdbb80 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=748438fdbb80
Branch: octbugs
Log Message:
Merge with Oct2020 branch.
diffs (136 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -786,3 +786,6 @@ 017e44827765fb819d31faefcdf9066dfe593f04
cb4b3f021774b60ffd84c3004d341ec04de736f3 Oct2020_3
017e44827765fb819d31faefcdf9066dfe593f04 Oct2020_release
cb4b3f021774b60ffd84c3004d341ec04de736f3 Oct2020_release
+bd91504a03736565fb2dff13cd4c94c738e81aa0 Oct2020_5
+cb4b3f021774b60ffd84c3004d341ec04de736f3 Oct2020_release
+bd91504a03736565fb2dff13cd4c94c738e81aa0 Oct2020_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -860,6 +860,13 @@ fi
%postun -p /sbin/ldconfig
%changelog
+* Tue Oct 13 2020 Sjoerd Mullender - 11.39.5-20201013
+- Rebuilt.
+
+* Mon Oct 12 2020 Sjoerd Mullender - 11.39.5-20201013
+- clients: mclient and msqldump now also look in $XDG_CONFIG_HOME for the
monetdb
+ configuration file.
+
* Fri Oct 09 2020 Sjoerd Mullender - 11.39.3-20201009
- Rebuilt.
diff --git a/clients/ChangeLog-Archive b/clients/ChangeLog-Archive
--- a/clients/ChangeLog-Archive
+++ b/clients/ChangeLog-Archive
@@ -1,6 +1,10 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
+* Mon Oct 12 2020 Sjoerd Mullender - 11.39.5-20201013
+- mclient and msqldump now also look in $XDG_CONFIG_HOME for the monetdb
+ configuration file.
+
* Mon Apr 20 2020 Sjoerd Mullender - 11.37.1-20200511
- The monetdb-client-tools (Debian/Ubuntu) and MonetDB-client-tools
(Fedora/RH) containing the stethoscope, tachograph, and tomograph has
diff --git a/clients/ChangeLog.Oct2020 b/clients/ChangeLog.Oct2020
--- a/clients/ChangeLog.Oct2020
+++ b/clients/ChangeLog.Oct2020
@@ -1,7 +1,3 @@
# ChangeLog file for clients
# This file is updated with Maddlog
-* Mon Oct 12 2020 Sjoerd Mullender
-- mclient and msqldump now also look in $XDG_CONFIG_HOME for the monetdb
- configuration file.
-
diff --git a/cmake/monetdb-versions.cmake b/cmake/monetdb-versions.cmake
--- a/cmake/monetdb-versions.cmake
+++ b/cmake/monetdb-versions.cmake
@@ -50,7 +50,7 @@ set(MONETDB_VERSION "${MONETDB_VERSION_M
# version of the GDK library (subdirectory gdk; also includes
# common/options and common/utils)
set(GDK_VERSION_CURRENT "21")
-set(GDK_VERSION_REVISION "1")
+set(GDK_VERSION_REVISION "2")
set(GDK_VERSION_AGE "0")
math(EXPR GDK_VERSION_MAJOR "${GDK_VERSION_CURRENT} - ${GDK_VERSION_AGE}")
set(GDK_VERSION
"${GDK_VERSION_MAJOR}.${GDK_VERSION_AGE}.${GDK_VERSION_REVISION}")
@@ -64,7 +64,7 @@ set(MAPI_VERSION "${MAPI_VERSION_MAJOR}.
# version of the MONETDB5 library (subdirectory monetdb5, not including extras
or sql)
set(MONETDB5_VERSION_CURRENT "30")
-set(MONETDB5_VERSION_REVISION "0")
+set(MONETDB5_VERSION_REVISION "1")
set(MONETDB5_VERSION_AGE "0")
math(EXPR MONETDB5_VERSION_MAJOR "${MONETDB5_VERSION_CURRENT} -
${MONETDB5_VERSION_AGE}")
set(MONETDB5_VERSION
"${MONETDB5_VERSION_MAJOR}.${MONETDB5_VERSION_AGE}.${MONETDB5_VERSION_REVISION}")
@@ -78,7 +78,7 @@ set(MONETDBE_VERSION "${MONETDBE_VERSION
# version of the STREAM library (subdirectory common/stream)
set(STREAM_VERSION_CURRENT "14")
-set(STREAM_VERSION_REVISION "0")
+set(STREAM_VERSION_REVISION "1")
set(STREAM_VERSION_AGE "0")
math(EXPR STREAM_VERSION_MAJOR "${STREAM_VERSION_CURRENT} -
${STREAM_VERSION_AGE}")
set(STREAM_VERSION
"${STREAM_VERSION_MAJOR}.${STREAM_VERSION_AGE}.${STREAM_VERSION_REVISION}")
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+monetdb (11.39.5) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender Tue, 13 Oct 2020 12:43:20 +0200
+
+monetdb (11.39.5) unstable; urgency=low
+
+ * clients: mclient and msqldump now also look in $XDG_CONFIG_HOME for the
monetdb
+configuration file.
+
+ -- Sjoerd Mullender Mon, 12 Oct 2020 12:43:20 +0200
+
monetdb (11.39.3) unstable; urgency=low
* Rebuilt.
diff --git a/misc/packages/deb/changelog b/misc/packages/deb/changelog
--- a/misc/packages/deb/changelog
+++ b/misc/packages/deb/changelog
@@ -1,3 +1,16 @@
+monetdb (11.39.5) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender Tue, 13 Oct 2020 12:43:20 +0200
+
+monetdb (11.39.5) unstable; urgency=low
+
+ * clients: mclient and msqldump now also look in $XDG_CONFIG_HOME for the
monetdb
+configuration file.
+
+ -- Sjoerd Mullender Mon, 12 Oct 2020 12:43:20 +0200
+
monetdb (11.39.3) unstable; urgency=low
* Rebuilt.
diff --git a/misc/packages/rpm/changelog b/misc/packages/rpm/changelog
--- a/misc/packages/rpm/changelog
+++ b/misc/packages/rpm/changelog
@@ -1,3 +1,10 @@
+* Tue Oct 13 2020 Sjoerd Mullender - 11.39.5-202010
MonetDB: default - Merge with octbugs branch.
Changeset: f49905982211 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f49905982211
Modified Files:
MonetDB.spec
cmake/monetdb-versions.cmake
Branch: default
Log Message:
Merge with octbugs branch.
diffs (136 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -786,3 +786,6 @@ 017e44827765fb819d31faefcdf9066dfe593f04
cb4b3f021774b60ffd84c3004d341ec04de736f3 Oct2020_3
017e44827765fb819d31faefcdf9066dfe593f04 Oct2020_release
cb4b3f021774b60ffd84c3004d341ec04de736f3 Oct2020_release
+bd91504a03736565fb2dff13cd4c94c738e81aa0 Oct2020_5
+cb4b3f021774b60ffd84c3004d341ec04de736f3 Oct2020_release
+bd91504a03736565fb2dff13cd4c94c738e81aa0 Oct2020_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -860,6 +860,13 @@ fi
%postun -p /sbin/ldconfig
%changelog
+* Tue Oct 13 2020 Sjoerd Mullender - 11.39.5-20201013
+- Rebuilt.
+
+* Mon Oct 12 2020 Sjoerd Mullender - 11.39.5-20201013
+- clients: mclient and msqldump now also look in $XDG_CONFIG_HOME for the
monetdb
+ configuration file.
+
* Fri Oct 09 2020 Sjoerd Mullender - 11.39.3-20201009
- Rebuilt.
diff --git a/clients/ChangeLog-Archive b/clients/ChangeLog-Archive
--- a/clients/ChangeLog-Archive
+++ b/clients/ChangeLog-Archive
@@ -1,6 +1,10 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
+* Mon Oct 12 2020 Sjoerd Mullender - 11.39.5-20201013
+- mclient and msqldump now also look in $XDG_CONFIG_HOME for the monetdb
+ configuration file.
+
* Mon Apr 20 2020 Sjoerd Mullender - 11.37.1-20200511
- The monetdb-client-tools (Debian/Ubuntu) and MonetDB-client-tools
(Fedora/RH) containing the stethoscope, tachograph, and tomograph has
diff --git a/clients/ChangeLog.Oct2020 b/clients/ChangeLog.Oct2020
--- a/clients/ChangeLog.Oct2020
+++ b/clients/ChangeLog.Oct2020
@@ -1,7 +1,3 @@
# ChangeLog file for clients
# This file is updated with Maddlog
-* Mon Oct 12 2020 Sjoerd Mullender
-- mclient and msqldump now also look in $XDG_CONFIG_HOME for the monetdb
- configuration file.
-
diff --git a/cmake/monetdb-versions.cmake b/cmake/monetdb-versions.cmake
--- a/cmake/monetdb-versions.cmake
+++ b/cmake/monetdb-versions.cmake
@@ -50,7 +50,7 @@ set(MONETDB_VERSION "${MONETDB_VERSION_M
# version of the GDK library (subdirectory gdk; also includes
# common/options and common/utils)
set(GDK_VERSION_CURRENT "21")
-set(GDK_VERSION_REVISION "1")
+set(GDK_VERSION_REVISION "2")
set(GDK_VERSION_AGE "0")
math(EXPR GDK_VERSION_MAJOR "${GDK_VERSION_CURRENT} - ${GDK_VERSION_AGE}")
set(GDK_VERSION
"${GDK_VERSION_MAJOR}.${GDK_VERSION_AGE}.${GDK_VERSION_REVISION}")
@@ -64,7 +64,7 @@ set(MAPI_VERSION "${MAPI_VERSION_MAJOR}.
# version of the MONETDB5 library (subdirectory monetdb5, not including extras
or sql)
set(MONETDB5_VERSION_CURRENT "30")
-set(MONETDB5_VERSION_REVISION "0")
+set(MONETDB5_VERSION_REVISION "1")
set(MONETDB5_VERSION_AGE "0")
math(EXPR MONETDB5_VERSION_MAJOR "${MONETDB5_VERSION_CURRENT} -
${MONETDB5_VERSION_AGE}")
set(MONETDB5_VERSION
"${MONETDB5_VERSION_MAJOR}.${MONETDB5_VERSION_AGE}.${MONETDB5_VERSION_REVISION}")
@@ -78,7 +78,7 @@ set(MONETDBE_VERSION "${MONETDBE_VERSION
# version of the STREAM library (subdirectory common/stream)
set(STREAM_VERSION_CURRENT "14")
-set(STREAM_VERSION_REVISION "0")
+set(STREAM_VERSION_REVISION "1")
set(STREAM_VERSION_AGE "0")
math(EXPR STREAM_VERSION_MAJOR "${STREAM_VERSION_CURRENT} -
${STREAM_VERSION_AGE}")
set(STREAM_VERSION
"${STREAM_VERSION_MAJOR}.${STREAM_VERSION_AGE}.${STREAM_VERSION_REVISION}")
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+monetdb (11.39.5) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender Tue, 13 Oct 2020 12:43:20 +0200
+
+monetdb (11.39.5) unstable; urgency=low
+
+ * clients: mclient and msqldump now also look in $XDG_CONFIG_HOME for the
monetdb
+configuration file.
+
+ -- Sjoerd Mullender Mon, 12 Oct 2020 12:43:20 +0200
+
monetdb (11.39.3) unstable; urgency=low
* Rebuilt.
diff --git a/misc/packages/deb/changelog b/misc/packages/deb/changelog
--- a/misc/packages/deb/changelog
+++ b/misc/packages/deb/changelog
@@ -1,3 +1,16 @@
+monetdb (11.39.5) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender Tue, 13 Oct 2020 12:43:20 +0200
+
+monetdb (11.39.5) unstable; urgency=low
+
+ * clients: mclient and msqldump now also look in $XDG_CONFIG_HOME for the
monetdb
+configuration file.
+
+ -- Sjoerd Mullender Mon, 12 Oct 2020 12:43:20 +0200
+
monetdb (11.39.3) unstable; urgency=low
* Rebuilt.
diff --git a/misc/packages/rpm/changelog b/misc/packages/rpm/changelog
--- a/misc/packages/rpm/changelog
+++ b/misc/packages/rpm/changel
MonetDB: Oct2020 - Post release build.
Changeset: 6a36899139c3 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6a36899139c3
Modified Files:
.bumpversion.cfg
MonetDB.spec
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
cmake/monetdb-versions.cmake
gdk/libbat.rc
monetdb5/tools/libmonetdb5.rc
Branch: Oct2020
Log Message:
Post release build.
diffs (189 lines):
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
[bumpversion]
-current_version = 11.39.5
+current_version = 11.39.6
commit = False
tag = False
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1,5 +1,5 @@
%global name MonetDB
-%global version 11.39.5
+%global version 11.39.6
%{!?buildno: %global buildno %(date +%Y%m%d)}
# Use bcond_with to add a --with option; i.e., "without" is default.
diff --git a/clients/mapilib/mapi.rc b/clients/mapilib/mapi.rc
--- a/clients/mapilib/mapi.rc
+++ b/clients/mapilib/mapi.rc
@@ -6,8 +6,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_U
#define sversion(major,minor,patch)#major "." #minor "." #patch "\0"
1 VERSIONINFO
- FILEVERSION version(11,39,5)
- PRODUCTVERSION version(11,39,5)
+ FILEVERSION version(11,39,6)
+ PRODUCTVERSION version(11,39,6)
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -21,14 +21,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "MonetDB B.V.\0"
VALUE "FileDescription", "MonetDB Application Interface DLL\0"
- VALUE "FileVersion", sversion(11,39,5)
+ VALUE "FileVersion", sversion(11,39,6)
VALUE "InternalName", "Mapi\0"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2020\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "Mapi.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB Client Libraries\0"
- VALUE "ProductVersion", sversion(11,39,5)
+ VALUE "ProductVersion", sversion(11,39,6)
VALUE "SpecialBuild", "\0"
END
END
diff --git a/clients/odbc/driver/driver.rc b/clients/odbc/driver/driver.rc
--- a/clients/odbc/driver/driver.rc
+++ b/clients/odbc/driver/driver.rc
@@ -6,8 +6,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_U
#define sversion(major,minor,patch)#major "." #minor "." #patch "\0"
1 VERSIONINFO
- FILEVERSION version(11,39,5)
- PRODUCTVERSION version(11,39,5)
+ FILEVERSION version(11,39,6)
+ PRODUCTVERSION version(11,39,6)
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -21,14 +21,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "MonetDB B.V.\0"
VALUE "FileDescription", "MonetDB ODBC Driver DLL\0"
- VALUE "FileVersion", sversion(11,39,5)
+ VALUE "FileVersion", sversion(11,39,6)
VALUE "InternalName", "libMonetODBC\0"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2020\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "libMonetODBC.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB SQL Server\0"
- VALUE "ProductVersion", sversion(11,39,5)
+ VALUE "ProductVersion", sversion(11,39,6)
VALUE "SpecialBuild", "\0"
END
END
diff --git a/clients/odbc/winsetup/setup.rc b/clients/odbc/winsetup/setup.rc
--- a/clients/odbc/winsetup/setup.rc
+++ b/clients/odbc/winsetup/setup.rc
@@ -65,8 +65,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION version(11,39,5)
- PRODUCTVERSION version(11,39,5)
+ FILEVERSION version(11,39,6)
+ PRODUCTVERSION version(11,39,6)
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -83,12 +83,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "MonetDB B.V."
VALUE "FileDescription", "MonetDB ODBC Setup DLL"
-VALUE "FileVersion", sversion(11,39,5)
+VALUE "FileVersion", sversion(11,39,6)
VALUE "InternalName", "libMonetODBCs.dll"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2020"
VALUE "OriginalFilename", "libMonetODBCs.dll"
VALUE "ProductName", "MonetDB SQL Server"
-VALUE "ProductVersion", sversion(11,39,5)
+VALUE "ProductVersion", sversion(11,39,6)
END
END
BLOCK "VarFileInfo"
diff --git a/cmake/monetdb-versions.cmake b/cmake/monetdb-versions.cmake
--- a/cmake/monetdb-versions.cmake
+++ b/cmake/monetdb-versions.cmake
@@ -8,10 +8,10 @@
set(MONETDB_VERSION_MAJOR "11")
set(MONETDB_VERSION_MINOR "39")
-set(MONETDB_VERSION_PATCH "5")
+set(MONETDB_VERSION_PATCH "6")
if(RELEASE_VERSION)
- set(MONETDB_RELEASE "Oct2020")
+ set(MONETDB_RELEASE "unreleased")
endif()
set(MONETDB_VERSION
"${MONETDB_VERSION_MAJOR}.${MONETDB_VERSION_MINOR}.${MONETDB_VERSION_PATCH}")
diff --git a/gdk/libbat.rc b/gdk/libbat.rc
--- a/gdk/libbat.rc
+++ b/gdk/libbat.rc
@@ -6,8 +6,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_U
#define sv
MonetDB: octbugs - Merge with Oct2020 branch.
Changeset: ee8b143961bf for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ee8b143961bf
Branch: octbugs
Log Message:
Merge with Oct2020 branch.
diffs (189 lines):
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
[bumpversion]
-current_version = 11.39.5
+current_version = 11.39.6
commit = False
tag = False
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1,5 +1,5 @@
%global name MonetDB
-%global version 11.39.5
+%global version 11.39.6
%{!?buildno: %global buildno %(date +%Y%m%d)}
# Use bcond_with to add a --with option; i.e., "without" is default.
diff --git a/clients/mapilib/mapi.rc b/clients/mapilib/mapi.rc
--- a/clients/mapilib/mapi.rc
+++ b/clients/mapilib/mapi.rc
@@ -6,8 +6,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_U
#define sversion(major,minor,patch)#major "." #minor "." #patch "\0"
1 VERSIONINFO
- FILEVERSION version(11,39,5)
- PRODUCTVERSION version(11,39,5)
+ FILEVERSION version(11,39,6)
+ PRODUCTVERSION version(11,39,6)
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -21,14 +21,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "MonetDB B.V.\0"
VALUE "FileDescription", "MonetDB Application Interface DLL\0"
- VALUE "FileVersion", sversion(11,39,5)
+ VALUE "FileVersion", sversion(11,39,6)
VALUE "InternalName", "Mapi\0"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2020\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "Mapi.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB Client Libraries\0"
- VALUE "ProductVersion", sversion(11,39,5)
+ VALUE "ProductVersion", sversion(11,39,6)
VALUE "SpecialBuild", "\0"
END
END
diff --git a/clients/odbc/driver/driver.rc b/clients/odbc/driver/driver.rc
--- a/clients/odbc/driver/driver.rc
+++ b/clients/odbc/driver/driver.rc
@@ -6,8 +6,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_U
#define sversion(major,minor,patch)#major "." #minor "." #patch "\0"
1 VERSIONINFO
- FILEVERSION version(11,39,5)
- PRODUCTVERSION version(11,39,5)
+ FILEVERSION version(11,39,6)
+ PRODUCTVERSION version(11,39,6)
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -21,14 +21,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "MonetDB B.V.\0"
VALUE "FileDescription", "MonetDB ODBC Driver DLL\0"
- VALUE "FileVersion", sversion(11,39,5)
+ VALUE "FileVersion", sversion(11,39,6)
VALUE "InternalName", "libMonetODBC\0"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2020\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "libMonetODBC.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB SQL Server\0"
- VALUE "ProductVersion", sversion(11,39,5)
+ VALUE "ProductVersion", sversion(11,39,6)
VALUE "SpecialBuild", "\0"
END
END
diff --git a/clients/odbc/winsetup/setup.rc b/clients/odbc/winsetup/setup.rc
--- a/clients/odbc/winsetup/setup.rc
+++ b/clients/odbc/winsetup/setup.rc
@@ -65,8 +65,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION version(11,39,5)
- PRODUCTVERSION version(11,39,5)
+ FILEVERSION version(11,39,6)
+ PRODUCTVERSION version(11,39,6)
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -83,12 +83,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "MonetDB B.V."
VALUE "FileDescription", "MonetDB ODBC Setup DLL"
-VALUE "FileVersion", sversion(11,39,5)
+VALUE "FileVersion", sversion(11,39,6)
VALUE "InternalName", "libMonetODBCs.dll"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2020"
VALUE "OriginalFilename", "libMonetODBCs.dll"
VALUE "ProductName", "MonetDB SQL Server"
-VALUE "ProductVersion", sversion(11,39,5)
+VALUE "ProductVersion", sversion(11,39,6)
END
END
BLOCK "VarFileInfo"
diff --git a/cmake/monetdb-versions.cmake b/cmake/monetdb-versions.cmake
--- a/cmake/monetdb-versions.cmake
+++ b/cmake/monetdb-versions.cmake
@@ -8,10 +8,10 @@
set(MONETDB_VERSION_MAJOR "11")
set(MONETDB_VERSION_MINOR "39")
-set(MONETDB_VERSION_PATCH "5")
+set(MONETDB_VERSION_PATCH "6")
if(RELEASE_VERSION)
- set(MONETDB_RELEASE "Oct2020")
+ set(MONETDB_RELEASE "unreleased")
endif()
set(MONETDB_VERSION
"${MONETDB_VERSION_MAJOR}.${MONETDB_VERSION_MINOR}.${MONETDB_VERSION_PATCH}")
diff --git a/gdk/libbat.rc b/gdk/libbat.rc
--- a/gdk/libbat.rc
+++ b/gdk/libbat.rc
@@ -6,8 +6,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_U
#define sversion(major,minor,patch)#major "." #minor "." #patch "\0"
1 VERSIONINFO
- FILEVERSION version(11,39,5)
- PRODUCTVERSION version(11,39,5)
+ FILEVERSION version(11,39,6)
+ PRODUCTVERSION version(11,39,6)
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS
MonetDB: default - Merge with octbugs branch, not changing any f...
Changeset: a4a4e8e2479a for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a4a4e8e2479a Modified Files: .bumpversion.cfg MonetDB.spec clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc cmake/monetdb-versions.cmake gdk/libbat.rc monetdb5/tools/libmonetdb5.rc Branch: default Log Message: Merge with octbugs branch, not changing any files.. ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: octbugs - Close stream with close_stream, not destroy_s...
Changeset: 5ba41708a2bb for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5ba41708a2bb
Modified Files:
common/stream/stream.c
Branch: octbugs
Log Message:
Close stream with close_stream, not destroy_stream
In open_wstream, if wrapping the opened stream in a compressed_stream
does not work, properly close the stream so the file can be removed,
even on Windows.
diffs (12 lines):
diff --git a/common/stream/stream.c b/common/stream/stream.c
--- a/common/stream/stream.c
+++ b/common/stream/stream.c
@@ -871,7 +871,7 @@ open_wstream(const char *filename)
stream *c = compressed_stream(s, 0);
if (c == NULL) {
- mnstr_destroy(s);
+ close_stream(s);
file_remove(filename);
}
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: octbugs - Make sure stream error is set when compressed...
Changeset: 9bafc43b9a6b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9bafc43b9a6b
Modified Files:
common/stream/bz2_stream.c
common/stream/gz_stream.c
common/stream/lz4_stream.c
common/stream/xz_stream.c
Branch: octbugs
Log Message:
Make sure stream error is set when compressed stream fails
diffs (44 lines):
diff --git a/common/stream/bz2_stream.c b/common/stream/bz2_stream.c
--- a/common/stream/bz2_stream.c
+++ b/common/stream/bz2_stream.c
@@ -137,6 +137,7 @@ bz2_stream(stream *inner, int level)
if (bz == NULL || state == NULL) {
free(bz);
free(state);
+ mnstr_set_open_error(inner->name, errno, "couldn't initialize
bz2 stream");
return NULL;
}
diff --git a/common/stream/gz_stream.c b/common/stream/gz_stream.c
--- a/common/stream/gz_stream.c
+++ b/common/stream/gz_stream.c
@@ -115,6 +115,7 @@ gz_stream(stream *inner, int level)
if (gz == NULL || state == NULL) {
free(gz);
free(state);
+ mnstr_set_open_error(inner->name, errno, "couldn't initialize
gz stream");
return NULL;
}
diff --git a/common/stream/lz4_stream.c b/common/stream/lz4_stream.c
--- a/common/stream/lz4_stream.c
+++ b/common/stream/lz4_stream.c
@@ -277,6 +277,7 @@ lz4_stream(stream *inner, int level)
if (inner_state == NULL || state == NULL) {
free(inner_state);
free(state);
+ mnstr_set_open_error(inner->name, errno, "couldn't initialize
lz4 stream");
return NULL;
}
diff --git a/common/stream/xz_stream.c b/common/stream/xz_stream.c
--- a/common/stream/xz_stream.c
+++ b/common/stream/xz_stream.c
@@ -115,6 +115,7 @@ xz_stream(stream *inner, int preset)
if (xz == NULL || state == NULL) {
free(xz);
free(state);
+ mnstr_set_open_error(inner->name, errno, "couldn't initialize
xz stream");
return NULL;
}
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: octbugs - Simplify error message when snapshot cannot b...
Changeset: 117bbd1b7493 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=117bbd1b7493
Modified Files:
sql/storage/store.c
tools/merovingian/daemon/snapshot.c
Branch: octbugs
Log Message:
Simplify error message when snapshot cannot be created
Old:
snapshot:
internal error:
execute failed:
GDK reported error:
store_hot_snapshot:
Failed to open DIR/foo_20201013T120047UTC.tar..tmp..lz4 for writing:
when opening DIR/foo_20201013T120047UTC.tar..tmp..lz4:
LZ4 support has been left out of this MonetDB
New:
snapshot:
GDK reported error:
store_hot_snapshot:
when opening DIR/foo_20201013T123209UTC.tar..tmp..lz4:
LZ4 support has been left out of this MonetDB
diffs (48 lines):
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -2822,7 +2822,7 @@ store_hot_snapshot(str tarfile)
}
tar_stream = open_wstream(tmppath);
if (!tar_stream) {
- GDKerror("Failed to open %s for writing: %s", tmppath,
mnstr_peek_error(NULL));
+ GDKerror("%s", mnstr_peek_error(NULL));
goto end;
}
do_remove = 1;
diff --git a/tools/merovingian/daemon/snapshot.c
b/tools/merovingian/daemon/snapshot.c
--- a/tools/merovingian/daemon/snapshot.c
+++ b/tools/merovingian/daemon/snapshot.c
@@ -117,11 +117,11 @@ snapshot_database_stream(char *dbname, s
handle = mapi_prepare(conn, "CALL sys.hot_snapshot('/root/dummy', 0)");
if (handle == NULL || mapi_error(conn)) {
- e = newErr("prepare failed: %s", mapi_error_str(conn));
+ e = newErr("mapi_prepare: %s", mapi_error_str(conn));
goto bailout;
}
if (mapi_execute(handle) != MOK) {
- e = newErr("internal error: execute failed: %s",
mapi_result_error(handle));
+ e = newErr("%s", mapi_result_error(handle));
goto bailout;
}
@@ -192,15 +192,15 @@ snapshot_database_to(char *dbname, char
/* Trigger the snapshot */
handle = mapi_prepare(conn, "CALL sys.hot_snapshot(?)");
if (handle == NULL || mapi_error(conn)) {
- e = newErr("prepare failed: %s", mapi_error_str(conn));
+ e = newErr("mapi_prepare: %s", mapi_error_str(conn));
goto bailout;
}
if (mapi_param_string(handle, 0, 12, dest, NULL) != MOK) {
- e = newErr("internal error: mapi_param_string: %s",
mapi_error_str(conn));
+ e = newErr("mapi_param_string: %s", mapi_error_str(conn));
goto bailout;
}
if (mapi_execute(handle) != MOK) {
- e = newErr("internal error: execute failed: %s",
mapi_result_error(handle));
+ e = newErr("%s", mapi_result_error(handle));
goto bailout;
}
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: octbugs - Use join + except to handle merge statements,...
Changeset: 4726e2cb964b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4726e2cb964b
Modified Files:
sql/server/rel_updates.c
sql/test/SQLancer/Tests/sqlancer08.stable.out
Branch: octbugs
Log Message:
Use join + except to handle merge statements, so it handles NULL values
correctly. Also fixed SQLancer issue.
diffs (161 lines):
diff --git a/sql/server/rel_updates.c b/sql/server/rel_updates.c
--- a/sql/server/rel_updates.c
+++ b/sql/server/rel_updates.c
@@ -1182,7 +1182,7 @@ truncate_table(mvc *sql, dlist *qname, i
static sql_rel *
validate_merge_update_delete(mvc *sql, sql_table *t, str alias, sql_rel
*joined_table, tokens upd_token,
-sql_rel *upd_del,
sql_rel *bt, sql_rel *extra_selection)
+sql_rel *upd_del,
sql_rel *bt, sql_rel *extra_projection)
{
char buf[BUFSIZ];
sql_exp *aggr, *bigger, *ex;
@@ -1194,7 +1194,7 @@ validate_merge_update_delete(mvc *sql, s
assert(upd_token == SQL_UPDATE || upd_token == SQL_DELETE);
- groupby = rel_groupby(sql, rel_dup(extra_selection), NULL); //aggregate
by all column and count (distinct values)
+ groupby = rel_groupby(sql, rel_dup(extra_projection), NULL);
//aggregate by all column and count (distinct values)
groupby->r = rel_projections(sql, bt, NULL, 1, 0);
aggr = exp_aggr(sql->sa, NULL, cf, 0, 0, groupby->card, 0);
(void) rel_groupby_add_aggr(sql, groupby, aggr);
@@ -1233,8 +1233,7 @@ merge_into_table(sql_query *query, dlist
char *sname = qname_schema(qname), *tname = qname_schema_object(qname);
sql_schema *s = cur_schema(sql);
sql_table *t = NULL;
- sql_rel *bt, *joined, *join_rel = NULL, *extra_project, *insert = NULL,
*upd_del = NULL, *res = NULL, *extra_select;
- sql_exp *nils, *project_first;
+ sql_rel *bt, *joined, *join_rel = NULL, *extra_project, *insert = NULL,
*upd_del = NULL, *res = NULL;
int processed = 0;
const char *bt_name;
@@ -1283,7 +1282,7 @@ merge_into_table(sql_query *query, dlist
if ((processed & MERGE_INSERT) == MERGE_INSERT)
{
join_rel = rel_dup(join_rel);
} else {
- join_rel = rel_crossproduct(sql->sa,
joined, bt, op_left);
+ join_rel = rel_crossproduct(sql->sa,
joined, bt, op_join);
if (!(join_rel = rel_logical_exp(query,
join_rel, search_cond, sql_where | sql_join)))
return NULL;
set_processed(join_rel);
@@ -1295,24 +1294,8 @@ merge_into_table(sql_query *query, dlist
set_has_nil((sql_exp*)n->data);
extra_project = rel_project(sql->sa, join_rel,
nexps);
extra_project->exps =
list_merge(extra_project->exps, rel_projections(sql, joined, NULL, 1, 0),
(fdup)NULL);
- list_append(extra_project->exps,
exp_column(sql->sa, bt_name, TID, sql_bind_localtype("oid"), CARD_MULTI, 0, 1));
+ list_prepend(extra_project->exps,
exp_column(sql->sa, bt_name, TID, sql_bind_localtype("oid"), CARD_MULTI, 0, 1));
- //select bt values which are not null (they had
a match in the join)
- project_first =
extra_project->exps->h->next->data; // this expression must come from bt!!
- project_first = exp_ref(sql, project_first);
- if (!(nils = rel_unop_(sql, extra_project,
project_first, NULL, "isnull", card_value)))
- return NULL;
- set_has_no_nil(nils);
- extra_select = rel_select(sql->sa,
extra_project, exp_compare(sql->sa, nils, exp_atom_bool(sql->sa, 0),
cmp_equal));
-
- //the update statement requires a projection on
the right side
- nexps = rel_projections(sql, bt, NULL, 1, 0);
- for (node *n = nexps->h ; n ; n = n->next) /*
after going through the left outer join, a NOT NULL column may have NULL values
*/
- set_has_nil((sql_exp*)n->data);
- extra_project = rel_project(sql->sa,
extra_select, nexps);
- extra_project->exps =
list_merge(extra_project->exps, rel_projections(sql, joined, NULL, 1, 0),
(fdup)NULL);
- list_append(extra_project->exps,
- exp_column(sql->sa, bt_name, TID,
sql_bind_localtype("oid"), CARD_MULTI, 0, 1));
MonetDB: octbugs - Cleanup further
Changeset: f6efcbe2f714 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f6efcbe2f714
Modified Files:
sql/server/rel_updates.c
Branch: octbugs
Log Message:
Cleanup further
diffs (49 lines):
diff --git a/sql/server/rel_updates.c b/sql/server/rel_updates.c
--- a/sql/server/rel_updates.c
+++ b/sql/server/rel_updates.c
@@ -1261,7 +1261,6 @@ merge_into_table(sql_query *query, dlist
symbol *sym = m->data.sym, *opt_search, *action;
tokens token = sym->token;
dlist* dl = sym->data.lval, *sts;
- list *nexps;
opt_search = dl->h->data.sym;
action = dl->h->next->data.sym;
sts = action->data.lval;
@@ -1288,11 +1287,8 @@ merge_into_table(sql_query *query, dlist
set_processed(join_rel);
}
- //project columns of both bt and joined + oid
- nexps = rel_projections(sql, bt, NULL, 1, 0);
- for (node *n = nexps->h ; n ; n = n->next) /*
after going through the left outer join, a NOT NULL column may have NULL values
*/
- set_has_nil((sql_exp*)n->data);
- extra_project = rel_project(sql->sa, join_rel,
nexps);
+ //project columns of both bt and joined + oid
to be used on update
+ extra_project = rel_project(sql->sa, join_rel,
rel_projections(sql, bt, NULL, 1, 0));
extra_project->exps =
list_merge(extra_project->exps, rel_projections(sql, joined, NULL, 1, 0),
(fdup)NULL);
list_prepend(extra_project->exps,
exp_column(sql->sa, bt_name, TID, sql_bind_localtype("oid"), CARD_MULTI, 0, 1));
@@ -1309,11 +1305,8 @@ merge_into_table(sql_query *query, dlist
set_processed(join_rel);
}
- //project columns of bt + oid
- nexps = rel_projections(sql, bt, NULL, 1, 0);
- for (node *n = nexps->h ; n ; n = n->next) /*
after going through the left outer join, a NOT NULL column may have NULL values
*/
- set_has_nil((sql_exp*)n->data);
- extra_project = rel_project(sql->sa, join_rel,
nexps);
+ //project columns of bt + oid to be used on
delete
+ extra_project = rel_project(sql->sa, join_rel,
rel_projections(sql, bt, NULL, 1, 0));
list_prepend(extra_project->exps,
exp_column(sql->sa, bt_name, TID, sql_bind_localtype("oid"), CARD_MULTI, 0, 1));
upd_del = rel_delete(sql->sa, rel_dup(bt),
extra_project);
@@ -1339,8 +1332,8 @@ merge_into_table(sql_query *query, dlist
set_processed(join_rel);
}
+ //project joined values which didn't match on the join
and insert them
extra_project = rel_project(sql->sa, join_rel,
rel_projections(sql, joined, NULL, 1, 0));
- //select bt values which are null (they didn't have
match in the join) and project them
extra_project = rel_setop(sql->sa, rel_dup(joined),
extra_project, op_except);
if (!(insert = merge_generate_inserts(query, t,
extra_project, sts->h->data.lval, sts->h->next->data.sym)))
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: octbugs - New bug, exception not working with null valu...
Changeset: 85c45222503c for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=85c45222503c Modified Files: sql/test/miscellaneous/Tests/simple_selects.sql Branch: octbugs Log Message: New bug, exception not working with null values on the multi column case :( diffs (10 lines): diff --git a/sql/test/miscellaneous/Tests/simple_selects.sql b/sql/test/miscellaneous/Tests/simple_selects.sql --- a/sql/test/miscellaneous/Tests/simple_selects.sql +++ b/sql/test/miscellaneous/Tests/simple_selects.sql @@ -221,3 +221,6 @@ select x as z, y as z from (select 1, 2) select x as z, y as z from (select 1, 2) as x(x,y) order by z; -- error 'z' identifier is ambiguous + +select 1, null except select 1, null; + -- empty ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: octbugs - Same for intersection :(
Changeset: b56e5bb72df9 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b56e5bb72df9 Modified Files: sql/test/miscellaneous/Tests/simple_selects.sql Branch: octbugs Log Message: Same for intersection :( diffs (10 lines): diff --git a/sql/test/miscellaneous/Tests/simple_selects.sql b/sql/test/miscellaneous/Tests/simple_selects.sql --- a/sql/test/miscellaneous/Tests/simple_selects.sql +++ b/sql/test/miscellaneous/Tests/simple_selects.sql @@ -224,3 +224,6 @@ select x as z, y as z from (select 1, 2) select 1, null except select 1, null; -- empty + +select 1, null intersect select 1, null; + -- 1 NULL ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: mtest - tpch default all in one test
Changeset: 186c1856eadb for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=186c1856eadb Added Files: sql/benchmarks/tpch/Tests/one.test.in Modified Files: sql/benchmarks/tpch/Tests/All Branch: mtest Log Message: tpch default all in one test diffs (truncated from 1084 to 300 lines): diff --git a/sql/benchmarks/tpch/Tests/All b/sql/benchmarks/tpch/Tests/All --- a/sql/benchmarks/tpch/Tests/All +++ b/sql/benchmarks/tpch/Tests/All @@ -1,33 +1,1 @@ -create -check0 -load -check1 -01 -02 -03 -04 -05 -06 -#06a -07 -#07a -08 -#08a -09 -#09b -#09c -10 -11 -12 -13 -#13a -14 -15 -16 -17 -18 -19 -20 -21 -22 -lowcardinality +one diff --git a/sql/benchmarks/tpch/Tests/one.test.in b/sql/benchmarks/tpch/Tests/one.test.in new file mode 100644 --- /dev/null +++ b/sql/benchmarks/tpch/Tests/one.test.in @@ -0,0 +1,1041 @@ +statement ok +START TRANSACTION + +statement ok +CREATE TABLE REGION ( R_REGIONKEY INTEGER NOT NULL, +R_NAME CHAR(25) NOT NULL, +R_COMMENTVARCHAR(152), +PRIMARY KEY (R_REGIONKEY)) + +statement ok +CREATE TABLE NATION ( N_NATIONKEY INTEGER NOT NULL, +N_NAME CHAR(25) NOT NULL, +N_REGIONKEY INTEGER NOT NULL, +N_COMMENTVARCHAR(152), +PRIMARY KEY (N_NATIONKEY), +FOREIGN KEY (N_REGIONKEY) references REGION) + +statement ok +CREATE TABLE PART ( P_PARTKEY INTEGER NOT NULL, + P_NAMEVARCHAR(55) NOT NULL, + P_MFGRCHAR(25) NOT NULL, + P_BRAND CHAR(10) NOT NULL, + P_TYPEVARCHAR(25) NOT NULL, + P_SIZEINTEGER NOT NULL, + P_CONTAINER CHAR(10) NOT NULL, + P_RETAILPRICE DECIMAL(15,2) NOT NULL, + P_COMMENT VARCHAR(23) NOT NULL, + PRIMARY KEY (P_PARTKEY) ) + +statement ok +CREATE TABLE SUPPLIER ( S_SUPPKEY INTEGER NOT NULL, + S_NAMECHAR(25) NOT NULL, + S_ADDRESS VARCHAR(40) NOT NULL, + S_NATIONKEY INTEGER NOT NULL, + S_PHONE CHAR(15) NOT NULL, + S_ACCTBAL DECIMAL(15,2) NOT NULL, + S_COMMENT VARCHAR(101) NOT NULL, + PRIMARY KEY (S_SUPPKEY), + FOREIGN KEY (S_NATIONKEY) references NATION) + +statement ok +CREATE TABLE PARTSUPP ( PS_PARTKEY INTEGER NOT NULL, + PS_SUPPKEY INTEGER NOT NULL, + PS_AVAILQTYINTEGER NOT NULL, + PS_SUPPLYCOST DECIMAL(15,2) NOT NULL, + PS_COMMENT VARCHAR(199) NOT NULL, + PRIMARY KEY(PS_PARTKEY,PS_SUPPKEY), + FOREIGN KEY (PS_SUPPKEY) references SUPPLIER, + FOREIGN KEY (PS_PARTKEY) references PART ) + +statement ok +CREATE TABLE CUSTOMER ( C_CUSTKEY INTEGER NOT NULL, + C_NAMEVARCHAR(25) NOT NULL, + C_ADDRESS VARCHAR(40) NOT NULL, + C_NATIONKEY INTEGER NOT NULL, + C_PHONE CHAR(15) NOT NULL, + C_ACCTBAL DECIMAL(15,2) NOT NULL, + C_MKTSEGMENT CHAR(10) NOT NULL, + C_COMMENT VARCHAR(117) NOT NULL, + PRIMARY KEY (C_CUSTKEY), + FOREIGN KEY (C_NATIONKEY) references NATION) + +statement ok +CREATE TABLE ORDERS ( O_ORDERKEY INTEGER NOT NULL, + O_CUSTKEYINTEGER NOT NULL, + O_ORDERSTATUSCHAR(1) NOT NULL, + O_TOTALPRICE DECIMAL(15,2) NOT NULL, + O_ORDERDATE DATE NOT NULL, + O_ORDERPRIORITY CHAR(15) NOT NULL, + O_CLERK CHAR(15) NOT NULL, + O_SHIPPRIORITY INTEGER NOT NULL, + O_COMMENTVARCHAR(79) NOT NULL, + PRIMARY KEY (O_ORDERKEY), + FOREIGN KEY (O_CUSTKEY) references CUSTOMER) + +statement ok +CREATE TABLE LINEITEM ( L_ORDERKEYINTEGER NOT NULL, + L_PARTKEY INTEGER NOT NULL, + L_SUPPKEY INTEGER NOT NULL, + L_LINENUMBER INTEGER NOT NULL, + L_QUANTITYDECIMAL(15,2) NOT NULL, +
MonetDB: octbugs - Making SQLancer happy. Make sure input for mi...
Changeset: 61e8f805d07e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=61e8f805d07e
Modified Files:
sql/backends/monet5/rel_bin.c
sql/test/SQLancer/Tests/sqlancer08.sql
sql/test/SQLancer/Tests/sqlancer08.stable.out
Branch: octbugs
Log Message:
Making SQLancer happy. Make sure input for mirror function is a column
diffs (85 lines):
diff --git a/sql/backends/monet5/rel_bin.c b/sql/backends/monet5/rel_bin.c
--- a/sql/backends/monet5/rel_bin.c
+++ b/sql/backends/monet5/rel_bin.c
@@ -2728,7 +2728,7 @@ rel2bin_semijoin(backend *be, sql_rel *r
/* We did a full join, thats too much.
Reduce this using difference and intersect */
- c = stmt_mirror(be, left->op4.lval->h->data);
+ c = stmt_mirror(be, bin_first_column(be, left));
if (rel->op == op_anti) {
join = stmt_tdiff(be, c, jl, lcand);
} else {
diff --git a/sql/test/SQLancer/Tests/sqlancer08.sql
b/sql/test/SQLancer/Tests/sqlancer08.sql
--- a/sql/test/SQLancer/Tests/sqlancer08.sql
+++ b/sql/test/SQLancer/Tests/sqlancer08.sql
@@ -171,3 +171,29 @@ 1301584464000.000
create view v0(vc0) as (select distinct sql_neg(abs(nullif(interval '2' month,
interval '3' month))) where greatest(nullif(4 in (0.42, 0.43), 'v' ilike
'|pRd(Wɮ&'), ((interval '3' second) is null) = false));
MERGE INTO t2 USING (SELECT * FROM v0) AS v0 ON "isauuid"('4') WHEN MATCHED
THEN UPDATE SET tc2 = INTERVAL '3' DAY;
ROLLBACK;
+
+START TRANSACTION;
+CREATE TABLE "sys"."t0" ("tc0" INTEGER NOT NULL,"tc1" TINYINT,CONSTRAINT
"t0_tc0_pkey" PRIMARY KEY ("tc0"),CONSTRAINT "t0_tc0_unique" UNIQUE ("tc0"));
+CREATE TABLE "sys"."t1" ("tc1" DATE);
+COPY 3 RECORDS INTO "sys"."t1" FROM stdin USING DELIMITERS E'\t',E'\n','"';
+1970-01-24
+1970-01-24
+1970-01-24
+CREATE TABLE "sys"."t2" ("tc1" DATE NOT NULL,CONSTRAINT "t2_tc1_pkey" PRIMARY
KEY ("tc1"));
+COPY 5 RECORDS INTO "sys"."t2" FROM stdin USING DELIMITERS E'\t',E'\n','"';
+1970-01-25
+1970-01-14
+1970-01-01
+1970-01-16
+1970-01-19
+
+create view v0(vc0) as ((select least(r'KZu', trim(case interval '4' day when
interval '3' day then r'8|' when interval '3' day then null end)))
+intersect distinct (select distinct nullif(ifthenelse((3) not in (2.33, 4.02,
-4), r'J{
# 11:38:36 > "Done."
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: mtest - update notes
Changeset: 1ef682063436 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1ef682063436 Modified Files: testing/SQLogicConvertNotes Branch: mtest Log Message: update notes diffs (20 lines): diff --git a/testing/SQLogicConvertNotes b/testing/SQLogicConvertNotes --- a/testing/SQLogicConvertNotes +++ b/testing/SQLogicConvertNotes @@ -33,9 +33,10 @@ changed. To run tests under one of the c Converted folders progress: --- -- sql/test/null/Tests pass -- sql/test/json/Tests pass -- sql/test/Testspass -- sql/test/ADT2006 pass -- sql/test/broken_deletepass -- sql/test/astropass +- sql/test/null/Tests pass +- sql/test/json/Tests pass +- sql/test/Testspass +- sql/test/ADT2006 pass +- sql/test/broken_deletepass +- sql/test/astropass +- sql/benchmarks/tpch/Tests pass ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Oct2020 - Close and destroy stream.
Changeset: 74764fdef0c4 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=74764fdef0c4
Modified Files:
common/stream/stream.c
Branch: Oct2020
Log Message:
Close and destroy stream.
diffs (39 lines):
diff --git a/common/stream/stream.c b/common/stream/stream.c
--- a/common/stream/stream.c
+++ b/common/stream/stream.c
@@ -851,7 +851,7 @@ open_rstream(const char *filename)
stream *c = compressed_stream(s, 0);
if (c == NULL)
- mnstr_destroy(s);
+ close_stream(s);
return c;
}
@@ -871,7 +871,7 @@ open_wstream(const char *filename)
stream *c = compressed_stream(s, 0);
if (c == NULL) {
- mnstr_destroy(s);
+ close_stream(s);
file_remove(filename);
}
@@ -892,7 +892,7 @@ open_rastream(const char *filename)
stream *t = create_text_stream(s);
if (t == NULL)
- mnstr_destroy(s);
+ close_stream(s);
return t;
}
@@ -911,7 +911,7 @@ open_wastream(const char *filename)
stream *t = create_text_stream(s);
if (t == NULL) {
- mnstr_destroy(s);
+ close_stream(s);
file_remove(filename);
}
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: octbugs - Making SQLancer happy. Look for null values w...
Changeset: 8098126e5f80 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8098126e5f80
Modified Files:
sql/server/rel_optimizer.c
sql/test/SQLancer/Tests/sqlancer08.sql
sql/test/SQLancer/Tests/sqlancer08.stable.out
Branch: octbugs
Log Message:
Making SQLancer happy. Look for null values when trying to simplify a like
select
diffs (81 lines):
diff --git a/sql/server/rel_optimizer.c b/sql/server/rel_optimizer.c
--- a/sql/server/rel_optimizer.c
+++ b/sql/server/rel_optimizer.c
@@ -7531,7 +7531,7 @@ rel_simplify_like_select(visitor *v, sql
list *r = e->r;
sql_exp *fmt = r->h->data;
sql_exp *esc =
(r->h->next)?r->h->next->data:NULL;
- int rewrite = 0;
+ int rewrite = 0, isnull = 0;
if (fmt->type == e_convert)
fmt = fmt->l;
@@ -7541,27 +7541,33 @@ rel_simplify_like_select(visitor *v, sql
if (fmt->l)
fa = fmt->l;
- if (fa && fa->data.vtype == TYPE_str &&
+ if (fa && fa->isnull)
+ isnull = 1;
+ else if (fa && fa->data.vtype ==
TYPE_str &&
!strchr(fa->data.val.sval, '%') &&
!strchr(fa->data.val.sval, '_'))
rewrite = 1;
}
- if (rewrite && esc && is_atom(esc->type)) {
+ if (rewrite && !isnull && esc &&
is_atom(esc->type)) {
atom *ea = NULL;
if (esc->l)
ea = esc->l;
- if (ea && (ea->data.vtype != TYPE_str ||
+ if (ea && ea->isnull)
+ isnull = 1;
+ else if (ea && (ea->data.vtype !=
TYPE_str ||
strlen(ea->data.val.sval) != 0))
rewrite = 0;
}
- if (rewrite) { /* rewrite to cmp_equal ! */
+ if (isnull) {
+ list_append(exps, exp_null(v->sql->sa,
sql_bind_localtype("bit")));
+ v->changes++;
+ } else if (rewrite) { /* rewrite to cmp_equal
! */
list *l = e->l;
list *r = e->r;
sql_exp *ne = exp_compare(v->sql->sa,
l->h->data, r->h->data, cmp_equal);
if (is_anti(e)) set_anti(ne);
- /* if rewritten don't cache this query
*/
list_append(exps, ne);
v->changes++;
} else {
diff --git a/sql/test/SQLancer/Tests/sqlancer08.sql
b/sql/test/SQLancer/Tests/sqlancer08.sql
--- a/sql/test/SQLancer/Tests/sqlancer08.sql
+++ b/sql/test/SQLancer/Tests/sqlancer08.sql
@@ -197,3 +197,8 @@ create view v3(vc0) as (values (cast(((a
SELECT CAST(SUM(count) AS BIGINT) FROM (SELECT CAST(FALSE AS INT) as count
FROM t2, t1, v2 FULL OUTER JOIN t0 ON "isauuid"(r'2A') NATURAL JOIN v1 NATURAL
JOIN v3) as res;
ROLLBACK;
+
+START TRANSACTION;
+create view v7(vc0, vc1) as (select all 56, replace(r'0.0074401190660642325',
"insert"(r'0.9471086251830542', null, 1872651914, r'(Ga_'), r'2]vK') where not
(not (false))) with check option;
+select 1 from v7 where not (((cast(scale_up(4751, -1823537248) as
string(86)))not like(v7.vc1)));
+ROLLBACK;
diff --git a/sql/test/SQLancer/Tests/sqlancer08.stable.out
b/sql/test/SQLancer/Tests/sqlancer08.stable.out
--- a/sql/test/SQLancer/Tests/sqlancer08.stable.out
+++ b/sql/test/SQLancer/Tests/sqlancer08.stable.out
@@ -267,6 +267,14 @@ stdout of test 'sqlancer08` in directory
% 1 # length
[ NULL ]
#ROLLBACK;
+#START TRANSACTION;
+#create view v7(vc0, vc1) as (select all 56, replace(r'0.0074401190660642325',
"insert"(r'0.9471086251830542', null, 1872651914, r'(Ga_'), r'2]vK') where not
(not (false))) with check option;
+#select 1 from v7 where not (((cast(scale_up(4751, -1823537248) as
string(86)))not like(v7.vc1)));
+% .%3 # table_name
+% %3 # name
+% tinyint # type
+% 1 # length
+#ROLLBACK;
# 11:38:36 >
# 11:38:36 > "Done."
___
checkin-l
MonetDB: mtest - convert tpcds into single sqllogic test
Changeset: 810eb1e176dc for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=810eb1e176dc Added Files: sql/benchmarks/tpcds/Tests/one.test.in Modified Files: sql/benchmarks/tpcds/Tests/All Branch: mtest Log Message: convert tpcds into single sqllogic test diffs (truncated from 8285 to 300 lines): diff --git a/sql/benchmarks/tpcds/Tests/All b/sql/benchmarks/tpcds/Tests/All --- a/sql/benchmarks/tpcds/Tests/All +++ b/sql/benchmarks/tpcds/Tests/All @@ -1,109 +1,110 @@ -create -check0 -HAVE_DATA_PATH?load -alter -check1 -01 -02 -03 -04 -05 -06 -07 -08 -09 -10 -11 -12 -13 -14a -14b -15 -16 -17 -18 -19 -20 -21 -22 -23a -23b -24a -24b -25 -26 -27 -28 -29 -30 -31 -32 -33 -34 -35 -36 -37 -38 -39a -39b -40 -41 -42 -43 -44 -45 -46 -47 -48 -49 -50 -51 -52 -53 -54 -55 -56 -57 -58 -59 -60 -61 -62 -63 -64 -65 -66 -67 -68 -69 -70 -71 -72 -73 -74 -75 -76 -77 -78 -79 -80 -81 -82 -83 -84 -85 -86 -87 -88 -89 -90 -91 -92 -93 -94 -95 -96 -97 -98 -99 -drop +HAVE_DATA_PATH?one +#create +#check0 +#HAVE_DATA_PATH?load +#alter +#check1 +#01 +#02 +#03 +#04 +#05 +#06 +#07 +#08 +#09 +#10 +#11 +#12 +#13 +#14a +#14b +#15 +#16 +#17 +#18 +#19 +#20 +#21 +#22 +#23a +#23b +#24a +#24b +#25 +#26 +#27 +#28 +#29 +#30 +#31 +#32 +#33 +#34 +#35 +#36 +#37 +#38 +#39a +#39b +#40 +#41 +#42 +#43 +#44 +#45 +#46 +#47 +#48 +#49 +#50 +#51 +#52 +#53 +#54 +#55 +#56 +#57 +#58 +#59 +#60 +#61 +#62 +#63 +#64 +#65 +#66 +#67 +#68 +#69 +#70 +#71 +#72 +#73 +#74 +#75 +#76 +#77 +#78 +#79 +#80 +#81 +#82 +#83 +#84 +#85 +#86 +#87 +#88 +#89 +#90 +#91 +#92 +#93 +#94 +#95 +#96 +#97 +#98 +#99 +#drop diff --git a/sql/benchmarks/tpcds/Tests/one.test.in b/sql/benchmarks/tpcds/Tests/one.test.in new file mode 100644 --- /dev/null +++ b/sql/benchmarks/tpcds/Tests/one.test.in @@ -0,0 +1,8057 @@ +statement ok +start transaction + +statement ok +create table dbgen_version +( +dv_versionvarchar(16) , +dv_create_datedate , +dv_create_timetime , +dv_cmdline_args varchar(200) +) + +statement ok +create table customer_address +( +ca_address_sk integer not null, +ca_address_id char(16) not null, +ca_street_number char(10) , +ca_street_namevarchar(60) , +ca_street_typechar(15) , +ca_suite_number char(10) , +ca_city varchar(60) , +ca_county varchar(30) , +ca_state char(2) , +ca_zipchar(10) , +ca_countryvarchar(20) , +ca_gmt_offset decimal(5,2) , +ca_location_type char(20) , +primary key (ca_address_sk) +) + +statement ok +create table customer_demographics +( +cd_demo_skinteger not null, +cd_gender char(1) , +cd_marital_status char(1) , +cd_education_status char(20) , +cd_purchase_estimate integer , +cd_credit_rating char(10) , +cd_dep_count integer , +cd_dep_employed_count integer , +cd_dep_college_count integer , +primary key (cd_demo_sk) +) + +statement ok +create table date_dim +( +d_date_sk integer not null, +d_date_id char(16) not null, +d_datedate , +d_month_seq integer , +d_week_seqinteger , +d_quarter_seq integer , +d_yearinteger , +d_dow integer , +d_moy integer , +d_dom integer , +d_qoy integer , +d_fy_year integer , +d_fy_quarter_seq integer , +d_fy_week_seq integer , +d_day_namechar(9) , +d_quarter_namechar(6) , +d_holiday char(1) , +d_weekend char(1) , +d_following_holiday char(1) , +d_first_dom integer , +d_last_dominteg
MonetDB: mtest - notes
Changeset: 1f0173b74a6c for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1f0173b74a6c Modified Files: testing/SQLogicConvertNotes Branch: mtest Log Message: notes diffs (8 lines): diff --git a/testing/SQLogicConvertNotes b/testing/SQLogicConvertNotes --- a/testing/SQLogicConvertNotes +++ b/testing/SQLogicConvertNotes @@ -40,3 +40,4 @@ Converted folders progress: - sql/test/broken_deletepass - sql/test/astropass - sql/benchmarks/tpch/Tests pass +- sql/benchmarks/tpcds pass ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: octbugs - Making SQLancer happy. Swap input parameters ...
Changeset: 660b5b25a25c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=660b5b25a25c
Modified Files:
sql/server/rel_select.c
sql/test/SQLancer/Tests/sqlancer08.sql
sql/test/SQLancer/Tests/sqlancer08.stable.out
Branch: octbugs
Log Message:
Making SQLancer happy. Swap input parameters for comparison if it is the case
in projections (as it happens in selections). With this, rel_convert_types will
output the same type for both in case they have different input parameters
diffs (75 lines):
diff --git a/sql/server/rel_select.c b/sql/server/rel_select.c
--- a/sql/server/rel_select.c
+++ b/sql/server/rel_select.c
@@ -2213,12 +2213,19 @@ rel_logical_value_exp(sql_query *query,
if (!rs)
return NULL;
+ if (!exp_is_rel(ls) && !exp_is_rel(rs) && ls->card < rs->card) {
+ sql_exp *swap = ls; /* has to swap parameters like in
the rel_logical_exp case */
+ ls = rs;
+ rs = swap;
+ cmp_type = swap_compare(cmp_type);
+ }
+
if (rel_binop_check_types(sql, rel ? *rel : NULL, ls, rs, 0) <
0)
return NULL;
if (exp_is_null(ls) && exp_is_null(rs))
return exp_atom(sql->sa, atom_general(sql->sa,
sql_bind_localtype("bit"), NULL));
- ls = exp_compare_func(sql, ls, rs,
compare_func(compare_str2type(compare_op), quantifier?0:need_not), quantifier);
+ ls = exp_compare_func(sql, ls, rs, compare_func(cmp_type,
quantifier?0:need_not), quantifier);
if (need_not && quantifier)
ls = rel_unop_(sql, NULL, ls, NULL, "not", card_value);
return ls;
diff --git a/sql/test/SQLancer/Tests/sqlancer08.sql
b/sql/test/SQLancer/Tests/sqlancer08.sql
--- a/sql/test/SQLancer/Tests/sqlancer08.sql
+++ b/sql/test/SQLancer/Tests/sqlancer08.sql
@@ -202,3 +202,15 @@ START TRANSACTION;
create view v7(vc0, vc1) as (select all 56, replace(r'0.0074401190660642325',
"insert"(r'0.9471086251830542', null, 1872651914, r'(Ga_'), r'2]vK') where not
(not (false))) with check option;
select 1 from v7 where not (((cast(scale_up(4751, -1823537248) as
string(86)))not like(v7.vc1)));
ROLLBACK;
+
+START TRANSACTION;
+CREATE TABLE "sys"."t1" ("tc0" BIGINT);
+COPY 4 RECORDS INTO "sys"."t1" FROM stdin USING DELIMITERS E'\t',E'\n','"';
+284462307
+1404201729
+1549521937
+452608969
+
+SELECT 1 FROM t1 WHERE ('1255780658' > (least(1287317023, ((0.8056138 +
t1.tc0) ;
+SELECT CAST(SUM(count) AS BIGINT) FROM (SELECT CAST(('1255780658' >
(least(1287317023, ((0.8056138 + t1.tc0) AS INT) as count FROM t1) as res;
+ROLLBACK;
diff --git a/sql/test/SQLancer/Tests/sqlancer08.stable.out
b/sql/test/SQLancer/Tests/sqlancer08.stable.out
--- a/sql/test/SQLancer/Tests/sqlancer08.stable.out
+++ b/sql/test/SQLancer/Tests/sqlancer08.stable.out
@@ -275,6 +275,28 @@ stdout of test 'sqlancer08` in directory
% tinyint # type
% 1 # length
#ROLLBACK;
+#START TRANSACTION;
+#CREATE TABLE "sys"."t1" ("tc0" BIGINT);
+#COPY 4 RECORDS INTO "sys"."t1" FROM stdin USING DELIMITERS E'\t',E'\n','"';
+#284462307
+#1404201729
+#1549521937
+#452608969
+[ 4]
+#SELECT 1 FROM t1 WHERE ('1255780658' > (least(1287317023, ((0.8056138 +
t1.tc0) ;
+% .%1 # table_name
+% %1 # name
+% tinyint # type
+% 1 # length
+[ 1]
+[ 1]
+#SELECT CAST(SUM(count) AS BIGINT) FROM (SELECT CAST(('1255780658' >
(least(1287317023, ((0.8056138 + t1.tc0) AS INT) as count FROM t1) as res;
+% .%3 # table_name
+% %3 # name
+% bigint # type
+% 1 # length
+[ 2]
+#ROLLBACK;
# 11:38:36 >
# 11:38:36 > "Done."
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: mtest - added functionality to sqllogic test (and frien...
Changeset: af3e4208a03a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=af3e4208a03a
Added Files:
monetdb5/modules/mal/Tests/ascii_io2.maltest
monetdb5/modules/mal/Tests/batpartition.maltest
monetdb5/modules/mal/Tests/bigsum.maltest
monetdb5/modules/mal/Tests/call00.maltest
monetdb5/modules/mal/Tests/callfunction.maltest
monetdb5/modules/mal/Tests/callstring.maltest
monetdb5/modules/mal/Tests/clients-getpasswd.maltest
monetdb5/modules/mal/Tests/clients-hashes.maltest
monetdb5/modules/mal/Tests/clients01.maltest
monetdb5/modules/mal/Tests/flags.maltest
monetdb5/modules/mal/Tests/groupby00.maltest
monetdb5/modules/mal/Tests/imprints.maltest
monetdb5/modules/mal/Tests/inspect00.maltest
monetdb5/modules/mal/Tests/inspect05.maltest
monetdb5/modules/mal/Tests/inspect10.maltest
monetdb5/modules/mal/Tests/inspect40.maltest
monetdb5/modules/mal/Tests/iterator01.maltest
monetdb5/modules/mal/Tests/iterator02.maltest
monetdb5/modules/mal/Tests/iterator03.maltest
monetdb5/modules/mal/Tests/manifold.maltest
monetdb5/modules/mal/Tests/manifoldstr.maltest
monetdb5/modules/mal/Tests/mapi01.maltest
monetdb5/modules/mal/Tests/mapi02.maltest
monetdb5/modules/mal/Tests/mapi04.maltest
monetdb5/modules/mal/Tests/mapi05.maltest
monetdb5/modules/mal/Tests/mapi06.maltest
monetdb5/modules/mal/Tests/mapi07.maltest
monetdb5/modules/mal/Tests/mat.maltest
monetdb5/modules/mal/Tests/mserver00.maltest
monetdb5/modules/mal/Tests/orderidx00.maltest
monetdb5/modules/mal/Tests/orderidx01.maltest
monetdb5/modules/mal/Tests/orderidx02.maltest
monetdb5/modules/mal/Tests/orderidx04.maltest
monetdb5/modules/mal/Tests/partition.maltest
monetdb5/modules/mal/Tests/pqueue.maltest
monetdb5/modules/mal/Tests/pqueue2.maltest
monetdb5/modules/mal/Tests/pqueue3.maltest
monetdb5/modules/mal/Tests/printf.maltest
monetdb5/modules/mal/Tests/qgram.maltest
monetdb5/modules/mal/Tests/register00.maltest
monetdb5/modules/mal/Tests/remote89.maltest
monetdb5/modules/mal/Tests/remoteInit.maltest
monetdb5/modules/mal/Tests/tokenizer00.maltest
testing/malmapi.py
testing/mapicursor.py
Modified Files:
monetdb5/modules/mal/Tests/mapi01.malC
testing/CMakeLists.txt
testing/Mz.py.in
testing/convert_to_sqllogic.sh
testing/helpers.py
testing/mktest.py
testing/sqllogictest.py
Branch: mtest
Log Message:
added functionality to sqllogic test (and friend) to handle mal. .maltest files
are now run through the sqllogic setup.
diffs (truncated from 4968 to 300 lines):
diff --git a/monetdb5/modules/mal/Tests/ascii_io2.maltest
b/monetdb5/modules/mal/Tests/ascii_io2.maltest
new file mode 100644
--- /dev/null
+++ b/monetdb5/modules/mal/Tests/ascii_io2.maltest
@@ -0,0 +1,31 @@
+statement ok
+namebat := bat.new( :str)
+
+statement ok
+bat.append(namebat,"tmpdocs")
+
+statement ok
+bat.append(namebat,"tmpterms")
+
+query T rowsort
+io.printf("#source:%s\n","namebat")
+
+#source:namebat
+
+statement ok
+io.export(namebat, "namebat")
+
+statement ok
+z:= bat.new(:str)
+
+statement ok
+io.import(z,"namebat")
+
+query TT rowsort
+io.print(z)
+
+@
+tmpdocs
+@
+tmpterms
+
diff --git a/monetdb5/modules/mal/Tests/batpartition.maltest
b/monetdb5/modules/mal/Tests/batpartition.maltest
new file mode 100644
--- /dev/null
+++ b/monetdb5/modules/mal/Tests/batpartition.maltest
@@ -0,0 +1,69 @@
+statement ok
+b := bat.new(:lng)
+
+statement ok
+bat.append(b,0:lng)
+
+statement ok
+bat.append(b,1:lng)
+
+statement ok
+bat.append(b,2:lng)
+
+statement ok
+bat.append(b,3:lng)
+
+statement ok
+bat.append(b,4:lng)
+
+statement ok
+bat.append(b,5:lng)
+
+statement ok
+bat.append(b,6:lng)
+
+statement ok
+bat.append(b,7:lng)
+
+statement ok
+bat.append(b,8:lng)
+
+statement ok
+bat.append(b,9:lng)
+
+statement ok
+b1 := bat.partition(b,2,0)
+
+statement error
+io.print(b1)
+
+statement ok
+b2 := bat.partition(b,2,1)
+
+statement error
+io.print(b2)
+
+statement ok
+c1 := bat.partition(b1,2,0)
+
+statement error
+io.print(c1)
+
+statement ok
+c2 := bat.partition(b1,2,1)
+
+statement error
+io.print(c2)
+
+statement ok
+d1 := bat.partition(b2,2,0)
+
+statement error
+io.print(d1)
+
+statement ok
+d2 := bat.partition(b2,2,1)
+
+statement error
+io.print(d2)
+
diff --git a/monetdb5/modules/mal/Tests/bigsum.maltest
b/monetdb5/modules/mal/Tests/bigsum.maltest
new file mode 100644
--- /dev/null
+++ b/monetdb5/modules/mal/Tests/bigsum.maltest
@@ -0,0 +1,45 @@
+statement ok
+b := bat.new(:lng,1001)
+
+statement ok
+INT_MAX := 2147483647
+
+statement ok
+dbgmsk_restore := mdb.getDebug()
+
+statement ok
+dbgmsk_unset := 8+8388608
+
+statement ok
+dbgmsk_keep := calc.xor(INT_M
MonetDB: mtest - small test fix
Changeset: 48a4fb925f4b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=48a4fb925f4b
Modified Files:
monetdb5/modules/mal/Tests/mapi01.malC
Branch: mtest
Log Message:
small test fix
diffs (12 lines):
diff --git a/monetdb5/modules/mal/Tests/mapi01.malC
b/monetdb5/modules/mal/Tests/mapi01.malC
--- a/monetdb5/modules/mal/Tests/mapi01.malC
+++ b/monetdb5/modules/mal/Tests/mapi01.malC
@@ -29,7 +29,7 @@ mapi.put(mid,"low",low);
mapi.rpc(mid,"e:=algebra.select(b,d,low,7,true,true,false);");
mapi.rpc(mid,"i:=aggr.count(e);");
i:lng:= mapi.rpc(mid,"io.print(i);");
-io.printf("#count %d\n",i);
+io.printf(" count %d\n",i);
d:bat[:int]:= mapi.rpc(mid,"e1:=algebra.projection(e,b);io.print(e1);");
io.print(d);
mapi.disconnect(mid);
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
