Changeset: 1cfa4916a274 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/1cfa4916a274
Modified Files:
clients/Tests/MAL-signatures-hge.test
clients/Tests/MAL-signatures.test
monetdb5/modules/atoms/mtime.c
monetdb5/modules/kernel/bat5.c
Branch: default
Log Message:
Merge with Dec2023 branch.
diffs (truncated from 805 to 300 lines):
diff --git a/clients/Tests/MAL-signatures-hge.test
b/clients/Tests/MAL-signatures-hge.test
--- a/clients/Tests/MAL-signatures-hge.test
+++ b/clients/Tests/MAL-signatures-hge.test
@@ -3999,16 +3999,6 @@ command bat.replace(X_0:bat[:any_1], X_1
BKCbun_inplace_force;
Replace the tail value of one BUN that has some head value.
bat
-reuse
-command bat.reuse(X_0:bat[:any_1], X_1:bat[:oid]):bat[:any_1]
-BKCreuseBAT;
-Shuffle the values around to restore a dense representation of buns.
-bat
-reuseMap
-command bat.reuseMap(X_0:bat[:any_1], X_1:bat[:oid]):bat[:oid]
-BKCreuseBATmap;
-Derive the oid mapping for reuse BAT based on list of to-be-deleted
-bat
save
command bat.save(X_0:bat[:any_1]):void
BKCsave2;
diff --git a/clients/Tests/MAL-signatures.test
b/clients/Tests/MAL-signatures.test
--- a/clients/Tests/MAL-signatures.test
+++ b/clients/Tests/MAL-signatures.test
@@ -3424,16 +3424,6 @@ command bat.replace(X_0:bat[:any_1], X_1
BKCbun_inplace_force;
Replace the tail value of one BUN that has some head value.
bat
-reuse
-command bat.reuse(X_0:bat[:any_1], X_1:bat[:oid]):bat[:any_1]
-BKCreuseBAT;
-Shuffle the values around to restore a dense representation of buns.
-bat
-reuseMap
-command bat.reuseMap(X_0:bat[:any_1], X_1:bat[:oid]):bat[:oid]
-BKCreuseBATmap;
-Derive the oid mapping for reuse BAT based on list of to-be-deleted
-bat
save
command bat.save(X_0:bat[:any_1]):void
BKCsave2;
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
@@ -753,10 +753,6 @@ str AUTHunlockVault(const char *password
str AUTHverifyPassword(const char *passwd);
str BKCmirror(bat *ret, const bat *bid);
str BKCnewBAT(bat *res, const int *tt, const BUN *cap, role_t role);
-str BKCreuseBAT(bat *ret, const bat *bid, const bat *did);
-str BKCsetName(void *r, const bat *bid, const char *const *s);
-str BKCsetPersistent(void *r, const bat *bid);
-str BKCshrinkBAT(bat *ret, const bat *bid, const bat *did);
str CLTsessions(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CLTshutdown(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str COPYrejects(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
diff --git a/clients/mapiclient/msqldump.c b/clients/mapiclient/msqldump.c
--- a/clients/mapiclient/msqldump.c
+++ b/clients/mapiclient/msqldump.c
@@ -203,7 +203,11 @@ main(int argc, char **argv)
passwd = passwd_allocated;
}
- mid = mapi_mapi(host, port, user, passwd, "sql", dbname);
+ if (dbname != NULL && strchr(dbname, ':') != NULL) {
+ mid = mapi_mapiuri(dbname, user, passwd, "sql");
+ } else {
+ mid = mapi_mapi(host, port, user, passwd, "sql", dbname);
+ }
free(user_allocated);
user_allocated = NULL;
free(passwd_allocated);
@@ -215,6 +219,10 @@ main(int argc, char **argv)
fprintf(stderr, "failed to allocate Mapi structure\n");
exit(2);
}
+ if (mapi_error(mid)) {
+ mapi_explain(mid, stderr);
+ exit(2);
+ }
mapi_set_time_zone(mid, 0);
mapi_reconnect(mid);
if (mapi_error(mid)) {
diff --git a/clients/mapilib/parseurl.c b/clients/mapilib/parseurl.c
--- a/clients/mapilib/parseurl.c
+++ b/clients/mapilib/parseurl.c
@@ -514,7 +514,7 @@ parse_by_scheme(msettings *mp, scanner *
msetting_set_bool(mp, MP_TLS, false);
return parse_classic(mp, sc);
} else {
- return complain(sc, "unknown scheme '%s'", scheme);
+ return complain(sc, "unknown URL scheme '%s'", scheme);
}
}
diff --git a/documentation/source/build-fedora.rst
b/documentation/source/build-fedora.rst
--- a/documentation/source/build-fedora.rst
+++ b/documentation/source/build-fedora.rst
@@ -16,7 +16,7 @@ These packages are required.
| cmake # version >= 3.12
| bison
-| gettext-devel
+| gcc
| libxml2-devel
| mercurial
diff --git a/documentation/source/build.rst b/documentation/source/build.rst
--- a/documentation/source/build.rst
+++ b/documentation/source/build.rst
@@ -6,18 +6,18 @@ Summary
=======
For cmake, you should always build the code in a separate directory, say
-"build". This directory should be outside of the source code tree. The
-results of the build are stored in this directory. The location on the
+"build". This directory should be outside of the source code tree. The
+results of the build are stored in this directory. The location in the
filesystem is not important, as long as you have permissions to write in
that location.
Assuming the MonetDB source code is checked out in directory
"/path/to/monetdb/source", and if you have all the required packages
(see below) to build MonetDB, these are the set of commands to build and
-install it from source. Install is one of the predefined targets
-[``install``, ``test``, ``mtest``]. When you test MonetDB, you will
+install it from source. Install is one of the predefined targets
+[``install``, ``test``, ``mtest``]. When you test MonetDB, you will
likely not want to install it in the default location, the standard GNU
-directory structure. So you may want to set the install prefix variable
+directory structure. So you may want to set the install prefix variable
when generating the build system, using ``-DCMAKE_INSTALL_PREFIX``::
mkdir build
@@ -37,8 +37,8 @@ Role of clients?? How to install
For testing, you likely don't want to install in the default location,
so you need to add the installation prefix parameter to the cmake
-command. But you do not need any configuration to run mtest (on
-Linux). Just run the command::
+command. But you do not need any configuration to run mtest (on Linux).
+Just run the command::
cmake --build . --target mtest
@@ -47,29 +47,29 @@ Configuration options
The way options interact with building of the MonetDB source has
fundamentally changed from the way this was done using the autotools
-build system. Now almost all options are on by default. And these options
-mostly control library detection. In the old system, it was possible to
-build a subset of the code base. For example, you could choose not to
-build the sql part. Now the every part of the code is build, as long as
-the dependent libraries are detected. And by default, the system would
-try to detect all dependent libraries. If your system does not have a
-required library, that section of the code will not be build. Only if
-you want to prevent the build of a certain section, you could use the
-option to prevent that a dependency is detected.
+build system. Now almost all options are on by default. And these
+options mostly control library detection. In the old system, it was
+possible to build a subset of the code base. For example, you could
+choose not to build the sql part. Now every part of the code is built,
+as long as the dependent libraries are detected. And by default, the
+system would try to detect all dependent libraries. If your system does
+not have a required library, that section of the code will not be built.
+Only if you want to prevent the build of a certain section, you could
+use the option to prevent that a dependency is detected.
Evidently there are several options to control as illustrated in
``$SOURCE/cmake/monetdb-options.cmake``
The important once to choose from are ``-DCMAKE_BUILD_TYPE``, which
-takes the value Release, Debug, RelWithDebInfo and MinSizeRel. The
-first creates the binary ready for shipping, including all compiler
-optimizations that come with it. The Debug mode is necessary if you
-plan to debug the binary and needs access to the symbol tables. This
-build type also typically leads to a slower execution time, because
-also all kinds of assertions are being checked. The RelWithDebInfo
-combines Release and Debug with both compiler optimizations and symbol
-tables for debugging. Finally MinSizeRel is a Release build optimized
-for binary size instead of speed.
+takes the value ``Release``, ``Debug``, ``RelWithDebInfo`` and
+``MinSizeRel``. The first creates the binary ready for shipping,
+including all compiler optimizations that come with it. The ``Debug``
+mode is necessary if you plan to debug the binary and need access to the
+symbol tables. This build type also typically leads to a slower
+execution time, because all kinds of assertions will be checked. The
+``RelWithDebInfo`` combines ``Release`` and ``Debug`` with both compiler
+optimizations and symbol tables for debugging. Finally ``MinSizeRel``
+is a Release build optimized for binary size instead of speed.
Other relevant properties are also ``-DASSERT=ON`` and ``-DSTRICT=ON``,
used in combination with a Debug build, e.g.::
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -1717,7 +1717,7 @@ gdk_export gdk_return GDKtracer_fill_com
GDKtracer_log(__FILE__, __func__, __LINE__, M_ERROR, \
GDK, NULL, format, ##__VA_ARGS__)
#define GDKsyserr(errno, format, ...) \
- GDKtracer_log(__FILE__, __func__, __LINE__, M_CRITICAL, \
+ GDKtracer_log(__FILE__, __func__, __LINE__, M_ERROR, \
GDK, GDKstrerror(errno, (char[64]){0}, 64), \
format, ##__VA_ARGS__)
#define GDKsyserror(format, ...) GDKsyserr(errno, format, ##__VA_ARGS__)
diff --git a/gdk/gdk_system_private.h b/gdk/gdk_system_private.h
--- a/gdk/gdk_system_private.h
+++ b/gdk/gdk_system_private.h
@@ -31,7 +31,7 @@ bool MT_thread_override_limits(void)
MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), \
(LPTSTR) _osmsgbuf, sizeof(_osmsgbuf), \
NULL); \
- GDKtracer_log(__FILE__, __func__, __LINE__, M_CRITICAL, \
+ GDKtracer_log(__FILE__, __func__, __LINE__, M_ERROR, \
GDK, _osmsgbuf, format, ##__VA_ARGS__); \
SetLastError(0); \
} while (0)
diff --git a/monetdb5/ChangeLog.Dec2023 b/monetdb5/ChangeLog.Dec2023
--- a/monetdb5/ChangeLog.Dec2023
+++ b/monetdb5/ChangeLog.Dec2023
@@ -1,6 +1,9 @@
# ChangeLog file for MonetDB5
# This file is updated with Maddlog
+* Tue Dec 19 2023 Sjoerd Mullender <sjo...@acm.org>
+- Removed MAL functions bat.reuse and bat.reuseMap.
+
* Wed Dec 6 2023 Sjoerd Mullender <sjo...@acm.org>
- The MAL functions io.import and io.export have been removed.
diff --git a/monetdb5/mal/Tests/All b/monetdb5/mal/Tests/All
--- a/monetdb5/mal/Tests/All
+++ b/monetdb5/mal/Tests/All
@@ -161,7 +161,6 @@ tst810
tst819
tst840
tst850
-tst866
tst870
tst880
tst890
diff --git a/monetdb5/mal/Tests/tst866.maltest
b/monetdb5/mal/Tests/tst866.maltest
deleted file mode 100644
--- a/monetdb5/mal/Tests/tst866.maltest
+++ /dev/null
@@ -1,76 +0,0 @@
-statement ok
-function foo();
-b:= bat.new(:int);
-bat.append(b,1);
-bat.append(b,2);
-bat.append(b,3);
-bat.append(b,4);
-bat.append(b,5);
-bat.append(b,6);
-bat.append(b,7);
-bat.append(b,8);
-bat.append(b,9);
-io.print(b);
-d:= bat.new(:oid);
-bat.append(d,1@0);
-bat.append(d,2@0);
-bat.append(d,7@0);
-io.print(d);
-s:= bat.reuse(b,d);
-io.print(s);
-so:= bat.reuseMap(b,d);
-io.print(so);
-end foo;
-
-query II rowsort
-user.foo();
-----
-0
-0
-0
-1
-0
-1
-0
-1
-1
-2
-1
-2
-1
-3
-1
-4
-2
-3
-2
-4
-2
-5
-2
-7
-3
-4
-3
-5
-3
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
