Changeset: ededabbe8704 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ededabbe8704
Modified Files:
clients/Tests/exports.stable.out
sql/server/rel_unnest.c
Branch: typing
Log Message:
Merged with Oct2020
diffs (truncated from 604 to 300 lines):
diff --git a/clients/Tests/SingleServer b/clients/Tests/SingleServer
deleted file mode 100644
--- a/clients/Tests/SingleServer
+++ /dev/null
@@ -1,3 +0,0 @@
---set embedded_py=3
---set embedded_r=true
---set embedded_c=true
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -281,7 +281,7 @@ bool GDKgetenv_istrue(const char *name);
bool GDKgetenv_isyes(const char *name);
gdk_return GDKgetsem(int sem_id, int count, int *semid);
gdk_return GDKgetsemval(int sem_id, int number, int *semval);
-gdk_return GDKinit(struct opt *set, int setlen, int embedded);
+gdk_return GDKinit(struct opt *set, int setlen, bool embedded);
void *GDKinitmmap(size_t id, size_t size, size_t *return_size);
bool GDKinmemory(void);
ATOMIC_TYPE GDKlockcnt;
@@ -1793,7 +1793,7 @@ int mnstr_fsetpos(stream *restrict s, fp
int mnstr_fsync(stream *s);
buffer *mnstr_get_buffer(stream *s);
bool mnstr_get_swapbytes(const stream *s);
-int mnstr_init(int embedded);
+int mnstr_init(bool embedded);
int mnstr_isalive(const stream *s);
bool mnstr_isbinary(const stream *s);
char *mnstr_name(const stream *s);
diff --git a/clients/examples/C/streamcat.c b/clients/examples/C/streamcat.c
--- a/clients/examples/C/streamcat.c
+++ b/clients/examples/C/streamcat.c
@@ -92,7 +92,7 @@ croak(int status, const char *msg, ...)
int
main(int argc, char *argv[])
{
- if (mnstr_init(0) < 0)
+ if (mnstr_init(false) < 0)
croak(2, "Could not initialize streams library");
if (argc < 2)
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -3230,7 +3230,7 @@ main(int argc, char **argv)
perror("sigaction");
#endif
- if (mnstr_init(0) < 0) {
+ if (mnstr_init(false) < 0) {
fprintf(stderr, "error: could not initialize streams library");
exit(2);
}
diff --git a/clients/mapilib/mapi.c b/clients/mapilib/mapi.c
--- a/clients/mapilib/mapi.c
+++ b/clients/mapilib/mapi.c
@@ -1972,7 +1972,7 @@ mapi_mapiuri(const char *url, const char
char *query;
if (!ATOMIC_TAS(&mapi_initialized)) {
- if (mnstr_init(0) < 0)
+ if (mnstr_init(false) < 0)
return NULL;
}
@@ -2094,7 +2094,7 @@ mapi_mapi(const char *host, int port, co
Mapi mid;
if (!ATOMIC_TAS(&mapi_initialized)) {
- if (mnstr_init(0) < 0)
+ if (mnstr_init(false) < 0)
return NULL;
}
diff --git a/common/stream/stream.c b/common/stream/stream.c
--- a/common/stream/stream.c
+++ b/common/stream/stream.c
@@ -146,7 +146,7 @@ get_tl_error_buf(void)
static const char *mnstr_error_kind_description(mnstr_error_kind kind);
int
-mnstr_init(int embedded)
+mnstr_init(bool embedded)
{
static ATOMIC_FLAG inited = ATOMIC_FLAG_INIT;
diff --git a/common/stream/stream.h b/common/stream/stream.h
--- a/common/stream/stream.h
+++ b/common/stream/stream.h
@@ -76,7 +76,7 @@ typedef __int128_t hge;
typedef struct stream stream;
/* some os specific initialization */
-stream_export int mnstr_init(int embedded);
+stream_export int mnstr_init(bool embedded);
typedef enum mnstr_error_kind {
diff --git a/ctest/monetdb5/mal/test_malEmbeddedBoot.c
b/ctest/monetdb5/mal/test_malEmbeddedBoot.c
--- a/ctest/monetdb5/mal/test_malEmbeddedBoot.c
+++ b/ctest/monetdb5/mal/test_malEmbeddedBoot.c
@@ -16,7 +16,7 @@ main(void)
char* msg = MAL_SUCCEED;
gdk_return gdk_res;
- gdk_res = GDKinit(NULL, 0, 1);
+ gdk_res = GDKinit(NULL, 0, true);
if (gdk_res == GDK_FAIL) {
msg = createException(MAL, "embedded.monetdb_startup", "GDKinit()
failed");
return 1;
diff --git a/ctest/monetdb5/mal/test_malInclude.c
b/ctest/monetdb5/mal/test_malInclude.c
--- a/ctest/monetdb5/mal/test_malInclude.c
+++ b/ctest/monetdb5/mal/test_malInclude.c
@@ -17,7 +17,7 @@ main(void)
{
gdk_return gdk_res;
- gdk_res = GDKinit(NULL, 0, 1);
+ gdk_res = GDKinit(NULL, 0, true);
if (gdk_res == GDK_FAIL) {
createException(MAL, "embedded.monetdb_startup", "GDKinit() failed");
return 1;
diff --git a/gdk/gdk_group.c b/gdk/gdk_group.c
--- a/gdk/gdk_group.c
+++ b/gdk/gdk_group.c
@@ -1048,7 +1048,7 @@ BATgroup_internal(BAT **groups, BAT **ex
* BATassertProps for similar code; we also exploit if
* g is clustered */
algomsg = "new partial hash -- ";
- nme = GDKinmemory() ? ":inmemory" : BBP_physical(b->batCacheid);
+ nme = GDKinmemory() ? ":memory:" : BBP_physical(b->batCacheid);
if (grps && !gc) {
/* we manipulate the hash value after having
* calculated it, and when doing that, we
diff --git a/gdk/gdk_hash.c b/gdk/gdk_hash.c
--- a/gdk/gdk_hash.c
+++ b/gdk/gdk_hash.c
@@ -715,7 +715,7 @@ BAThash_impl(BAT *restrict b, struct can
oid o;
BUN hnil, hget, hb;
Hash *h = NULL;
- const char *nme = GDKinmemory() ? ":inmemory" :
BBP_physical(b->batCacheid);
+ const char *nme = GDKinmemory() ? ":memory:" :
BBP_physical(b->batCacheid);
BATiter bi = bat_iterator(b);
PROPrec *prop;
bool hascand = ci->tpe != cand_dense || ci->ncand != BATcount(b);
diff --git a/gdk/gdk_heap.c b/gdk/gdk_heap.c
--- a/gdk/gdk_heap.c
+++ b/gdk/gdk_heap.c
@@ -159,7 +159,7 @@ HEAPextend(Heap *h, size_t size, bool ma
const char *failure = "None";
if (GDKinmemory()) {
- strcpy_len(nme, ":inmemory", sizeof(nme));
+ strcpy_len(nme, ":memory:", sizeof(nme));
ext = "ext";
} else {
strcpy_len(nme, h->filename, sizeof(nme));
diff --git a/gdk/gdk_imprints.c b/gdk/gdk_imprints.c
--- a/gdk/gdk_imprints.c
+++ b/gdk/gdk_imprints.c
@@ -377,7 +377,7 @@ BATimprints(BAT *b)
if (b->timprints == NULL) {
BUN cnt;
- const char *nme = GDKinmemory() ? ":inmemory" :
BBP_physical(b->batCacheid);
+ const char *nme = GDKinmemory() ? ":memory:" :
BBP_physical(b->batCacheid);
size_t pages;
MT_lock_unset(&b->batIdxLock);
diff --git a/gdk/gdk_orderidx.c b/gdk/gdk_orderidx.c
--- a/gdk/gdk_orderidx.c
+++ b/gdk/gdk_orderidx.c
@@ -140,7 +140,7 @@ createOIDXheap(BAT *b, bool stable)
oid *restrict mv;
const char *nme;
- nme = GDKinmemory() ? ":inmemory" : BBP_physical(b->batCacheid);
+ nme = GDKinmemory() ? ":memory:" : BBP_physical(b->batCacheid);
if ((m = GDKzalloc(sizeof(Heap))) == NULL ||
(m->farmid = BBPselectfarm(b->batRole, b->ttype, orderidxheap)) < 0
||
strconcat_len(m->filename, sizeof(m->filename),
diff --git a/gdk/gdk_storage.c b/gdk/gdk_storage.c
--- a/gdk/gdk_storage.c
+++ b/gdk/gdk_storage.c
@@ -57,7 +57,7 @@ GDKfilepath(int farmid, const char *dir,
char *path;
if (GDKinmemory())
- return GDKstrdup(":inmemory");
+ return GDKstrdup(":memory:");
assert(dir == NULL || *dir != DIR_SEP);
assert(farmid == NOFARM ||
diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -732,7 +732,7 @@ GDKgetdebug(void)
return debug;
}
-static bool Mbedded = 1;
+static bool Mbedded = true;
bool
GDKembedded(void)
{
@@ -740,7 +740,7 @@ GDKembedded(void)
}
gdk_return
-GDKinit(opt *set, int setlen, int embedded)
+GDKinit(opt *set, int setlen, bool embedded)
{
static bool first = true;
char *dbpath = mo_find_option(set, setlen, "gdk_dbpath");
@@ -956,8 +956,8 @@ GDKinit(opt *set, int setlen, int embedd
}
#endif
}
- } else {
- if (GDKsetenv("gdk_dbname", ":inmemory") != GDK_SUCCEED) {
+ } else if (GDKgetenv("gdk_dbname") == NULL) {
+ if (GDKsetenv("gdk_dbname", ":memory:") != GDK_SUCCEED) {
TRC_CRITICAL(GDK, "GDKsetenv gdk_dbname failed");
return GDK_FAIL;
}
diff --git a/gdk/gdk_utils.h b/gdk/gdk_utils.h
--- a/gdk/gdk_utils.h
+++ b/gdk/gdk_utils.h
@@ -101,7 +101,7 @@ gdk_export str GDKstrndup(const char *s,
gdk_export void MT_init(void); /* init the package. */
struct opt;
-gdk_export gdk_return GDKinit(struct opt *set, int setlen, int embedded);
+gdk_export gdk_return GDKinit(struct opt *set, int setlen, bool embedded);
/* used for testing only */
gdk_export void GDKsetmallocsuccesscount(lng count);
diff --git a/monetdb5/mal/mal_authorize.c b/monetdb5/mal/mal_authorize.c
--- a/monetdb5/mal/mal_authorize.c
+++ b/monetdb5/mal/mal_authorize.c
@@ -521,7 +521,7 @@ AUTHaddUser(oid *uid, Client cntxt, cons
throw(MAL, "addUser", "user '%s' already exists", username);
/* we assume the BATs are still aligned */
- if (!GDKinmemory()) {
+ if (!GDKembedded()) {
rethrow("addUser", tmp, AUTHcypherValue(&hash, passwd));
} else {
hash = GDKstrdup("hash");
@@ -537,7 +537,7 @@ AUTHaddUser(oid *uid, Client cntxt, cons
p = AUTHfindUser(username);
/* make the stuff persistent */
- if (!GDKinmemory())
+ if (!GDKembedded())
AUTHcommit();
*uid = p;
diff --git a/monetdb5/modules/kernel/batstr.c b/monetdb5/modules/kernel/batstr.c
--- a/monetdb5/modules/kernel/batstr.c
+++ b/monetdb5/modules/kernel/batstr.c
@@ -1329,7 +1329,7 @@ static str
STRbatSubstitutecst(bat *ret, const bat *l, const str *arg2, const str *arg3,
const bit *rep)
{
BATiter lefti;
- BAT *bn, *left;
+ BAT *bn = NULL, *left;
BUN p,q;
str y = NULL, err = MAL_SUCCEED;
@@ -1380,7 +1380,7 @@ static str
STRbatSubstitute(bat *ret, const bat *l, const bat *arg2, const bat *arg3,
const bat *rep)
{
BATiter lefti, arg2i, arg3i;
- BAT *bn, *left, *arg2b, *arg3b, *repb;
+ BAT *bn = NULL, *left, *arg2b = NULL, *arg3b = NULL, *repb = NULL;
BUN p,q;
str y = NULL, err = MAL_SUCCEED;
bit *restrict repi;
@@ -1447,7 +1447,7 @@ static str
STRbatsplitpartcst(bat *ret, const bat *bid, const str *needle, const int
*field)
{
BATiter lefti;
- BAT *bn, *left;
+ BAT *bn = NULL, *left;
BUN p,q;
str y = NULL, err = MAL_SUCCEED;
@@ -1498,7 +1498,7 @@ static str
STRbatsplitpart(bat *ret, const bat *l, const bat *r, const bat *t)
{
BATiter lefti, arg2i;
- BAT *bn, *left, *arg2b, *arg3b;
+ BAT *bn = NULL, *left, *arg2b = NULL, *arg3b = NULL;
BUN p,q;
str y = NULL, err = MAL_SUCCEED;
int *restrict fieldi;
@@ -1561,7 +1561,7 @@ static str
STRbatReplacecst(bat *ret, const bat *bid, const str *pat, const str *s2)
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
