Changeset: cad1d791fa48 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cad1d791fa48 Modified Files: debian/control gdk/gdk.h gdk/gdk_bbp.c gdk/gdk_logger.c monetdb5/modules/atoms/json.c sql/backends/monet5/sql_result.c sql/backends/monet5/sql_upgrades.c sql/storage/bat/bat_logger.c sql/storage/store.c Branch: oscar Log Message:
Merge with Jun2020 branch.
diffs (truncated from 1259 to 300 lines):
diff --git a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends: debhelper (>= 9), autotoo
Standards-Version: 3.8.0
X-Python-Version: >= 2.6
-Package: libmonetdb
+Package: libmonetdb20
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: libmonetdb5-server-geom (<< ${source:Version})
@@ -35,7 +35,7 @@ Description: MonetDB core library
Package: libmonetdb-dev
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends},
- libmonetdb, libmonetdb-stream-dev
+ libmonetdb20, libmonetdb-stream-dev
Description: MonetDB development files
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
@@ -45,7 +45,7 @@ Description: MonetDB development files
This package contains files needed to develop extensions to the core
functionality of MonetDB.
-Package: libmonetdb-stream
+Package: libmonetdb-stream13
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: MonetDB stream library
@@ -60,7 +60,7 @@ Description: MonetDB stream library
Package: libmonetdb-stream-dev
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends},
- libmonetdb-stream (= ${source:Version})
+ libmonetdb-stream13 (= ${source:Version})
Description: MonetDB stream library development files
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
@@ -68,9 +68,9 @@ Description: MonetDB stream library deve
accelerators. It also has an SQL front end.
.
This package contains the files to develop with the
- libmonetdb-stream library.
+ libmonetdb-stream13 library.
-Package: libmonetdb-client
+Package: libmonetdb-client12
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: MonetDB client/server interface library
@@ -85,14 +85,14 @@ Description: MonetDB client/server inter
Package: libmonetdb-client-dev
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends},
- libmonetdb-client (= ${source:Version})
+ libmonetdb-client12 (= ${source:Version})
Description: MonetDB client/server interface library development files
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
automatic index management, extensibility of data types and search
accelerators. It also has an SQL front end.
.
- This package contains the files to develop with the libmonetdb-client
+ This package contains the files to develop with the libmonetdb-client12
library.
Package: monetdb-client
diff --git a/debian/libmonetdb-client.install b/debian/libmonetdb-client.install
deleted file mode 100644
--- a/debian/libmonetdb-client.install
+++ /dev/null
@@ -1,1 +0,0 @@
-debian/tmp/usr/lib/x86_64-linux-gnu/libmapi.so.* /usr/lib/x86_64-linux-gnu
diff --git a/debian/libmonetdb-client12.install
b/debian/libmonetdb-client12.install
new file mode 100644
--- /dev/null
+++ b/debian/libmonetdb-client12.install
@@ -0,0 +1,1 @@
+debian/tmp/usr/lib/x86_64-linux-gnu/libmapi.so.* /usr/lib/x86_64-linux-gnu
diff --git a/debian/libmonetdb-stream.install b/debian/libmonetdb-stream.install
deleted file mode 100644
--- a/debian/libmonetdb-stream.install
+++ /dev/null
@@ -1,1 +0,0 @@
-debian/tmp/usr/lib/x86_64-linux-gnu/libstream.so.* usr/lib/x86_64-linux-gnu
diff --git a/debian/libmonetdb-stream13.install
b/debian/libmonetdb-stream13.install
new file mode 100644
--- /dev/null
+++ b/debian/libmonetdb-stream13.install
@@ -0,0 +1,1 @@
+debian/tmp/usr/lib/x86_64-linux-gnu/libstream.so.* usr/lib/x86_64-linux-gnu
diff --git a/debian/libmonetdb.install b/debian/libmonetdb.install
deleted file mode 100644
--- a/debian/libmonetdb.install
+++ /dev/null
@@ -1,1 +0,0 @@
-debian/tmp/usr/lib/x86_64-linux-gnu/libbat.so.* usr/lib/x86_64-linux-gnu
diff --git a/debian/libmonetdb20.install b/debian/libmonetdb20.install
new file mode 100644
--- /dev/null
+++ b/debian/libmonetdb20.install
@@ -0,0 +1,1 @@
+debian/tmp/usr/lib/x86_64-linux-gnu/libbat.so.* usr/lib/x86_64-linux-gnu
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -710,9 +710,9 @@ typedef struct {
/* assert that atom width is power of 2, i.e., width == 1<<shift */
#define assert_shift_width(shift,width) assert(((shift) == 0 && (width) == 0)
|| ((unsigned)1<<(shift)) == (unsigned)(width))
-#define GDKLIBRARY_BLOB_SORT 061040U /* blob compare changed */
-#define GDKLIBRARY_OLDDATE 061041U /* the representation of times changed
*/
-#define GDKLIBRARY 061042U
+#define GDKLIBRARY_BLOB_SORT 061040U /* first in Mar2018: blob compare
changed */
+#define GDKLIBRARY_OLDDATE 061041U /* first in Apr2019: time/date in old
format */
+#define GDKLIBRARY 061042U /* first in Nov2019 */
typedef struct BAT {
/* static bat properties */
diff --git a/monetdb5/modules/atoms/json.c b/monetdb5/modules/atoms/json.c
--- a/monetdb5/modules/atoms/json.c
+++ b/monetdb5/modules/atoms/json.c
@@ -874,14 +874,12 @@ JSONnumberParser(const char *j, const ch
if (!JSONfractionParser(j, next)) {
*next = j;
- return MAL_SUCCEED;
}
j = *next;
if (!JSONexponentParser(j, next)) {
*next = j;
- return MAL_SUCCEED;
}
return MAL_SUCCEED;
}
diff --git a/sql/backends/monet5/sql_result.c b/sql/backends/monet5/sql_result.c
--- a/sql/backends/monet5/sql_result.c
+++ b/sql/backends/monet5/sql_result.c
@@ -34,14 +34,14 @@
#define normal_int_SWAP(i) (((0x000000ff&(i))<<24) | ((0x0000ff00&(i))<<8) | \
((0x00ff0000&(i))>>8) | ((0xff000000&(i))>>24))
-#define long_long_SWAP(l) \
- ((((lng)normal_int_SWAP(l))<<32) | \
+#define long_long_SWAP(l) \
+ ((((lng)normal_int_SWAP(l))<<32) | \
(0xffffffff&normal_int_SWAP(l>>32)))
#endif
#ifdef HAVE_HGE
-#define huge_int_SWAP(h) \
- ((((hge)long_long_SWAP(h))<<64) | \
+#define huge_int_SWAP(h)
\
+ ((((hge)long_long_SWAP(h))<<64) |
\
(0xffffffffffffffff&long_long_SWAP(h>>64)))
#endif
@@ -50,58 +50,58 @@ mnstr_swap_lng(stream *s, lng lngval) {
return mnstr_get_swapbytes(s) ? long_long_SWAP(lngval) : lngval;
}
-#define DEC_TOSTR(TYPE)
\
- do { \
- char buf[64]; \
- TYPE v = *(const TYPE *) a; \
- int scale = (int) (ptrdiff_t) extra; \
- int cur = 63, i, done = 0; \
- int neg = v < 0; \
- ssize_t l; \
- if (is_##TYPE##_nil(v)) { \
- if (*len < 5){ \
- if (*Buf) \
- GDKfree(*Buf); \
- *len = 5; \
- *Buf = GDKzalloc(*len); \
- if (*Buf == NULL) { \
- return -1; \
- } \
- } \
- strcpy(*Buf, "NULL"); \
- return 4; \
- } \
- if (v<0) \
- v = -v; \
- buf[cur--] = 0; \
- if (scale){ \
- for (i=0; i<scale; i++) { \
+#define DEC_TOSTR(TYPE)
\
+ do {
\
+ char buf[64];
\
+ TYPE v = *(const TYPE *) a;
\
+ int scale = (int) (ptrdiff_t) extra; \
+ int cur = 63, i, done = 0;
\
+ int neg = v < 0;
\
+ ssize_t l;
\
+ if (is_##TYPE##_nil(v)) {
\
+ if (*len < 5){
\
+ if (*Buf)
\
+ GDKfree(*Buf);
\
+ *len = 5;
\
+ *Buf = GDKzalloc(*len);
\
+ if (*Buf == NULL) {
\
+ return -1;
\
+ }
\
+ }
\
+ strcpy(*Buf, "NULL");
\
+ return 4;
\
+ }
\
+ if (v<0)
\
+ v = -v;
\
+ buf[cur--] = 0;
\
+ if (scale){
\
+ for (i=0; i<scale; i++) {
\
buf[cur--] = (char) (v%10 + '0'); \
- v /= 10; \
- } \
- buf[cur--] = '.'; \
- } \
- while (v) { \
+ v /= 10;
\
+ }
\
+ buf[cur--] = '.';
\
+ }
\
+ while (v) {
\
buf[cur--] = (char ) (v%10 + '0'); \
- v /= 10; \
- done = 1; \
- } \
- if (!done) \
- buf[cur--] = '0'; \
- if (neg) \
- buf[cur--] = '-'; \
- l = (64-cur-1); \
- if ((ssize_t) *len < l){ \
- if (*Buf) \
- GDKfree(*Buf); \
- *len = (size_t) l+1; \
- *Buf = GDKzalloc(*len); \
- if (*Buf == NULL) { \
- return -1; \
- } \
- } \
- strcpy(*Buf, buf+cur+1); \
- return l-1; \
+ v /= 10;
\
+ done = 1;
\
+ }
\
+ if (!done)
\
+ buf[cur--] = '0';
\
+ if (neg)
\
+ buf[cur--] = '-';
\
+ l = (64-cur-1);
\
+ if ((ssize_t) *len < l){
\
+ if (*Buf)
\
+ GDKfree(*Buf);
\
+ *len = (size_t) l+1;
\
+ *Buf = GDKzalloc(*len);
\
+ if (*Buf == NULL) {
\
+ return -1;
\
+ }
\
+ }
\
+ strcpy(*Buf, buf+cur+1);
\
+ return l-1;
\
} while (0)
static ssize_t
@@ -581,64 +581,59 @@ bat_max_hgelength(BAT *b)
}
#endif
-#define DEC_FRSTR(X) \
- do { \
- sql_column *col = c->extra; \
- sql_subtype *t = &col->type; \
- \
- unsigned int i, neg = 0; \
- X *r; \
- X res = 0; \
- while(isspace((unsigned char) *s)) \
- s++; \
- if (*s == '-'){ \
- neg = 1; \
- s++; \
- } else if (*s == '+'){ \
- neg = 0; \
- s++; \
- } \
+#define DEC_FRSTR(X)
\
+ do {
\
+ sql_column *col = c->extra;
\
+ sql_subtype *t = &col->type;
\
+ unsigned int scale = t->scale;
\
+ unsigned int i;
\
+ bool neg = false;
\
+ X *r;
\
+ X res = 0;
\
+ while(isspace((unsigned char) *s))
\
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
