diff options
| author | Andres Freund | 2019-04-05 00:36:45 +0000 |
|---|---|---|
| committer | Andres Freund | 2019-04-05 00:39:39 +0000 |
| commit | 57a7a3adfe4eadb471bb45a7effb1a99ebb00a7b (patch) | |
| tree | f2d56b31f8c89e50db0fc7631b41723175a8bd86 | |
| parent | ea97e440b8570ffd1a6cd6604f2ef882c0a72291 (diff) | |
Remove unused struct member, enforce multi_insert callback presence.
Author: David Rowley, Andres Freund
Discussion: https://postgr.es/m/CAKJS1f9=9phmm66diAji4gvHnWSrK7BGFoNct+mEUT_c8pPOjw@mail.gmail.com
| -rw-r--r-- | src/backend/access/table/tableamapi.c | 1 | ||||
| -rw-r--r-- | src/backend/commands/copy.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/backend/access/table/tableamapi.c b/src/backend/access/table/tableamapi.c index 6f3f638965..bfd713f3af 100644 --- a/src/backend/access/table/tableamapi.c +++ b/src/backend/access/table/tableamapi.c @@ -72,6 +72,7 @@ GetTableAmRoutine(Oid amhandler) Assert(routine->tuple_insert_speculative != NULL); Assert(routine->tuple_complete_speculative != NULL); + Assert(routine->multi_insert != NULL); Assert(routine->tuple_delete != NULL); Assert(routine->tuple_update != NULL); Assert(routine->tuple_lock != NULL); diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c index 3f63ba4caa..c39218f8db 100644 --- a/src/backend/commands/copy.c +++ b/src/backend/commands/copy.c @@ -277,7 +277,6 @@ typedef struct CopyMultiInsertInfo List *multiInsertBuffers; /* List of tracked CopyMultiInsertBuffers */ int bufferedTuples; /* number of tuples buffered over all buffers */ int bufferedBytes; /* number of bytes from all buffered tuples */ - int nbuffers; /* number of buffers we're tracking */ CopyState cstate; /* Copy state for this CopyMultiInsertInfo */ EState *estate; /* Executor state used for COPY */ CommandId mycid; /* Command Id used for COPY */ @@ -2393,7 +2392,6 @@ CopyMultiInsertInfoInit(CopyMultiInsertInfo *miinfo, ResultRelInfo *rri, miinfo->multiInsertBuffers = NIL; miinfo->bufferedTuples = 0; miinfo->bufferedBytes = 0; - miinfo->nbuffers = 0; miinfo->cstate = cstate; miinfo->estate = estate; miinfo->mycid = mycid; |