Move the output write outside the memory context, and fix the off by …

…1 error in the array iteration
apigee-labs · Nov 9, 2016 · 87cad11 · 87cad11
1 parent ed78a07
commit 87cad11
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/pgoutput/output_proto.c b/pgoutput/output_proto.c
@@ -70,6 +70,7 @@ static void tuple_to_proto(
 {
   int	natt;
   int cp = 0;
+  int colnum = 0;
 
   for (natt = 0; natt < tupdesc->natts; natt++)
 	{
@@ -87,7 +88,7 @@ static void tuple_to_proto(
 
     col = (Common__ColumnPb*)palloc(sizeof(Common__ColumnPb));
     common__column_pb__init(col);
-    cols[natt] = col;
+    cols[colnum++] = col;
 
     typ =  attr->atttypid;
     col->name = NameStr(attr->attname);
@@ -211,5 +212,4 @@ void transicatorOutputChangeProto(
 
   OutputPluginPrepareWrite(ctx, true);
   appendBinaryStringInfo(ctx->out, (char*)pack, packSize);
-  OutputPluginWrite(ctx, true);
 }
diff --git a/pgoutput/output_string.c b/pgoutput/output_string.c
@@ -195,5 +195,4 @@ void transicatorOutputChangeString(
   }
 
   appendStringInfoChar(ctx->out, '}');
-  OutputPluginWrite(ctx, true);
 }
diff --git a/pgoutput/transicator_output.c b/pgoutput/transicator_output.c
@@ -116,6 +116,7 @@ static void outputChange(
   /* Switch back to original context and release everything we "palloc"ed */
   MemoryContextSwitchTo(oldMemCtx);
   MemoryContextReset(state->memCtx);
+  OutputPluginWrite(ctx, true);
 }
 
 void _PG_output_plugin_init(OutputPluginCallbacks *cb) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -195,5 +195,4 @@ void transicatorOutputChangeString( @@
       }
       appendStringInfoChar(ctx->out, '}');
-      OutputPluginWrite(ctx, true);
     }