Changeset: 1392060a1f70 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1392060a1f70
Modified Files:
MonetDB.spec
cmake/monetdb-versions.cmake
Branch: default
Log Message:
Merge with Oct2020 branch.
diffs (truncated from 29942 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -358,9 +358,10 @@ developer.
%{_bindir}/sample0
%{_bindir}/sample1
%{_bindir}/sample4
+%{_bindir}/shutdowntest
%{_bindir}/smack00
%{_bindir}/smack01
-%{_bindir}/shutdowntest
+%{_bindir}/streamcat
%{_bindir}/testgetinfo
%{_bindir}/testStmtAttr
%{_bindir}/malsample.pl
@@ -518,8 +519,6 @@ exit 0
%exclude %{_bindir}/stethoscope
%{_libdir}/libmonetdb5.so.*
%dir %{_libdir}/monetdb5
-%{_libdir}/monetdb5/microbenchmark.mal
-%{_libdir}/monetdb5/run_*.mal
%if %{with cintegration}
%{_libdir}/monetdb5/lib_capi.so
%endif
@@ -764,6 +763,7 @@ fi
%build
%cmake3 \
+ -DRELEASE_VERSION=ON \
-DASSERT=OFF \
-DCINTEGRATION=%{?with_cintegration:ON}%{!?with_cintegration:OFF} \
-DFITS=%{?with_fits:ON}%{!?with_fits:OFF} \
@@ -817,6 +817,10 @@ install -d -m 0775 %{buildroot}%{_rundir
rm -f %{buildroot}%{_libdir}/*.la
rm -f %{buildroot}%{_libdir}/monetdb5/*.la
rm -f %{buildroot}%{_libdir}/monetdb5/lib_opt_sql_append.so
+rm -f %{buildroot}%{_libdir}/monetdb5/run_*.mal
+rm -f %{buildroot}%{_libdir}/monetdb5/lib_run_*.so
+rm -f %{buildroot}%{_libdir}/monetdb5/microbenchmark.mal
+rm -f %{buildroot}%{_libdir}/monetdb5/lib_microbenchmark*.so
rm -f %{buildroot}%{_bindir}/monetdb_mtest.sh
rm -rf %{buildroot}%{_datadir}/monetdb # /cmake
diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py
--- a/NT/mksqlwxs.py
+++ b/NT/mksqlwxs.py
@@ -171,11 +171,9 @@ def main():
print(r' <Directory Id="lib" Name="lib">')
print(r' <Directory Id="monetdb5" Name="monetdb5">')
id = comp(features, id, 16,
- [r'lib\monetdb5\microbenchmark.mal'])
- id = comp(features, id, 16,
- [r'lib\monetdb5\{}'.format(x) for x in sorted(filter(lambda x:
x.startswith('_') and x.endswith('.dll') and ('geom' not in x) and ('pyapi' not
in x) and ('opt_sql_append' not in x), os.listdir(os.path.join(sys.argv[3],
'lib', 'monetdb5'))))])
+ [r'lib\monetdb5\{}'.format(x) for x in sorted(filter(lambda x:
x.startswith('_') and x.endswith('.dll') and ('geom' not in x) and ('pyapi' not
in x) and ('opt_sql_append' not in x) and ('run_' not in x) and
('microbenchmark' not in x), os.listdir(os.path.join(sys.argv[3], 'lib',
'monetdb5'))))])
id = comp(debug, id, 16,
- [r'lib\monetdb5\{}'.format(x) for x in sorted(filter(lambda x:
x.startswith('_') and x.endswith('.pdb') and ('geom' not in x) and
('opt_sql_append' not in x), os.listdir(os.path.join(sys.argv[3], 'lib',
'monetdb5'))))])
+ [r'lib\monetdb5\{}'.format(x) for x in sorted(filter(lambda x:
x.startswith('_') and x.endswith('.pdb') and ('geom' not in x) and
('opt_sql_append' not in x) and ('run_' not in x) and ('microbenchmark' not in
x), os.listdir(os.path.join(sys.argv[3], 'lib', 'monetdb5'))))])
id = comp(geom, id, 16,
[r'lib\monetdb5\{}'.format(x) for x in sorted(filter(lambda x:
x.startswith('_') and (x.endswith('.dll') or x.endswith('.pdb')) and ('geom' in
x), os.listdir(os.path.join(sys.argv[3], 'lib', 'monetdb5'))))])
id = comp(pyapi3, id, 16,
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
@@ -911,12 +911,6 @@ str MANUALcreateOverview(Client cntxt, M
str MATpack(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str MATpackIncrement(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str MATpackValues(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-str MBMmix(bat *ret, bat *batid);
-str MBMnormal(bat *ret, oid *base, lng *size, int *domain, int *stddev, int
*mean);
-str MBMrandom(bat *ret, oid *base, lng *size, int *domain);
-str MBMrandom_seed(bat *ret, oid *base, lng *size, int *domain, const int
*seed);
-str MBMskewed(bat *ret, oid *base, lng *size, int *domain, int *skew);
-str MBMuniform(bat *ret, oid *base, lng *size, int *domain);
int MCactiveClients(void);
str MCawakeClient(int id);
void MCcloseClient(Client c);
@@ -1026,12 +1020,6 @@ str RMTput(Client cntxt, MalBlkPtr mb, M
str RMTregister(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str RMTregisterSupervisor(int *ret, str *sup_uuid, str *query_uuid);
str RMTresolve(bat *ret, str *pat);
-str RUNadder(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-str RUNchoice(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-str RUNcostPrediction(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-str RUNisolation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-str RUNpickResult(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-str RUNvolumeCost(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str SAMPLEuniform(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str SERVERbindBAT(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str SERVERclient(void *res, const Stream *In, const Stream *Out);
@@ -1580,12 +1568,12 @@ void moveInstruction(MalBlkPtr mb, int p
void msab_dbfarminit(const char *dbfarm);
void msab_dbnameinit(const char *dbname);
void msab_dbpathinit(const char *dbpath);
-char *msab_deserialise(sabdb **ret, char *sabdb);
+char *msab_deserialise(sabdb **ret, const char *sabdb);
void msab_freeStatus(sabdb **ret);
char *msab_getDBfarm(char **ret);
char *msab_getDBname(char **ret);
char *msab_getMyStatus(sabdb **ret);
-char *msab_getStatus(sabdb **ret, char *dbname);
+char *msab_getStatus(sabdb **ret, const char *dbname);
char *msab_getUUID(char **ret);
char *msab_getUplogInfo(sabuplog *ret, const sabdb *db);
char *msab_marchConnection(const char *host, const int port);
diff --git a/cmake/monetdb-custom-targets.cmake
b/cmake/monetdb-custom-targets.cmake
--- a/cmake/monetdb-custom-targets.cmake
+++ b/cmake/monetdb-custom-targets.cmake
@@ -86,7 +86,7 @@ endif()
if(CANDLE_FOUND)
add_custom_target(create-wix-packages
COMMAND
- ${CMAKE_CPACK_COMMAND} -G WIX -C Debug
+ ${CMAKE_CPACK_COMMAND} -G WIX -C Release
WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
else()
add_custom_target(create-wix-packages
diff --git a/cmake/monetdb-versions.cmake b/cmake/monetdb-versions.cmake
--- a/cmake/monetdb-versions.cmake
+++ b/cmake/monetdb-versions.cmake
@@ -11,10 +11,7 @@ set(MONETDB_VERSION_MINOR "40")
set(MONETDB_VERSION_PATCH "0")
if(RELEASE_VERSION)
- math(EXPR MONETDB_VERSION_PATCH "${MONETDB_VERSION_PATCH} + 1")
- set(MONETDB_RELEASE "default")
-#else()
-# set(MONETDB_RELEASE "unreleased")
+ set(MONETDB_RELEASE "unreleased")
endif()
set(MONETDB_VERSION
"${MONETDB_VERSION_MAJOR}.${MONETDB_VERSION_MINOR}.${MONETDB_VERSION_PATCH}")
diff --git a/common/stream/stdio_stream.c b/common/stream/stdio_stream.c
--- a/common/stream/stdio_stream.c
+++ b/common/stream/stdio_stream.c
@@ -410,9 +410,6 @@ stream *
stdin_rastream(void)
{
const char *name = "<stdin>";
-#ifdef _MSC_VER
- return win_console_in_stream(name);
-#else
// Make an attempt to skip a BOM marker.
// It would be nice to integrate this with with the BOM removal code
// in text_stream.c but that is complicated. In text_stream,
@@ -433,6 +430,9 @@ stdin_rastream(void)
}
}
+#ifdef _MSC_VER
+ return win_console_in_stream(name);
+#else
return file_rstream(stdin, false, name);
#endif
}
diff --git a/common/utils/CMakeLists.txt b/common/utils/CMakeLists.txt
--- a/common/utils/CMakeLists.txt
+++ b/common/utils/CMakeLists.txt
@@ -63,7 +63,7 @@ target_link_libraries(mcrypt
if(WIN32)
target_compile_definitions(mcrypt
PRIVATE
- LIBMAL
+ LIBMONETDB5
LIBMAPI
LIBMCRYPT)
endif()
@@ -102,12 +102,7 @@ target_link_libraries(msabaoth
if(WIN32)
target_compile_definitions(msabaoth
PRIVATE
- LIBMAL
- LIBATOMS
- LIBKERNEL
LIBMSABAOTH
- LIBOPTIMIZER
- LIBSCHEDULER
LIBMONETDB5)
endif()
diff --git a/common/utils/mcrypt.h b/common/utils/mcrypt.h
--- a/common/utils/mcrypt.h
+++ b/common/utils/mcrypt.h
@@ -10,7 +10,7 @@
#define _SEEN_MCRYPT_H 1
#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__)
-#if !defined(LIBMAPI) && !defined(LIBMCRYPT) && !defined(LIBMAL)
+#if !defined(LIBMAPI) && !defined(LIBMCRYPT) && !defined(LIBMONETDB5)
#define mcrypt_export extern __declspec(dllimport)
#else
#define mcrypt_export extern __declspec(dllexport)
@@ -45,4 +45,3 @@ mcrypt_export char *mcrypt_RIPEMD160Sum(
mcrypt_export char *mcrypt_BackendSum(const char *string, size_t len);
mcrypt_export char *mcrypt_hashPassword(const char *algo, const char
*password, const char *challenge);
#endif
-
diff --git a/common/utils/msabaoth.c b/common/utils/msabaoth.c
--- a/common/utils/msabaoth.c
+++ b/common/utils/msabaoth.c
@@ -33,6 +33,7 @@
#include "msabaoth.h"
#include "mutils.h"
#include "muuid.h"
+#include "mstring.h"
#if defined(_MSC_VER) && _MSC_VER >= 1400
#define close _close
@@ -895,7 +896,7 @@ msab_getSingleStatus(const char *pathbuf
* is terminated by a NULL entry.
*/
char *
-msab_getStatus(sabdb** ret, char *dbname)
+msab_getStatus(sabdb** ret, const char *dbname)
{
DIR *d;
struct dirent *e;
@@ -1148,272 +1149,202 @@ msab_serialise(char **ret, const sabdb *
* Produces a sabdb struct out of a serialised string.
*/
char *
-msab_deserialise(sabdb **ret, char *sdb)
+msab_deserialise(sabdb **ret, const char *sdb)
{
char *dbname;
char *uri;
- int locked;
- int state;
- char *scens = "";
+ char *scens;
sabdb *s;
sabuplog *u;
- sablist *l;
- char *p;
- char *lasts;
+ const char *lasts;
char buf[FILENAME_MAX];
- char protover = 0;
- lasts = sdb;
- if ((p = strchr(lasts, ':')) == NULL) {
+ if (strncmp(sdb, "sabdb:", 6) != 0) {
snprintf(buf, sizeof(buf),
- "string does not contain a magic: %s", lasts);
- return(strdup(buf));
- }
- *p++ = '\0';
- if (strcmp(lasts, "sabdb") != 0) {
- snprintf(buf, sizeof(buf),
- "string is not a sabdb struct: %s", lasts);
- return(strdup(buf));
- }
- lasts = p;
- if ((p = strchr(p, ':')) == NULL) {
- snprintf(buf, sizeof(buf),
- "string does not contain a version number: %s",
lasts);
+ "string is not a sabdb struct: %s", sdb);
return(strdup(buf));
}
- *p++ = '\0';
- if (strcmp(lasts, "1") == 0) {
- /* Protocol 1 was used uptil Oct2012. Since Jul2012 a new state
- * SABdbStarting was introduced, but not exposed to the client
- * in serialise. In Feb2013, the path component was removed
- * and replaced by an URI field. This meant dbname could no
- * longer be deduced from path, and hence sent separately.
- * Since the conns property became useless in the light of the
- * added uri, it was dropped. On top of this, a laststop
- * property was added to the uplog struct.
- * These four changes were effectuated in protocol 2. When
- * reading protocol 1, we use the path field to set dbname, but
- * ignore the path information (and set uri to "<unknown>". The
- * SABdbStarting state never occurs. */
- } else if (strcmp(lasts, SABDBVER) != 0) {
+ sdb += 6;
+ /* Protocol 1 was used uptil Oct2012 and is no longer supported.
+ * Since Jul2012 a new state
+ * SABdbStarting was introduced, but not exposed to the client
+ * in serialise. In Feb2013, the path component was removed
+ * and replaced by a URI field. This meant dbname could no
+ * longer be deduced from path, and hence sent separately.
+ * Since the conns property became useless in the light of the
+ * added uri, it was dropped. On top of this, a laststop
+ * property was added to the uplog struct.
+ * These four changes were effectuated in protocol 2. When
+ * reading protocol 1, we use the path field to set dbname, but
+ * ignore the path information (and set uri to "<unknown>". The
+ * SABdbStarting state never occurs. */
+ if (strncmp(sdb, SABDBVER ":", sizeof(SABDBVER)) != 0) {
snprintf(buf, sizeof(buf),
- "string has unsupported version: %s", lasts);
+ "string has unsupported version: %s", sdb);
return(strdup(buf));
}
- protover = lasts[0];
- lasts = p;
- if ((p = strchr(p, ',')) == NULL) {
+ sdb += sizeof(SABDBVER);
+ lasts = strchr(sdb, ',');
+ if (lasts == NULL) {
snprintf(buf, sizeof(buf),
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
