Merge branch 'adb-6.x-dev' into ADBDEV-6573

arenadata · Nov 1, 2024 · 27861b5 · 27861b5
2 parents 4866d47 + 8ec3a02
commit 27861b5
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 10 deletions.
diff --git a/gpcontrib/gpcloud/src/s3restful_service.cpp b/gpcontrib/gpcloud/src/s3restful_service.cpp
@@ -237,7 +237,7 @@ Response S3RESTfulService::post(const string &url, HTTPHeaders &headers,
     UploadData uploadData(s3data);
     curl_easy_setopt(curl, CURLOPT_READDATA, (void *)&uploadData);
     curl_easy_setopt(curl, CURLOPT_READFUNCTION, RESTfulServiceReadFuncCallback);
-    curl_easy_setopt(curl, CURLOPT_INFILESIZE_LARGE, (curl_off_t)data.size());
+    curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE_LARGE, (curl_off_t)data.size());
 
     this->performCurl(curl, response);
 

diff --git a/src/backend/access/bitmap/bitmapattutil.c b/src/backend/access/bitmap/bitmapattutil.c
@@ -336,11 +336,23 @@ _bitmap_insert_lov(Relation lovHeap, Relation lovIndex, Datum *datum,
 	result = index_insert(lovIndex, indexDatum, indexNulls,
 					 	  &(tuple->t_self), lovHeap, true);
 
-	SIMPLE_FAULT_INJECTOR("insert_bmlov_before_freeze");
+#ifdef FAULT_INJECTOR
+	FaultInjector_InjectFaultIfSet(
+							"insert_bmlov_before_freeze",
+							DDLNotSpecified,
+							"", //databaseName
+							RelationGetRelationName(lovHeap));
+#endif
 	/* freeze the tuple */
 	heap_freeze_tuple_wal_logged(lovHeap, tuple);
 
-	SIMPLE_FAULT_INJECTOR("insert_bmlov_after_freeze");
+#ifdef FAULT_INJECTOR
+	FaultInjector_InjectFaultIfSet(
+							"insert_bmlov_after_freeze",
+							DDLNotSpecified,
+							"", //databaseName
+							RelationGetRelationName(lovHeap));
+#endif
 	pfree(indexDatum);
 	pfree(indexNulls);
 	Assert(result);

diff --git a/src/backend/catalog/oid_dispatch.c b/src/backend/catalog/oid_dispatch.c
@@ -508,7 +508,7 @@ CreateKeyFromCatalogTuple(Relation catalogrel, HeapTuple tuple,
  * during plannign stage to touch oid assignments.
  *
  */
-extern List*
+List*
 SaveOidAssignments()
 {
 	List     *src = NIL;
@@ -529,7 +529,7 @@ SaveOidAssignments()
 	return src;
 }
 
-extern void
+void
 RestoreOidAssignments(List *oid_assignments)
 {
 	List          **target;

diff --git a/src/backend/commands/exttablecmds.c b/src/backend/commands/exttablecmds.c
@@ -60,7 +60,7 @@ static Datum optionsListToArray(List *options);
 * to leave it intact and do another dispatch.
 * ----------------------------------------------------------------
 */
-extern void
+void
 DefineExternalRelation(CreateExternalStmt *createExtStmt)
 {
 	CreateStmt *createStmt = makeNode(CreateStmt);

diff --git a/src/backend/commands/resgroupcmds.c b/src/backend/commands/resgroupcmds.c
@@ -1601,7 +1601,7 @@ checkCpusetSyntax(const char *cpuset)
 /*
  * Check Cpuset by coordinator and segment
  */
-extern void
+void
 checkCpuSetByRole(const char *cpuset)
 {
 	char *first = NULL;
@@ -1652,7 +1652,7 @@ checkCpuSetByRole(const char *cpuset)
  * cpuset = "1"
  * assign '1' to both coordinator and segment
  */
-extern char *
+char *
 getCpuSetByRole(const char *cpuset)
 {
 	char *splitcpuset = NULL;

diff --git a/src/backend/utils/adt/complex_type.c b/src/backend/utils/adt/complex_type.c
@@ -394,7 +394,7 @@ construct_complex(PG_FUNCTION_ARGS)
 /*
  *		construct_complex_trig	- returns arg1*cos(arg2) + arg1*sin(arg2)i
  */
-extern Datum
+Datum
 construct_complex_trig(PG_FUNCTION_ARGS)
 {
 	double		mag = PG_GETARG_FLOAT8(0);

diff --git a/src/backend/utils/misc/faultinjector.c b/src/backend/utils/misc/faultinjector.c
@@ -308,7 +308,7 @@ FaultInjector_InjectFaultIfSet_out_of_line(
 			/* fault injection is not set for the specified database name */
 			break;
 
-		if (strcmp(entryShared->tableName, tableNameLocal) != 0)
+		if (strlen(entryShared->tableName) > 0 && strcmp(entryShared->tableName, tableNameLocal) != 0)
 			/* fault injection is not set for the specified table name */
 			break;