Changeset: 2fd526026ddd for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/2fd526026ddd
Modified Files:
        .github/workflows/linux.yml
        clients/Tests/exports.stable.out
        gdk/gdk.h
        gdk/gdk_private.h
        gdk/gdk_system.h
        gdk/gdk_utils.c
        monetdb5/mal/mal_client.h
        monetdb5/mal/mal_private.h
        monetdb5/mal/mal_profiler.c
        monetdb5/mal/mal_session.c
        monetdb5/modules/kernel/algebra.c
        monetdb5/modules/mal/mal_mapi.c
        monetdb5/modules/mal/profiler.c
        monetdb5/optimizer/opt_mitosis.c
        monetdb5/optimizer/opt_pipes.c
        monetdb5/optimizer/optimizer.c
        sql/backends/monet5/rel_bin.c
        sql/backends/monet5/sql_execute.c
        sql/backends/monet5/sql_scenario.c
        sql/backends/monet5/sql_statement.c
        sql/backends/monet5/sql_statement.h
        sql/backends/monet5/sql_upgrades.c
        sql/server/rel_optimize_sel.c
        sql/server/rel_schema.c
        sql/server/rel_select.c
        sql/server/rel_unnest.c
        sql/server/sql_parser.y
        sql/server/sql_privileges.c
        tools/monetdbe/monetdbe.c
Branch: resource_management
Log Message:

merge with default


diffs (truncated from 7373 to 300 lines):

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -98,8 +98,8 @@ jobs:
             -DCMAKE_INSTALL_PREFIX=$HOME/MDB \
             -DPY3INTEGRATION=OFF \
             -DRINTEGRATION=OFF  \
-            -DCMAKE_BUILD_TYPE=Debug \
-            -DASSERT=ON \
+            -DCMAKE_BUILD_TYPE=Release \
+            -DASSERT=OFF \
             -DCMAKE_C_COMPILER=${{ matrix.c_compiler }} \
             -DBISON_EXECUTABLE=/opt/homebrew/opt/bison/bin/bison \
             -DCMAKE_SUMMARY=ON
diff --git a/clients/ChangeLog.Mar2025 b/clients/ChangeLog.Mar2025
--- a/clients/ChangeLog.Mar2025
+++ b/clients/ChangeLog.Mar2025
@@ -1,3 +1,9 @@
 # ChangeLog file for clients
 # This file is updated with Maddlog
 
+* Thu Sep 11 2025 Sjoerd Mullender <[email protected]>
+- Changed the --describe (-D) option of msqldump to really mean (as it
+  says in the manual) do a dump without the data.  Before, the output
+  looked like a dump, but could not necessarily be fed back into an
+  mserver5, i.e. it wasn't really a dump without data.
+
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
@@ -3510,12 +3510,12 @@ PCRElikeselect
 Select all head values of the first input BAT for which the@tail value is 
"like" the given (SQL-style) pattern and for@which the head value occurs in the 
tail of the second input@BAT.@Input is a dense-headed BAT, output is a 
dense-headed BAT with in@the tail the head value of the input BAT for which 
the@relationship holds.  The output BAT is sorted on the tail value.
 algebra
 markjoin
-command algebra.markjoin(X_0:bat[:any_1], X_1:bat[:any_1], X_2:bat[:oid], 
X_3:bat[:oid], X_4:lng) (X_5:bat[:oid], X_6:bat[:bit])
+command algebra.markjoin(X_0:bat[:any_1], X_1:bat[:any_1], X_2:bat[:oid], 
X_3:bat[:oid], X_4:bit, X_5:lng) (X_6:bat[:oid], X_7:bat[:bit])
 ALGmark2join
 Mark join with candidate lists
 algebra
 markjoin
-command algebra.markjoin(X_0:bat[:any_1], X_1:bat[:any_1], X_2:bat[:oid], 
X_3:bat[:oid], X_4:lng) (X_5:bat[:oid], X_6:bat[:oid], X_7:bat[:bit])
+command algebra.markjoin(X_0:bat[:any_1], X_1:bat[:any_1], X_2:bat[:oid], 
X_3:bat[:oid], X_4:bit, X_5:lng) (X_6:bat[:oid], X_7:bat[:oid], X_8:bat[:bit])
 ALGmark3join
 Mark join with candidate lists
 algebra
@@ -47258,11 +47258,6 @@ getType
 pattern inspect.getType(X_0:any_1):str
 INSPECTtypeName
 Return the concrete type of a variable (expression).
