Merge branch 'main' into udp2

zhangyue1818 · web-flow · commit bb95856f49ce · 2025-12-02T09:58:55.000+08:00
diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c
@@ -2758,7 +2758,7 @@ process_sample_rows(Portal portal,
 
 		if (!attr->attisdropped)
 		{
-			TupleDescInitEntry(funcTupleDesc, (AttrNumber) 4 + index, "",
+			TupleDescInitEntry(funcTupleDesc, (AttrNumber) NUM_SAMPLE_FIXED_COLS + 1 + index, "",
 							   typid, attr->atttypmod, attr->attndims);
 
 			index++;

Original file line number	Diff line number	Diff line change
`@@ -2758,7 +2758,7 @@ process_sample_rows(Portal portal,`
`2758`	`2758`
`2759`	`2759`	`if (!attr->attisdropped)`
`2760`	`2760`	`{`
`2761`		`- TupleDescInitEntry(funcTupleDesc, (AttrNumber) 4 + index, "",`
	`2761`	`+ TupleDescInitEntry(funcTupleDesc, (AttrNumber) NUM_SAMPLE_FIXED_COLS + 1 + index, "",`
`2762`	`2762`	`typid, attr->atttypmod, attr->attndims);`
`2763`	`2763`
`2764`	`2764`	`index++;`