v11-0005-Parallel-Copy-For-Binary-Format-Files.patch
text/x-patch
Filename: v11-0005-Parallel-Copy-For-Binary-Format-Files.patch
Type: text/x-patch
Part: 4
Message:
Re: Parallel copy
Patch
Same data as JSON:
GET /api/v1/attachments/:id/patch
the parsed metadata as JSON — format, series position, per-file stats; never the diff bytes.
API reference →
Format: format-patch
Series: patch v11-0005
Subject: Parallel Copy For Binary Format Files
| File | + | − |
|---|---|---|
| src/backend/commands/copy.c | 1 | 1 |
| src/backend/commands/copyfromparse.c | 58 | 65 |
| src/backend/commands/copyparallel.c | 329 | 21 |
| src/include/commands/copyfrom_internal.h | 127 | 0 |
From 9985c531c5f12d3cb83868fa479ddb7f29e69f0a Mon Sep 17 00:00:00 2001
From: Vignesh C <vignesh21@gmail.com>
Date: Thu, 3 Dec 2020 11:32:43 +0530
Subject: [PATCH v11 5/6] Parallel Copy For Binary Format Files
Leader reads data from the file into the DSM data blocks each of 64K size.
It also identifies each tuple data block id, start offset, end offset,
tuple size and updates this information in the ring data structure.
Workers parallelly read the tuple information from the ring data structure,
the actual tuple data from the data blocks and parallelly insert the tuples
into the table.
---
src/backend/commands/copy.c | 2 +-
src/backend/commands/copyfromparse.c | 123 +++++------
src/backend/commands/copyparallel.c | 350 +++++++++++++++++++++++++++++--
src/include/commands/copyfrom_internal.h | 127 +++++++++++
4 files changed, 515 insertions(+), 87 deletions(-)
diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c
index 7d6ea72..865e562 100644
--- a/src/backend/commands/copy.c
+++ b/src/backend/commands/copy.c
@@ -336,7 +336,7 @@ DoCopy(ParseState *pstate, const CopyStmt *stmt,
* specifies parallel workers, but, no worker is picked up, so go
* back to non parallel mode value of nworkers.
*/
- cstate->nworkers = -1;
+ cstate->opts.nworkers = -1;
*processed = CopyFrom(cstate); /* copy from file to database */
}
diff --git a/src/backend/commands/copyfromparse.c b/src/backend/commands/copyfromparse.c
index 69b06e2..a767bae 100644
--- a/src/backend/commands/copyfromparse.c
+++ b/src/backend/commands/copyfromparse.c
@@ -116,12 +116,12 @@ static Datum CopyReadBinaryAttribute(CopyFromState cstate, FmgrInfo *flinfo,
/* Low-level communications functions */
-static int CopyGetData(CopyFromState cstate, void *databuf,
+int CopyGetData(CopyFromState cstate, void *databuf,
int minread, int maxread);
static inline bool CopyGetInt32(CopyFromState cstate, int32 *val);
static inline bool CopyGetInt16(CopyFromState cstate, int16 *val);
static bool CopyLoadRawBuf(CopyFromState cstate);
-static int CopyReadBinaryData(CopyFromState cstate, char *dest, int nbytes);
+int CopyReadBinaryData(CopyFromState cstate, char *dest, int nbytes);
static void ClearEOLFromCopiedData(CopyFromState cstate, char *copy_line_data,
int copy_line_pos, int *copy_line_size);
void ConvertToServerEncoding(CopyFromState cstate);
@@ -169,7 +169,7 @@ ReceiveCopyBinaryHeader(CopyFromState cstate)
int32 tmp;
/* Signature */
- if (CopyReadBinaryData(cstate, readSig, 11) != 11 ||
+ if (CopyGetData(cstate, readSig, 11, 11) != 11 ||
memcmp(readSig, BinarySignature, 11) != 0)
ereport(ERROR,
(errcode(ERRCODE_BAD_COPY_FILE_FORMAT),
@@ -197,7 +197,7 @@ ReceiveCopyBinaryHeader(CopyFromState cstate)
/* Skip extension header, if present */
while (tmp-- > 0)
{
- if (CopyReadBinaryData(cstate, readSig, 1) != 1)
+ if (CopyGetData(cstate, readSig, 1, 1) != 1)
ereport(ERROR,
(errcode(ERRCODE_BAD_COPY_FILE_FORMAT),
errmsg("invalid COPY file header (wrong length)")));
@@ -217,7 +217,7 @@ ReceiveCopyBinaryHeader(CopyFromState cstate)
*
* NB: no data conversion is applied here.
*/
-static int
+int
CopyGetData(CopyFromState cstate, void *databuf, int minread, int maxread)
{
int bytesread = 0;
@@ -338,10 +338,25 @@ CopyGetInt32(CopyFromState cstate, int32 *val)
{
uint32 buf;
- if (CopyReadBinaryData(cstate, (char *) &buf, sizeof(buf)) != sizeof(buf))
+ /*
+ * For parallel copy, avoid reading data to raw buf, read directly from
+ * file, later the data will be read to parallel copy data buffers.
+ */
+ if (cstate->opts.nworkers > 0)
{
- *val = 0; /* suppress compiler warning */
- return false;
+ if (CopyGetData(cstate, &buf, sizeof(buf), sizeof(buf)) != sizeof(buf))
+ {
+ *val = 0; /* suppress compiler warning */
+ return false;
+ }
+ }
+ else
+ {
+ if (CopyReadBinaryData(cstate, (char *) &buf, sizeof(buf)) != sizeof(buf))
+ {
+ *val = 0; /* suppress compiler warning */
+ return false;
+ }
}
*val = (int32) pg_ntoh32(buf);
return true;
@@ -403,7 +418,7 @@ CopyLoadRawBuf(CopyFromState cstate)
* and writes them to 'dest'. Returns the number of bytes read (which
* would be less than 'nbytes' only if we reach EOF).
*/
-static int
+int
CopyReadBinaryData(CopyFromState cstate, char *dest, int nbytes)
{
int copied_bytes = 0;
@@ -619,60 +634,44 @@ NextCopyFrom(CopyFromState cstate, ExprContext *econtext,
else
{
/* binary */
- int16 fld_count;
- ListCell *cur;
-
cstate->cur_lineno++;
+ cstate->max_fields = list_length(cstate->attnumlist);
- if (!CopyGetInt16(cstate, &fld_count))
- {
- /* EOF detected (end of file, or protocol-level EOF) */
- return false;
- }
-
- if (fld_count == -1)
+ if (!IsParallelCopy())
{
- /*
- * Received EOF marker. In a V3-protocol copy, wait for the
- * protocol-level EOF, and complain if it doesn't come
- * immediately. This ensures that we correctly handle CopyFail,
- * if client chooses to send that now.
- *
- * Note that we MUST NOT try to read more data in an old-protocol
- * copy, since there is no protocol-level EOF marker then. We
- * could go either way for copy from file, but choose to throw
- * error if there's data after the EOF marker, for consistency
- * with the new-protocol case.
- */
- char dummy;
+ int16 fld_count;
+ ListCell *cur;
- if (cstate->copy_src != COPY_OLD_FE &&
- CopyReadBinaryData(cstate, &dummy, 1) > 0)
- ereport(ERROR,
- (errcode(ERRCODE_BAD_COPY_FILE_FORMAT),
- errmsg("received copy data after EOF marker")));
- return false;
- }
+ if (!CopyGetInt16(cstate, &fld_count))
+ {
+ /* EOF detected (end of file, or protocol-level EOF) */
+ return false;
+ }
- if (fld_count != attr_count)
- ereport(ERROR,
- (errcode(ERRCODE_BAD_COPY_FILE_FORMAT),
- errmsg("row field count is %d, expected %d",
- (int) fld_count, attr_count)));
+ CHECK_FIELD_COUNT;
- foreach(cur, cstate->attnumlist)
+ foreach(cur, cstate->attnumlist)
+ {
+ int attnum = lfirst_int(cur);
+ int m = attnum - 1;
+ Form_pg_attribute att = TupleDescAttr(tupDesc, m);
+
+ cstate->cur_attname = NameStr(att->attname);
+ values[m] = CopyReadBinaryAttribute(cstate,
+ &in_functions[m],
+ typioparams[m],
+ att->atttypmod,
+ &nulls[m]);
+ cstate->cur_attname = NULL;
+ }
+ }
+ else
{
- int attnum = lfirst_int(cur);
- int m = attnum - 1;
- Form_pg_attribute att = TupleDescAttr(tupDesc, m);
+ bool eof = false;
- cstate->cur_attname = NameStr(att->attname);
- values[m] = CopyReadBinaryAttribute(cstate,
- &in_functions[m],
- typioparams[m],
- att->atttypmod,
- &nulls[m]);
- cstate->cur_attname = NULL;
+ eof = CopyReadBinaryTupleWorker(cstate, values, nulls);
+ if (eof)
+ return false;
}
}
@@ -1673,18 +1672,14 @@ CopyReadBinaryAttribute(CopyFromState cstate, FmgrInfo *flinfo,
Datum result;
if (!CopyGetInt32(cstate, &fld_size))
- ereport(ERROR,
- (errcode(ERRCODE_BAD_COPY_FILE_FORMAT),
- errmsg("unexpected EOF in COPY data")));
+ EOF_ERROR;
+
if (fld_size == -1)
{
*isnull = true;
return ReceiveFunctionCall(flinfo, NULL, typioparam, typmod);
}
- if (fld_size < 0)
- ereport(ERROR,
- (errcode(ERRCODE_BAD_COPY_FILE_FORMAT),
- errmsg("invalid field size")));
+ CHECK_FIELD_SIZE(fld_size);
/* reset attribute_buf to empty, and load raw data in it */
resetStringInfo(&cstate->attribute_buf);
@@ -1692,9 +1687,7 @@ CopyReadBinaryAttribute(CopyFromState cstate, FmgrInfo *flinfo,
enlargeStringInfo(&cstate->attribute_buf, fld_size);
if (CopyReadBinaryData(cstate, cstate->attribute_buf.data,
fld_size) != fld_size)
- ereport(ERROR,
- (errcode(ERRCODE_BAD_COPY_FILE_FORMAT),
- errmsg("unexpected EOF in COPY data")));
+ EOF_ERROR;
cstate->attribute_buf.len = fld_size;
cstate->attribute_buf.data[fld_size] = '\0';
diff --git a/src/backend/commands/copyparallel.c b/src/backend/commands/copyparallel.c
index d46707d..5149798 100644
--- a/src/backend/commands/copyparallel.c
+++ b/src/backend/commands/copyparallel.c
@@ -615,6 +615,7 @@ InitializeParallelCopyInfo(CopyFromState cstate, List *attnamelist)
cstate->cur_lineno = 0;
cstate->cur_attname = NULL;
cstate->cur_attval = NULL;
+ cstate->pcdata->curr_data_block = NULL;
/* Set up variables to avoid per-attribute overhead. */
initStringInfo(&cstate->attribute_buf);
@@ -1050,37 +1051,61 @@ ParallelCopyFrom(CopyFromState cstate)
errcallback.previous = error_context_stack;
error_context_stack = &errcallback;
- /* On input just throw the header line away. */
- if (cstate->cur_lineno == 0 && cstate->opts.header_line)
+ if (!cstate->opts.binary)
{
- cstate->cur_lineno++;
- if (CopyReadLine(cstate))
+ /* On input just throw the header line away. */
+ if (cstate->cur_lineno == 0 && cstate->opts.header_line)
{
- pcshared_info->is_read_in_progress = false;
- return; /* done */
+ cstate->cur_lineno++;
+ if (CopyReadLine(cstate))
+ {
+ pcshared_info->is_read_in_progress = false;
+ return; /* done */
+ }
}
- }
- for (;;)
- {
- bool done;
+ for (;;)
+ {
+ bool done;
- CHECK_FOR_INTERRUPTS();
+ CHECK_FOR_INTERRUPTS();
- cstate->cur_lineno++;
+ cstate->cur_lineno++;
- /* Actually read the line into memory here. */
- done = CopyReadLine(cstate);
+ /* Actually read the line into memory here. */
+ done = CopyReadLine(cstate);
- /*
- * EOF at start of line means we're done. If we see EOF after some
- * characters, we act as though it was newline followed by EOF, ie,
- * process the line and then exit loop on next iteration.
- */
- if (done && cstate->line_buf.len == 0)
- break;
+ /*
+ * EOF at start of line means we're done. If we see EOF after
+ * some characters, we act as though it was newline followed by
+ * EOF, ie, process the line and then exit loop on next iteration.
+ */
+ if (done && cstate->line_buf.len == 0)
+ break;
+ }
}
+ else
+ {
+ cstate->pcdata->curr_data_block = NULL;
+ cstate->raw_buf_index = 0;
+ pcshared_info->populated = 0;
+ cstate->cur_lineno = 0;
+ cstate->max_fields = list_length(cstate->attnumlist);
+
+ for (;;)
+ {
+ bool eof = false;
+
+ CHECK_FOR_INTERRUPTS();
+
+ cstate->cur_lineno++;
+
+ eof = CopyReadBinaryTupleLeader(cstate);
+ if (eof)
+ break;
+ }
+ }
/* Done, clean up */
error_context_stack = errcallback.previous;
@@ -1097,6 +1122,289 @@ ParallelCopyFrom(CopyFromState cstate)
}
/*
+ * CopyReadBinaryGetDataBlock
+ *
+ * Gets a new block, updates the current offset, calculates the skip bytes.
+ */
+void
+CopyReadBinaryGetDataBlock(CopyFromState cstate, FieldInfoType field_info)
+{
+ ParallelCopyDataBlock *data_block = NULL;
+ ParallelCopyDataBlock *curr_data_block = cstate->pcdata->curr_data_block;
+ ParallelCopyShmInfo *pcshared_info = cstate->pcdata->pcshared_info;
+ uint8 move_bytes = 0;
+ uint32 block_pos;
+ uint32 prev_block_pos;
+ int read_bytes = 0;
+
+ prev_block_pos = pcshared_info->cur_block_pos;
+
+ block_pos = WaitGetFreeCopyBlock(pcshared_info);
+
+ if (field_info == FIELD_SIZE || field_info == FIELD_COUNT)
+ move_bytes = (DATA_BLOCK_SIZE - cstate->raw_buf_index);
+
+ if (curr_data_block != NULL)
+ curr_data_block->skip_bytes = move_bytes;
+
+ data_block = &pcshared_info->data_blocks[block_pos];
+
+ if (move_bytes > 0 && curr_data_block != NULL)
+ memmove(&data_block->data[0], &curr_data_block->data[cstate->raw_buf_index], move_bytes);
+
+ elog(DEBUG1, "LEADER - field info %d is spread across data blocks - moved %d bytes from current block %u to %u block",
+ field_info, move_bytes, prev_block_pos, block_pos);
+
+ read_bytes = CopyGetData(cstate, &data_block->data[move_bytes], 1, (DATA_BLOCK_SIZE - move_bytes));
+
+ if (field_info == FIELD_NONE && cstate->reached_eof)
+ return;
+
+ if (cstate->reached_eof)
+ EOF_ERROR;
+
+ elog(DEBUG1, "LEADER - bytes read from file %d", read_bytes);
+
+ if (field_info == FIELD_SIZE || field_info == FIELD_DATA)
+ {
+ ParallelCopyDataBlock *prev_data_block = NULL;
+
+ prev_data_block = curr_data_block;
+ prev_data_block->following_block = block_pos;
+
+ if (prev_data_block->curr_blk_completed == false)
+ prev_data_block->curr_blk_completed = true;
+
+ pg_atomic_add_fetch_u32(&prev_data_block->unprocessed_line_parts, 1);
+ }
+
+ cstate->pcdata->curr_data_block = data_block;
+ cstate->raw_buf_index = 0;
+}
+
+/*
+ * CopyReadBinaryTupleLeader
+ *
+ * Leader reads data from binary formatted file to data blocks and identifies
+ * tuple boundaries/offsets so that workers can work on the data blocks data.
+ */
+bool
+CopyReadBinaryTupleLeader(CopyFromState cstate)
+{
+ ParallelCopyShmInfo *pcshared_info = cstate->pcdata->pcshared_info;
+ int16 fld_count;
+ uint32 line_size = 0;
+ uint32 start_block_pos;
+ uint32 start_offset;
+
+ if (cstate->pcdata->curr_data_block == NULL)
+ {
+ CopyReadBinaryGetDataBlock(cstate, FIELD_NONE);
+
+ /*
+ * no data is read from file here. one possibility to be here could be
+ * that the binary file just has a valid signature but nothing else.
+ */
+ if (cstate->reached_eof)
+ return true;
+ }
+
+ if ((cstate->raw_buf_index + sizeof(fld_count)) >= DATA_BLOCK_SIZE)
+ CopyReadBinaryGetDataBlock(cstate, FIELD_COUNT);
+
+ memcpy(&fld_count, &cstate->pcdata->curr_data_block->data[cstate->raw_buf_index], sizeof(fld_count));
+ fld_count = (int16) pg_ntoh16(fld_count);
+
+ CHECK_FIELD_COUNT;
+
+ start_offset = cstate->raw_buf_index;
+ cstate->raw_buf_index += sizeof(fld_count);
+ line_size += sizeof(fld_count);
+ start_block_pos = pcshared_info->cur_block_pos;
+
+ CopyReadBinaryFindTupleSize(cstate, &line_size);
+
+ pg_atomic_add_fetch_u32(&cstate->pcdata->curr_data_block->unprocessed_line_parts, 1);
+
+ if (line_size > 0)
+ (void) UpdateSharedLineInfo(cstate, start_block_pos, start_offset,
+ line_size, LINE_LEADER_POPULATED, -1);
+
+ return false;
+}
+
+/*
+ * CopyReadBinaryFindTupleSize
+ *
+ * Leader identifies boundaries/offsets for each attribute/column and finally
+ * results in the tuple/row size. It moves on to next data block if the
+ * attribute/column is spread across data blocks.
+ */
+void
+CopyReadBinaryFindTupleSize(CopyFromState cstate, uint32 *line_size)
+{
+ int32 fld_size;
+ ListCell *cur;
+ TupleDesc tup_desc = RelationGetDescr(cstate->rel);
+
+ foreach(cur, cstate->attnumlist)
+ {
+ int att_num = lfirst_int(cur);
+ Form_pg_attribute att = TupleDescAttr(tup_desc, (att_num - 1));
+
+ cstate->cur_attname = NameStr(att->attname);
+ fld_size = 0;
+
+ if ((cstate->raw_buf_index + sizeof(fld_size)) >= DATA_BLOCK_SIZE)
+ CopyReadBinaryGetDataBlock(cstate, FIELD_SIZE);
+
+ memcpy(&fld_size, &cstate->pcdata->curr_data_block->data[cstate->raw_buf_index], sizeof(fld_size));
+ cstate->raw_buf_index += sizeof(fld_size);
+ *line_size += sizeof(fld_size);
+ fld_size = (int32) pg_ntoh32(fld_size);
+
+ /* fld_size -1 represents the null value for the field. */
+ if (fld_size == -1)
+ continue;
+
+ CHECK_FIELD_SIZE(fld_size);
+
+ *line_size += fld_size;
+
+ if ((DATA_BLOCK_SIZE - cstate->raw_buf_index) >= fld_size)
+ {
+ cstate->raw_buf_index += fld_size;
+ elog(DEBUG1, "LEADER - tuple lies in he same data block");
+ }
+ else
+ {
+ int32 required_blks = 0;
+ int32 curr_blk_bytes = (DATA_BLOCK_SIZE - cstate->raw_buf_index);
+ int i = 0;
+
+ GET_REQUIRED_BLOCKS(required_blks, fld_size, curr_blk_bytes);
+
+ i = required_blks;
+
+ while (i > 0)
+ {
+ CopyReadBinaryGetDataBlock(cstate, FIELD_DATA);
+ i--;
+ }
+
+ GET_RAW_BUF_INDEX(cstate->raw_buf_index, fld_size, required_blks, curr_blk_bytes);
+
+ /*
+ * raw_buf_index should never cross data block size, as the
+ * required number of data blocks would have been obtained in the
+ * above while loop.
+ */
+ Assert(cstate->raw_buf_index <= DATA_BLOCK_SIZE);
+ }
+ cstate->cur_attname = NULL;
+ }
+}
+
+/*
+ * CopyReadBinaryTupleWorker
+ *
+ * Each worker reads data from data blocks caches the tuple data into local
+ * memory.
+ */
+bool
+CopyReadBinaryTupleWorker(CopyFromState cstate, Datum *values, bool *nulls)
+{
+ int16 fld_count;
+ ListCell *cur;
+ FmgrInfo *in_functions = cstate->in_functions;
+ Oid *typioparams = cstate->typioparams;
+ TupleDesc tup_desc = RelationGetDescr(cstate->rel);
+ bool done = false;
+
+ done = GetWorkerLine(cstate);
+ cstate->raw_buf_index = 0;
+
+ if (done && cstate->line_buf.len == 0)
+ return true;
+
+ memcpy(&fld_count, &cstate->line_buf.data[cstate->raw_buf_index], sizeof(fld_count));
+ fld_count = (int16) pg_ntoh16(fld_count);
+
+ CHECK_FIELD_COUNT;
+
+ cstate->raw_buf_index += sizeof(fld_count);
+
+ foreach(cur, cstate->attnumlist)
+ {
+ int att_num = lfirst_int(cur);
+ int m = att_num - 1;
+ Form_pg_attribute att = TupleDescAttr(tup_desc, m);
+
+ cstate->cur_attname = NameStr(att->attname);
+
+ values[m] = CopyReadBinaryAttributeWorker(cstate,
+ &in_functions[m],
+ typioparams[m],
+ att->atttypmod,
+ &nulls[m]);
+ cstate->cur_attname = NULL;
+ }
+
+ return false;
+}
+
+/*
+ * CopyReadBinaryAttributeWorker
+ *
+ * Worker identifies and converts each attribute/column data from binary to
+ * the data type of attribute/column.
+ */
+Datum
+CopyReadBinaryAttributeWorker(CopyFromState cstate, FmgrInfo *flinfo,
+ Oid typioparam, int32 typmod, bool *isnull)
+{
+ int32 fld_size;
+ Datum result;
+
+ memcpy(&fld_size, &cstate->line_buf.data[cstate->raw_buf_index], sizeof(fld_size));
+ cstate->raw_buf_index += sizeof(fld_size);
+ fld_size = (int32) pg_ntoh32(fld_size);
+
+ /* fld_size -1 represents the null value for the field. */
+ if (fld_size == -1)
+ {
+ *isnull = true;
+ return ReceiveFunctionCall(flinfo, NULL, typioparam, typmod);
+ }
+
+ CHECK_FIELD_SIZE(fld_size);
+
+ /* Reset attribute_buf to empty, and load raw data in it */
+ resetStringInfo(&cstate->attribute_buf);
+
+ enlargeStringInfo(&cstate->attribute_buf, fld_size);
+
+ memcpy(&cstate->attribute_buf.data[0], &cstate->line_buf.data[cstate->raw_buf_index], fld_size);
+ cstate->raw_buf_index += fld_size;
+
+ cstate->attribute_buf.len = fld_size;
+ cstate->attribute_buf.data[fld_size] = '\0';
+
+ /* Call the column type's binary input converter */
+ result = ReceiveFunctionCall(flinfo, &cstate->attribute_buf,
+ typioparam, typmod);
+
+ /* Trouble if it didn't eat the whole buffer */
+ if (cstate->attribute_buf.cursor != cstate->attribute_buf.len)
+ ereport(ERROR,
+ (errcode(ERRCODE_INVALID_BINARY_REPRESENTATION),
+ errmsg("incorrect binary data format")));
+
+ *isnull = false;
+ return result;
+}
+
+/*
* GetLinePosition
*
* Return the line position once the leader has populated the data.
diff --git a/src/include/commands/copyfrom_internal.h b/src/include/commands/copyfrom_internal.h
index d44f2b5..67cf775 100644
--- a/src/include/commands/copyfrom_internal.h
+++ b/src/include/commands/copyfrom_internal.h
@@ -58,6 +58,109 @@
#define IsWorker() (IsParallelCopy() && !IsLeader())
/*
+ * CHECK_FIELD_COUNT - Handles the error cases for field count
+ * for binary format files.
+ */
+#define CHECK_FIELD_COUNT \
+{\
+ if (fld_count == -1) \
+ { \
+ if (IsParallelCopy() && \
+ !IsLeader()) \
+ return true; \
+ else if (IsParallelCopy() && \
+ IsLeader()) \
+ { \
+ if (cstate->pcdata->curr_data_block->data[cstate->raw_buf_index + sizeof(fld_count)] != 0) \
+ ereport(ERROR, \
+ (errcode(ERRCODE_BAD_COPY_FILE_FORMAT), \
+ errmsg("received copy data after EOF marker"))); \
+ return true; \
+ } \
+ else \
+ { \
+ /* \
+ * Received EOF marker. In a V3-protocol copy, wait for the \
+ * protocol-level EOF, and complain if it doesn't come \
+ * immediately. This ensures that we correctly handle CopyFail, \
+ * if client chooses to send that now. \
+ * \
+ * Note that we MUST NOT try to read more data in an old-protocol \
+ * copy, since there is no protocol-level EOF marker then. We \
+ * could go either way for copy from file, but choose to throw \
+ * error if there's data after the EOF marker, for consistency \
+ * with the new-protocol case. \
+ */ \
+ char dummy; \
+ if (cstate->copy_src != COPY_OLD_FE && \
+ CopyReadBinaryData(cstate, &dummy, 1) > 0) \
+ ereport(ERROR, \
+ (errcode(ERRCODE_BAD_COPY_FILE_FORMAT), \
+ errmsg("received copy data after EOF marker"))); \
+ return false; \
+ } \
+ } \
+ if (fld_count != cstate->max_fields) \
+ ereport(ERROR, \
+ (errcode(ERRCODE_BAD_COPY_FILE_FORMAT), \
+ errmsg("row field count is %d, expected %d", \
+ (int) fld_count, cstate->max_fields))); \
+}
+
+/*
+ * CHECK_FIELD_SIZE - Handles the error case for field size
+ * for binary format files.
+ */
+#define CHECK_FIELD_SIZE(fld_size) \
+{ \
+ if (fld_size < -1) \
+ ereport(ERROR, \
+ (errcode(ERRCODE_BAD_COPY_FILE_FORMAT), \
+ errmsg("invalid field size")));\
+}
+
+/*
+ * EOF_ERROR - Error statement for EOF for binary format
+ * files.
+ */
+#define EOF_ERROR \
+{ \
+ ereport(ERROR, \
+ (errcode(ERRCODE_BAD_COPY_FILE_FORMAT), \
+ errmsg("unexpected EOF in COPY data")));\
+}
+
+/*
+ * GET_RAW_BUF_INDEX - Calculates the raw buf index for the cases
+ * where the data spread is across multiple data blocks.
+ */
+#define GET_RAW_BUF_INDEX(raw_buf_index, fld_size, required_blks, curr_blk_bytes) \
+{ \
+ raw_buf_index = fld_size - (((required_blks - 1) * DATA_BLOCK_SIZE) + curr_blk_bytes); \
+}
+
+/*
+ * GET_REQUIRED_BLOCKS - Calculates the number of data
+ * blocks required for the cases where the data spread
+ * is across multiple data blocks.
+ */
+#define GET_REQUIRED_BLOCKS(required_blks, fld_size, curr_blk_bytes) \
+{ \
+ /* \
+ * field size can spread across multiple data blocks, \
+ * calculate the number of required data blocks and try to get \
+ * those many data blocks. \
+ */ \
+ required_blks = (int32)(fld_size - curr_blk_bytes)/(int32)DATA_BLOCK_SIZE; \
+ /* \
+ * check if we need the data block for the field data \
+ * bytes that are not modulus of data block size. \
+ */ \
+ if ((fld_size - curr_blk_bytes)%DATA_BLOCK_SIZE != 0) \
+ required_blks++; \
+}
+
+/*
* Represents the different source cases we need to worry about at
* the bottom level
*/
@@ -241,6 +344,17 @@ typedef struct ParallelCopyLineBuf
} ParallelCopyLineBuf;
/*
+ * Represents the usage mode for CopyReadBinaryGetDataBlock.
+ */
+typedef enum FieldInfoType
+{
+ FIELD_NONE = 0,
+ FIELD_COUNT,
+ FIELD_SIZE,
+ FIELD_DATA
+} FieldInfoType;
+
+/*
* This structure helps in storing the common List/Node from CopyStateData that
* are required by the workers. This information will then be copied and stored
* into the DSM for the worker to retrieve and copy it to CopyStateData.
@@ -279,6 +393,9 @@ typedef struct ParallelCopyData
/* Current position in worker_line_buf */
uint32 worker_line_buf_pos;
+
+ /* For binary formatted files */
+ ParallelCopyDataBlock *curr_data_block;
} ParallelCopyData;
@@ -417,4 +534,14 @@ extern uint32 UpdateSharedLineInfo(CopyFromState cstate, uint32 blk_pos, uint32
uint32 line_size, uint32 line_state, uint32 blk_line_pos);
extern void EndLineParallelCopy(CopyFromState cstate, uint32 line_pos, uint32 line_size,
uint32 raw_buf_ptr);
+
+extern int CopyGetData(CopyFromState cstate, void *databuf, int minread, int maxread);
+extern int CopyReadBinaryData(CopyFromState cstate, char *dest, int nbytes);
+extern bool CopyReadBinaryTupleLeader(CopyFromState cstate);
+extern bool CopyReadBinaryTupleWorker(CopyFromState cstate, Datum *values, bool *nulls);
+extern void CopyReadBinaryFindTupleSize(CopyFromState cstate, uint32 *line_size);
+extern Datum CopyReadBinaryAttributeWorker(CopyFromState cstate, FmgrInfo *flinfo,
+ Oid typioparam, int32 typmod, bool *isnull);
+extern void CopyReadBinaryGetDataBlock(CopyFromState cstate, FieldInfoType field_info);
+
#endif /* COPYFROM_INTERNAL_H */
--
1.8.3.1