-inspect
-optimizer_stats
-pattern inspect.optimizer_stats() (X_0:bat[:str], X_1:bat[:int], X_2:bat[:lng])
-OPTstatistics
-Get optimizer use statistics, i.e. calls and total time
 io
 print
 pattern io.print(X_0:any_1):void
@@ -48894,13 +48889,13 @@ pattern optimizer.deadcode(X_0:str, X_1:
 OPTwrapper
 Dead code optimizer
 optimizer
-defaultfast
-pattern optimizer.defaultfast():str
-OPTwrapper
-(empty)
-optimizer
-defaultfast
-pattern optimizer.defaultfast(X_0:str, X_1:str):str
+defaultpipe
+pattern optimizer.defaultpipe():str
+OPTwrapper
+(empty)
+optimizer
+defaultpipe
+pattern optimizer.defaultpipe(X_0:str, X_1:str):str
 OPTwrapper
 Fast compound default optimizer pipe
 optimizer
@@ -48999,13 +48994,13 @@ pattern optimizer.mergetable(X_0:str, X_
 OPTwrapper
 Resolve the multi-table definitions
 optimizer
-minimalfast
-pattern optimizer.minimalfast():str
-OPTwrapper
-(empty)
-optimizer
-minimalfast
-pattern optimizer.minimalfast(X_0:str, X_1:str):str
+minimalpipe
+pattern optimizer.minimalpipe():str
+OPTwrapper
+(empty)
+optimizer
+minimalpipe
+pattern optimizer.minimalpipe(X_0:str, X_1:str):str
 OPTwrapper
 Fast compound minimal optimizer pipe
 optimizer
@@ -49029,6 +49024,16 @@ pattern optimizer.multiplex(X_0:str, X_1
 OPTwrapper
 Compiler for multiplexed instructions
 optimizer
+nomitosispipe
+pattern optimizer.nomitosispipe():str
+OPTwrapper
+(empty)
+optimizer
+nomitosispipe
+pattern optimizer.nomitosispipe(X_0:str, X_1:str):str
+OPTwrapper
+Fast compound optimizer pipe without mitosis
+optimizer
 optimize
 pattern optimizer.optimize(X_0:str, X_1:str):void
 QOToptimize
@@ -49084,6 +49089,16 @@ pattern optimizer.querylog(X_0:str, X_1:
 OPTwrapper
 Collect SQL query statistics
 optimizer
+recursivepipe
+pattern optimizer.recursivepipe():str
+OPTwrapper
+(empty)
+optimizer
+recursivepipe
+pattern optimizer.recursivepipe(X_0:str, X_1:str):str
+OPTwrapper
+Fast compound recursive optimizer pipe
+optimizer
 reduce
 pattern optimizer.reduce():str
 OPTwrapper
@@ -49124,6 +49139,16 @@ pattern optimizer.reorder(X_0:str, X_1:s
 OPTwrapper
 Reorder by dataflow dependencies
 optimizer
+sequentialpipe
+pattern optimizer.sequentialpipe():str
+OPTwrapper
+(empty)
+optimizer
+sequentialpipe
+pattern optimizer.sequentialpipe(X_0:str, X_1:str):str
+OPTwrapper
+Fast compound sequential optimizer pipe
+optimizer
 strimps
 pattern optimizer.strimps():str
 OPTwrapper
@@ -49187,7 +49212,7 @@ profiler
 closestream
 pattern profiler.closestream():void
 CMDcloseProfilerStream
-Stop offline proviling
+Stop offline profiling
 profiler
 cpuload
 command profiler.cpuload(X_0:lng, X_1:lng, X_2:lng, X_3:lng, X_4:lng) 
(X_5:int, X_6:int)
@@ -49214,11 +49239,6 @@ command profiler.getSystemTime():lng
 CMDgetSystemTime
 Obtain the user timing information.
 profiler
-getTrace
-pattern profiler.getTrace(X_0:str):bat[:any_1]
-CMDgetTrace
-Get the trace details of a specific event
-profiler
 getUserTime
 command profiler.getUserTime():lng
 CMDgetUserTime
@@ -49229,11 +49249,6 @@ command profiler.getlimit():int
 CMDgetprofilerlimit
 Get profiler limit
 profiler
-noop
-command profiler.noop():void
-CMDnoopProfiler
-Fetch any pending performance events
-profiler
 openstream
 pattern profiler.openstream():void
 CMDopenProfilerStream
@@ -49259,20 +49274,10 @@ unsafe pattern profiler.start():void
 CMDstartProfiler
 Start offline performance profiling
 profiler
-starttrace
-unsafe pattern profiler.starttrace():void
-CMDstartTrace
-Start collecting trace information
-profiler
 stop
 unsafe pattern profiler.stop():void
 CMDstopProfiler
 Stop offline performance profiling
-profiler
-stoptrace
-unsafe pattern profiler.stoptrace():void
-CMDstopTrace
-Stop collecting trace information
 pyapi3
 epilogue
 command pyapi3.epilogue():void
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
@@ -2945,12 +2945,12 @@ PCRElikeselect
 Select all head values of the first input BAT for which the@tail value is 
"like" the given (SQL-style) pattern and for@which the head value occurs in the 
tail of the second input@BAT.@Input is a dense-headed BAT, output is a 
dense-headed BAT with in@the tail the head value of the input BAT for which 
the@relationship holds.  The output BAT is sorted on the tail value.
 algebra
 markjoin
-command algebra.markjoin(X_0:bat[:any_1], X_1:bat[:any_1], X_2:bat[:oid], 
X_3:bat[:oid], X_4:lng) (X_5:bat[:oid], X_6:bat[:bit])
+command algebra.markjoin(X_0:bat[:any_1], X_1:bat[:any_1], X_2:bat[:oid], 
X_3:bat[:oid], X_4:bit, X_5:lng) (X_6:bat[:oid], X_7:bat[:bit])
 ALGmark2join
 Mark join with candidate lists
 algebra
 markjoin
-command algebra.markjoin(X_0:bat[:any_1], X_1:bat[:any_1], X_2:bat[:oid], 
X_3:bat[:oid], X_4:lng) (X_5:bat[:oid], X_6:bat[:oid], X_7:bat[:bit])
+command algebra.markjoin(X_0:bat[:any_1], X_1:bat[:any_1], X_2:bat[:oid], 
X_3:bat[:oid], X_4:bit, X_5:lng) (X_6:bat[:oid], X_7:bat[:oid], X_8:bat[:bit])
 ALGmark3join
 Mark join with candidate lists
 algebra
@@ -35758,11 +35758,6 @@ getType
 pattern inspect.getType(X_0:any_1):str
 INSPECTtypeName
 Return the concrete type of a variable (expression).
-inspect
-optimizer_stats
-pattern inspect.optimizer_stats() (X_0:bat[:str], X_1:bat[:int], X_2:bat[:lng])
-OPTstatistics
-Get optimizer use statistics, i.e. calls and total time
 io
 print
 pattern io.print(X_0:any_1):void
@@ -37374,13 +37369,13 @@ pattern optimizer.deadcode(X_0:str, X_1:
 OPTwrapper
 Dead code optimizer
 optimizer
-defaultfast
-pattern optimizer.defaultfast():str
-OPTwrapper
-(empty)
-optimizer
-defaultfast
-pattern optimizer.defaultfast(X_0:str, X_1:str):str
+defaultpipe
+pattern optimizer.defaultpipe():str
+OPTwrapper
+(empty)
+optimizer
+defaultpipe
+pattern optimizer.defaultpipe(X_0:str, X_1:str):str
 OPTwrapper
 Fast compound default optimizer pipe
 optimizer
@@ -37479,13 +37474,13 @@ pattern optimizer.mergetable(X_0:str, X_
 OPTwrapper
 Resolve the multi-table definitions
 optimizer
-minimalfast
-pattern optimizer.minimalfast():str
-OPTwrapper
-(empty)
-optimizer
-minimalfast
-pattern optimizer.minimalfast(X_0:str, X_1:str):str
+minimalpipe
+pattern optimizer.minimalpipe():str
+OPTwrapper
+(empty)
+optimizer
+minimalpipe
+pattern optimizer.minimalpipe(X_0:str, X_1:str):str
 OPTwrapper
 Fast compound minimal optimizer pipe
 optimizer
@@ -37509,6 +37504,16 @@ pattern optimizer.multiplex(X_0:str, X_1
 OPTwrapper
 Compiler for multiplexed instructions
 optimizer
+nomitosispipe
+pattern optimizer.nomitosispipe():str
+OPTwrapper
+(empty)
+optimizer
+nomitosispipe
+pattern optimizer.nomitosispipe(X_0:str, X_1:str):str
+OPTwrapper
+Fast compound optimizer pipe without mitosis
+optimizer
 optimize
 pattern optimizer.optimize(X_0:str, X_1:str):void
 QOToptimize
@@ -37564,6 +37569,16 @@ pattern optimizer.querylog(X_0:str, X_1:
 OPTwrapper
 Collect SQL query statistics
 optimizer
+recursivepipe
+pattern optimizer.recursivepipe():str
+OPTwrapper
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to