Changeset: 8a80c1b6b1fe for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8a80c1b6b1fe
Modified Files:
monetdb5/modules/atoms/url.c
tools/monetdbe/monetdbe.c
Branch: default
Log Message:
we should not start the msab* in the embedded library
diffs (68 lines):
diff --git a/monetdb5/modules/atoms/url.c b/monetdb5/modules/atoms/url.c
--- a/monetdb5/modules/atoms/url.c
+++ b/monetdb5/modules/atoms/url.c
@@ -650,21 +650,12 @@ URLgetUser(str *retval, url *val)
if (val == NULL || *val == NULL)
throw(ILLARG, "url.getUser", "url missing");
if ((s = skip_scheme(*val)) == NULL ||
- (p = skip_authority(s, NULL, NULL, NULL, NULL)) == NULL ||
- (s = skip_path(p, NULL, NULL)) == NULL)
+ (p = skip_authority(s, &u, NULL, NULL, NULL)) == NULL)
throw(ILLARG, "url.getUser", "bad url");
- if (p == s || *p != '/' || p[1] != '~') {
+ if (u == s || !u) {
*retval = GDKstrdup(str_nil);
} else {
- size_t l;
-
- u = p + 2;
- for (p = u; p < s && *p != '/'; p++)
- ;
- l = p - u;
- if ((*retval = GDKmalloc(l + 1)) != NULL) {
- strcpy_len(*retval, u, l + 1);
- }
+ *retval = GDKstrdup(u);
}
if (*retval == NULL)
throw(MAL, "url.getUser", SQLSTATE(HY013) MAL_MALLOC_FAIL);
diff --git a/tools/monetdbe/monetdbe.c b/tools/monetdbe/monetdbe.c
--- a/tools/monetdbe/monetdbe.c
+++ b/tools/monetdbe/monetdbe.c
@@ -25,7 +25,6 @@
#include "rel_rel.h"
#include "rel_updates.h"
#include "monet_options.h"
-#include "msabaoth.h"
#include "mapi.h"
#define UNUSED(x) (void)(x)
@@ -414,7 +413,7 @@ monetdbe_shutdown_internal(void) // Call
static char*
monetdbe_startup(char* dbdir, monetdbe_options *opts)
{
- char* msg = MAL_SUCCEED, *err;
+ char* msg = MAL_SUCCEED;//, *err;
monetdbe_result* res = NULL;
void* c;
opt *set = NULL;
@@ -478,19 +477,6 @@ monetdbe_startup(char* dbdir, monetdbe_o
msg = createException(MAL, "monetdbe.monetdbe_startup",
"Cannot create directory %s", dbdir);
goto cleanup;
}
- msab_dbpathinit(dbdir);
- if ((err = msab_wildRetreat()) != NULL) {
- mo_free_options(set, setlen);
- msg = createException(MAL, "monetdbe.monetdbe_startup",
"%s", err);
- free(err);
- goto cleanup;
- }
- if ((err = msab_registerStarting()) != NULL) {
- mo_free_options(set, setlen);
- msg = createException(MAL, "monetdbe.monetdbe_startup",
"%s", err);
- free(err);
- goto cleanup;
- }
}
gdk_res = GDKinit(set, setlen, 1);
mo_free_options(set, setlen);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
