Merge branch 'master' of https://github.com/kotsachin/pg_repack into kotsachin-master

schmiddy · schmiddy · commit b6b6a8bfb35e · 2015-05-25T10:59:32.000-06:00
diff --git a/bin/pg_repack.c b/bin/pg_repack.c
@@ -243,7 +243,7 @@ static char *
 utoa(unsigned int value, char *buffer)
 {
 	sprintf(buffer, "%u", value);
-	return strdup(buffer);
+	return pgut_strdup(buffer);
 }
 
 static pgut_option options[] =
@@ -1391,6 +1391,7 @@ repack_one_table(repack_table *table, const char *orderby)
 	params[1] = utoa(temp_obj_num, buffer);
 	command("SELECT repack.repack_drop($1, $2)", 2, params);
 	command("COMMIT", 0, NULL);
+	temp_obj_num = 0; /* reset temporary object counter after cleanup */
 
 	/*
 	 * 7. Analyze.
@@ -1706,6 +1707,7 @@ repack_cleanup_callback(bool fatal, void *userdata)
 
 		reconnect(ERROR);
 		command("SELECT repack.repack_drop($1, $2)", 2, params);
+		temp_obj_num = 0; /* reset temporary object counter after cleanup */
 	}
 }
 
@@ -1734,6 +1736,7 @@ repack_cleanup(bool fatal, const repack_table *table)
 		params[0] = utoa(table->target_oid, buffer);
 		params[1] =  utoa(temp_obj_num, buffer);
 		command("SELECT repack.repack_drop($1, $2)", 2, params);
+		temp_obj_num = 0; /* reset temporary object counter after cleanup */
 	}
 }
 
diff --git a/bin/pgut/pgut.c b/bin/pgut/pgut.c
@@ -64,7 +64,7 @@ static void on_before_exec(pgutConn *conn);
 static void on_after_exec(pgutConn *conn);
 static void on_interrupt(void);
 static void on_cleanup(void);
-static void exit_or_abort(int exitcode);
+static void exit_or_abort(int exitcode, int elevel);
 
 void
 pgut_init(int argc, char **argv)
@@ -872,7 +872,10 @@ pgut_errfinish(int dummy, ...)
 			edata->detail.data);
 
 	if (pgut_abort_level <= edata->elevel && edata->elevel <= PANIC)
-		exit_or_abort(edata->code);
+	{
+		in_cleanup = true; /* need to be set for cleaning temporary objects on error */
+		exit_or_abort(edata->code, edata->elevel);
+	}
 }
 
 #ifndef PGUT_OVERRIDE_ELOG
@@ -1195,13 +1198,19 @@ on_cleanup(void)
 }
 
 static void
-exit_or_abort(int exitcode)
+exit_or_abort(int exitcode, int elevel)
 {
-	call_atexit_callbacks(true);
-	if (in_cleanup)
+	
+	if (in_cleanup && FATAL > elevel)
 	{
 		/* oops, error in cleanup*/
-		in_cleanup = false;
+		call_atexit_callbacks(true);
+		exit(exitcode);
+	}
+	else if (FATAL <= elevel <= PANIC)
+	{
+		/* on FATAL or PANIC */
+		call_atexit_callbacks(true);
 		abort();
 	}
 	else

Original file line number	Diff line number	Diff line change
`@@ -243,7 +243,7 @@ static char *`
`243`	`243`	`utoa(unsigned int value, char *buffer)`
`244`	`244`	`{`
`245`	`245`	`sprintf(buffer, "%u", value);`
`246`		`- return strdup(buffer);`
	`246`	`+ return pgut_strdup(buffer);`
`247`	`247`	`}`
`248`	`248`
`249`	`249`	`static pgut_option options[] =`
`@@ -1391,6 +1391,7 @@ repack_one_table(repack_table table, const char orderby)`
`1391`	`1391`	`params[1] = utoa(temp_obj_num, buffer);`
`1392`	`1392`	`command("SELECT repack.repack_drop($1, $2)", 2, params);`
`1393`	`1393`	`command("COMMIT", 0, NULL);`
	`1394`	`+ temp_obj_num = 0; /* reset temporary object counter after cleanup */`
`1394`	`1395`
`1395`	`1396`	`/*`
`1396`	`1397`	`* 7. Analyze.`
`@@ -1706,6 +1707,7 @@ repack_cleanup_callback(bool fatal, void *userdata)`
`1706`	`1707`
`1707`	`1708`	`reconnect(ERROR);`
`1708`	`1709`	`command("SELECT repack.repack_drop($1, $2)", 2, params);`
	`1710`	`+ temp_obj_num = 0; /* reset temporary object counter after cleanup */`
`1709`	`1711`	`}`
`1710`	`1712`	`}`
`1711`	`1713`
`@@ -1734,6 +1736,7 @@ repack_cleanup(bool fatal, const repack_table *table)`
`1734`	`1736`	`params[0] = utoa(table->target_oid, buffer);`
`1735`	`1737`	`params[1] = utoa(temp_obj_num, buffer);`
`1736`	`1738`	`command("SELECT repack.repack_drop($1, $2)", 2, params);`
	`1739`	`+ temp_obj_num = 0; /* reset temporary object counter after cleanup */`
`1737`	`1740`	`}`
`1738`	`1741`	`}`
`1739`	`1742`