Changeset: 2d1fb499ad1e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2d1fb499ad1e
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/mapiclient/Makefile.ag
clients/mapiclient/Tests/All
debian/control
Branch: compactprofiler
Log Message:
Remove all references to tachograph and tomograph
diffs (truncated from 2724 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -303,24 +303,6 @@ 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/mapiclient/Makefile.ag b/clients/mapiclient/Makefile.ag
--- a/clients/mapiclient/Makefile.ag
+++ b/clients/mapiclient/Makefile.ag
@@ -40,25 +40,6 @@ bin_stethoscope = {
$(SOCKET_LIBS) $(zlib_LIBS) $(bzip2_LIBS) $(snappy_LIBS)
$(lz4_LIBS) $(liblzma_LIBS) $(curl_LIBS) $(LTLIBICONV) $(openssl_LIBS)
}
-# disabled: the console should be enough
-# bin_tachograph = {
-# SOURCES = tachograph.c
-# LIBS = libmcutil \
-# ../mapilib/libmapi \
-# ../../common/stream/libstream \
-# ../../common/utils/libmutils \
-# $(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 \
-# $(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/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/tachograph.c b/clients/mapiclient/tachograph.c
deleted file mode 100644
--- a/clients/mapiclient/tachograph.c
+++ /dev/null
@@ -1,573 +0,0 @@
-/*
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V.
- */
-
-/* author: M Kersten
- * Progress indicator
- * tachograph -d demo
- * which connects to the demo database server and presents a server progress
bar.
-*/
-
-#include "monetdb_config.h"
-#include "stream.h"
-#include "stream_socket.h"
-#include "mapi.h"
-#include <string.h>
-#include <sys/stat.h>
-#include <signal.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-#include <math.h>
-#include "mprompt.h"
-#include "dotmonetdb.h"
-#include "eventparser.h"
-
-#ifndef HAVE_GETOPT_LONG
-# include "monet_getopt.h"
-#else
-# ifdef HAVE_GETOPT_H
-# include "getopt.h"
-# endif
-#endif
-
-#ifdef HAVE_NETDB_H
-# include <netdb.h>
-# include <netinet/in.h>
-#endif
-
-#ifndef INVALID_SOCKET
-#define INVALID_SOCKET (-1)
-#endif
-
-
-#define die(dbh, hdl) \
- do { \
- if (hdl) \
- mapi_explain_query(hdl, stderr); \
- else if (dbh) \
- mapi_explain(dbh, stderr); \
- else \
- fprintf(stderr, "!! command failed\n"); \
- goto stop_disconnect; \
- } while (0)
-
-#define doQ(X) \
- do { \
- if ((hdl = mapi_query(dbh, X)) == NULL || \
- mapi_error(dbh) != MOK) \
- die(dbh, hdl); \
- } while (0)
-
-static stream *conn = NULL;
-static char hostname[128];
-static char *dbname;
-static Mapi dbh;
-static MapiHdl hdl = NULL;
-static int capturing=0;
-static int lastpc;
-static int showonbar;
-static int pccount;
-
-#define RUNNING 1
-#define FINISHED 2
-typedef struct{
- int state;
- int64_t etc;
- int64_t actual;
- int64_t clkticks;
- char *stmt;
-} Event;
-
-Event *events;
-static int maxevents;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
