Changeset: 6b9c535d9b10 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6b9c535d9b10 Added Files: sql/scripts/61_wlcr.sql sql/test/mergetables/Tests/sqlsmith-exists.sql sql/test/subquery/Tests/subquery3.sql sql/test/wlcr/Tests/wlc80.py sql/test/wlcr/Tests/wlr10.py sql/test/wlcr/Tests/wlr10.stable.err sql/test/wlcr/Tests/wlr10.stable.out sql/test/wlcr/Tests/wlr80.py Modified Files: Makefile.ag MonetDB.spec NT/rules.msc buildtools/doc/HowToRelease.rst buildtools/doc/windowsbuild.rst clients/R/Tests/copy_into_fwf.stable.err clients/R/Tests/dbi.stable.err clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out configure.ag debian/rules gdk/gdk.h gdk/gdk_bat.c geom/Makefile.ag monetdb5/mal/mal.h monetdb5/mal/mal_client.c monetdb5/mal/mal_client.h monetdb5/mal/mal_interpreter.c monetdb5/mal/mal_profiler.c monetdb5/mal/mal_resource.c monetdb5/mal/mal_resource.h monetdb5/mal/mal_runtime.c monetdb5/mal/mal_runtime.h monetdb5/modules/atoms/json.c monetdb5/modules/mal/clients.c monetdb5/modules/mal/clients.h monetdb5/modules/mal/clients.mal monetdb5/modules/mal/mdb.c monetdb5/modules/mal/sysmon.c monetdb5/modules/mal/wlc.c monetdb5/modules/mal/wlc.h monetdb5/modules/mal/wlc.mal sql/backends/monet5/sql_scenario.c sql/backends/monet5/sql_upgrades.c sql/backends/monet5/vaults/fits/fits.c sql/backends/monet5/wlr.c sql/backends/monet5/wlr.h sql/backends/monet5/wlr.mal sql/common/sql_types.c sql/scripts/60_wlcr.sql sql/scripts/Makefile.ag sql/server/sql_partition.c sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-0.Bug-3063.stable.out sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-1.Bug-3063.stable.out sql/test/Dependencies/Tests/Dependencies.stable.out sql/test/Dependencies/Tests/Dependencies.stable.out.int128 sql/test/Tests/copy-from-lz4.py sql/test/bugs/Tests/groupby_having_charlength-bug-sf-943566.stable.out sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128 sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade/Tests/upgrade.stable.out sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128 sql/test/emptydb/Tests/check.stable.out sql/test/emptydb/Tests/check.stable.out.32bit sql/test/emptydb/Tests/check.stable.out.int128 sql/test/mergetables/Tests/All sql/test/subquery/Tests/All sql/test/subquery/Tests/subquery2.sql sql/test/sys-schema/Tests/systemfunctions.stable.out sql/test/sys-schema/Tests/systemfunctions.stable.out.int128 sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade/Tests/upgrade.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 sql/test/wlcr/Tests/All sql/test/wlcr/Tests/wlc01.py sql/test/wlcr/Tests/wlc01.stable.out sql/test/wlcr/Tests/wlc100.py sql/test/wlcr/Tests/wlc20.py sql/test/wlcr/Tests/wlc21.py sql/test/wlcr/Tests/wlc30.py sql/test/wlcr/Tests/wlc40.py sql/test/wlcr/Tests/wlc50.py sql/test/wlcr/Tests/wlc70.py sql/test/wlcr/Tests/wlcr00.py sql/test/wlcr/Tests/wlr01.py sql/test/wlcr/Tests/wlr01.stable.err sql/test/wlcr/Tests/wlr01.stable.out sql/test/wlcr/Tests/wlr100.py sql/test/wlcr/Tests/wlr100.stable.err sql/test/wlcr/Tests/wlr100.stable.out sql/test/wlcr/Tests/wlr20.py sql/test/wlcr/Tests/wlr20.stable.err sql/test/wlcr/Tests/wlr20.stable.out sql/test/wlcr/Tests/wlr30.py sql/test/wlcr/Tests/wlr30.stable.err sql/test/wlcr/Tests/wlr30.stable.out sql/test/wlcr/Tests/wlr40.py sql/test/wlcr/Tests/wlr40.stable.err sql/test/wlcr/Tests/wlr40.stable.out sql/test/wlcr/Tests/wlr50.py sql/test/wlcr/Tests/wlr50.stable.err sql/test/wlcr/Tests/wlr50.stable.out sql/test/wlcr/Tests/wlr70.py sql/test/wlcr/Tests/wlr70.stable.err sql/test/wlcr/Tests/wlr70.stable.out testing/Mtest.py.in tools/Makefile.ag tools/merovingian/Makefile.ag tools/merovingian/daemon/connections.c tools/merovingian/daemon/handlers.c tools/merovingian/daemon/merovingian.c tools/merovingian/daemon/merovingian.h Branch: grouping-analytics Log Message:
Merge with default diffs (truncated from 7901 to 300 lines): diff --git a/Makefile.ag b/Makefile.ag --- a/Makefile.ag +++ b/Makefile.ag @@ -5,9 +5,9 @@ # Copyright 1997 - July 2008 CWI, August 2008 - 2019 MonetDB B.V. SUBDIRS = buildtools common clients \ - HAVE_GDK?gdk \ - HAVE_MONETDB5?monetdb5 \ - HAVE_SQL?sql \ + gdk \ + monetdb5 \ + sql \ HAVE_GEOM?geom \ tools \ HAVE_TESTING?testing \ diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -60,7 +60,7 @@ # derivatives (CentOS, Scientific Linux), the liblas library is only # available if EPEL is enabled, and then only on version 7. %if %{fedpkgs} -%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7 +%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} == 7 # By default create the MonetDB-lidar package on Fedora and RHEL 7 %bcond_without lidar %endif @@ -959,12 +959,10 @@ export CFLAGS --enable-embedded=no \ --enable-embedded-r=no \ --enable-fits=%{?with_fits:yes}%{!?with_fits:no} \ - --enable-gdk=yes \ --enable-geom=%{?with_geos:yes}%{!?with_geos:no} \ --enable-int128=%{?with_hugeint:yes}%{!?with_hugeint:no} \ --enable-lidar=%{?with_lidar:yes}%{!?with_lidar:no} \ --enable-mapi=yes \ - --enable-monetdb5=yes \ --enable-netcdf=no \ --enable-odbc=yes \ --enable-py2integration=%{?with_py2integration:yes}%{!?with_py2integration:no} \ @@ -972,7 +970,6 @@ export CFLAGS --enable-rintegration=%{?with_rintegration:yes}%{!?with_rintegration:no} \ --enable-sanitizer=no \ --enable-shp=no \ - --enable-sql=yes \ --enable-static-analysis=no \ --enable-strict=no \ --enable-testing=yes \ diff --git a/NT/rules.msc b/NT/rules.msc --- a/NT/rules.msc +++ b/NT/rules.msc @@ -297,11 +297,6 @@ create_winconfig_conds_new_py: !ELSE $(ECHO) HAVE_FITS_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py" !ENDIF -!IFDEF HAVE_GDK - $(ECHO) HAVE_GDK_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py" -!ELSE - $(ECHO) HAVE_GDK_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py" -!ENDIF !IFDEF HAVE_GEOM $(ECHO) HAVE_GEOM_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py" !ELSE @@ -352,11 +347,6 @@ create_winconfig_conds_new_py: !ELSE $(ECHO) HAVE_LIDAR_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py" !ENDIF -!IFDEF HAVE_MONETDB5 - $(ECHO) HAVE_MONETDB5_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py" -!ELSE - $(ECHO) HAVE_MONETDB5_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py" -!ENDIF !IFDEF HAVE_NETCDF $(ECHO) HAVE_NETCDF_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py" !ELSE @@ -392,11 +382,6 @@ create_winconfig_conds_new_py: !ELSE $(ECHO) HAVE_MAL_DEBUGGER_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py" !ENDIF -!IFDEF HAVE_SQL - $(ECHO) HAVE_SQL_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py" -!ELSE - $(ECHO) HAVE_SQL_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py" -!ENDIF !IFDEF HAVE_TESTING $(ECHO) HAVE_TESTING_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py" !ELSE @@ -412,11 +397,6 @@ create_winconfig_conds_new_py: !ELSE $(ECHO) NOT_WIN32_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py" !ENDIF -!IFDEF PROFILING - $(ECHO) PROFILING_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py" -!ELSE - $(ECHO) PROFILING_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py" -!ENDIF update_winconfig_conds_py: create_winconfig_conds_new_py if not exist "$(TOPDIR)\winconfig_conds.py" $(CP) "$(TOPDIR)\winconfig_conds_new.py" "$(TOPDIR)\winconfig_conds.py" diff --git a/buildtools/doc/HowToRelease.rst b/buildtools/doc/HowToRelease.rst --- a/buildtools/doc/HowToRelease.rst +++ b/buildtools/doc/HowToRelease.rst @@ -117,10 +117,10 @@ Releasing correct compiler, i.e., Microsoft Visual Studio 8, and options: Use these ``nmake`` options for a 32 bit compile: ``NDEBUG=1 - HAVE_PYTHON=1 HAVE_PCRE=1 HAVE_MONETDB5=1`` + HAVE_PYTHON=1 HAVE_PCRE=1`` Use these ``nmake`` options for a 64 bit compile: ``bits=64 NDEBUG=1 - HAVE_MONETDB5=1 HAVE_PYTHON=1 HAVE_PCRE=1`` + HAVE_PYTHON=1 HAVE_PCRE=1`` - Create PGP signatures and SHA1 checksums:: diff --git a/buildtools/doc/windowsbuild.rst b/buildtools/doc/windowsbuild.rst --- a/buildtools/doc/windowsbuild.rst +++ b/buildtools/doc/windowsbuild.rst @@ -761,8 +761,6 @@ possible: - ``DEBUG=1`` - compile with extra debugging information - ``NDEBUG=1`` - compile without extra debugging information (this is used for creating a binary release); -- ``HAVE_MONETDB5=1`` - include the MonetDB5 component; -- ``HAVE_SQL=1`` - include the sql component; - ``HAVE_GEOM=1`` - include the geom component; - ``HAVE_TESTING=1`` - include the testing component; - ``HAVE_PYTHON=1`` - include the Python component; diff --git a/clients/R/Tests/copy_into_fwf.stable.err b/clients/R/Tests/copy_into_fwf.stable.err --- a/clients/R/Tests/copy_into_fwf.stable.err +++ b/clients/R/Tests/copy_into_fwf.stable.err @@ -28,6 +28,8 @@ stderr of test 'copy_into_fwf` in direct # 16:40:23 > "R" "--vanilla" "--slave" "--args" "30658" # 16:40:23 > +Warning message: +S3 methods ‘[.fun_list’, ‘[.grouped_df’, ‘all.equal.tbl_df’, ‘anti_join.data.frame’, ‘anti_join.tbl_df’, ‘arrange.data.frame’, ‘arrange.default’, ‘arrange.grouped_df’, ‘arrange.tbl_df’, ‘arrange_.data.frame’, ‘arrange_.tbl_df’, ‘as.data.frame.grouped_df’, ‘as.data.frame.rowwise_df’, ‘as.data.frame.tbl_cube’, ‘as.table.tbl_cube’, ‘as.tbl.data.frame’, ‘as.tbl.tbl’, ‘as.tbl_cube.array’, ‘as.tbl_cube.data.frame’, ‘as.tbl_cube.matrix’, ‘as.tbl_cube.table’, ‘as_tibble.grouped_df’, ‘as_tibble.tbl_cube’, ‘auto_copy.tbl_cube’, ‘auto_copy.tbl_df’, ‘cbind.grouped_df’, ‘collapse.data.frame’, ‘collect.data.frame’, ‘common_by.NULL’, ‘common_by.character’, ‘common_by.default’, ‘common_by.list’, ‘compute.data.frame’, ‘copy_to.DBIConnection’, ‘copy_to.src_local’, ‘default_missing.data.frame’, ‘default_missing.default’, ‘dim.tbl_cube’, ‘distinct.data.f [... truncated] # 16:40:23 > # 16:40:23 > "Done." diff --git a/clients/R/Tests/dbi.stable.err b/clients/R/Tests/dbi.stable.err --- a/clients/R/Tests/dbi.stable.err +++ b/clients/R/Tests/dbi.stable.err @@ -30,6 +30,8 @@ stderr of test 'dbi` in directory 'clien # 12:27:25 > "R" "--vanilla" "--slave" "--args" "31728" # 12:27:25 > +Warning message: +S3 methods ‘[.fun_list’, ‘[.grouped_df’, ‘all.equal.tbl_df’, ‘anti_join.data.frame’, ‘anti_join.tbl_df’, ‘arrange.data.frame’, ‘arrange.default’, ‘arrange.grouped_df’, ‘arrange.tbl_df’, ‘arrange_.data.frame’, ‘arrange_.tbl_df’, ‘as.data.frame.grouped_df’, ‘as.data.frame.rowwise_df’, ‘as.data.frame.tbl_cube’, ‘as.table.tbl_cube’, ‘as.tbl.data.frame’, ‘as.tbl.tbl’, ‘as.tbl_cube.array’, ‘as.tbl_cube.data.frame’, ‘as.tbl_cube.matrix’, ‘as.tbl_cube.table’, ‘as_tibble.grouped_df’, ‘as_tibble.tbl_cube’, ‘auto_copy.tbl_cube’, ‘auto_copy.tbl_df’, ‘cbind.grouped_df’, ‘collapse.data.frame’, ‘collect.data.frame’, ‘common_by.NULL’, ‘common_by.character’, ‘common_by.default’, ‘common_by.list’, ‘compute.data.frame’, ‘copy_to.DBIConnection’, ‘copy_to.src_local’, ‘default_missing.data.frame’, ‘default_missing.default’, ‘dim.tbl_cube’, ‘distinct.data.f [... truncated] Identifier(s) "Sepal.Length", "Sepal.Width", "Petal.Length", "Petal.Width", "Species" contain uppercase or reserved SQL characters and need(s) to be quoted in queries. Warning message: 'MonetDBLite::isIdCurrent' is deprecated. diff --git a/clients/Tests/MAL-signatures.stable.out b/clients/Tests/MAL-signatures.stable.out --- a/clients/Tests/MAL-signatures.stable.out +++ b/clients/Tests/MAL-signatures.stable.out @@ -10732,17 +10732,14 @@ stdout of test 'MAL-signatures` in direc [ "clients", "changePassword", "pattern clients.changePassword(old:str, new:str):void ", "CLTchangePassword;", "Change the password for the current user" ] [ "clients", "changeUsername", "pattern clients.changeUsername(old:str, new:str):void ", "CLTchangeUsername;", "Change the username of the user into the new string" ] [ "clients", "checkPermission", "pattern clients.checkPermission(usr:str, pw:str):void ", "CLTcheckPermission;", "Check permission for a user, requires hashed password (backendsum)" ] -[ "clients", "getActions", "command clients.getActions():bat[:int] ", "CLTActions;", "Pseudo bat of client's command counts." ] [ "clients", "getId", "pattern clients.getId():int ", "CLTgetClientId;", "Return a number that uniquely represents the current client." ] [ "clients", "getInfo", "pattern clients.getInfo() (X_0:bat[:str], X_1:bat[:str]) ", "CLTInfo;", "Pseudo bat with client attributes." ] -[ "clients", "getLastCommand", "command clients.getLastCommand():bat[:str] ", "CLTLastCommand;", "Pseudo bat of client's last command time." ] [ "clients", "getLogins", "command clients.getLogins() (user:bat[:oid], start:bat[:str]) ", "CLTLogin;", "Pseudo bat of client id and login time." ] [ "clients", "getPasswordHash", "pattern clients.getPasswordHash(user:str):str ", "CLTgetPasswordHash;", "Return the password hash of the given user" ] [ "clients", "getScenario", "pattern clients.getScenario():str ", "CLTgetScenario;", "Retrieve current scenario name." ] [ "clients", "getTimeout", "pattern clients.getTimeout() (q:lng, s:lng) ", "CLTgetTimeout;", "A query is aborted after q milliseconds (q=0 means run undisturbed).\nThe session timeout aborts the connection after spending too\nmany seconds on query processing." ] [ "clients", "getUsername", "pattern clients.getUsername():str ", "CLTgetUsername;", "Return the username of the currently logged in user" ] [ "clients", "getUsers", "pattern clients.getUsers() (X_0:bat[:oid], X_1:bat[:str]) ", "CLTgetUsers;", "return a BAT with user id and one with name available in the system" ] -[ "clients", "getUsers", "command clients.getUsers():bat[:str] ", "CLTusers;", "Pseudo bat of users id and name." ] [ "clients", "md5sum", "command clients.md5sum(pw:str):str ", "CLTmd5sum;", "Return hex string representation of the MD5 hash of the given string" ] [ "clients", "quit", "pattern clients.quit():void ", "CLTquit;", "Terminate the client session." ] [ "clients", "quit", "pattern clients.quit(idx:int):void ", "CLTquit;", "Terminate the session for a single client using a soft error.\nIt is the privilige of the console user." ] @@ -12063,9 +12060,10 @@ stdout of test 'MAL-signatures` in direc [ "wlc", "drop_user", "pattern wlc.drop_user(sname:str, action:int):void ", "WLCgeneric;", "Catalog operation drop_user" ] [ "wlc", "drop_user", "pattern wlc.drop_user(sname:str, auth:str, action:int):void ", "WLCgeneric;", "Catalog operation drop_user" ] [ "wlc", "drop_view", "pattern wlc.drop_view(sname:str, name:str, action:int, ifexists:int):void ", "WLCgeneric;", "Catalog operation drop_view" ] -[ "wlc", "getmasterbeat", "pattern wlc.getmasterbeat(duration:int):str ", "WLCgetmasterbeat;", "Maximal delay for transaction log flushing" ] -[ "wlc", "getmasterclock", "pattern wlc.getmasterclock():str ", "WLCgetmasterclock;", "Timestamp of last update transaction" ] -[ "wlc", "getmastertick", "pattern wlc.getmastertick():lng ", "WLCgetmastertick;", "Transaction identifier of the last committed transaction" ] +[ "wlc", "flush", "pattern wlc.flush():void ", "WLCflush;", "Flush current log buffer" ] +[ "wlc", "getbeat", "pattern wlc.getbeat(duration:int):str ", "WLCgetbeat;", "Maximal delay for transaction log flushing" ] +[ "wlc", "getclock", "pattern wlc.getclock():str ", "WLCgetclock;", "Timestamp of last update transaction" ] +[ "wlc", "gettick", "pattern wlc.gettick():lng ", "WLCgettick;", "Transaction identifier of the last committed transaction" ] [ "wlc", "grant", "pattern wlc.grant(sname:str, tbl:str, grantee:str, privs:int, cname:str, gr:int, grantor:int):void ", "WLCgeneric;", "Catalog operation grant" ] [ "wlc", "grant_function", "pattern wlc.grant_function(sname:str, fcnid:int, grantee:str, privs:int, grant:int, grantor:int):void ", "WLCgeneric;", "Catalog operation grant_function" ] [ "wlc", "grant_roles", "pattern wlc.grant_roles(sname:str, auth:str, grantor:int, admin:int):void ", "WLCgeneric;", "Catalog operation grant_roles" ] @@ -12082,14 +12080,15 @@ stdout of test 'MAL-signatures` in direc [ "wlc", "revoke_roles", "pattern wlc.revoke_roles(sname:str, auth:str, grantor:int, admin:int):void ", "WLCgeneric;", "Catalog operation revoke_roles" ] [ "wlc", "rollback", "pattern wlc.rollback():void ", "WLCcommitCmd;", "Rollback the workload-capture-replay record" ] [ "wlc", "rollback", "pattern wlc.rollback():void ", "WLCrollbackCmd;", "Mark the end of the work unit" ] -[ "wlc", "setmasterbeat", "pattern wlc.setmasterbeat(duration:int):void ", "WLCsetmasterbeat;", "Maximal delay for transaction log flushing" ] -[ "wlc", "stopmaster", "pattern wlc.stopmaster():void ", "WLCstopmaster;", "Stop capturing the logs" ] +[ "wlc", "setbeat", "pattern wlc.setbeat(duration:int):void ", "WLCsetbeat;", "Maximal delay for transaction log flushing" ] +[ "wlc", "stop", "pattern wlc.stop():void ", "WLCstop;", "Stop capturing the logs" ] [ "wlc", "transaction", "unsafe pattern wlc.transaction():void ", "WLCgeneric;", "Start an autocommit transaction" ] [ "wlc", "transaction_begin", "pattern wlc.transaction_begin(chain:int, name:str):void ", "WLCgeneric;", "A transaction statement (type can be commit,release,rollback or start)" ] [ "wlc", "transaction_commit", "pattern wlc.transaction_commit(chain:int, name:str):void ", "WLCgeneric;", "A transaction statement (type can be commit,release,rollback or start)" ] [ "wlc", "transaction_release", "pattern wlc.transaction_release(chain:int, name:str):void ", "WLCgeneric;", "A transaction statement (type can be commit,release,rollback or start)" ] [ "wlc", "transaction_rollback", "pattern wlc.transaction_rollback(chain:int, name:str):void ", "WLCgeneric;", "A transaction statement (type can be commit,release,rollback or start)" ] [ "wlc", "update", "pattern wlc.update(sname:str, tname:str, cname:str, tid:any, val:any):int ", "WLCupdate;", "Keep the update in the workload-capture-replay list" ] +[ "wlr", "accept", "pattern wlr.accept():void ", "WLRaccept;", "Accept failing transaction" ] [ "wlr", "action", "pattern wlr.action(q:str):void ", "WLRaction;", "A query producing updates" ] [ "wlr", "alter_add_range_partition", "pattern wlr.alter_add_range_partition(sname:str, mtnme:str, psnme:str, ptnme:str, min:str, max:str, nills:int, update:int):void ", "WLRgeneric;", "Catalog operation alter_add_range_partition" ] [ "wlr", "alter_add_table", "pattern wlr.alter_add_table(sname:str, mtnme:str, psnme:str, ptnme:str, action:int):void ", "WLRgeneric;", "Catalog operation alter_add_table" ] @@ -12128,28 +12127,28 @@ stdout of test 'MAL-signatures` in direc [ "wlr", "drop_user", "pattern wlr.drop_user(sname:str, action:int):void ", "WLRgeneric;", "Catalog operation drop_user" ] [ "wlr", "drop_user", "pattern wlr.drop_user(sname:str, auth:str, action:int):void ", "WLRgeneric;", "Catalog operation drop_user" ] [ "wlr", "drop_view", "pattern wlr.drop_view(sname:str, name:str, action:int, ifexists:int):void ", "WLRgeneric;", "Catalog operation drop_view" ] -[ "wlr", "getreplicaclock", "pattern wlr.getreplicaclock():str ", "WLRgetreplicaclock;", "Timestamp of last replicated transaction." ] -[ "wlr", "getreplicatick", "pattern wlr.getreplicatick():lng ", "WLRgetreplicatick;", "Transaction identifier of the last replicated transaction." ] +[ "wlr", "getclock", "pattern wlr.getclock():str ", "WLRgetclock;", "Timestamp of last replicated transaction." ] +[ "wlr", "gettick", "pattern wlr.gettick():lng ", "WLRgettick;", "Transaction identifier of the last replicated transaction." ] [ "wlr", "grant", "pattern wlr.grant(sname:str, tbl:str, grantee:str, privs:int, cname:str, gr:int, grantor:int):void ", "WLRgeneric;", "Catalog operation grant" ] [ "wlr", "grant_function", "pattern wlr.grant_function(sname:str, fcnid:int, grantee:str, privs:int, grant:int, grantor:int):void ", "WLRgeneric;", "Catalog operation grant_function" ] [ "wlr", "grant_roles", "pattern wlr.grant_roles(sname:str, auth:str, grantor:int, admin:int):void ", "WLRgeneric;", "Catalog operation grant_roles" ] +[ "wlr", "master", "pattern wlr.master(dbname:str):void ", "WLRmaster;", "Initialize the replicator thread" ] [ "wlr", "rename_column", "pattern wlr.rename_column(sname:str, tname:str, cname:str, newnme:str):void ", "WLRgeneric;", "Catalog operation rename_column" ] [ "wlr", "rename_schema", "pattern wlr.rename_schema(sname:str, newnme:str):void ", "WLRgeneric;", "Catalog operation rename_schema" ] [ "wlr", "rename_table", "pattern wlr.rename_table(osname:str, nsname:str, otname:str, ntname:str):void ", "WLRgeneric;", "Catalog operation rename_table" ] [ "wlr", "rename_user", "pattern wlr.rename_user(sname:str, newnme:str, action:int):void ", "WLRgeneric;", "Catalog operation rename_user" ] -[ "wlr", "replicate", "pattern wlr.replicate():void ", "WLRreplicate;", "Roll the snapshot forward to an up-to-date clone" ] -[ "wlr", "replicate", "pattern wlr.replicate(dbname:str):void ", "WLRreplicate;", "Roll the snapshot forward to an up-to-date clone" ] -[ "wlr", "replicate", "pattern wlr.replicate(dbname:str, id:bte):void ", "WLRreplicate;", "Roll the snapshot forward to a specific transaction id" ] -[ "wlr", "replicate", "pattern wlr.replicate(dbname:str, id:int):void ", "WLRreplicate;", "Roll the snapshot forward to a specific transaction id" ] -[ "wlr", "replicate", "pattern wlr.replicate(dbname:str, id:lng):void ", "WLRreplicate;", "Roll the snapshot forward to a specific transaction id" ] -[ "wlr", "replicate", "pattern wlr.replicate(dbname:str, id:sht):void ", "WLRreplicate;", "Roll the snapshot forward to a specific transaction id" ] -[ "wlr", "replicate", "pattern wlr.replicate(dbname:str, ts:timestamp):void ", "WLRreplicate;", "Roll the snapshot forward to the time TS" ] +[ "wlr", "replicate", "pattern wlr.replicate():void ", "WLRreplicate;", "Continue to keep the replica in sink" ] +[ "wlr", "replicate", "pattern wlr.replicate(id:bte):void ", "WLRreplicate;", "Roll the snapshot forward to a specific transaction id" ] +[ "wlr", "replicate", "pattern wlr.replicate(id:int):void ", "WLRreplicate;", "Roll the snapshot forward to a specific transaction id" ] +[ "wlr", "replicate", "pattern wlr.replicate(id:lng):void ", "WLRreplicate;", "Roll the snapshot forward to a specific transaction id" ] +[ "wlr", "replicate", "pattern wlr.replicate(id:sht):void ", "WLRreplicate;", "Roll the snapshot forward to a specific transaction id" ] [ "wlr", "replicate", "pattern wlr.replicate(ts:timestamp):void ", "WLRreplicate;", "Roll the snapshot forward to an up-to-date clone" ] [ "wlr", "revoke", "pattern wlr.revoke(sname:str, tbl:str, grantee:str, privs:int, cname:str, grant:int, grantor:int):void ", "WLRgeneric;", "Catalog operation revoke" ] [ "wlr", "revoke_function", "pattern wlr.revoke_function(sname:str, fcnid:int, grantee:str, privs:int, grant:int, grantor:int):void ", "WLRgeneric;", "Catalog operation revoke_function" ] [ "wlr", "revoke_roles", "pattern wlr.revoke_roles(sname:str, auth:str, grantor:int, admin:int):void ", "WLRgeneric;", "Catalog operation revoke_roles" ] [ "wlr", "rollback", "pattern wlr.rollback():void ", "WLRrollback;", "Mark the end of the work unit" ] -[ "wlr", "setreplicabeat", "pattern wlr.setreplicabeat(dur:int):void ", "WLRsetreplicabeat;", "Threshold (in seconds) for re-running queries" ] +[ "wlr", "setbeat", "pattern wlr.setbeat(dur:int):void ", "WLRsetbeat;", "Threshold (in seconds) for re-running queries" ] +[ "wlr", "stop", "pattern wlr.stop():void ", "WLRstop;", "Stop the replicator thread" ] [ "wlr", "transaction", "unsafe pattern wlr.transaction():void ", "WLRgeneric;", "Start an autocommit transaction" ] [ "wlr", "transaction", "pattern wlr.transaction(tid:lng, started:str, user:str):void ", "WLRtransaction;", "Mark the beginning of the work unit which can be a compound transaction" ] [ "wlr", "transaction_begin", "pattern wlr.transaction_begin(chain:int, name:str):void ", "WLRgeneric;", "A transaction statement (type can be commit,release,rollback or start)" ] diff --git a/clients/Tests/MAL-signatures.stable.out.int128 b/clients/Tests/MAL-signatures.stable.out.int128 --- a/clients/Tests/MAL-signatures.stable.out.int128 +++ b/clients/Tests/MAL-signatures.stable.out.int128 @@ -15120,17 +15120,14 @@ stdout of test 'MAL-signatures` in direc [ "clients", "changePassword", "pattern clients.changePassword(old:str, new:str):void ", "CLTchangePassword;", "Change the password for the current user" ] [ "clients", "changeUsername", "pattern clients.changeUsername(old:str, new:str):void ", "CLTchangeUsername;", "Change the username of the user into the new string" ] [ "clients", "checkPermission", "pattern clients.checkPermission(usr:str, pw:str):void ", "CLTcheckPermission;", "Check permission for a user, requires hashed password (backendsum)" ] -[ "clients", "getActions", "command clients.getActions():bat[:int] ", "CLTActions;", "Pseudo bat of client's command counts." ] [ "clients", "getId", "pattern clients.getId():int ", "CLTgetClientId;", "Return a number that uniquely represents the current client." ] [ "clients", "getInfo", "pattern clients.getInfo() (X_0:bat[:str], X_1:bat[:str]) ", "CLTInfo;", "Pseudo bat with client attributes." ] -[ "clients", "getLastCommand", "command clients.getLastCommand():bat[:str] ", "CLTLastCommand;", "Pseudo bat of client's last command time." ] [ "clients", "getLogins", "command clients.getLogins() (user:bat[:oid], start:bat[:str]) ", "CLTLogin;", "Pseudo bat of client id and login time." ] [ "clients", "getPasswordHash", "pattern clients.getPasswordHash(user:str):str ", "CLTgetPasswordHash;", "Return the password hash of the given user" ] [ "clients", "getScenario", "pattern clients.getScenario():str ", "CLTgetScenario;", "Retrieve current scenario name." ] [ "clients", "getTimeout", "pattern clients.getTimeout() (q:lng, s:lng) ", "CLTgetTimeout;", "A query is aborted after q milliseconds (q=0 means run undisturbed).\nThe session timeout aborts the connection after spending too\nmany seconds on query processing." ] [ "clients", "getUsername", "pattern clients.getUsername():str ", "CLTgetUsername;", "Return the username of the currently logged in user" ] [ "clients", "getUsers", "pattern clients.getUsers() (X_0:bat[:oid], X_1:bat[:str]) ", "CLTgetUsers;", "return a BAT with user id and one with name available in the system" ] -[ "clients", "getUsers", "command clients.getUsers():bat[:str] ", "CLTusers;", "Pseudo bat of users id and name." ] [ "clients", "md5sum", "command clients.md5sum(pw:str):str ", "CLTmd5sum;", "Return hex string representation of the MD5 hash of the given string" ] [ "clients", "quit", "pattern clients.quit():void ", "CLTquit;", "Terminate the client session." ] [ "clients", "quit", "pattern clients.quit(idx:int):void ", "CLTquit;", "Terminate the session for a single client using a soft error.\nIt is the privilige of the console user." ] @@ -16483,9 +16480,10 @@ stdout of test 'MAL-signatures` in direc [ "wlc", "drop_user", "pattern wlc.drop_user(sname:str, action:int):void ", "WLCgeneric;", "Catalog operation drop_user" ] [ "wlc", "drop_user", "pattern wlc.drop_user(sname:str, auth:str, action:int):void ", "WLCgeneric;", "Catalog operation drop_user" ] [ "wlc", "drop_view", "pattern wlc.drop_view(sname:str, name:str, action:int, ifexists:int):void ", "WLCgeneric;", "Catalog operation drop_view" ] -[ "wlc", "getmasterbeat", "pattern wlc.getmasterbeat(duration:int):str ", "WLCgetmasterbeat;", "Maximal delay for transaction log flushing" ] -[ "wlc", "getmasterclock", "pattern wlc.getmasterclock():str ", "WLCgetmasterclock;", "Timestamp of last update transaction" ] -[ "wlc", "getmastertick", "pattern wlc.getmastertick():lng ", "WLCgetmastertick;", "Transaction identifier of the last committed transaction" ] +[ "wlc", "flush", "pattern wlc.flush():void ", "WLCflush;", "Flush current log buffer" ] +[ "wlc", "getbeat", "pattern wlc.getbeat(duration:int):str ", "WLCgetbeat;", "Maximal delay for transaction log flushing" ] +[ "wlc", "getclock", "pattern wlc.getclock():str ", "WLCgetclock;", "Timestamp of last update transaction" ] +[ "wlc", "gettick", "pattern wlc.gettick():lng ", "WLCgettick;", "Transaction identifier of the last committed transaction" ] [ "wlc", "grant", "pattern wlc.grant(sname:str, tbl:str, grantee:str, privs:int, cname:str, gr:int, grantor:int):void ", "WLCgeneric;", "Catalog operation grant" ] [ "wlc", "grant_function", "pattern wlc.grant_function(sname:str, fcnid:int, grantee:str, privs:int, grant:int, grantor:int):void ", "WLCgeneric;", "Catalog operation grant_function" ] [ "wlc", "grant_roles", "pattern wlc.grant_roles(sname:str, auth:str, grantor:int, admin:int):void ", "WLCgeneric;", "Catalog operation grant_roles" ] @@ -16502,14 +16500,15 @@ stdout of test 'MAL-signatures` in direc [ "wlc", "revoke_roles", "pattern wlc.revoke_roles(sname:str, auth:str, grantor:int, admin:int):void ", "WLCgeneric;", "Catalog operation revoke_roles" ] [ "wlc", "rollback", "pattern wlc.rollback():void ", "WLCcommitCmd;", "Rollback the workload-capture-replay record" ] [ "wlc", "rollback", "pattern wlc.rollback():void ", "WLCrollbackCmd;", "Mark the end of the work unit" ] -[ "wlc", "setmasterbeat", "pattern wlc.setmasterbeat(duration:int):void ", "WLCsetmasterbeat;", "Maximal delay for transaction log flushing" ] -[ "wlc", "stopmaster", "pattern wlc.stopmaster():void ", "WLCstopmaster;", "Stop capturing the logs" ] +[ "wlc", "setbeat", "pattern wlc.setbeat(duration:int):void ", "WLCsetbeat;", "Maximal delay for transaction log flushing" ] +[ "wlc", "stop", "pattern wlc.stop():void ", "WLCstop;", "Stop capturing the logs" ] [ "wlc", "transaction", "unsafe pattern wlc.transaction():void ", "WLCgeneric;", "Start an autocommit transaction" ] [ "wlc", "transaction_begin", "pattern wlc.transaction_begin(chain:int, name:str):void ", "WLCgeneric;", "A transaction statement (type can be commit,release,rollback or start)" ] [ "wlc", "transaction_commit", "pattern wlc.transaction_commit(chain:int, name:str):void ", "WLCgeneric;", "A transaction statement (type can be commit,release,rollback or start)" ] [ "wlc", "transaction_release", "pattern wlc.transaction_release(chain:int, name:str):void ", "WLCgeneric;", "A transaction statement (type can be commit,release,rollback or start)" ] [ "wlc", "transaction_rollback", "pattern wlc.transaction_rollback(chain:int, name:str):void ", "WLCgeneric;", "A transaction statement (type can be commit,release,rollback or start)" ] [ "wlc", "update", "pattern wlc.update(sname:str, tname:str, cname:str, tid:any, val:any):int ", "WLCupdate;", "Keep the update in the workload-capture-replay list" ] +[ "wlr", "accept", "pattern wlr.accept():void ", "WLRaccept;", "Accept failing transaction" ] [ "wlr", "action", "pattern wlr.action(q:str):void ", "WLRaction;", "A query producing updates" ] [ "wlr", "alter_add_range_partition", "pattern wlr.alter_add_range_partition(sname:str, mtnme:str, psnme:str, ptnme:str, min:str, max:str, nills:int, update:int):void ", "WLRgeneric;", "Catalog operation alter_add_range_partition" ] [ "wlr", "alter_add_table", "pattern wlr.alter_add_table(sname:str, mtnme:str, psnme:str, ptnme:str, action:int):void ", "WLRgeneric;", "Catalog operation alter_add_table" ] @@ -16548,28 +16547,28 @@ stdout of test 'MAL-signatures` in direc [ "wlr", "drop_user", "pattern wlr.drop_user(sname:str, action:int):void ", "WLRgeneric;", "Catalog operation drop_user" ] [ "wlr", "drop_user", "pattern wlr.drop_user(sname:str, auth:str, action:int):void ", "WLRgeneric;", "Catalog operation drop_user" ] _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list