(cloudberry) 02/03: Fix related code in copyfrom.c

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

maxyang pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudberry.git

commit aec3384edd4fd96cffbe2d5ddeee4962d1382bc9
Author: Yongtao Huang <yo...@gmail.com>
AuthorDate: Tue Dec 17 23:26:58 2024 +0800

    Fix related code in copyfrom.c
    
    Part of copy.c is split into copyfrom.c and copyto.c in PG-14
    
    Signed-off-by: Yongtao Huang <yo...@gmail.com>
---
 src/backend/commands/copyfrom.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/backend/commands/copyfrom.c b/src/backend/commands/copyfrom.c
index 905fd7e68e..d7aaf8b97a 100644
--- a/src/backend/commands/copyfrom.c
+++ b/src/backend/commands/copyfrom.c
@@ -3327,9 +3327,14 @@ NextCopyFromX(CopyFromState cstate, ExprContext *econtext,
 				fldct = 0;
 			field_strings = cstate->raw_fields;
 		}
-
-		/* check for overflowing fields */
-		if (attr_count > 0 && fldct > attr_count)
+		/* 
+		 * Check for overflowing fields.
+		 * GPDB: Change below condition compared to upstream to 
+		 * greater than or equal to 0 as in QE, 
+		 * attr_count may be equal to 0, 
+		 * when all fields are processed in the QD.
+		 */
+		if (fldct > attr_count)
 			ereport(ERROR,
 					(errcode(ERRCODE_BAD_COPY_FILE_FORMAT),
 					 errmsg("extra data after last expected column")));


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cloudberry.apache.org
For additional commands, e-mail: commits-help@cloudberry.apache.org