Changeset: b248ef12208e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/b248ef12208e
Modified Files:
MonetDB.spec
gdk/gdk_align.c
gdk/gdk_batop.c
gdk/gdk_private.h
sql/storage/bat/bat_storage.c
Branch: default
Log Message:
Merge with Sep2022 branch.
diffs (228 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -128,6 +128,7 @@ BuildRequires: pkgconfig(zlib)
BuildRequires: pkgconfig(liblz4) >= 1.8
%if %{with py3integration}
BuildRequires: pkgconfig(python3) >= 3.5
+# cannot use python3dist(numpy) because of CentOS 7
BuildRequires: python3-numpy
%endif
%if %{with rintegration}
@@ -343,7 +344,6 @@ Recommends: perl-DBD-monetdb >= 1.0
Recommends: php-monetdb >= 1.0
%endif
Requires: MonetDB5-server%{?_isa} = %{version}-%{release}
-Requires: python3-pymonetdb >= 1.0.6
%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} > 7
Recommends: python3dist(lz4)
Recommends: python3dist(scipy)
@@ -690,6 +690,7 @@ package. You probably don't need this,
Summary: MonetDB - Monet Database Management System
Group: Applications/Databases
Requires: %{name}-client-tests = %{version}-%{release}
+Requires: python3dist(pymonetdb) >= 1.0.6
BuildArch: noarch
%description testing-python
diff --git a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
@@ -136,7 +136,6 @@ Depends: ${shlibs:Depends}, libmonetdb-c
monetdb5-server (= ${source:Version}),
libdbd-monetdb-perl (>= 1.0),
php-monetdb (>= 1.0),
- python3-pymonetdb (>= 1.0.6),
monetdb5-server (= ${source:Version})
Description: MonetDB client testing tools
MonetDB is a database management system that is developed from a
@@ -328,6 +327,7 @@ Description: MonetDB embedded testing to
Package: monetdb-testing-python
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, python3,
+ python3-pymonetdb (>= 1.0.6),
monetdb-client-testing (= ${source:Version})
Description: MonetDB testing Python programs
MonetDB is a database management system that is developed from a
diff --git a/documentation/source/manual_pages/monetdb.rst
b/documentation/source/manual_pages/monetdb.rst
--- a/documentation/source/manual_pages/monetdb.rst
+++ b/documentation/source/manual_pages/monetdb.rst
@@ -56,10 +56,9 @@ COMMANDS
The commands for the *monetdb* utility are **create**, **destroy**,
**lock**, **release**, **status**, **start**, **stop**, **kill**,
-**profilerstart**, **profilerstop**, **snapshot**, **set**, **get**,
-**inherit**, **discover**, **help**, and **version**. The commands
-facilitate adding, removing, maintaining, starting and stopping a
-database inside the MonetDB Database Server.
+**snapshot**, **set**, **get**, **inherit**, **discover**, **help**, and
+**version**. The commands facilitate adding, removing, maintaining,
+starting and stopping a database inside the MonetDB Database Server.
For all commands, database arguments can be glob-like expressions. This
allows to do wildcard matches. For details on the syntax, see
@@ -186,7 +185,7 @@ successful.
**monetdb snapshot write**\ *dbname*
Takes a snapshot of the given database and writes it to stdout.
-**monetdb snapshot create [-t**\ *targetfile*\ **]**\ *dbname*\ **[**\
*dbname*\ **..]**
+**monetdb snapshot create [-t**\ *targetfile*\ **]**\ *dbname*\ **[**\
*dbname*\ **...]**
Takes a snapshot of the given databases. Here, *dbname* can be either
the name of a single database or a pattern such as *staging\**
indicating multiple databases to snapshot. Unless **-t** is given,
@@ -200,7 +199,7 @@ successful.
be somewhere under *snapshotdir* but which does not have to follow
any particular naming convention.
-**monetdb snapshot list [**\ *dbname*\ **..]**
+**monetdb snapshot list [**\ *dbname*\ **...]**
Lists the snapshots for the given databases, or all databases if none
is given, showing the snapshot id, the time the snapshot was taken
and the (compressed) size of the snapshot file. Only snapshots
@@ -220,11 +219,11 @@ successful.
*snapshotid* is a full path. When **-f** is given, no confirmation is
asked when overwriting an existing database.
-**monetdb snapshot destroy [-f]**\ *name*\ **@**\ *tag*\ **..**
+**monetdb snapshot destroy [-f]**\ *name*\ **@**\ *tag*\ **[**\ *name*\ **@**\
*tag*\ **...]**
Delete the listed snapshots from the *snapshotdir* directory. When
**-f** is given, no confirmation is asked.
-**monetdb snapshot destroy [-f] -r**\ *N*\ *dbname*\ **..**
+**monetdb snapshot destroy [-f] -r**\ *N*\ *dbname*\ **[**\ *dbname*\ **...]**
Delete all but the *N* latest snapshots for the given databases.
Again, *dbname* can be a pattern such as *staging\** or even *\** to
work on all snapshotted databases. When **-f** is given, no
@@ -280,6 +279,12 @@ successful.
Defines how the server interprets literal strings. See the
*mserver5*\ (1) manpage for more details.
+ **loadmodules=**\ *module-list*
+ Enable the modules in *module-list* for the given database. The
+ *module-list* is a comma or space separated list of module names
+ and translates to a **--loadmodule=**\ *module*\ **option to**
+ *mserver5*\ (1) for each of the modules in the list.
+
**inherit**\ *property*\ *database*\ **[**\ *database*\ **...]**
Like set, but unsets the database-local value, and reverts to inherit
from the default again.
diff --git a/documentation/source/manual_pages/monetdbd.rst.in
b/documentation/source/manual_pages/monetdbd.rst.in
--- a/documentation/source/manual_pages/monetdbd.rst.in
+++ b/documentation/source/manual_pages/monetdbd.rst.in
@@ -94,6 +94,12 @@ Server, and retrieving or setting option
running *monetdbd* to reload the properties file (if running). For an
explanation of the properties, see the *CONFIGURATION* section below.
+**help** [ *command* ]
+ Shows general help, or short help for a given command.
+
+**version**
+ Shows the version and release information of *monetdbd*.
+
CONFIGURATION
=============
@@ -108,6 +114,14 @@ using the **set** command. The following
point to e.g. another medium. Changing this property takes effect
immediately at runtime.
+**loglevel**
+ This property defines the level of what messages should be logged. It
+ can be: error or warning or information or debug. Defaut is
+ information. When loglevel is error, only errors are logged. When
+ loglevel is warning, errors and warnings are logged. When loglevel is
+ information, errors and warnings and information messages are logged.
+ When loglevel is debug, all messages are logged.
+
**pidfile**
*Monetdbd* stores the process ID of the background server in the file
pointed to by this property. The same rules apply as for the
diff --git a/gdk/gdk_align.c b/gdk/gdk_align.c
--- a/gdk/gdk_align.c
+++ b/gdk/gdk_align.c
@@ -274,16 +274,16 @@ BATmaterialize(BAT *b, BUN cap)
* the underlying BAT and compensates for outliers.
*/
void
-VIEWbounds(BAT *b, BAT *view, BUN l, BUN h)
+VIEWboundsbi(BATiter *bi, BAT *view, BUN l, BUN h)
{
BUN cnt;
BUN baseoff;
- if (b == NULL || view == NULL)
+ if (bi == NULL || view == NULL)
return;
- if (h > BATcount(b))
- h = BATcount(b);
- baseoff = b->tbaseoff;
+ if (h > bi->count)
+ h = bi->count;
+ baseoff = bi->baseoff;
if (h < l)
h = l;
cnt = h - l;
@@ -319,6 +319,13 @@ VIEWbounds(BAT *b, BAT *view, BUN l, BUN
view->tmaxpos = BUN_NONE;
view->tkey |= cnt <= 1;
}
+void
+VIEWbounds(BAT *b, BAT *view, BUN l, BUN h)
+{
+ BATiter bi = bat_iterator(b);
+ VIEWboundsbi(&bi, view, l, h);
+ bat_iterator_end(&bi);
+}
/*
* Destroy a view.
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -1814,7 +1814,7 @@ BATslice(BAT *b, BUN l, BUN h)
bn = VIEWcreate(b->hseqbase + low, b);
if (bn == NULL)
goto doreturn;
- VIEWbounds(b, bn, l, h);
+ VIEWboundsbi(&bi, bn, l, h);
} else {
/* create a new BAT and put everything into it */
BUN p = l;
diff --git a/gdk/gdk_private.h b/gdk/gdk_private.h
--- a/gdk/gdk_private.h
+++ b/gdk/gdk_private.h
@@ -279,6 +279,8 @@ gdk_return TMcommit(void)
gdk_return unshare_varsized_heap(BAT *b)
__attribute__((__warn_unused_result__))
__attribute__((__visibility__("hidden")));
+void VIEWboundsbi(BATiter *bi, BAT *view, BUN l, BUN h)
+ __attribute__((__visibility__("hidden")));
void VIEWdestroy(BAT *b)
__attribute__((__visibility__("hidden")));
BAT *virtualize(BAT *bn)
diff --git a/sql/storage/bat/bat_storage.c b/sql/storage/bat/bat_storage.c
--- a/sql/storage/bat/bat_storage.c
+++ b/sql/storage/bat/bat_storage.c
@@ -149,14 +149,17 @@ new_segment(segment *o, sql_trans *tr, s
n->ts = tr->tid;
n->oldts = 0;
n->deleted = false;
- n->start = 0;
+ if (o) {
+ n->start = o->end;
+ n->end = o->end + cnt;
+ } else {
+ n->start = 0;
+ n->end = cnt;
+ }
n->next = NULL;
n->prev = NULL;
- if (o) {
- n->start = o->end;
+ if (o)
o->next = n;
- }
- n->end = n->start + cnt;
}
return n;
}
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
