Changeset: 22ff17f06368 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=22ff17f06368
Modified Files:
clients/Tests/exports.stable.out
sql/backends/monet5/sql.h
sql/test/miscellaneous/Tests/simple_plans.stable.out
sql/test/miscellaneous/Tests/simple_plans.stable.out.single
Branch: clean-candidates
Log Message:
Merged with default
diffs (truncated from 503 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -783,3 +783,6 @@ bb157905ecb86908dcfb112d102a8c6152557b5d
94231c85384d893701beeeb69996f57c70fade4d Oct2020_root
017e44827765fb819d31faefcdf9066dfe593f04 Oct2020_1
017e44827765fb819d31faefcdf9066dfe593f04 Oct2020_release
+cb4b3f021774b60ffd84c3004d341ec04de736f3 Oct2020_3
+017e44827765fb819d31faefcdf9066dfe593f04 Oct2020_release
+cb4b3f021774b60ffd84c3004d341ec04de736f3 Oct2020_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -860,6 +860,9 @@ fi
%postun -p /sbin/ldconfig
%changelog
+* Fri Oct 09 2020 Sjoerd Mullender <sjo...@acm.org> - 11.39.3-20201009
+- Rebuilt.
+
* Tue Oct 06 2020 Sjoerd Mullender <sjo...@acm.org> - 11.39.1-20201006
- Rebuilt.
- BZ#3553: All schema access to ubiquitous functions
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
@@ -1387,7 +1387,7 @@ str mal2str(MalBlkPtr mb, int first, int
int malAtomSize(int size, const char *name);
str malBootstrap(char *modules[], int embedded);
str malCommandCall(MalStkPtr stk, InstrPtr pci);
-str malEmbeddedBoot(int workerlimit, int memorylimit, int querytimeout, int
sessionlimit);
+str malEmbeddedBoot(int workerlimit, int memorylimit, int querytimeout, int
sessionlimit, int with_mapi_server);
void malEmbeddedReset(void);
_Noreturn void malEmbeddedStop(int status);
str malExtraModulesBoot(Client c, str extraMalModules[], char *mal_scripts);
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 "0")
+set(GDK_VERSION_REVISION "1")
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}")
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
@@ -21,7 +21,7 @@ main(void)
msg = createException(MAL, "embedded.monetdb_startup", "GDKinit()
failed");
return 1;
}
- if ((msg = malEmbeddedBoot(0, 0, 0, 0)) != MAL_SUCCEED)
+ if ((msg = malEmbeddedBoot(0, 0, 0, 0, 0)) != MAL_SUCCEED)
return 1;
return 0;
}
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+monetdb (11.39.3) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <sjo...@acm.org> Fri, 09 Oct 2020 09:48:30 +0200
+
monetdb (11.39.1) 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,9 @@
+monetdb (11.39.3) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <sjo...@acm.org> Fri, 09 Oct 2020 09:48:30 +0200
+
monetdb (11.39.1) 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,6 @@
+* Fri Oct 09 2020 Sjoerd Mullender <sjo...@acm.org> - 11.39.3-20201009
+- Rebuilt.
+
* Tue Oct 06 2020 Sjoerd Mullender <sjo...@acm.org> - 11.39.1-20201006
- Rebuilt.
- BZ#3553: All schema access to ubiquitous functions
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
@@ -391,10 +391,7 @@ AUTHinitTables(const char *passwd) {
passwd = "monetdb"; /* default password */
pw = mcrypt_BackendSum(passwd, strlen(passwd));
if(!pw) {
- if (!GDKembedded())
- throw(MAL, "initTables", SQLSTATE(42000) "Crypt
backend hash not found");
- else
- pw = strdup(passwd);
+ throw(MAL, "initTables", SQLSTATE(42000) "Crypt backend
hash not found");
}
msg = AUTHaddUser(&uid, NULL, "monetdb", pw);
free(pw);
@@ -521,11 +518,8 @@ AUTHaddUser(oid *uid, Client cntxt, cons
throw(MAL, "addUser", "user '%s' already exists", username);
/* we assume the BATs are still aligned */
- if (!GDKembedded()) {
- rethrow("addUser", tmp, AUTHcypherValue(&hash, passwd));
- } else {
- hash = GDKstrdup("hash");
- }
+ rethrow("addUser", tmp, AUTHcypherValue(&hash, passwd));
+
/* needs force, as SQL makes a view over user */
if (BUNappend(user, username, true) != GDK_SUCCEED ||
BUNappend(pass, hash, true) != GDK_SUCCEED) {
@@ -537,8 +531,7 @@ AUTHaddUser(oid *uid, Client cntxt, cons
p = AUTHfindUser(username);
/* make the stuff persistent */
- if (!GDKembedded())
- AUTHcommit();
+ AUTHcommit();
*uid = p;
return(MAL_SUCCEED);
@@ -993,8 +986,6 @@ AUTHverifyPassword(const char *passwd)
return(MAL_SUCCEED);
#else
- if (GDKembedded())
- return(MAL_SUCCEED);
(void) passwd;
throw(MAL, "verifyPassword", "Unknown backend hash algorithm: %s",
MONETDB5_PASSWDHASH);
diff --git a/monetdb5/mal/mal_embedded.c b/monetdb5/mal/mal_embedded.c
--- a/monetdb5/mal/mal_embedded.c
+++ b/monetdb5/mal/mal_embedded.c
@@ -40,7 +40,7 @@
static bool embeddedinitialized = false;
str
-malEmbeddedBoot(int workerlimit, int memorylimit, int querytimeout, int
sessiontimeout)
+malEmbeddedBoot(int workerlimit, int memorylimit, int querytimeout, int
sessiontimeout, int with_mapi_server)
{
Client c;
str msg = MAL_SUCCEED;
@@ -120,7 +120,7 @@ malEmbeddedBoot(int workerlimit, int mem
return msg;
}
char *modules[3] = { "embedded", "sql" };
- if ((msg = malIncludeModules(c, modules, 0, 1)) != MAL_SUCCEED) {
+ if ((msg = malIncludeModules(c, modules, 0, !with_mapi_server)) !=
MAL_SUCCEED) {
MCcloseClient(c);
return msg;
}
diff --git a/monetdb5/mal/mal_embedded.h b/monetdb5/mal/mal_embedded.h
--- a/monetdb5/mal/mal_embedded.h
+++ b/monetdb5/mal/mal_embedded.h
@@ -16,7 +16,7 @@
#define MAXMODULES 128
-mal_export str malEmbeddedBoot(int workerlimit, int memorylimit, int
querytimeout, int sessionlimit);
+mal_export str malEmbeddedBoot(int workerlimit, int memorylimit, int
querytimeout, int sessionlimit, int with_mapi_server);
mal_export str malExtraModulesBoot(Client c, str extraMalModules[], char*
mal_scripts);
mal_export void malEmbeddedReset(void);
mal_export _Noreturn void malEmbeddedStop(int status);
diff --git a/monetdb5/mal/mal_prelude.c b/monetdb5/mal/mal_prelude.c
--- a/monetdb5/mal/mal_prelude.c
+++ b/monetdb5/mal/mal_prelude.c
@@ -394,7 +394,7 @@ melFunction(bool command, char *mod, cha
}
static str
-malPrelude(Client c, int listing, int embedded)
+malPrelude(Client c, int listing, int no_mapi_server)
{
int i;
str msg = MAL_SUCCEED;
@@ -420,8 +420,8 @@ malPrelude(Client c, int listing, int em
if (msg)
return msg;
- /* skip sql should be last to startup and mapi in the
embedded version */
- if (strcmp(mel_module_name[i], "sql") == 0 || (embedded
&& strcmp(mel_module_name[i], "mapi") == 0))
+ /* skip sql should be last to startup and mapi if
configured without mapi server */
+ if (strcmp(mel_module_name[i], "sql") == 0 ||
(no_mapi_server && strcmp(mel_module_name[i], "mapi") == 0))
continue;
if (!mel_module_inits[i]) {
msg = initModule(c, mel_module_name[i]);
@@ -433,8 +433,8 @@ malPrelude(Client c, int listing, int em
msg = mel_module_inits[i]();
if (msg)
return msg;
- /* skip sql should be last to startup and mapi in the
embedded version */
- if (strcmp(mel_module_name[i], "sql") == 0 || (embedded
&& strcmp(mel_module_name[i], "mapi") == 0))
+ /* skip sql should be last to startup and mapi if
configured without mapi server */
+ if (strcmp(mel_module_name[i], "sql") == 0 ||
(no_mapi_server && strcmp(mel_module_name[i], "mapi") == 0))
continue;
msg = initModule(c, mel_module_name[i]);
if (msg)
@@ -445,7 +445,7 @@ malPrelude(Client c, int listing, int em
}
str
-malIncludeModules(Client c, char *modules[], int listing, int embedded)
+malIncludeModules(Client c, char *modules[], int listing, int no_mapi_server)
{
int i;
str msg;
@@ -458,7 +458,7 @@ malIncludeModules(Client c, char *module
return msg;
}
/* load the mal code for these modules and execute preludes */
- if ((msg = malPrelude(c, listing, embedded)) != NULL)
+ if ((msg = malPrelude(c, listing, no_mapi_server)) != NULL)
return msg;
for(int i = 0; modules[i]; i++) {
if (strcmp(modules[i], "sql") == 0) { /* start now */
diff --git a/sql/backends/monet5/sql_scenario.c
b/sql/backends/monet5/sql_scenario.c
--- a/sql/backends/monet5/sql_scenario.c
+++ b/sql/backends/monet5/sql_scenario.c
@@ -600,7 +600,7 @@ SQLinitClient(Client c)
MT_lock_unset(&sql_contextLock);
throw(SQL, "SQLinitClient", SQLSTATE(42000) "Catalogue not
available");
}
- msg = SQLprepareClient(c, !GDKembedded());
+ msg = SQLprepareClient(c, true);
MT_lock_unset(&sql_contextLock);
return msg;
}
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
@@ -1342,11 +1342,14 @@ can_push_func(sql_exp *e, sql_rel *rel,
if (e->flag == cmp_or || e->flag == cmp_in || e->flag ==
cmp_notin || e->flag == cmp_filter)
return 0;
- return ((l->type == e_column || can_push_func(l, rel, &mustl))
&& (*must = mustl)) ||
- (!f && (r->type == e_column || can_push_func(r,
rel, &mustr)) && (*must = mustr)) ||
- (f &&
- (r->type == e_column || can_push_func(r, rel,
&mustr)) &&
- (f->type == e_column || can_push_func(f, rel, &mustf))
&& (*must = (mustr || mustf)));
+ if (!f) {
+ return ((l->type == e_column || can_push_func(l, rel,
&mustl)) && (*must = mustl)) ||
+ ((r->type == e_column || can_push_func(r,
rel, &mustr)) && (*must = mustr));
+ } else {
+ return (l->type == e_column || can_push_func(l, rel,
&mustl)) &&
+ (r->type == e_column || can_push_func(r,
rel, &mustr)) &&
+ (f->type == e_column || can_push_func(f,
rel, &mustf)) && (*must = (mustl || mustr || mustf));
+ }
}
case e_convert:
return can_push_func(e->l, rel, must);
diff --git a/sql/test/miscellaneous/Tests/simple_plans.stable.out
b/sql/test/miscellaneous/Tests/simple_plans.stable.out
--- a/sql/test/miscellaneous/Tests/simple_plans.stable.out
+++ b/sql/test/miscellaneous/Tests/simple_plans.stable.out
@@ -284,61 +284,61 @@ end user.main;
% clob # type
% 174 # length
function user.main():void;
- X_1:void := querylog.define("explain select 1 from another_t t1 inner join
another_t t2 on t1.col1 between t2.col1 - 1 and t2.col1 + 1;":str,
"default_pipe":str, 31:int);
-barrier X_163:bit := language.dataflow();
- X_44:bat[:str] := bat.pack(".%3":str);
- X_45:bat[:str] := bat.pack("%3":str);
- X_46:bat[:str] := bat.pack("tinyint":str);
- X_47:bat[:int] := bat.pack(1:int);
- X_48:bat[:int] := bat.pack(0:int);
+ X_1:void := querylog.define("explain select 1 from another_t t1 inner join
another_t t2 on t1.col1 between t2.col1 - 1 and t2.col1 + 1;":str,
"default_pipe":str, 29:int);
+barrier X_153:bit := language.dataflow();
+ X_42:bat[:str] := bat.pack(".%1":str);
+ X_43:bat[:str] := bat.pack("%1":str);
+ X_44:bat[:str] := bat.pack("tinyint":str);
+ X_45:bat[:int] := bat.pack(1:int);
+ X_46:bat[:int] := bat.pack(0:int);
X_4:int := sql.mvc();
- C_97:bat[:oid] := sql.tid(X_4:int, "sys":str, "another_t":str, 0:int,
4:int);
- X_108:bat[:int] := sql.bind(X_4:int, "sys":str, "another_t":str,
"col1":str, 0:int, 0:int, 4:int);
- X_113:bat[:int] := algebra.projection(C_97:bat[:oid], X_108:bat[:int]);
- X_117:bat[:lng] := batcalc.lng(X_113:bat[:int], nil:BAT);
+ C_95:bat[:oid] := sql.tid(X_4:int, "sys":str, "another_t":str, 0:int,
4:int);
+ X_106:bat[:int] := sql.bind(X_4:int, "sys":str, "another_t":str,
"col1":str, 0:int, 0:int, 4:int);
+ X_111:bat[:int] := algebra.projection(C_95:bat[:oid], X_106:bat[:int]);
+ X_115:bat[:lng] := batcalc.lng(X_111:bat[:int], nil:BAT);
C_12:bat[:oid] := sql.tid(X_4:int, "sys":str, "another_t":str);
X_14:bat[:int] := sql.bind(X_4:int, "sys":str, "another_t":str,
"col1":str, 0:int);
- X_15:bat[:int] := algebra.projection(C_12:bat[:oid], X_14:bat[:int]);
- X_16:bat[:lng] := batcalc.lng(X_15:bat[:int], nil:BAT);
- X_20:bat[:lng] := batcalc.-(X_16:bat[:lng], 1:lng, nil:BAT);
- X_25:bat[:lng] := batcalc.+(X_16:bat[:lng], 1:lng, nil:BAT);
- X_121:bat[:oid] := algebra.rangejoin(X_117:bat[:lng], X_20:bat[:lng],
X_25:bat[:lng], nil:BAT, nil:BAT, true:bit, true:bit, false:bit, false:bit,
nil:lng);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
