PGPRO-2065: add async mode to pgut_execute_parallel()

gsmolk · gsmolk · commit 79cc076a0c28 · 2019-04-02T18:52:00.000+03:00
diff --git a/src/backup.c b/src/backup.c
@@ -1021,8 +1021,15 @@ do_block_validation(void)
 	/* TODO write better info message */
 	if (check_isok)
 		elog(INFO, "Data files are valid");
-	else
-		elog(ERROR, "Data files are corrupted");
+
+	if (!check_isok)
+	{
+		if (thread_interrupted || interrupted)
+			elog(ERROR, "Checkdb failed");
+		else
+			elog(ERROR, "Data files are corrupted");
+	}
+
 
 	if (backup_files_list)
 	{
@@ -1131,7 +1138,7 @@ do_amcheck(void)
 	if (check_isok && !db_skipped)
 		elog(INFO, "Indexes are valid");
 
-	if (!check_isok)
+	if (!check_isok && !interrupted)
 		elog(ERROR, "Some indexes are corrupted");
 
 	if (db_skipped)
@@ -3398,7 +3405,7 @@ pg_ptrack_get_block(backup_files_arg *arguments,
 	res = pgut_execute_parallel(arguments->backup_conn,
 								arguments->cancel_conn,
 					"SELECT pg_catalog.pg_ptrack_get_block_2($1, $2, $3, $4)",
-					4, (const char **)params, true, false);
+					4, (const char **)params, true, false, false);
 
 	if (PQnfields(res) != 1)
 	{
@@ -3598,7 +3605,7 @@ amcheck_one_index(backup_files_arg *arguments,
 
 		res = pgut_execute_parallel(arguments->backup_conn,
 								arguments->cancel_conn,
-								query, 2, (const char **)params, true, true);
+								query, 2, (const char **)params, true, true, true);
 	}
 	else
 	{
@@ -3607,7 +3614,7 @@ amcheck_one_index(backup_files_arg *arguments,
 
 		res = pgut_execute_parallel(arguments->backup_conn,
 								arguments->cancel_conn,
-								query, 1, (const char **)params, true, true);
+								query, 1, (const char **)params, true, true, true);
 	}
 
 	if (PQresultStatus(res) != PGRES_TUPLES_OK)
diff --git a/src/utils/pgut.c b/src/utils/pgut.c
@@ -359,9 +359,10 @@ PGresult *
 pgut_execute_parallel(PGconn* conn,
 					  PGcancel* thread_cancel_conn, const char *query,
 					  int nParams, const char **params,
-					  bool text_result, bool ok_error)
+					  bool text_result, bool ok_error, bool async)
 {
 	PGresult   *res;
+	int			ret = 0;
 
 	if (interrupted && !in_cleanup)
 		elog(ERROR, "interrupted");
@@ -387,15 +388,50 @@ pgut_execute_parallel(PGconn* conn,
 	}
 
 	//on_before_exec(conn, thread_cancel_conn);
-	if (nParams == 0)
-		res = PQexec(conn, query);
+	if (async)
+	{
+		if (nParams == 0)
+			ret = PQsendQuery(conn, query);
+		else
+			ret = PQsendQueryParams(conn, query, nParams, NULL, params, NULL, NULL,
+								/*
+								* Specify zero to obtain results in text format,
+								* or one to obtain results in binary format.
+								*/
+								(text_result) ? 0 : 1);
+
+		/* wait for processing */
+		while (true)
+		{
+
+			if (interrupted)
+				elog(ERROR, "interrupted");
+
+			if (!PQconsumeInput(conn))
+				elog(ERROR, "query failed: %squery was: %s",
+					PQerrorMessage(conn), query);
+
+			/* query is no done */
+			if (!PQisBusy(conn))
+				break;
+
+			usleep(1000);
+		}
+
+		res = PQgetResult(conn);
+	}
 	else
-		res = PQexecParams(conn, query, nParams, NULL, params, NULL, NULL,
-						   /*
-							* Specify zero to obtain results in text format,
-							* or one to obtain results in binary format.
-							*/
-						   (text_result) ? 0 : 1);
+	{
+		if (nParams == 0)
+			res = PQexec(conn, query);
+		else
+			res = PQexecParams(conn, query, nParams, NULL, params, NULL, NULL,
+								/*
+								* Specify zero to obtain results in text format,
+								* or one to obtain results in binary format.
+								*/
+								(text_result) ? 0 : 1);
+	}
 	//on_after_exec(thread_cancel_conn);
 
 	switch (PQresultStatus(res))
diff --git a/src/utils/pgut.h b/src/utils/pgut.h
@@ -57,7 +57,7 @@ extern PGresult *pgut_execute_extended(PGconn* conn, const char *query, int nPar
 							  const char **params, bool text_result, bool ok_error);
 extern PGresult *pgut_execute_parallel(PGconn* conn, PGcancel* thread_cancel_conn,
 							  const char *query, int nParams,
-							  const char **params, bool text_result, bool ok_error);
+							  const char **params, bool text_result, bool ok_error, bool async);
 extern bool pgut_send(PGconn* conn, const char *query, int nParams, const char **params, int elevel);
 extern void pgut_cancel(PGconn* conn);
 extern int pgut_wait(int num, PGconn *connections[], struct timeval *timeout);
