Changeset: b2efdca7d3db for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b2efdca7d3db
Modified Files:
MonetDB.spec
NT/Makefile
NT/rules.msc
NT/winconfig.py
buildtools/autogen/autogen/am.py
buildtools/autogen/autogen/msc.py
debian/changelog
gdk/gdk.h
gdk/gdk_bat.c
gdk/gdk_bbp.c
gdk/gdk_hash.c
gdk/gdk_imprints.c
gdk/gdk_orderidx.c
gdk/gdk_storage.c
gdk/gdk_system.c
gdk/gdk_system.h
gdk/gdk_utils.c
monetdb5/mal/mal_client.c
monetdb5/mal/mal_dataflow.c
monetdb5/modules/mal/mal_mapi.c
monetdb5/modules/mal/tablet.c
monetdb5/optimizer/opt_support.c
sql/ChangeLog.Jun2020
sql/backends/monet5/mal_backend.c
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_statement.c
sql/backends/monet5/sql_upgrades.c
sql/common/sql_types.c
sql/scripts/51_sys_schema_extension.sql
sql/server/rel_exp.c
sql/server/rel_select.c
sql/server/rel_unnest.c
sql/server/rel_updates.c
sql/server/sql_atom.c
sql/server/sql_parser.y
sql/server/sql_partition.c
sql/server/sql_query.c
sql/server/sql_scan.c
sql/server/sql_semantic.c
sql/server/sql_tokens.h
sql/storage/bat/bat_storage.c
sql/storage/sql_storage.h
sql/storage/store.c
sql/test/BugTracker-2015/Tests/project_rewrite.Bug-3693.sql
sql/test/Tests/hot-snapshot.py
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.32bit
sql/test/emptydb/Tests/check.stable.out.int128
sql/test/miscellaneous/Tests/simple_selects.sql
sql/test/miscellaneous/Tests/simple_selects.stable.err
sql/test/subquery/Tests/subquery5.sql
sql/test/subquery/Tests/subquery5.stable.err
sql/test/subquery/Tests/subquery5.stable.out
testing/Mtest.py.in
Branch: mbedded
Log Message:
merged with default
diffs (truncated from 1500 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -5062,20 +5062,20 @@ fi
* Fri May 13 2011 Sjoerd Mullender <sjo...@acm.org> - 11.3.3-20110517
- gdk: Fixed a bug where large files (> 2GB) didn't always get deleted on
-Windows.
+ Windows.
* Wed May 11 2011 Fabian Groffen <fab...@cwi.nl> - 11.3.3-20110517
- java: Insertion via PreparedStatement and retrieval via ResultSet of
timestamp
-and time fields with and without timezones was improved to better
-respect timezones, as partly indicated in bug #2781.
+ and time fields with and without timezones was improved to better
+ respect timezones, as partly indicated in bug #2781.
* Wed May 11 2011 Sjoerd Mullender <sjo...@acm.org> - 11.3.3-20110517
- monetdb5: Fixed a bug in conversion from string to the URL type. The bug was
-an incorrect call to free().
+ an incorrect call to free().
* Wed Apr 27 2011 Sjoerd Mullender <sjo...@acm.org> - 11.3.3-20110517
- geom: Fixed various problems so that now all our tests work correctly on
-all our testing platforms.
+ all our testing platforms.
* Thu Apr 21 2011 Sjoerd Mullender <sjo...@acm.org> - 11.3.1-20110421
- Rebuilt.
diff --git a/NT/Makefile b/NT/Makefile
--- a/NT/Makefile
+++ b/NT/Makefile
@@ -64,7 +64,6 @@ targetdirs:
if not exist "$(libexecdir)" $(MKDIR) "$(libexecdir)"
if not exist "$(datadir)" $(MKDIR) "$(datadir)"
if not exist "$(sysconfdir)" $(MKDIR) "$(sysconfdir)"
- if not exist "$(sharedstatedir)" $(MKDIR) "$(sharedstatedir)"
if not exist "$(localstatedir)" $(MKDIR) "$(localstatedir)"
if not exist "$(libdir)" $(MKDIR) "$(libdir)"
if not exist "$(infodir)" $(MKDIR) "$(infodir)"
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -218,7 +218,6 @@ sbindir = $(exec_prefix)\sbin
libexecdir = $(exec_prefix)\libexec
datadir = $(prefix)\share
sysconfdir = $(prefix)\etc
-sharedstatedir = $(prefix)\com
localstatedir = $(prefix)\var
libdir = $(exec_prefix)\lib
infodir = $(prefix)\info
diff --git a/NT/winconfig.py b/NT/winconfig.py
--- a/NT/winconfig.py
+++ b/NT/winconfig.py
@@ -18,7 +18,6 @@ subs = [("@exec_prefix@", r'%prefix%'),
("@datadir@", r'%prefix%\share'),
("@datarootdir@", r'%prefix%\share'),
("@sysconfdir@", r'%prefix%\etc'),
- ("@sharedstatedir@", r'%prefix%\com'),
("@localstatedir@", r'%prefix%\var'),
("@libdir@", r'%exec_prefix%\lib'),
("@infodir@", r'%prefix%\info'),
diff --git a/buildtools/autogen/autogen/am.py b/buildtools/autogen/autogen/am.py
--- a/buildtools/autogen/autogen/am.py
+++ b/buildtools/autogen/autogen/am.py
@@ -853,7 +853,7 @@ def am_translate_dir(path, am):
'libdir', 'libexecdir', 'localstatedir', 'mandir',
'oldincludedir', 'pkgbindir', 'pkgdatadir', 'pkgincludedir',
'pkglibdir', 'pkglocalstatedir', 'pkgsysconfdir', 'sbindir',
- 'sharedstatedir', 'srcdir', 'sysconfdir', 'top_builddir',
+ 'srcdir', 'sysconfdir', 'top_builddir',
'top_srcdir', 'prefix'):
dir = "$("+dir+")"
dir = dir + rest
diff --git a/buildtools/autogen/autogen/msc.py
b/buildtools/autogen/autogen/msc.py
--- a/buildtools/autogen/autogen/msc.py
+++ b/buildtools/autogen/autogen/msc.py
@@ -147,7 +147,7 @@ def msc_translate_dir(path, msc):
'libdir', 'libexecdir', 'localstatedir', 'mandir',
'oldincludedir', 'pkgbindir', 'pkgdatadir', 'pkgincludedir',
'pkglibdir', 'pkglocalstatedir', 'pkgsysconfdir', 'sbindir',
- 'sharedstatedir', 'srcdir', 'sysconfdir', 'top_builddir',
+ 'srcdir', 'sysconfdir', 'top_builddir',
'top_srcdir', 'prefix'):
dir = "$("+dir+")"
if rest:
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -5846,29 +5846,29 @@ monetdb (11.3.3) unstable; urgency=low
monetdb (11.3.3) unstable; urgency=low
* gdk: Fixed a bug where large files (> 2GB) didn't always get deleted on
-Windows.
+ Windows.
-- Sjoerd Mullender <sjo...@acm.org> Fri, 13 May 2011 16:45:38 +0200
monetdb (11.3.3) unstable; urgency=low
* java: Insertion via PreparedStatement and retrieval via ResultSet of
timestamp
-and time fields with and without timezones was improved to better
-respect timezones, as partly indicated in bug #2781.
+ and time fields with and without timezones was improved to better
+ respect timezones, as partly indicated in bug #2781.
-- Fabian Groffen <fab...@cwi.nl> Wed, 11 May 2011 16:45:38 +0200
monetdb (11.3.3) unstable; urgency=low
* monetdb5: Fixed a bug in conversion from string to the URL type. The bug
was
-an incorrect call to free().
+ an incorrect call to free().
-- Sjoerd Mullender <sjo...@acm.org> Wed, 11 May 2011 16:45:38 +0200
monetdb (11.3.3) unstable; urgency=low
* geom: Fixed various problems so that now all our tests work correctly on
-all our testing platforms.
+ all our testing platforms.
-- Sjoerd Mullender <sjo...@acm.org> Wed, 27 Apr 2011 16:45:38 +0200
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -1709,7 +1709,7 @@ typedef struct threadStruct {
* into this array + 1 (0 is
* invalid) */
ATOMIC_TYPE pid; /* thread id, 0 = unallocated */
- char name[16];
+ char name[MT_NAME_LEN];
void *data[THREADDATA];
uintptr_t sp;
} *Thread;
diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -121,7 +121,7 @@ BATcreatedesc(oid hseq, int tt, bool hea
bn->tvheap->parentid = bn->batCacheid;
bn->tvheap->farmid = BBPselectfarm(role, bn->ttype, varheap);
}
- char name[16];
+ char name[MT_NAME_LEN];
snprintf(name, sizeof(name), "BATlock%d", bn->batCacheid); /* fits */
MT_lock_init(&bn->batIdxLock, name);
bn->batDirtydesc = true;
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -910,7 +910,7 @@ BBPreadEntries(FILE *fp, unsigned bbpver
bn->batCount = (BUN) count;
bn->batInserted = bn->batCount;
bn->batCapacity = (BUN) capacity;
- char name[16];
+ char name[MT_NAME_LEN];
snprintf(name, sizeof(name), "BATlock%d", bn->batCacheid); /*
fits */
MT_lock_init(&bn->batIdxLock, name);
diff --git a/gdk/gdk_hash.c b/gdk/gdk_hash.c
--- a/gdk/gdk_hash.c
+++ b/gdk/gdk_hash.c
@@ -957,7 +957,7 @@ BAThash(BAT *b)
if (BBP_status(b->batCacheid) & BBPEXISTING && !b->theap.dirty
&& !GDKinmemory()) {
MT_Id tid;
BBPfix(b->batCacheid);
- char name[16];
+ char name[MT_NAME_LEN];
snprintf(name, sizeof(name), "hashsync%d",
b->batCacheid);
MT_lock_unset(&b->batIdxLock);
if (MT_create_thread(&tid, BAThashsync, b,
diff --git a/gdk/gdk_imprints.c b/gdk/gdk_imprints.c
--- a/gdk/gdk_imprints.c
+++ b/gdk/gdk_imprints.c
@@ -534,7 +534,7 @@ BATimprints(BAT *b)
!GDKinmemory()) {
MT_Id tid;
BBPfix(b->batCacheid);
- char name[16];
+ char name[MT_NAME_LEN];
snprintf(name, sizeof(name), "impssync%d",
b->batCacheid);
if (MT_create_thread(&tid, BATimpsync, b,
MT_THR_DETACHED, name) < 0)
diff --git a/gdk/gdk_orderidx.c b/gdk/gdk_orderidx.c
--- a/gdk/gdk_orderidx.c
+++ b/gdk/gdk_orderidx.c
@@ -169,7 +169,7 @@ persistOIDX(BAT *b)
!GDKinmemory()) {
MT_Id tid;
BBPfix(b->batCacheid);
- char name[16];
+ char name[MT_NAME_LEN];
snprintf(name, sizeof(name), "oidxsync%d", b->batCacheid);
if (MT_create_thread(&tid, BATidxsync, b,
MT_THR_DETACHED, name) < 0)
@@ -479,7 +479,7 @@ GDKmergeidx(BAT *b, BAT**a, int n_ar)
b->batInserted == b->batCount) {
MT_Id tid;
BBPfix(b->batCacheid);
- char name[16];
+ char name[MT_NAME_LEN];
snprintf(name, sizeof(name), "oidxsync%d", b->batCacheid);
if (MT_create_thread(&tid, BATidxsync, b,
MT_THR_DETACHED, name) < 0)
diff --git a/gdk/gdk_storage.c b/gdk/gdk_storage.c
--- a/gdk/gdk_storage.c
+++ b/gdk/gdk_storage.c
@@ -705,7 +705,7 @@ BATmsync(BAT *b)
arg->h = &b->theap;
BBPfix(b->batCacheid);
#ifdef MSYNC_BACKGROUND
- char name[16];
+ char name[MT_NAME_LEN];
snprintf(name, sizeof(name), "msync%d", b->batCacheid);
if (MT_create_thread(&tid, BATmsyncImplementation, arg,
MT_THR_DETACHED, name) < 0) {
@@ -724,7 +724,7 @@ BATmsync(BAT *b)
arg->h = b->tvheap;
BBPfix(b->batCacheid);
#ifdef MSYNC_BACKGROUND
- char name[16];
+ char name[MT_NAME_LEN];
snprintf(name, sizeof(name), "msync%d", b->batCacheid);
if (MT_create_thread(&tid, BATmsyncImplementation, arg,
MT_THR_DETACHED, name) < 0) {
diff --git a/gdk/gdk_system.c b/gdk/gdk_system.c
--- a/gdk/gdk_system.c
+++ b/gdk/gdk_system.c
@@ -180,7 +180,7 @@ static struct winthread {
const char *working; /* what we're currently doing */
ATOMIC_TYPE exited;
bool detached:1, waiting:1;
- char threadname[16];
+ char threadname[MT_NAME_LEN];
} *winthreads = NULL;
static struct winthread mainthread = {
.threadname = "main thread",
@@ -509,7 +509,7 @@ static struct posthread {
MT_Sema *semawait; /* semaphore we're waiting for */
struct posthread *joinwait; /* process we are joining with */
const char *working; /* what we're currently doing */
- char threadname[16];
+ char threadname[MT_NAME_LEN];
pthread_t tid;
MT_Id mtid;
ATOMIC_TYPE exited;
diff --git a/gdk/gdk_system.h b/gdk/gdk_system.h
--- a/gdk/gdk_system.h
+++ b/gdk/gdk_system.h
@@ -135,6 +135,7 @@ gdk_export void MT_sleep_ms(unsigned int
typedef size_t MT_Id; /* thread number. will not be zero */
enum MT_thr_detach { MT_THR_JOINABLE, MT_THR_DETACHED };
+#define MT_NAME_LEN 32 /* length of thread/semaphore/etc. names */
gdk_export bool MT_thread_init(void);
gdk_export int MT_create_thread(MT_Id *t, void (*function) (void *),
@@ -285,7 +286,7 @@ gdk_export int MT_join_thread(MT_Id t);
#if !defined(HAVE_PTHREAD_H) && defined(WIN32)
typedef struct MT_Lock {
HANDLE lock;
- char name[16];
+ char name[MT_NAME_LEN];
#ifdef LOCK_STATS
size_t count;
ATOMIC_TYPE contention;
@@ -359,7 +360,7 @@ MT_lock_try(MT_Lock *l)
typedef struct MT_Lock {
pthread_mutex_t lock;
- char name[16];
+ char name[MT_NAME_LEN];
#ifdef LOCK_STATS
size_t count;
ATOMIC_TYPE contention;
@@ -424,7 +425,7 @@ typedef struct MT_Lock {
* a linked list of active locks */
typedef struct MT_Lock {
ATOMIC_FLAG lock;
- char name[16];
+ char name[MT_NAME_LEN];
#ifdef LOCK_STATS
size_t count;
ATOMIC_TYPE contention;
@@ -503,7 +504,7 @@ gdk_export ATOMIC_TYPE GDKlocksleepcnt;
typedef struct {
HANDLE sema;
- char name[16];
+ char name[MT_NAME_LEN];
} MT_Sema;
#define MT_sema_init(s, nr, n) \
@@ -539,7 +540,7 @@ typedef struct {
/* MacOS X */
typedef struct {
dispatch_semaphore_t sema;
- char name[16];
+ char name[MT_NAME_LEN];
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
