Merge branch 'adb-7.2.0' into ADBDEV-5465

arenadata · Nov 1, 2024 · ae3aa47 · ae3aa47
2 parents 3f40630 + 1de16e5
commit ae3aa47
Show file tree

Hide file tree

Showing 71 changed files with 267 additions and 256 deletions.
diff --git a/contrib/btree_gin/btree_gin.c b/contrib/btree_gin/btree_gin.c
@@ -89,7 +89,7 @@ gin_btree_extract_query(FunctionCallInfo fcinfo,
 		case BTGreaterEqualStrategyNumber:
 		case BTGreaterStrategyNumber:
 			*ptr_partialmatch = true;
-			/* FALLTHROUGH */
+			fallthru;
 		case BTEqualStrategyNumber:
 			entries[0] = datum;
 			break;

diff --git a/contrib/isn/isn.c b/contrib/isn/isn.c
@@ -852,6 +852,7 @@ string2ean(const char *str, bool errorOK, ean13 *result,
 		case UPC:
 			buf[2] = '0';
 			valid = (valid && ((rcheck = checkdig(buf + 2, 13)) == check || magic));
+			fallthru;
 		default:
 			break;
 	}

diff --git a/contrib/pg_trgm/trgm_gin.c b/contrib/pg_trgm/trgm_gin.c
@@ -97,7 +97,7 @@ gin_extract_query_trgm(PG_FUNCTION_ARGS)
 #ifndef IGNORECASE
 			elog(ERROR, "cannot handle ~~* with case-sensitive trigrams");
 #endif
-			/* FALL THRU */
+			fallthru;
 		case LikeStrategyNumber:
 
 			/*
@@ -111,7 +111,7 @@ gin_extract_query_trgm(PG_FUNCTION_ARGS)
 #ifndef IGNORECASE
 			elog(ERROR, "cannot handle ~* with case-sensitive trigrams");
 #endif
-			/* FALL THRU */
+			fallthru;
 		case RegExpStrategyNumber:
 			trg = createTrgmNFA(val, PG_GET_COLLATION(),
 								&graph, CurrentMemoryContext);
@@ -221,7 +221,7 @@ gin_trgm_consistent(PG_FUNCTION_ARGS)
 #ifndef IGNORECASE
 			elog(ERROR, "cannot handle ~~* with case-sensitive trigrams");
 #endif
-			/* FALL THRU */
+			fallthru;
 		case LikeStrategyNumber:
 			/* Check if all extracted trigrams are presented. */
 			res = true;
@@ -238,7 +238,7 @@ gin_trgm_consistent(PG_FUNCTION_ARGS)
 #ifndef IGNORECASE
 			elog(ERROR, "cannot handle ~* with case-sensitive trigrams");
 #endif
-			/* FALL THRU */
+			fallthru;
 		case RegExpStrategyNumber:
 			if (nkeys < 1)
 			{
@@ -306,7 +306,7 @@ gin_trgm_triconsistent(PG_FUNCTION_ARGS)
 #ifndef IGNORECASE
 			elog(ERROR, "cannot handle ~~* with case-sensitive trigrams");
 #endif
-			/* FALL THRU */
+			fallthru;
 		case LikeStrategyNumber:
 			/* Check if all extracted trigrams are presented. */
 			res = GIN_MAYBE;
@@ -323,7 +323,7 @@ gin_trgm_triconsistent(PG_FUNCTION_ARGS)
 #ifndef IGNORECASE
 			elog(ERROR, "cannot handle ~* with case-sensitive trigrams");
 #endif
-			/* FALL THRU */
+			fallthru;
 		case RegExpStrategyNumber:
 			if (nkeys < 1)
 			{

diff --git a/contrib/pg_trgm/trgm_gist.c b/contrib/pg_trgm/trgm_gist.c
@@ -210,7 +210,7 @@ gtrgm_consistent(PG_FUNCTION_ARGS)
 #ifndef IGNORECASE
 				elog(ERROR, "cannot handle ~~* with case-sensitive trigrams");
 #endif
-				/* FALL THRU */
+				fallthru;
 			case LikeStrategyNumber:
 				qtrg = generate_wildcard_trgm(VARDATA(query),
 											  querysize - VARHDRSZ);
@@ -219,7 +219,7 @@ gtrgm_consistent(PG_FUNCTION_ARGS)
 #ifndef IGNORECASE
 				elog(ERROR, "cannot handle ~* with case-sensitive trigrams");
 #endif
-				/* FALL THRU */
+				fallthru;
 			case RegExpStrategyNumber:
 				qtrg = createTrgmNFA(query, PG_GET_COLLATION(),
 									 &graph, fcinfo->flinfo->fn_mcxt);
@@ -307,7 +307,7 @@ gtrgm_consistent(PG_FUNCTION_ARGS)
 #ifndef IGNORECASE
 			elog(ERROR, "cannot handle ~~* with case-sensitive trigrams");
 #endif
-			/* FALL THRU */
+			fallthru;
 		case LikeStrategyNumber:
 			/* Wildcard search is inexact */
 			*recheck = true;
@@ -348,7 +348,7 @@ gtrgm_consistent(PG_FUNCTION_ARGS)
 #ifndef IGNORECASE
 			elog(ERROR, "cannot handle ~* with case-sensitive trigrams");
 #endif
-			/* FALL THRU */
+			fallthru;
 		case RegExpStrategyNumber:
 			/* Regexp search is inexact */
 			*recheck = true;

diff --git a/contrib/pgcrypto/imath.c b/contrib/pgcrypto/imath.c
@@ -1978,7 +1978,8 @@ mp_int_read_cstring(mp_int z, mp_size radix, const char *str,
 			++str;
 			break;
 		case '+':
-			++str;				/* fallthrough */
+			++str;
+			fallthru;
 		default:
 			z->sign = MP_ZPOS;
 			break;

diff --git a/contrib/pgcrypto/pgp-info.c b/contrib/pgcrypto/pgp-info.c
@@ -169,7 +169,7 @@ pgp_get_keyid(MBuf *pgp_data, char *dst)
 				break;
 			case PGP_PKT_SYMENCRYPTED_SESSKEY:
 				got_symenc_key++;
-				/* fallthru */
+				fallthru;
 			case PGP_PKT_SIGNATURE:
 			case PGP_PKT_MARKER:
 			case PGP_PKT_TRUST:

diff --git a/contrib/postgres_fdw/deparse.c b/contrib/postgres_fdw/deparse.c
@@ -3101,13 +3101,10 @@ deparsePartialAggFunctionParamFilter(Aggref *node, deparse_expr_cxt *context,
 	{
 		case 2100:
 			/* int8 AVG */
-			/* Fall through */
 		case 2101:
 			/* int4 AVG function */
-			/* Fall through */
 		case 2102:
 			/* int2 AVG function */
-			/* Fall through */
 		case 2103:
 			/* numeric AVG function */
 			/* According to aggcombinefn, those aggregate functions need to fetch same columns from remote server. */
@@ -3116,7 +3113,6 @@ deparsePartialAggFunctionParamFilter(Aggref *node, deparse_expr_cxt *context,
 			break;
 		case 2104:
 			/* float4 AVG function */
-			/* Fall through */
 		case 2105:
 			/* float8 AVG function */
 			appendStringInfo(buf, "array[count(%s)%s, sum(%s)%s, count(%s)*var_pop(%s)%s]",

diff --git a/contrib/postgres_fdw/postgres_fdw.c b/contrib/postgres_fdw/postgres_fdw.c
@@ -6350,7 +6350,7 @@ postgresGetForeignUpperPaths(PlannerInfo *root, UpperRelationKind stage,
 			/* It's unsafe to push having statements with partial aggregates */
 			if (((GroupPathExtraData *) extra)->havingQual)
 				return;
-			/* Fall through */
+			fallthru;
 			/* Partial agg push down path */
 		case UPPERREL_GROUP_AGG:
 			add_foreign_grouping_paths(root, input_rel, output_rel,

diff --git a/gpcontrib/gp_sparse_vector/operators.c b/gpcontrib/gp_sparse_vector/operators.c
@@ -411,7 +411,7 @@ svec_count(PG_FUNCTION_ARGS)
 			 * beginning of the accumulation of the correct dimension.
 			 */
 			left = makeSparseDataFromDouble(0.,right->total_value_count);
-			/* FALLTHROUGH */
+			fallthru;
 
 		case 0: 		//neither arg is scalar
 		case 2:			//right arg is scalar

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/heap/heapam_handler.c b/src/backend/access/heap/heapam_handler.c
@@ -917,7 +917,7 @@ heapam_relation_copy_for_cluster(Relation OldHeap, Relation NewHeap,
 				break;
 			case HEAPTUPLE_RECENTLY_DEAD:
 				*tups_recently_dead += 1;
-				/* fall through */
+				fallthru;
 			case HEAPTUPLE_LIVE:
 				/* Live or recently dead, must copy it */
 				isdead = false;

diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
@@ -7757,6 +7757,7 @@ StartupXLOG(void)
 						recoveryPausesHere();
 
 						/* drop into promote */
+						fallthru;
 
 					case RECOVERY_TARGET_ACTION_PROMOTE:
 						break;

diff --git a/src/backend/catalog/dependency.c b/src/backend/catalog/dependency.c
@@ -639,7 +639,7 @@ findDependentObjects(const ObjectAddress *object,
 					break;
 
 				/* Otherwise, treat this like an internal dependency */
-				/* FALL THRU */
+				fallthru;
 
 			case DEPENDENCY_INTERNAL:
 

diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c
@@ -2172,7 +2172,7 @@ pg_get_object_address(PG_FUNCTION_ARGS)
 						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 						 errmsg("name list length must be at least %d", 3)));
 			/* fall through to check args length */
-			/* FALLTHROUGH */
+			fallthru;
 		case OBJECT_OPERATOR:
 			if (list_length(args) != 2)
 				ereport(ERROR,

diff --git a/src/backend/cdb/cdbtm.c b/src/backend/cdb/cdbtm.c
@@ -825,7 +825,7 @@ doNotifyingAbort(void)
 				setCurrentDtxState(DTX_STATE_RETRY_ABORT_PREPARED);
 				setDistributedTransactionContext(DTX_CONTEXT_QD_RETRY_PHASE_2);
 			}
-			/* FALL THRU */
+			fallthru;
 
 		case DTX_STATE_RETRY_ABORT_PREPARED:
 			retryAbortPrepared();

diff --git a/src/backend/commands/explain.c b/src/backend/commands/explain.c
@@ -2352,7 +2352,7 @@ ExplainNode(PlanState *planstate, List *ancestors,
 			show_tablesample(((SampleScan *) plan)->tablesample,
 							 planstate, ancestors, es);
 			/* fall through to print additional fields the same as SeqScan */
-			/* FALLTHROUGH */
+			fallthru;
 		case T_SeqScan:
 		case T_DynamicSeqScan:
 		case T_ValuesScan:

diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
@@ -14587,7 +14587,7 @@ ATExecChangeOwner(Oid relationOid, Oid newOwnerId, bool recursing, LOCKMODE lock
 		case RELKIND_AOVISIMAP:
 			if (recursing)
 				break;
-			/* FALL THRU */
+			fallthru;
 		default:
 			ereport(ERROR,
 					(errcode(ERRCODE_WRONG_OBJECT_TYPE),

diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c
@@ -4381,7 +4381,7 @@ AfterTriggerExecute(EState *estate,
 											 trig_tuple_slot2))
 					elog(ERROR, "failed to fetch tuple2 for AFTER trigger");
 			}
-			/* fall through */
+			fallthru;
 		case AFTER_TRIGGER_FDW_REUSE:
 
 			/*

diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c
@@ -2326,7 +2326,7 @@ ExecAgg(PlanState *pstate)
 			case AGG_HASHED:
 				if (!node->table_filled)
 					agg_fill_hash_table(node);
-				/* FALLTHROUGH */
+				fallthru;
 			case AGG_MIXED:
 				result = agg_retrieve_hash_table(node);
 				break;

diff --git a/src/backend/executor/nodeHash.c b/src/backend/executor/nodeHash.c
@@ -291,7 +291,7 @@ MultiExecParallelHash(HashState *node)
 			 * way, wait for everyone to arrive here so we can proceed.
 			 */
 			BarrierArriveAndWait(build_barrier, WAIT_EVENT_HASH_BUILD_ALLOCATING);
-			/* Fall through. */
+			fallthru;
 
 		case PHJ_BUILD_HASHING_INNER:
 
@@ -1349,13 +1349,13 @@ ExecParallelHashIncreaseNumBatches(HashJoinTable hashtable)
 				/* All other participants just flush their tuples to disk. */
 				ExecParallelHashCloseBatchAccessors(hashtable);
 			}
-			/* Fall through. */
+			fallthru;
 
 		case PHJ_GROW_BATCHES_ALLOCATING:
 			/* Wait for the above to be finished. */
 			BarrierArriveAndWait(&pstate->grow_batches_barrier,
 								 WAIT_EVENT_HASH_GROW_BATCHES_ALLOCATING);
-			/* Fall through. */
+			fallthru;
 
 		case PHJ_GROW_BATCHES_REPARTITIONING:
 			/* Make sure that we have the current dimensions and buckets. */
@@ -1368,7 +1368,7 @@ ExecParallelHashIncreaseNumBatches(HashJoinTable hashtable)
 			/* Wait for the above to be finished. */
 			BarrierArriveAndWait(&pstate->grow_batches_barrier,
 								 WAIT_EVENT_HASH_GROW_BATCHES_REPARTITIONING);
-			/* Fall through. */
+			fallthru;
 
 		case PHJ_GROW_BATCHES_DECIDING:
 
@@ -1423,7 +1423,7 @@ ExecParallelHashIncreaseNumBatches(HashJoinTable hashtable)
 				dsa_free(hashtable->area, pstate->old_batches);
 				pstate->old_batches = InvalidDsaPointer;
 			}
-			/* Fall through. */
+			fallthru;
 
 		case PHJ_GROW_BATCHES_FINISHING:
 			/* Wait for the above to complete. */
@@ -1701,13 +1701,13 @@ ExecParallelHashIncreaseNumBuckets(HashJoinTable hashtable)
 				/* Clear the flag. */
 				pstate->growth = PHJ_GROWTH_OK;
 			}
-			/* Fall through. */
+			fallthru;
 
 		case PHJ_GROW_BUCKETS_ALLOCATING:
 			/* Wait for the above to complete. */
 			BarrierArriveAndWait(&pstate->grow_buckets_barrier,
 								 WAIT_EVENT_HASH_GROW_BUCKETS_ALLOCATING);
-			/* Fall through. */
+			fallthru;
 
 		case PHJ_GROW_BUCKETS_REINSERTING:
 			/* Reinsert all tuples into the hash table. */

diff --git a/src/backend/executor/nodeHashjoin.c b/src/backend/executor/nodeHashjoin.c
@@ -417,7 +417,7 @@ ExecHashJoinImpl(PlanState *pstate, bool parallel)
 				else
 					node->hj_JoinState = HJ_NEED_NEW_OUTER;
 
-				/* FALL THRU */
+				fallthru;
 
 			case HJ_NEED_NEW_OUTER:
 
@@ -511,7 +511,7 @@ ExecHashJoinImpl(PlanState *pstate, bool parallel)
 				/* OK, let's scan the bucket for matches */
 				node->hj_JoinState = HJ_SCAN_BUCKET;
 
-				/* FALL THRU */
+				fallthru;
 
 			case HJ_SCAN_BUCKET:
 
@@ -1389,13 +1389,13 @@ ExecParallelHashJoinNewBatch(HashJoinState *hjstate)
 					if (BarrierArriveAndWait(batch_barrier,
 											 WAIT_EVENT_HASH_BATCH_ELECTING))
 						ExecParallelHashTableAlloc(hashtable, batchno);
-					/* Fall through. */
+					fallthru;
 
 				case PHJ_BATCH_ALLOCATING:
 					/* Wait for allocation to complete. */
 					BarrierArriveAndWait(batch_barrier,
 										 WAIT_EVENT_HASH_BATCH_ALLOCATING);
-					/* Fall through. */
+					fallthru;
 
 				case PHJ_BATCH_LOADING:
 					/* Start (or join in) loading tuples. */
@@ -1415,7 +1415,7 @@ ExecParallelHashJoinNewBatch(HashJoinState *hjstate)
 					sts_end_parallel_scan(inner_tuples);
 					BarrierArriveAndWait(batch_barrier,
 										 WAIT_EVENT_HASH_BATCH_LOADING);
-					/* Fall through. */
+					fallthru;
 
 				case PHJ_BATCH_PROBING:
 

diff --git a/src/backend/executor/nodeLimit.c b/src/backend/executor/nodeLimit.c
@@ -71,7 +71,7 @@ ExecLimit_guts(PlanState *pstate)
 			 */
 			recompute_limits(node);
 
-			/* FALL THRU */
+			fallthru;
 
 		case LIMIT_RESCAN:
 

diff --git a/src/backend/fts/ftsprobe.c b/src/backend/fts/ftsprobe.c
@@ -859,7 +859,7 @@ processRetry(fts_context *context)
 				if (!(ftsInfo->result.retryRequested && context->has_mirrors &&
 					  SEGMENT_IS_ALIVE(ftsInfo->mirror_cdbinfo)))
 					break;
-				/* else, fallthrough */
+				fallthru;
 			case FTS_PROBE_FAILED:
 			case FTS_SYNCREP_OFF_FAILED:
 			case FTS_PROMOTE_FAILED: