Changeset: 10857ba4a716 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/10857ba4a716
Modified Files:
gdk/gdk.h
gdk/gdk_delta.c
tools/mserver/mserver5.1.in
Branch: Mar2025
Log Message:
Some spring cleaning.
diffs (136 lines):
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -380,8 +380,6 @@ gdk_export _Noreturn void GDKfatal(_In_z
#define THRDMASK (1U)
#define CHECKMASK (1U<<1)
#define CHECKDEBUG if (ATOMIC_GET(&GDKdebug) & CHECKMASK)
-#define PROPMASK (1U<<3) /* unused */
-#define PROPDEBUG if (ATOMIC_GET(&GDKdebug) & PROPMASK) /* unused */
#define IOMASK (1U<<4)
#define BATMASK (1U<<5)
#define PARMASK (1U<<7)
@@ -403,11 +401,6 @@ gdk_export _Noreturn void GDKfatal(_In_z
#define ALLOCMASK (1U<<26)
-/* M5, only; cf.,
- * monetdb5/mal/mal.h
- */
-#define OPTMASK (1U<<27)
-
#define HEAPMASK (1U<<28)
#define FORCEMITOMASK (1U<<29)
diff --git a/gdk/gdk_delta.c b/gdk/gdk_delta.c
--- a/gdk/gdk_delta.c
+++ b/gdk/gdk_delta.c
@@ -41,9 +41,8 @@ BATcommit(BAT *b, BUN size)
if (b == NULL)
return;
assert(size <= BATcount(b) || size == BUN_NONE);
- TRC_DEBUG(DELTA, "BATcommit1 %s free %zu ins " BUNFMT " base %p\n",
- BATgetId(b), b->theap->free, b->batInserted, b->theap->base);
+ BUN old = b->batInserted;
b->batInserted = size < BATcount(b) ? size : BATcount(b);
- TRC_DEBUG(DELTA, "BATcommit2 %s free %zu ins " BUNFMT " base %p\n",
- BATgetId(b), b->theap->free, b->batInserted, b->theap->base);
+ TRC_DEBUG(DELTA, "%s free %zu ins from " BUNFMT " to " BUNFMT " base
%p\n",
+ BATgetId(b), b->theap->free, old, b->batInserted,
b->theap->base);
}
diff --git a/tools/mserver/mserver5.1.in b/tools/mserver/mserver5.1.in
--- a/tools/mserver/mserver5.1.in
+++ b/tools/mserver/mserver5.1.in
@@ -152,6 +152,27 @@ data will be written to disk.
The name of the database that a client can connect to is
.BR in\-memory .
.TP
+.B \-\-read\-password\-initialize\-and\-exit
+Read an unencrypted password from standard input and use it to set the
+password for the
+.B monetdb
+administrator user, initialize the database, and exit.
+If the database was already initialized, the administrator password is
+not changed.
+This option is used by
+.IR monetdbd (1)
+when creating a new database with an administrator password and should
+not be used otherwise.
+.TP
+.B \-\-process\-wal\-and\-exit
+Stop the server immediately after processing the write-ahead log.
+.TP
+.B \-\-clean\-BBP
+Clean up junk BATs from the BBP (i.e. the database). These are BATs
+that were accidentally left around by older versions of the software
+(the current version is not known to do this) and so this option should
+not normally be used.
+.TP
\fB\-\-debug\fP[\fB=\fP\fIvalue\fP]
.PD 0
.TP
@@ -184,6 +205,9 @@ The value is an integer, which can be (a
.B 128
(PARMASK) Thread management
.TP
+.B 256
+(TESTINGMASK) Used for testing
+.TP
.B 512
(TMMASK) Transaction management
.TP
@@ -191,7 +215,7 @@ The value is an integer, which can be (a
(TEMMASK) Locks and Triggers
.TP
.B 4096
-(PERFMASK) BBP Performance (?)
+(PERFMASK) BBP Performance
.TP
.B 8192
(DELTAMASK) Delta debugging (?)
@@ -199,6 +223,12 @@ The value is an integer, which can be (a
.B 16384
(LOADMASK) Module loading
.TP
+.B 32768
+(PUSHCANDMASK)
+.TP
+.B 65536
+(TAILCHKMASK) Check sizes of .tail files during low-level commit
+.TP
.B 1048576
(ACCELMASK) Accelerator debugging
.TP
@@ -224,10 +254,6 @@ measurements
(ALLOCMASK) exhaustive GDK malloc & free tracing
for debugging (GDK developers, only)
.TP
-.B 134217728
-(OPTMASK) trace the actions, decisions and
-effects of MAL optimizers
-.TP
.B 268435456
(HEAPMASK) trace/debug HEAPextend;
used only for development & debugging
@@ -275,21 +301,6 @@ Equivalent to \fB\-\-debug=\fP\fI(THRDMA
.TP
.B \-\-transactions
Equivalent to \fB\-\-debug=\fP\fI(TMMASK | DELTAMASK | TEMMASK)\fP.
-.TP
-.B \-\-read\-password\-initialize\-and\-exit
-Read an unencrypted password from standard input and use it to set the
-password for the
-.B monetdb
-administrator user, initialize the database, and exit.
-If the database was already initialized, the administrator password is
-not changed.
-This option is used by
-.IR monetdbd (1)
-when creating a new database with an administrator password and should
-not be used otherwise.
-.TP
-.B \-\-process\-wal\-and\-exit
-Stop the server immediately after processing the write-ahead log.
.SH MSERVER5 PARAMETERS
.I Mserver5
instructs the GDK kernel through the MAL (MonetDB Assembler Language)
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
