Merge #149898 #150253

149898: sql: INVERTED JOIN acceleration for `json ? string`, `json ?& array`, `json ?| array` and `array && array` r=ZhouXing19 a=ZhouXing19

fixes #81642
fixes #81643

ref: #81253

This commit adds support for accelerating the json ? string, json ?& array, json ?| array and array && array operators for INVERTED JOIN when the json/array argument is a column that has an inverted index over it.

Release note (sql change): the json ? string, json ?& array, json ?| array and array && array operators are now index accelerated for INVERTED JOIN statement if there is an inverted index over the json column referred to on the left hand side of the expression.

150253: tabledesc: allow TTL storage params to be set to 0 r=rafiss a=rafiss

Epic: None
Release note (bug fix): Fixed a bug that prevented the row-level TTL table storage parameters (e.g. ttl_select_batch_size, ttl_delete_batch_size, ttl_delete_rate_limit, and ttl_select_rate_limit) from being set to 0, which is their default value.

Co-authored-by: ZhouXing19 <[email protected]>
Co-authored-by: Rafi Shamim <[email protected]>

Author: 3 people

pkg/sql/catalog/tabledesc/ttl.go

@@ -131,10 +131,10 @@ func ValidateTTLExpirationColumn(desc catalog.TableDescriptor) error {
 
 // ValidateTTLBatchSize validates the batch size of a TTL.
 func ValidateTTLBatchSize(key string, val int64) error {
-	if val <= 0 {
+	if val < 0 {
 		return pgerror.Newf(
 			pgcode.InvalidParameterValue,
-			`"%s" must be at least 1`,
+			`"%s" must be at least 0`,
 			key,
 		)
 	}
@@ -157,10 +157,10 @@ func ValidateTTLCronExpr(key string, str string) error {
 // ValidateTTLRowStatsPollInterval validates the automatic statistics field
 // of TTL.
 func ValidateTTLRowStatsPollInterval(key string, val time.Duration) error {
-	if val <= 0 {
+	if val < 0 {
 		return pgerror.Newf(
 			pgcode.InvalidParameterValue,
-			`"%s" must be at least 1`,
+			`"%s" must be at least 0`,
 			key,
 		)
 	}
@@ -169,10 +169,10 @@ func ValidateTTLRowStatsPollInterval(key string, val time.Duration) error {
 
 // ValidateTTLRateLimit validates the rate limit parameters of TTL.
 func ValidateTTLRateLimit(key string, val int64) error {
-	if val <= 0 {
+	if val < 0 {
 		return pgerror.Newf(
 			pgcode.InvalidParameterValue,
-			`"%s" must be at least 1`,
+			`"%s" must be at least 0`,
 			key,
 		)
 	}

pkg/sql/catalog/tabledesc/validate_test.go

@@ -2852,7 +2852,7 @@ func TestValidateTableDesc(t *testing.T) {
 					DurationExpr: catpb.Expression("INTERVAL '2 minutes'"),
 				},
 			}},
-		{err: `"ttl_select_batch_size" must be at least 1`,
+		{err: `"ttl_select_batch_size" must be at least 0`,
 			desc: descpb.TableDescriptor{
 				ID:            2,
 				ParentID:      1,