cleanup errors, update expected error messages

Author: serprex

src/binary.c

@@ -318,10 +318,10 @@ struct ch_binary_state
 	bool		(*check_cancel_fn) (void);
 
 	/*
-	 * Set when an unrecoverable protocol/IO error happened (eg server
-	 * raised an exception mid-INSERT and closed the socket, or a write
-	 * hit EPIPE). Callers must drop the cached connection rather than
-	 * reuse it; the cache layer checks this via ch_binary_is_broken.
+	 * Set when an unrecoverable protocol/IO error happened (eg server raised
+	 * an exception mid-INSERT and closed the socket, or a write hit EPIPE).
+	 * Callers must drop the cached connection rather than reuse it; the cache
+	 * layer checks this via ch_binary_is_broken.
 	 */
 	bool		broken;
 };
@@ -495,8 +495,7 @@ ch_binary_connect(ch_connection_details * details, char *errbuf, size_t errbuf_s
 
 	if (rc != CHC_OK)
 	{
-		set_errbuf(errbuf, errbuf_size,
-				   err.msg[0] ? err.msg : "chc_client_init failed");
+		set_errbuf(errbuf, errbuf_size, err.msg);
 		goto fail;
 	}
 	return conn;
@@ -825,7 +824,7 @@ ch_binary_simple_query(ch_binary_connection_t * conn, const ch_query * query,
 
 	if (rc != CHC_OK)
 	{
-		resp_set_error(resp, err.msg[0] ? err.msg : "send_query failed");
+		resp_set_error(resp, err.msg);
 		s->broken = true;
 		goto done;
 	}
@@ -841,7 +840,7 @@ ch_binary_simple_query(ch_binary_connection_t * conn, const ch_query * query,
 		rc = chc_client_recv_packet(s->client, &pkt, &err);
 		if (rc != CHC_OK)
 		{
-			resp_set_error(resp, err.msg[0] ? err.msg : "recv_packet failed");
+			resp_set_error(resp, err.msg);
 			s->broken = true;
 			break;
 		}
@@ -874,12 +873,13 @@ ch_binary_simple_query(ch_binary_connection_t * conn, const ch_query * query,
 			case CHC_PKT_EXCEPTION:
 				resp_set_exception(resp, pkt.exception);
 				chc_packet_clear(s->client, &pkt);
+
 				/*
 				 * Older servers (and some protocol states) close the socket
 				 * after raising an exception, so reusing this connection for
 				 * a follow-up query risks EPIPE. Match the legacy C++ driver
-				 * (which always called Client::ResetConnection) and treat
-				 * the connection as broken.
+				 * (which always called Client::ResetConnection) and treat the
+				 * connection as broken.
 				 */
 				s->broken = true;
 				goto done;
@@ -1053,8 +1053,8 @@ struct ch_binary_insert_handle
 {
 	chc_client *client;
 	chc_alloc	alloc;
-	struct ch_binary_state *state;	/* parent connection; used to flag
-									 * broken state on error */
+	struct ch_binary_state *state;	/* parent connection; used to flag broken
+									 * state on error */
 	chc_block  *initial_block;	/* schema source (server's empty Data) */
 	chc_query_opts opts;
 	size_t		ncols;
@@ -1225,8 +1225,7 @@ recv_initial_block(struct ch_binary_state *s, ch_binary_insert_handle * h,
 
 		if (rc != CHC_OK)
 		{
-			set_errbuf(errbuf, errbuf_size,
-					   err.msg[0] ? err.msg : "recv_packet failed");
+			set_errbuf(errbuf, errbuf_size, err.msg);
 			s->broken = true;
 			return -1;
 		}
@@ -1316,7 +1315,7 @@ ch_binary_begin_insert(ch_binary_connection_t * conn, const ch_query * query,
 	free(sql);
 	if (rc != CHC_OK)
 	{
-		set_errbuf(errbuf, errbuf_size, err.msg[0] ? err.msg : "send_query failed");
+		set_errbuf(errbuf, errbuf_size, err.msg);
 		s->broken = true;
 		ch_binary_end_insert(h, errbuf, errbuf_size);
 		return NULL;
@@ -2127,7 +2126,7 @@ ch_binary_flush_block(ch_binary_insert_handle * h, char *errbuf, size_t errbuf_s
 
 	if (rc != CHC_OK)
 	{
-		set_errbuf(errbuf, errbuf_size, err.msg[0] ? err.msg : "block_builder_init");
+		set_errbuf(errbuf, errbuf_size, err.msg);
 		return -1;
 	}
 
@@ -2244,15 +2243,15 @@ ch_binary_flush_block(ch_binary_insert_handle * h, char *errbuf, size_t errbuf_s
 		}
 		if (rc != CHC_OK)
 		{
-			set_errbuf(errbuf, errbuf_size, err.msg[0] ? err.msg : "block_builder_append");
+			set_errbuf(errbuf, errbuf_size, err.msg);
 			goto cleanup;
 		}
 	}
 
 	rc = chc_client_send_data(h->client, bb, &err);
 	if (rc != CHC_OK)
 	{
-		set_errbuf(errbuf, errbuf_size, err.msg[0] ? err.msg : "send_data");
+		set_errbuf(errbuf, errbuf_size, err.msg);
 		if (h->state)
 			h->state->broken = true;
 		goto cleanup;
@@ -2305,8 +2304,7 @@ ch_binary_end_insert(ch_binary_insert_handle * h, char *errbuf, size_t errbuf_si
 				rc = chc_client_recv_packet(h->client, &pkt, &err);
 				if (rc != CHC_OK)
 				{
-					set_errbuf(errbuf, errbuf_size,
-							   err.msg[0] ? err.msg : "recv_packet failed");
+					set_errbuf(errbuf, errbuf_size, err.msg);
 					if (h->state)
 						h->state->broken = true;
 					chc_packet_clear(h->client, &pkt);
@@ -2321,6 +2319,7 @@ ch_binary_end_insert(ch_binary_insert_handle * h, char *errbuf, size_t errbuf_si
 					else if (pkt.exception && pkt.exception->name)
 						msg = pkt.exception->name;
 					set_errbuf(errbuf, errbuf_size, msg);
+
 					/*
 					 * Server raised an exception mid-INSERT and typically
 					 * closes the socket; the next op on this conn would
@@ -2338,7 +2337,7 @@ ch_binary_end_insert(ch_binary_insert_handle * h, char *errbuf, size_t errbuf_si
 		}
 		else
 		{
-			set_errbuf(errbuf, errbuf_size, err.msg[0] ? err.msg : "send_data terminator failed");
+			set_errbuf(errbuf, errbuf_size, err.msg);
 			if (h->state)
 				h->state->broken = true;
 		}

src/connection.c

@@ -125,9 +125,9 @@ chfdw_get_connection(UserMapping * user)
 	/*
 	 * Drop connections that hit an unrecoverable protocol/IO error on the
 	 * previous statement (server raised mid-INSERT and closed the socket,
-	 * write hit EPIPE, etc). Without this, a subsequent statement would
-	 * write to the dead socket and surface a useless "Broken pipe" instead
-	 * of the real error from the next request.
+	 * write hit EPIPE, etc). Without this, a subsequent statement would write
+	 * to the dead socket and surface a useless "Broken pipe" instead of the
+	 * real error from the next request.
 	 */
 	if (entry->gate.conn != NULL && entry->gate.methods->is_broken != NULL
 		&& entry->gate.methods->is_broken(entry->gate.conn))