Merge branch 'amitlan-master'

schmiddy · schmiddy · commit a8409dd62413 · 2015-05-27T21:38:26.000-04:00
diff --git a/bin/pg_repack.c b/bin/pg_repack.c
@@ -243,13 +243,8 @@ static char *
 utoa(unsigned int value, char *buffer)
 {
 	sprintf(buffer, "%u", value);
-	/* XXX: originally, we would just return buffer here without
-	 * the pgut_strdup(). But repack_cleanup_callback() seems to
-	 * depend on getting back a freshly strdup'd copy of buffer,
-	 * not sure why. So now we are leaking a tiny bit of memory
-	 * with each utoa() call.
-	 */
-	return pgut_strdup(buffer);
+
+	return buffer;
 }
 
 static pgut_option options[] =
@@ -1397,7 +1392,7 @@ repack_one_table(repack_table *table, const char *orderby)
 	elog(DEBUG2, "---- drop ----");
 
 	command("BEGIN ISOLATION LEVEL READ COMMITTED", 0, NULL);
-	params[1] = utoa(temp_obj_num, buffer);
+	params[1] = utoa(temp_obj_num, indexbuffer);
 	command("SELECT repack.repack_drop($1, $2)", 2, params);
 	command("COMMIT", 0, NULL);
 	temp_obj_num = 0; /* reset temporary object counter after cleanup */
@@ -1708,11 +1703,12 @@ repack_cleanup_callback(bool fatal, void *userdata)
 	Oid			target_table = *(Oid *) userdata;
 	const char *params[2];
 	char		buffer[12];
+	char		num_buff[12];	
 
 	if(fatal)
 	{
 		params[0] = utoa(target_table, buffer);
-		params[1] = utoa(temp_obj_num, buffer);
+		params[1] = utoa(temp_obj_num, num_buff);
 
 		/* testing PQstatus() of connection and conn2, as we do
 		 * in repack_cleanup(), doesn't seem to work here,
@@ -1738,6 +1734,7 @@ repack_cleanup(bool fatal, const repack_table *table)
 	else
 	{
 		char		buffer[12];
+		char		num_buff[12];
 		const char *params[2];
 
 		/* Try reconnection if not available. */
@@ -1747,7 +1744,7 @@ repack_cleanup(bool fatal, const repack_table *table)
 
 		/* do cleanup */
 		params[0] = utoa(table->target_oid, buffer);
-		params[1] =  utoa(temp_obj_num, buffer);
+		params[1] =  utoa(temp_obj_num, num_buff);
 		command("SELECT repack.repack_drop($1, $2)", 2, params);
 		temp_obj_num = 0; /* reset temporary object counter after cleanup */
 	}
