From: Christian Kruse <cjk@defunct.ch>
Date: Mon, 31 Mar 2014 12:16:08 +0000 (+0200)
Subject: bdr: better error messages for SPI calls
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=be8aa62b5168bc1bfcf2c12785bf25e596fc3ee8;p=users%2Fandresfreund%2Fpostgres.git

bdr: better error messages for SPI calls

I could be wrong but „blub“ or „blart“ is not a very comprehensible
error message ;-)
---

diff --git a/contrib/bdr/bdr_seq.c b/contrib/bdr/bdr_seq.c
index 63be861c97..84e05aadf3 100644
--- a/contrib/bdr/bdr_seq.c
+++ b/contrib/bdr/bdr_seq.c
@@ -605,7 +605,7 @@ again:
 								values, nulls, false, 0);
 
 	if (ret != SPI_OK_INSERT)
-		elog(ERROR, "blub");
+		elog(ERROR, "expected SPI state %u, got %u", SPI_OK_INSERT, ret);
 	my_processed = SPI_processed;
 	elog(LOG, "started %d votes", my_processed);
 
@@ -662,7 +662,7 @@ bdr_sequencer_start_elections(void)
 								values, nulls, false, 0);
 
 	if (ret != SPI_OK_INSERT_RETURNING)
-		elog(ERROR, "blub");
+		elog(ERROR, "expected SPI state %u, got %u", SPI_OK_INSERT_RETURNING, ret);
 
 	elog(LOG, "started %d elections", SPI_processed);
 
@@ -719,7 +719,7 @@ bdr_sequencer_tally(void)
 								values, nulls, false, 0);
 
 	if (ret != SPI_OK_SELECT)
-		elog(ERROR, "blub");
+		elog(ERROR, "expected SPI state %u, got %u", SPI_OK_SELECT, ret);
 
 	elog(LOG, "tallied %d elections", SPI_processed);
 
@@ -796,7 +796,7 @@ bdr_sequencer_fill_chunk(Oid seqoid, char *seqschema, char *seqname,
 	ret = SPI_execute_with_args(get_chunk_sql, 6, argtypes,
 								values, nulls, false, 0);
 	if (ret != SPI_OK_UPDATE_RETURNING)
-		elog(ERROR, "blart");
+		elog(ERROR, "expected SPI state %u, got %u", SPI_OK_UPDATE_RETURNING, ret);
 
 	if (SPI_processed != 1)
 	{