Changeset: fe73ff30b36d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fe73ff30b36d
Removed Files:
clients/mapiclient/Tests/tachograph--help
clients/mapiclient/Tests/tachograph--help.bat
clients/mapiclient/Tests/tachograph--help.stable.err
clients/mapiclient/Tests/tachograph--help.stable.out
clients/mapiclient/Tests/tomograph--help
clients/mapiclient/Tests/tomograph--help.bat
clients/mapiclient/Tests/tomograph--help.stable.err
clients/mapiclient/Tests/tomograph--help.stable.out
clients/mapiclient/tachograph.c
clients/mapiclient/tomograph.c
debian/monetdb-client-tools.docs
debian/monetdb-client-tools.install
Modified Files:
MonetDB.spec
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
clients/mapiclient/Makefile.ag
clients/mapiclient/Tests/All
clients/mapiclient/Tests/stethoscope--help.stable.err
clients/mapiclient/eventparser.c
clients/mapiclient/eventparser.h
clients/mapiclient/stethoscope.c
debian/control
debian/libmonetdb19.install
monetdb5/mal/mal_client.c
monetdb5/mal/mal_client.h
monetdb5/mal/mal_listing.c
monetdb5/mal/mal_listing.h
monetdb5/mal/mal_profiler.c
monetdb5/modules/mal/profiler.mal
sql/benchmarks/arno/Tests/inserts.options5
sql/benchmarks/arno/Tests/inserts.reqtests
sql/jdbc/tests/Tests/Bug_IsValid_Timeout_Bug_6782.stable.out
sql/test/BugTracker-2019/Tests/avg-changes-value-scale.Bug-6783.stable.out
sql/test/BugTracker-2019/Tests/index-insert-crash.Bug-6781.stable.out
sql/test/scanner/Tests/raw_strings.stable.err
sql/test/scanner/Tests/raw_strings.stable.out
sql/test/wlcr/Tests/wlr110.py
sql/test/wlcr/Tests/wlr35.py
Branch: default
Log Message:
Merged compactprofiler branch into default.
diffs (truncated from 4697 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -266,34 +266,6 @@ MonetDB, you will very likely need this
%doc %{_mandir}/man1/mclient.1.gz
%doc %{_mandir}/man1/msqldump.1.gz
-%package client-tools
-Summary: MonetDB - Monet Database Management System Client Programs
-Group: Applications/Databases
-Requires: %{name}-client%{?_isa} = %{version}-%{release}
-%if (0%{?fedora} >= 22)
-# tomograph executes these two:
-Recommends: /usr/bin/gs
-Recommends: /usr/bin/gnuplot
-%endif
-
-%description client-tools
-MonetDB is a database management system that is developed from a
-main-memory perspective with use of a fully decomposed storage model,
-automatic index management, extensibility of data types and search
-accelerators. It also has an SQL front end.
-
-This package contains stethoscope, tomograph, and tachograph. These
-tools can be used to monitor the MonetDB database server.
-
-%files client-tools
-%defattr(-,root,root)
-%{_bindir}/stethoscope
-%{_bindir}/tachograph
-%{_bindir}/tomograph
-%dir %{_datadir}/doc/MonetDB-client-tools
-%docdir %{_datadir}/doc/MonetDB-client-tools
-%{_datadir}/doc/MonetDB-client-tools/*
-
%package client-devel
Summary: MonetDB - Monet Database Management System Client Programs
Group: Applications/Databases
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
@@ -11257,6 +11257,7 @@ stdout of test 'MAL-signatures` in direc
[ "profiler", "getlimit", "command profiler.getlimit():int ",
"CMDgetprofilerlimit;", "Set profiler limit" ]
[ "profiler", "noop", "command profiler.noop():void ",
"CMDnoopProfiler;", "Fetch any pending performance events" ]
[ "profiler", "openstream", "pattern profiler.openstream():void ",
"CMDopenProfilerStream;", "Start profiling the events, send to output
stream" ]
+[ "profiler", "openstream", "pattern profiler.openstream(mode:int):void ",
"CMDopenProfilerStream;", "Start profiling the events, send to output
stream" ]
[ "profiler", "setheartbeat", "command profiler.setheartbeat(b:int):void ",
"CMDsetHeartbeat;", "Set heart beat performance tracing" ]
[ "profiler", "setlimit", "command profiler.setlimit(l:int):void ",
"CMDsetprofilerlimit;", "Get profiler limit" ]
[ "profiler", "start", "pattern profiler.start():void ",
"CMDstartProfiler;", "Start offline performance profiling" ]
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
@@ -15679,6 +15679,7 @@ stdout of test 'MAL-signatures` in direc
[ "profiler", "getlimit", "command profiler.getlimit():int ",
"CMDgetprofilerlimit;", "Set profiler limit" ]
[ "profiler", "noop", "command profiler.noop():void ",
"CMDnoopProfiler;", "Fetch any pending performance events" ]
[ "profiler", "openstream", "pattern profiler.openstream():void ",
"CMDopenProfilerStream;", "Start profiling the events, send to output
stream" ]
+[ "profiler", "openstream", "pattern profiler.openstream(mode:int):void ",
"CMDopenProfilerStream;", "Start profiling the events, send to output
stream" ]
[ "profiler", "setheartbeat", "command profiler.setheartbeat(b:int):void ",
"CMDsetHeartbeat;", "Set heart beat performance tracing" ]
[ "profiler", "setlimit", "command profiler.setlimit(l:int):void ",
"CMDsetprofilerlimit;", "Get profiler limit" ]
[ "profiler", "start", "pattern profiler.start():void ",
"CMDstartProfiler;", "Start offline performance profiling" ]
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
@@ -2632,7 +2632,6 @@ void setVariableScope(MalBlkPtr mb);
void setVariableType(MalBlkPtr mb, const int idx, malType type);
str setWriteModeRef;
void setprofilerlimit(int limit);
-str shortStmtRendering(MalBlkPtr mb, MalStkPtr stl, InstrPtr p);
void showAllScenarios(stream *f);
void showCurrentScenario(void);
void showMalBlkHistory(stream *out, MalBlkPtr mb);
diff --git a/clients/mapiclient/Makefile.ag b/clients/mapiclient/Makefile.ag
--- a/clients/mapiclient/Makefile.ag
+++ b/clients/mapiclient/Makefile.ag
@@ -43,26 +43,6 @@ bin_stethoscope = {
$(SOCKET_LIBS) $(zlib_LIBS) $(bzip2_LIBS) $(snappy_LIBS)
$(lz4_LIBS) $(liblzma_LIBS) $(curl_LIBS) $(LTLIBICONV) $(openssl_LIBS)
}
-bin_tachograph = {
- SOURCES = tachograph.c
- LIBS = libmcutil \
- ../mapilib/libmapi \
- ../../common/stream/libstream \
- ../../common/utils/libmutils \
- WIN32?../../common/options/libmoptions \
- $(SOCKET_LIBS) $(zlib_LIBS) $(bzip2_LIBS) $(snappy_LIBS)
$(lz4_LIBS) $(liblzma_LIBS) $(curl_LIBS) $(LTLIBICONV) $(openssl_LIBS)
-}
-
-bin_tomograph = {
- SOURCES = tomograph.c
- LIBS = libmcutil \
- ../../common/utils/libmutils \
- ../mapilib/libmapi \
- ../../common/stream/libstream \
- WIN32?../../common/options/libmoptions \
- $(SOCKET_LIBS) $(zlib_LIBS) $(bzip2_LIBS) $(snappy_LIBS)
$(lz4_LIBS) $(liblzma_LIBS) $(curl_LIBS) $(LTLIBICONV) $(openssl_LIBS)
-}
-
man_MANS = mclient.1 msqldump.1
EXTRA_DIST = $(man_MANS)
diff --git a/clients/mapiclient/Tests/All b/clients/mapiclient/Tests/All
--- a/clients/mapiclient/Tests/All
+++ b/clients/mapiclient/Tests/All
@@ -1,5 +1,3 @@
mclient--help
msqldump--help
stethoscope--help
-tomograph--help
-tachograph--help
diff --git a/clients/mapiclient/Tests/stethoscope--help.stable.err
b/clients/mapiclient/Tests/stethoscope--help.stable.err
--- a/clients/mapiclient/Tests/stethoscope--help.stable.err
+++ b/clients/mapiclient/Tests/stethoscope--help.stable.err
@@ -16,7 +16,6 @@ stethoscope [options]
-P | --password=<password>
-p | --port=<portnr>
-h | --host=<hostname>
- -c | --convert=<old formated file>
-j | --json
-o | --output=<file>
-b | --beat=<delay> in milliseconds (default 50)
diff --git a/clients/mapiclient/Tests/tachograph--help
b/clients/mapiclient/Tests/tachograph--help
deleted file mode 100755
--- a/clients/mapiclient/Tests/tachograph--help
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-Mlog -x tachograph --help
diff --git a/clients/mapiclient/Tests/tachograph--help.bat
b/clients/mapiclient/Tests/tachograph--help.bat
deleted file mode 100755
--- a/clients/mapiclient/Tests/tachograph--help.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-@echo on
-@prompt # $t $g
-
- tachograph --help
diff --git a/clients/mapiclient/Tests/tachograph--help.stable.err
b/clients/mapiclient/Tests/tachograph--help.stable.err
deleted file mode 100644
--- a/clients/mapiclient/Tests/tachograph--help.stable.err
+++ /dev/null
@@ -1,23 +0,0 @@
-stderr of test 'tachograph--help` in directory 'clients/mapiclient` itself:
-
-
-# 11:43:47 >
-# 11:43:47 > Mtimeout -timeout 120 ./tachograph--help tachograph--help
-# 11:43:47 >
-
-
-# 10:36:09 >
-# 10:36:09 > Mtimeout -timeout 60 tachograph --help
-# 10:36:09 >
-
-tachograph [options]
- -d | --dbname=<database_name>
- -u | --user=<user>
- -p | --port=<portnr>
- -h | --host=<hostname>
- -? | --help
-
-# 23:54:13 >
-# 23:54:13 > "Done."
-# 23:54:13 >
-
diff --git a/clients/mapiclient/Tests/tachograph--help.stable.out
b/clients/mapiclient/Tests/tachograph--help.stable.out
deleted file mode 100644
--- a/clients/mapiclient/Tests/tachograph--help.stable.out
+++ /dev/null
@@ -1,17 +0,0 @@
-stdout of test 'tachograph--help` in directory 'clients/mapiclient` itself:
-
-
-# 11:43:47 >
-# 11:43:47 > Mtimeout -timeout 120 ./tachograph--help tachograph--help
-# 11:43:47 >
-
-
-# 11:43:47 >
-# 11:43:47 > Mtimeout -timeout 60 tachograph --help
-# 11:43:47 >
-
-
-# 11:43:47 >
-# 11:43:47 > Done.
-# 11:43:47 >
-
diff --git a/clients/mapiclient/Tests/tomograph--help
b/clients/mapiclient/Tests/tomograph--help
deleted file mode 100755
--- a/clients/mapiclient/Tests/tomograph--help
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-Mlog -x tomograph --help
diff --git a/clients/mapiclient/Tests/tomograph--help.bat
b/clients/mapiclient/Tests/tomograph--help.bat
deleted file mode 100755
--- a/clients/mapiclient/Tests/tomograph--help.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-@echo on
-@prompt # $t $g
-
- tomograph --help
diff --git a/clients/mapiclient/Tests/tomograph--help.stable.err
b/clients/mapiclient/Tests/tomograph--help.stable.err
deleted file mode 100644
--- a/clients/mapiclient/Tests/tomograph--help.stable.err
+++ /dev/null
@@ -1,31 +0,0 @@
-stderr of test 'tomograph--help` in directory 'clients/mapiclient` itself:
-
-
-# 11:43:47 >
-# 11:43:47 > Mtimeout -timeout 120 ./tomograph--help tomograph--help
-# 11:43:47 >
-
-
-# 10:36:09 >
-# 10:36:09 > Mtimeout -timeout 60 tomograph --help
-# 10:36:09 >
-
-tomograph [options]
- -d | --dbname=<database_name>
- -u | --user=<user>
- -P | --password=<password>
- -p | --port=<portnr>
- -h | --host=<hostname>
- -T | --title=<plot title>
- -r | --range=<starttime>-<endtime>[ms,s]
- -i | --input=<profiler event file >
- -o | --output=<dir/file prefix > (default 'cache/<dbname>'
- -b | --beat=<delay> in milliseconds (default 5000)
- -A | --atlas=<number> maximum number of queries (default 1)
- -D | --debug
- -? | --help
-
-# 23:54:13 >
-# 23:54:13 > "Done."
-# 23:54:13 >
-
diff --git a/clients/mapiclient/Tests/tomograph--help.stable.out
b/clients/mapiclient/Tests/tomograph--help.stable.out
deleted file mode 100644
--- a/clients/mapiclient/Tests/tomograph--help.stable.out
+++ /dev/null
@@ -1,17 +0,0 @@
-stdout of test 'tomograph--help` in directory 'clients/mapiclient` itself:
-
-
-# 11:43:47 >
-# 11:43:47 > Mtimeout -timeout 120 ./tomograph--help tomograph--help
-# 11:43:47 >
-
-
-# 11:43:47 >
-# 11:43:47 > Mtimeout -timeout 60 tomograph --help
-# 11:43:47 >
-
-
-# 11:43:47 >
-# 11:43:47 > Done.
-# 11:43:47 >
-
diff --git a/clients/mapiclient/eventparser.c b/clients/mapiclient/eventparser.c
--- a/clients/mapiclient/eventparser.c
+++ b/clients/mapiclient/eventparser.c
@@ -11,205 +11,177 @@
#include "monetdb_config.h"
#include "eventparser.h"
-char *statenames[]= {"","start","done","action","ping","wait","system"};
-
-char *maltypes[MAXMALARGS];
-char *malvariables[MAXMALARGS];
-char *malvalues[MAXMALARGS];
-int malcount[MAXMALARGS];
-int malargc;
-int malretc;
-
-int malsize;
int debug=0;
-char *currentquery=0;
-int eventcounter = 0;
#define DATETIME_CHAR_LENGTH 27
-static void
-clearArguments(void)
-{
- int i;
-
- if( currentquery){
- free(currentquery);
- currentquery = 0;
- }
-
- for(i = 0; i < MAXMALARGS; i++){
- if( malvariables[i]){
- free(malvariables[i]);
- malvariables[i] = 0;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
