Rename FormLocalSequence to LocalAmdata.

The "Form" prefix is confusing, as it doesn't map directly to a catalog
table.

diff --git a/src/backend/access/sequence/seqlocal.c b/src/backend/access/sequence/seqlocal.c
index 0f8dc9bd9c5f9c6a4f2a3dc7a20fd5a38ce20a03..df469576a0d888d80b4f8e418ecf331b4f15c467 100644 (file)
--- a/src/backend/access/sequence/seqlocal.c
+++ b/src/backend/access/sequence/seqlocal.c
@@ -32,10 +32,10 @@
 #define SEQ_LOG_VALS   32
 
 /* Definition of additional columns for local sequence. */
-typedef struct FormLocalSequence
+typedef struct LocalAmdata
 {
        int64           log_cnt;
-} FormLocalSequence;
+} LocalAmdata;
 
 
 /*
@@ -74,7 +74,7 @@ seqam_local_init(PG_FUNCTION_ARGS)
                                last_value,
                                min_value,
                                max_value;
-       FormLocalSequence *localseq;
+       LocalAmdata *localseq;
 
        /* Get the new value to use as starting point. */
        start_value = DatumGetInt64(values[SEQ_COL_STARTVAL - 1]);
@@ -109,13 +109,13 @@ seqam_local_init(PG_FUNCTION_ARGS)
 
        if (nulls[SEQ_COL_AMDATA - 1])
        {
-               struct varlena *vl = palloc0(VARHDRSZ + sizeof(FormLocalSequence));
-               SET_VARSIZE(vl, VARHDRSZ + sizeof(FormLocalSequence));
+               struct varlena *vl = palloc0(VARHDRSZ + sizeof(LocalAmdata));
+               SET_VARSIZE(vl, VARHDRSZ + sizeof(LocalAmdata));
                nulls[SEQ_COL_AMDATA - 1] = false;
                values[SEQ_COL_AMDATA - 1] = PointerGetDatum(vl);
        }
 
-       localseq = (FormLocalSequence *)
+       localseq = (LocalAmdata *)
                VARDATA_ANY(DatumGetByteaP(values[SEQ_COL_AMDATA - 1]));
 
        /* We always reset the log_cnt. */
@@ -148,10 +148,10 @@ seqam_local_alloc(PG_FUNCTION_ARGS)
        bool            is_cycled,
                                is_called,
                                logit = false;
-       FormLocalSequence *localseq;
+       LocalAmdata *localseq;
 
        seq = (FormData_pg_sequence *) GETSTRUCT(sequence_read_tuple(seqh));
-       localseq = (FormLocalSequence *) VARDATA_ANY(&seq->amdata);
+       localseq = (LocalAmdata *) VARDATA_ANY(&seq->amdata);
 
        next = result = seq->last_value;
        incby = seq->increment_by;
@@ -201,7 +201,7 @@ seqam_local_alloc(PG_FUNCTION_ARGS)
 
        /* Fetch as many values as was requested by backend. */
        if (rescnt < nrequested)
-               rescnt += sequence_increment(seqrel, &next, nrequested-rescnt, minv,
+               rescnt += sequence_increment(seqrel, &next, nrequested - rescnt, minv,
                                                                         maxv, incby, is_cycled, false);
 
        /* Last value available for calling backend. */
@@ -211,7 +211,7 @@ seqam_local_alloc(PG_FUNCTION_ARGS)
 
        /* We might need to fetch even more values for our own caching. */
        if (rescnt < fetch)
-               rescnt += sequence_increment(seqrel, &next, fetch-rescnt, minv,
+               rescnt += sequence_increment(seqrel, &next, fetch - rescnt, minv,
                                                                        maxv, incby, is_cycled, false);
 
        fetch -= rescnt;
@@ -236,7 +236,7 @@ seqam_local_alloc(PG_FUNCTION_ARGS)
        /* Now update sequence tuple to the intended final state */
        seq->last_value = *last;                /* last fetched number */
        seq->is_called = true;
-       localseq->log_cnt = log;                        /* how much is logged */
+       localseq->log_cnt = log;                /* how much is logged */
 
        sequence_save_tuple(seqh, NULL, false);
 
@@ -254,10 +254,10 @@ seqam_local_setval(PG_FUNCTION_ARGS)
        SequenceHandle *seqh = (SequenceHandle *) PG_GETARG_POINTER(1);
        int64           next = PG_GETARG_INT64(2);
        FormData_pg_sequence *seq;
-       FormLocalSequence *localseq;
+       LocalAmdata *localseq;
 
        seq = (FormData_pg_sequence *) GETSTRUCT(sequence_read_tuple(seqh));
-       localseq = (FormLocalSequence *) VARDATA_ANY(&seq->amdata);
+       localseq = (LocalAmdata *) VARDATA_ANY(&seq->amdata);
 
        seq->last_value = next;         /* last fetched number */
        seq->is_called = true;