From d9fa17aa7c34dea66ce64da6fb4c643e75ba452c Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Thu, 11 Jun 2020 14:14:12 +0200 Subject: [PATCH] pg_dump: Remove dead code Remove some code relevant only for dumping from pre-7.1 servers, support for which had already been removed by 64f3524e2c8deebc02808aa5ebdfa17859473add. --- src/bin/pg_dump/pg_dump.c | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c index dfe43968b80..89d598f8568 100644 --- a/src/bin/pg_dump/pg_dump.c +++ b/src/bin/pg_dump/pg_dump.c @@ -13959,7 +13959,6 @@ dumpAgg(Archive *fout, AggInfo *agginfo) int i_aggmtransspace; int i_agginitval; int i_aggminitval; - int i_convertok; int i_proparallel; const char *aggtransfn; const char *aggfinalfn; @@ -13982,7 +13981,6 @@ dumpAgg(Archive *fout, AggInfo *agginfo) const char *aggmtransspace; const char *agginitval; const char *aggminitval; - bool convertok; const char *proparallel; char defaultfinalmodify; @@ -14008,7 +14006,6 @@ dumpAgg(Archive *fout, AggInfo *agginfo) "aggkind, " "aggtransspace, agginitval, " "aggmtransspace, aggminitval, " - "true AS convertok, " "pg_catalog.pg_get_function_arguments(p.oid) AS funcargs, " "pg_catalog.pg_get_function_identity_arguments(p.oid) AS funciargs, " "p.proparallel " @@ -14029,7 +14026,6 @@ dumpAgg(Archive *fout, AggInfo *agginfo) "aggkind, " "aggtransspace, agginitval, " "aggmtransspace, aggminitval, " - "true AS convertok, " "pg_catalog.pg_get_function_arguments(p.oid) AS funcargs, " "pg_catalog.pg_get_function_identity_arguments(p.oid) AS funciargs, " "p.proparallel " @@ -14051,7 +14047,6 @@ dumpAgg(Archive *fout, AggInfo *agginfo) "aggkind, " "aggtransspace, agginitval, " "aggmtransspace, aggminitval, " - "true AS convertok, " "pg_catalog.pg_get_function_arguments(p.oid) AS funcargs, " "pg_catalog.pg_get_function_identity_arguments(p.oid) AS funciargs " "FROM pg_catalog.pg_aggregate a, pg_catalog.pg_proc p " @@ -14073,7 +14068,6 @@ dumpAgg(Archive *fout, AggInfo *agginfo) "'n' AS aggkind, " "0 AS aggtransspace, agginitval, " "0 AS aggmtransspace, NULL AS aggminitval, " - "true AS convertok, " "pg_catalog.pg_get_function_arguments(p.oid) AS funcargs, " "pg_catalog.pg_get_function_identity_arguments(p.oid) AS funciargs " "FROM pg_catalog.pg_aggregate a, pg_catalog.pg_proc p " @@ -14095,7 +14089,6 @@ dumpAgg(Archive *fout, AggInfo *agginfo) "'n' AS aggkind, " "0 AS aggtransspace, agginitval, " "0 AS aggmtransspace, NULL AS aggminitval, " - "true AS convertok " "FROM pg_catalog.pg_aggregate a, pg_catalog.pg_proc p " "WHERE a.aggfnoid = p.oid " "AND p.oid = '%u'::pg_catalog.oid", @@ -14115,7 +14108,6 @@ dumpAgg(Archive *fout, AggInfo *agginfo) "'n' AS aggkind, " "0 AS aggtransspace, agginitval, " "0 AS aggmtransspace, NULL AS aggminitval, " - "true AS convertok " "FROM pg_catalog.pg_aggregate a, pg_catalog.pg_proc p " "WHERE a.aggfnoid = p.oid " "AND p.oid = '%u'::pg_catalog.oid", @@ -14144,7 +14136,6 @@ dumpAgg(Archive *fout, AggInfo *agginfo) i_aggmtransspace = PQfnumber(res, "aggmtransspace"); i_agginitval = PQfnumber(res, "agginitval"); i_aggminitval = PQfnumber(res, "aggminitval"); - i_convertok = PQfnumber(res, "convertok"); i_proparallel = PQfnumber(res, "proparallel"); aggtransfn = PQgetvalue(res, 0, i_aggtransfn); @@ -14167,7 +14158,6 @@ dumpAgg(Archive *fout, AggInfo *agginfo) aggmtransspace = PQgetvalue(res, 0, i_aggmtransspace); agginitval = PQgetvalue(res, 0, i_agginitval); aggminitval = PQgetvalue(res, 0, i_aggminitval); - convertok = (PQgetvalue(res, 0, i_convertok)[0] == 't'); if (fout->remoteVersion >= 80400) { @@ -14191,19 +14181,6 @@ dumpAgg(Archive *fout, AggInfo *agginfo) else proparallel = NULL; - if (!convertok) - { - pg_log_warning("aggregate function %s could not be dumped correctly for this database version; ignored", - aggsig); - - if (aggfullsig) - free(aggfullsig); - - free(aggsig); - - return; - } - /* identify default modify flag for aggkind (must match DefineAggregate) */ defaultfinalmodify = (aggkind == AGGKIND_NORMAL) ? AGGMODIFY_READ_ONLY : AGGMODIFY_READ_WRITE; /* replace omitted flags for old versions */