From b7b2f21e23157f1c744ef87651bdc8e0da68f713 Mon Sep 17 00:00:00 2001 From: Michael Paquier Date: Mon, 26 Aug 2024 11:15:21 +0900 Subject: [PATCH v7 1/8] Remove log_cnt from pg_sequence_read_tuple() This will be used by the sequence AM patch, and log_cnt is something that sequence AMs can optionally use, at least in this design. --- src/include/catalog/pg_proc.dat | 4 ++-- src/backend/commands/sequence.c | 15 +++++++-------- src/test/regress/expected/sequence.out | 6 +++--- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/include/catalog/pg_proc.dat b/src/include/catalog/pg_proc.dat index 4abc6d9526..986df08c6e 100644 --- a/src/include/catalog/pg_proc.dat +++ b/src/include/catalog/pg_proc.dat @@ -3332,8 +3332,8 @@ { oid => '9876', descr => 'return sequence tuple, for use by pg_dump', proname => 'pg_sequence_read_tuple', provolatile => 'v', proparallel => 'u', prorettype => 'record', proargtypes => 'regclass', - proallargtypes => '{regclass,int8,int8,bool}', proargmodes => '{i,o,o,o}', - proargnames => '{sequence_oid,last_value,log_cnt,is_called}', + proallargtypes => '{regclass,int8,bool}', proargmodes => '{i,o,o}', + proargnames => '{sequence_oid,last_value,is_called}', prosrc => 'pg_sequence_read_tuple' }, { oid => '275', descr => 'return the next oid for a system table', diff --git a/src/backend/commands/sequence.c b/src/backend/commands/sequence.c index 8c1131f020..11000b97bd 100644 --- a/src/backend/commands/sequence.c +++ b/src/backend/commands/sequence.c @@ -1783,21 +1783,20 @@ pg_sequence_parameters(PG_FUNCTION_ARGS) Datum pg_sequence_read_tuple(PG_FUNCTION_ARGS) { +#define SEQUENCE_READ_TUPLE_COLS 2 Oid relid = PG_GETARG_OID(0); SeqTable elm; Relation seqrel; - Datum values[SEQ_COL_LASTCOL] = {0}; - bool isnull[SEQ_COL_LASTCOL] = {0}; + Datum values[SEQUENCE_READ_TUPLE_COLS] = {0}; + bool isnull[SEQUENCE_READ_TUPLE_COLS] = {0}; TupleDesc resultTupleDesc; HeapTuple resultHeapTuple; Datum result; - resultTupleDesc = CreateTemplateTupleDesc(SEQ_COL_LASTCOL); + resultTupleDesc = CreateTemplateTupleDesc(SEQUENCE_READ_TUPLE_COLS); TupleDescInitEntry(resultTupleDesc, (AttrNumber) 1, "last_value", INT8OID, -1, 0); - TupleDescInitEntry(resultTupleDesc, (AttrNumber) 2, "log_cnt", - INT8OID, -1, 0); - TupleDescInitEntry(resultTupleDesc, (AttrNumber) 3, "is_called", + TupleDescInitEntry(resultTupleDesc, (AttrNumber) 2, "is_called", BOOLOID, -1, 0); resultTupleDesc = BlessTupleDesc(resultTupleDesc); @@ -1818,8 +1817,7 @@ pg_sequence_read_tuple(PG_FUNCTION_ARGS) seq = read_seq_tuple(seqrel, &buf, &seqtuple); values[0] = Int64GetDatum(seq->last_value); - values[1] = Int64GetDatum(seq->log_cnt); - values[2] = BoolGetDatum(seq->is_called); + values[1] = BoolGetDatum(seq->is_called); UnlockReleaseBuffer(buf); } @@ -1831,6 +1829,7 @@ pg_sequence_read_tuple(PG_FUNCTION_ARGS) resultHeapTuple = heap_form_tuple(resultTupleDesc, values, isnull); result = HeapTupleGetDatum(resultHeapTuple); PG_RETURN_DATUM(result); +#undef SEQUENCE_READ_TUPLE_COLS } diff --git a/src/test/regress/expected/sequence.out b/src/test/regress/expected/sequence.out index e749c4574e..6be5406ae9 100644 --- a/src/test/regress/expected/sequence.out +++ b/src/test/regress/expected/sequence.out @@ -841,9 +841,9 @@ SELECT nextval('test_seq1'); -- pg_sequence_read_tuple SELECT * FROM pg_sequence_read_tuple('test_seq1'); - last_value | log_cnt | is_called -------------+---------+----------- - 10 | 32 | t + last_value | is_called +------------+----------- + 10 | t (1 row) DROP SEQUENCE test_seq1; -- 2.45.2