From 23a27b039d94ba359286694831eafe03cd970eef Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Sat, 12 Mar 2016 16:05:10 -0500 Subject: Widen query numbers-of-tuples-processed counters to uint64. This patch widens SPI_processed, EState's es_processed field, PortalData's portalPos field, FuncCallContext's call_cntr and max_calls fields, ExecutorRun's count argument, PortalRunFetch's result, and the max number of rows in a SPITupleTable to uint64, and deals with (I hope) all the ensuing fallout. Some of these values were declared uint32 before, and others "long". I also removed PortalData's posOverflow field, since that logic seems pretty useless given that portalPos is now always 64 bits. The user-visible results are that command tags for SELECT etc will correctly report tuple counts larger than 4G, as will plpgsql's GET GET DIAGNOSTICS ... ROW_COUNT command. Queries processing more tuples than that are still not exactly the norm, but they're becoming more common. Most values associated with FETCH/MOVE distances, such as PortalRun's count argument and the count argument of most SPI functions that have one, remain declared as "long". It's not clear whether it would be worth promoting those to int64; but it would definitely be a large dollop of additional API churn on top of this, and it would only help 32-bit platforms which seem relatively less likely to see any benefit. Andreas Scherbaum, reviewed by Christian Ullrich, additional hacking by me --- src/backend/utils/adt/xml.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/backend/utils/adt/xml.c') diff --git a/src/backend/utils/adt/xml.c b/src/backend/utils/adt/xml.c index 56179f822ed..7ed5bcb93dd 100644 --- a/src/backend/utils/adt/xml.c +++ b/src/backend/utils/adt/xml.c @@ -161,7 +161,7 @@ static const char *map_sql_catalog_to_xmlschema_types(List *nspid_list, static const char *map_sql_type_to_xml_name(Oid typeoid, int typmod); static const char *map_sql_typecoll_to_xmlschema_types(List *tupdesc_list); static const char *map_sql_type_to_xmlschema_type(Oid typeoid, int typmod); -static void SPI_sql_row_to_xmlelement(int rownum, StringInfo result, +static void SPI_sql_row_to_xmlelement(uint64 rownum, StringInfo result, char *tablename, bool nulls, bool tableforest, const char *targetns, bool top_level); @@ -2260,7 +2260,7 @@ _SPI_strdup(const char *s) static List * query_to_oid_list(const char *query) { - int i; + uint64 i; List *list = NIL; SPI_execute(query, true, 0); @@ -2379,7 +2379,7 @@ cursor_to_xml(PG_FUNCTION_ARGS) StringInfoData result; Portal portal; - int i; + uint64 i; initStringInfo(&result); @@ -2454,7 +2454,7 @@ query_to_xml_internal(const char *query, char *tablename, { StringInfo result; char *xmltn; - int i; + uint64 i; if (tablename) xmltn = map_sql_identifier_to_xml_name(tablename, true, false); @@ -3532,7 +3532,7 @@ map_sql_type_to_xmlschema_type(Oid typeoid, int typmod) * SPI cursor. See also SQL/XML:2008 section 9.10. */ static void -SPI_sql_row_to_xmlelement(int rownum, StringInfo result, char *tablename, +SPI_sql_row_to_xmlelement(uint64 rownum, StringInfo result, char *tablename, bool nulls, bool tableforest, const char *targetns, bool top_level) { -- cgit v1.2.3