add within group

pkg/defines/const.go

@@ -51,7 +51,8 @@ const (
 	MORPCVersion13     int64 = 13 // lossless v2 prefix-index metadata
 	MORPCVersion14     int64 = 14 // utf8mb4 text MIN/MAX collation semantics
 	MORPCVersion15     int64 = 15 // CHECK metadata in rename-column alter requests
-	MORPCLatestVersion       = MORPCVersion15
+	MORPCVersion16     int64 = 16 // ordered-set percentile aggregate IDs
+	MORPCLatestVersion       = MORPCVersion16
 )
 
 // DefaultLockWaitTimeoutSeconds is shared by the frontend default and by

pkg/sql/colexec/aggexec/concat2.go

@@ -94,6 +94,21 @@ func EncodeGroupConcatOrderedConfig(config []byte, maxLen uint64) []byte {
 	return runtimeConfig
 }
 
+// HasGroupConcatOrder reports whether a GROUP_CONCAT_ORDER configuration
+// contains at least one real ORDER BY argument. The aggregate config is
+// carried in two forms: the plan payload starts with the version byte, while
+// the execution payload may be prefixed by the runtime max-length header.
+// Invalid payloads are treated as unordered so callers fail closed when
+// deciding whether generic DISTINCT spill is safe.
+func HasGroupConcatOrder(config []byte) bool {
+	if len(config) >= groupConcatOrderedConfigHeaderSize &&
+		bytes.Equal(config[:len(groupConcatOrderedConfigMagic)], groupConcatOrderedConfigMagic) {
+		config = config[groupConcatOrderedConfigHeaderSize:]
+	}
+	_, orderArgIndexes, _, _, _, err := decodeGroupConcatOrderConfig(config)
+	return err == nil && len(orderArgIndexes) > 0
+}
+
 func RefreshGroupConcatConfigMaxLen(config []byte, maxLen uint64) []byte {
 	if len(config) >= groupConcatOrderedConfigHeaderSize &&
 		bytes.Equal(config[:len(groupConcatOrderedConfigMagic)], groupConcatOrderedConfigMagic) {

pkg/sql/colexec/aggexec/concat2_test.go

@@ -876,6 +876,19 @@ func TestGroupConcatOrderConfigValidationAndReturnType(t *testing.T) {
 	})
 }
 
+func TestHasGroupConcatOrder(t *testing.T) {
+	ordered := testGroupConcatOrderConfig(1, []byte{groupConcatOrderAsc}, "|").Data
+	unordered := testGroupConcatOrderConfig(1, nil, "|").Data
+	malformed := []byte{groupConcatOrderConfigVersion}
+
+	require.True(t, HasGroupConcatOrder(ordered))
+	require.True(t, HasGroupConcatOrder(EncodeGroupConcatOrderedConfig(ordered, 10)))
+	require.False(t, HasGroupConcatOrder(unordered))
+	require.False(t, HasGroupConcatOrder(EncodeGroupConcatOrderedConfig(unordered, 10)))
+	require.False(t, HasGroupConcatOrder(malformed))
+	require.False(t, HasGroupConcatOrder(EncodeGroupConcatConfig("|", 10)))
+}
+
 func TestGroupConcatOrderedMaxLen(t *testing.T) {
 	mp := mpool.MustNewZero()
 	info := multiAggInfo{

pkg/sql/colexec/aggexec/empty_result.go

@@ -39,7 +39,8 @@ func GetEmptyResultKind(aggID int64) EmptyResultKind {
 		return EmptyResultZero
 	case AggIdOfAny, AggIdOfAvg, AggIdOfGroupConcat, AggIdOfJsonArrayAgg,
 		AggIdOfJsonObjectAgg, AggIdOfMax, AggIdOfMaxBy, AggIdOfMaxByNonNull,
-		AggIdOfMedian, AggIdOfMin, AggIdOfApproxPercentile, AggIdOfStdDevPop,
+		AggIdOfMedian, AggIdOfMin, AggIdOfApproxPercentile, AggIdOfPercentileCont,
+		AggIdOfPercentileDisc, AggIdOfStdDevPop,
 		AggIdOfStdDevSample, AggIdOfSum, AggIdOfVarPop, AggIdOfVarSample:
 		return EmptyResultNull
 	case AggIdOfAvgTwCache, AggIdOfAvgTwResult, AggIdOfBitmapConstruct,

pkg/sql/colexec/aggexec/function_id.go

@@ -58,4 +58,6 @@ const (
 	AggIdOfApproxPercentile    int64 = 557 << 32
 	AggIdOfMaxBy               int64 = 559 << 32
 	AggIdOfMaxByNonNull        int64 = 560 << 32
+	AggIdOfPercentileCont      int64 = 562 << 32
+	AggIdOfPercentileDisc      int64 = 563 << 32
 )