Log sqlstate.

Author: anse1

dut.hh

@@ -12,29 +12,31 @@ namespace dut {
 
 struct failure : public std::exception {
   std::string errstr;
+  std::string sqlstate;
   const char* what() const throw()
   {
     return errstr.c_str();
   }
-  failure(const char *s) throw()
-    : errstr() {
+  failure(const char *s, const char *sqlstate_ = "") throw()
+       : errstr(), sqlstate() {
     errstr = s;
+    sqlstate = sqlstate_;
   };
 };
 
 struct broken : failure {
-  broken(const char *s) throw()
-    : failure(s) { }
+  broken(const char *s, const char *sqlstate_ = "") throw()
+    : failure(s, sqlstate_) { }
 };
 
 struct timeout : failure {
-  timeout(const char *s) throw()
-    : failure(s) { }
+  timeout(const char *s, const char *sqlstate_ = "") throw()
+    : failure(s, sqlstate_) { }
 };
 
 struct syntax : failure {
-  syntax(const char *s) throw()
-    : failure(s) { }
+  syntax(const char *s, const char *sqlstate_ = "") throw()
+    : failure(s, sqlstate_) { }
 };
 
 }

log.cc

@@ -146,8 +146,8 @@ pqxx_logger::pqxx_logger(std::string target, std::string conninfo, struct schema
   id = r[0][0].as<long>(id);
 
   c->prepare("error",
-	     "insert into error (id, msg, query) "
-	     "values (" + to_string(id) + ", $1, $2)");
+	     "insert into error (id, msg, query, sqlstate) "
+	     "values (" + to_string(id) + ", $1, $2, $3)");
 
   w.exec("insert into stat (id) values (" + to_string(id) + ")");
   c->prepare("stat",
@@ -164,7 +164,7 @@ void pqxx_logger::error(prod &query, const dut::failure &e)
   work w(*c);
   ostringstream s;
   s << query;
-  w.prepared("error")(e.what())(s.str()).exec();
+  w.prepared("error")(e.what())(s.str())(e.sqlstate).exec();
   w.commit();
 }
 

log.sql

@@ -20,6 +20,7 @@ create table error (
     msg text,    -- error message
     query text,  -- failed query
     target text, -- conninfo of the target
+    sqlstate text, -- sqlstate of error
 
     -- not referenced by sqlsmith:
     t timestamptz default now(),
@@ -63,6 +64,20 @@ create view report as
        select count(1), max(t) as last_seen, error
        from base_error group by 3 order by count desc;
 
+
+create or replace view state_report as
+ SELECT count(1) AS count,
+    sqlstate,
+    min(substring(firstline(e.msg),1,80)) AS sample,
+    array_agg(DISTINCT i.hostname) AS hosts
+   FROM error e
+     JOIN instance i ON i.id = e.id
+  WHERE e.t > (now() - '24:00:00'::interval)
+  GROUP BY sqlstate
+  ORDER BY (count(1));
+
+comment on view state_report is 'an sqlstate-grouped report';
+
 comment on view report is 'same report as sqlsmith''s verbose output';
 
 drop view if exists report24h;
@@ -126,6 +141,7 @@ create trigger discard_known before insert on error
 -- YMMV.
 create index on error(t);
 
+-- Following views are used for debugging sqlsmith
 create view impedance as
     select id, generated, level, nodes, updated,
     	   prod, ok, bad, js.retries, limited, failed

postgres.cc

@@ -308,7 +308,7 @@ void dut_libpq::connect(std::string &conninfo)
     conn = PQconnectdb(conninfo.c_str());
     char *errmsg = PQerrorMessage(conn);
     if (strlen(errmsg))
-	throw dut::broken(errmsg);
+	 throw dut::broken(errmsg, "08000");
 
     test("set statement_timeout to '1s'");
     test("set client_min_messages to 'ERROR';");
@@ -330,25 +330,27 @@ void dut_libpq::test(const std::string &stmt)
 
     PGresult *res = PQexec(conn, stmt.c_str());
     int status = PQresultStatus(res);
-    const char *sqlstate;
 
     switch (status) {
 
     case PGRES_FATAL_ERROR:
     default:
     {
-	sqlstate = PQresultErrorField(res, PG_DIAG_SQLSTATE);
-	(void) sqlstate;
+	char *sqlstate = PQresultErrorField(res, PG_DIAG_SQLSTATE);
 	char *errmsg = PQresultErrorMessage(res);
 	std::string error_string(errmsg);
+	std::string sqlstate_string(sqlstate);
 	PQclear(res);
 
 	ConnStatusType connstatus = PQstatus(conn);
 	if (CONNECTION_OK != connstatus) {
 	    conn = 0;
-	    throw dut::broken(error_string.c_str());
+	    throw dut::broken(error_string.c_str(), sqlstate_string.c_str());
 	}
-	throw dut::failure(error_string.c_str());
+	if (sqlstate_string == "42601")
+	     throw dut::syntax(error_string.c_str(), sqlstate_string.c_str());
+	else
+	     throw dut::failure(error_string.c_str(), sqlstate_string.c_str());
     }
 
     case PGRES_NONFATAL_ERROR: