Changeset 19136 for trunk/FACT++

Timestamp:

08/03/18 20:53:39 (6 years ago)

Author:

tbretz

Message:

Output some more connection information with print-connect

Location:

trunk/FACT++/src

Files:

• calcsource.cc (modified) (1 diff)
• fits2sql.cc (modified) (2 diffs)
• root2sql.cc (modified) (2 diffs)
• rootifysql.cc (modified) (6 diffs)

trunk/FACT++/src/calcsource.cc

@@ -3 +3 @@
 #include "pal.h"
 #include "nova.h"
+#include "tools.h"
 #include "Time.h"
 #include "Configuration.h"

trunk/FACT++/src/fits2sql.cc

@@ -464 +464 @@
     Database connection(uri);
 
+    if (verbose>0)
+    {
+        cout << "Client Version: " << connection.client_version() << '\n';
+        cout << "Server Version: " << connection.server_version() << endl;
+    }
+
     if (print_connection)
     {
@@ -692 +698 @@
     }
 
+    if (print_connection)
+    {
+        try
+        {
+            const auto &res1 = connection.query("SHOW STATUS LIKE 'Bytes_%'").store();
+            cout << left << setw(16) << res1[0]["Variable_name"] << ' ' << Tools::Scientific(res1[0]["Value"]) << endl;
+            cout << left << setw(16) << res1[1]["Variable_name"] << ' ' << Tools::Scientific(res1[1]["Value"]) << endl;
+            cout << endl;
+        }
+        catch (const exception &e)
+        {
+            cerr << "\nSHOW STATUS LIKE 'Bytes_%'\n\n";
+            cerr << "SQL query failed:\n" << e.what() << endl;
+            return 6;
+        }
+    }
+
     return 0;
 }

trunk/FACT++/src/root2sql.cc

@@ -483 +483 @@
     }
 
+    if (verbose>0)
+    {
+        cout << "Client Version: " << connection.client_version() << '\n';
+        cout << "Server Version: " << connection.server_version() << endl;
+    }
+
     if (print_connection)
     {
@@ -680 +686 @@
     }
 
+    if (print_connection)
+    {
+        try
+        {
+            const auto &res1 = connection.query("SHOW STATUS LIKE 'Bytes_%'").store();
+            cout << left << setw(16) << res1[0]["Variable_name"] << ' ' << Tools::Scientific(res1[0]["Value"]) << endl;
+            cout << left << setw(16) << res1[1]["Variable_name"] << ' ' << Tools::Scientific(res1[1]["Value"]) << endl;
+            cout << endl;
+        }
+        catch (const exception &e)
+        {
+            cerr << "\nSHOW STATUS LIKE 'Bytes_%'\n\n";
+            cerr << "SQL query failed:\n" << e.what() << endl;
+            return 6;
+        }
+    }
+
     return 0;
 }

trunk/FACT++/src/rootifysql.cc

@@ -35 +35 @@
         ("ignore",        vars<string>(),              "Ignore the given columns")
         ("display,d",     po_switch(),                 "Displays contents on the screen (most usefull in combination with mysql statements as SHOW or EXPLAIN)")
-        ("write",         var<string>(""),             "Write output to an ascii file")
+        ("write,w",       var<string>(""),             "Write output to an ascii file")
         ("null,n",        po_switch(),                 "Redirect the output file to /dev/null (mainly for debugging purposes, e.g. performance studies)")
         ("no-fill",       po_switch(),                 "Do not fill events into the root file (mainly for debugging purposes, e.g. performance studies)")
@@ -446 +446 @@
             if (!l.empty() && l[0]!='#')
                 envs[ident].push_back(line);
+        }
 
         if (verbose>0)
@@ -499 +500 @@
     Database connection(uri); // Keep alive while fetching rows
 
+    if (verbose>0)
+    {
+        cout << "Client Version: " << connection.client_version() << '\n';
+        cout << "Server Version: " << connection.server_version() << endl;
+    }
+
     if (print_connection)
     {
@@ -511 +518 @@
         catch (const exception &e)
         {
-            cerr << "\nSHOW STATUS LIKE COMPRESSION\n\n";
+            cerr << "\nSHOW STATUS LIKE 'Compression'\n\n";
             cerr << "SQL query failed:\n" << e.what() << endl;
             return 6;
@@ -650 +657 @@
 
     if (verbose>0)
-        cout << "Opening file '" << path << "' [compression=" << compression << "]..." << endl;
+    {
+        cout << "Opening file '" << path << "' [compression=" << compression << "]...\n";
+        cout << "Writing data to tree '" << tree << "'" << endl;
+    }
 
     // ----------------------------- Open output file --------------------------
@@ -931 +941 @@
     }
 
+    if (print_connection)
+    {
+        try
+        {
+            const auto &res1 = connection.query("SHOW STATUS LIKE 'Bytes_%'").store();
+            cout << left << setw(16) << res1[0]["Variable_name"] << ' ' << Tools::Scientific(res1[0]["Value"]) << endl;
+            cout << left << setw(16) << res1[1]["Variable_name"] << ' ' << Tools::Scientific(res1[1]["Value"]) << endl;
+            cout << endl;
+        }
+        catch (const exception &e)
+        {
+            cerr << "\nSHOW STATUS LIKE 'Bytes_%'\n\n";
+            cerr << "SQL query failed:\n" << e.what() << endl;
+            return 6;
+        }
+    }
+
     return 0;
 }