Cleaned up log output a little bit more.

diff --git a/src/interfaces/ecpg/ecpglib/execute.c b/src/interfaces/ecpg/ecpglib/execute.c
index 93f912b891502e337f8784ef7a9b15d1b3177cf2..2a8f61785895601a5120094b110c817db9ebf824 100644 (file)
--- a/src/interfaces/ecpg/ecpglib/execute.c
+++ b/src/interfaces/ecpg/ecpglib/execute.c
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/execute.c,v 1.56 2006/08/02 13:43:23 meskes Exp $ */
+/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/execute.c,v 1.57 2006/08/08 15:30:39 meskes Exp $ */
 
 /*
  * The aim is to get a simpler inteface to the database routines.
@@ -421,9 +421,6 @@ ECPGstore_result(const PGresult *results, int act_field,
                                                len += strlen(PQgetvalue(results, act_tuple, act_field)) + 1;
                                        len *= var->offset; /* should be 1, but YMNK */
                                        len += (ntuples + 1) * sizeof(char *);
-
-                                       ECPGlog("ECPGstore_result: line %d: allocating %d bytes for %d tuples (char**=0)",
-                                                       stmt->lineno, len, ntuples);
                                }
                                else
                                {
@@ -447,6 +444,7 @@ ECPGstore_result(const PGresult *results, int act_field,
                                len = var->offset * ntuples;
                                break;
                }
+               ECPGlog("ECPGstore_result: line %d: allocating memory for %d tuples\n", stmt->lineno, ntuples);
                var->value = (char *) ECPGalloc(len, stmt->lineno);
                if (!var->value)
                        return false;

diff --git a/src/interfaces/ecpg/test/expected/complex-test2.stderr b/src/interfaces/ecpg/test/expected/complex-test2.stderr
index 2aa650abd5cbc1b3e499a8872e7f769b0994231f..34e45ac139843a151cfd659fe01d26a3d3175ed9 100644 (file)
--- a/src/interfaces/ecpg/test/expected/complex-test2.stderr
+++ b/src/interfaces/ecpg/test/expected/complex-test2.stderr
@@ -42,6 +42,8 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_data line 70: RESULT:  offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ECPGstore_result: line 70: allocating memory for 1 tuples
+[NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_data line 70: RESULT: 04-04-1990 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_data line 70: RESULT: 3 offset: -1 array: Yes
@@ -56,6 +58,8 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_data line 70: RESULT: 35 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ECPGstore_result: line 70: allocating memory for 1 tuples
+[NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_data line 70: RESULT: 04-04-1990 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_data line 70: RESULT: 3 offset: -1 array: Yes
@@ -70,6 +74,8 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_data line 70: RESULT: 10 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ECPGstore_result: line 70: allocating memory for 1 tuples
+[NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_data line 70: RESULT:  offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_data line 70: RESULT:  offset: -1 array: Yes
@@ -84,6 +90,8 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_data line 70: RESULT: 8 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ECPGstore_result: line 70: allocating memory for 1 tuples
+[NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_data line 70: RESULT:  offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_data line 70: RESULT:  offset: -1 array: Yes
@@ -98,6 +106,8 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_data line 70: RESULT: 4 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ECPGstore_result: line 70: allocating memory for 1 tuples
+[NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_data line 70: RESULT:  offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_data line 70: RESULT:  offset: -1 array: Yes
@@ -128,6 +138,8 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_data line 100: RESULT:  offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ECPGstore_result: line 100: allocating memory for 1 tuples
+[NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_data line 100: RESULT: 04-04-1990 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_data line 100: RESULT: 3 offset: -1 array: Yes

diff --git a/src/interfaces/ecpg/test/expected/complex-test3.stderr b/src/interfaces/ecpg/test/expected/complex-test3.stderr
index 740c670902a07fc523e693e377084298fb3f43ed..ea923fab168d430ca629c2171d62a86984ecd4a0 100644 (file)
--- a/src/interfaces/ecpg/test/expected/complex-test3.stderr
+++ b/src/interfaces/ecpg/test/expected/complex-test3.stderr
@@ -46,6 +46,8 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_data line 64: RESULT: 10 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ECPGstore_result: line 64: allocating memory for 1 tuples
+[NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_data line 64: RESULT:  offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_data line 64: RESULT:  offset: -1 array: Yes
@@ -60,6 +62,8 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_data line 64: RESULT: 8 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ECPGstore_result: line 64: allocating memory for 1 tuples
+[NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_data line 64: RESULT:  offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_data line 64: RESULT:  offset: -1 array: Yes
@@ -74,6 +78,8 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_data line 64: RESULT: 4 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ECPGstore_result: line 64: allocating memory for 1 tuples
+[NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_data line 64: RESULT:  offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_data line 64: RESULT:  offset: -1 array: Yes
@@ -104,6 +110,8 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_data line 94: RESULT:  offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ECPGstore_result: line 94: allocating memory for 1 tuples
+[NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_data line 94: RESULT: 04-04-1990 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_data line 94: RESULT: 3 offset: -1 array: Yes

diff --git a/src/interfaces/ecpg/test/expected/sql-dynalloc.stderr b/src/interfaces/ecpg/test/expected/sql-dynalloc.stderr
index ba457efdf64678a1f8bfa07248fb8c99134b646b..c871bee98a6a8cf6c128c4db32a6afe2b73a6053 100644 (file)
--- a/src/interfaces/ecpg/test/expected/sql-dynalloc.stderr
+++ b/src/interfaces/ecpg/test/expected/sql-dynalloc.stderr
@@ -22,54 +22,64 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_desc: reading items for tuple 1
 [NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ECPGstore_result: line 41: allocating memory for 2 tuples
+[NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_data line 41: RESULT: 1 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_data line 41: RESULT: 2 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_desc: reading items for tuple 2
 [NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ECPGstore_result: line 42: allocating memory for 2 tuples
+[NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_data line 42: RESULT: 23.456 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_data line 42: RESULT: 2.446 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_desc: reading items for tuple 3
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGstore_result: line 43: allocating 21 bytes for 2 tuples (char**=0)[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ECPGstore_result: line 43: allocating memory for 2 tuples
+[NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_data line 43: RESULT: varchar offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_data line 43: RESULT:  offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_desc: reading items for tuple 4
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGstore_result: line 44: allocating 16 bytes for 2 tuples (char**=0)[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ECPGstore_result: line 44: allocating memory for 2 tuples
+[NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_data line 44: RESULT: v offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_data line 44: RESULT: v offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_desc: reading items for tuple 5
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGstore_result: line 45: allocating 22 bytes for 2 tuples (char**=0)[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ECPGstore_result: line 45: allocating memory for 2 tuples
+[NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_data line 45: RESULT: c    offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_data line 45: RESULT: c    offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_desc: reading items for tuple 6
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGstore_result: line 46: allocating 70 bytes for 2 tuples (char**=0)[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ECPGstore_result: line 46: allocating memory for 2 tuples
+[NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_data line 46: RESULT: Mon Mar 03 11:33:07 2003 PST offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_data line 46: RESULT: Mon Mar 03 11:33:07 2003 PST offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_desc: reading items for tuple 7
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGstore_result: line 47: allocating 16 bytes for 2 tuples (char**=0)[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ECPGstore_result: line 47: allocating memory for 2 tuples
+[NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_data line 47: RESULT: t offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_data line 47: RESULT: f offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_desc: reading items for tuple 9
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGstore_result: line 50: allocating 46 bytes for 2 tuples (char**=0)[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ECPGstore_result: line 50: allocating memory for 2 tuples
+[NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_data line 50: RESULT: 2001:4f8:3:ba:2e0:81ff:fe22:d1f1 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_data line 50: RESULT:  offset: -1 array: Yes

diff --git a/src/interfaces/ecpg/test/expected/sql-dynalloc2.stderr b/src/interfaces/ecpg/test/expected/sql-dynalloc2.stderr
index cf5a48b415ec859d12dc0f7139888dc4658a220c..cddf00ac382c2902d8e89a84a050ff99e8b9b5f3 100644 (file)
--- a/src/interfaces/ecpg/test/expected/sql-dynalloc2.stderr
+++ b/src/interfaces/ecpg/test/expected/sql-dynalloc2.stderr
@@ -40,6 +40,8 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_desc: reading items for tuple 1
 [NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ECPGstore_result: line 33: allocating memory for 6 tuples
+[NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_data line 33: RESULT: 1 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_data line 33: RESULT: 2 offset: -1 array: Yes
@@ -54,7 +56,8 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_desc: reading items for tuple 2
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGstore_result: line 34: allocating 49 bytes for 6 tuples (char**=0)[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ECPGstore_result: line 34: allocating memory for 6 tuples
+[NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_data line 34: RESULT: one offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_data line 34: RESULT: two offset: -1 array: Yes