Skip to content

Commit 7d65bb4

Browse files
craig[bot]bghaljasonlmfongfqaziLloyd-Pottiger
committed
156884: sql: clean up deprecated compute expression field r=rafiss a=bghal The field is sufficiently deprecated to drop it. And with that gone the element version metadata is also cleaned up. Part of: #142914 Epic: CRDB-31283 Release note: None 158889: ts: update the recording of changefeed child metrics r=dhartunian a=jasonlmfong ts: record histogram child metrics When child metrics collection was performed, it only picked up gauges and counters. This commit adds the ability to record histograms as well. This was done through exposing child histograms snapshots which were previously not accessible. Epic: CRDB-55079 Release: None -- ts: memoize child metric name transformation Curently the child metric name transformations are being performed every polling cycle. The memoization will ensure every subsequent poll does not need to allocate memory and cpu to transform the names. Epic: CRDB-55079 Release: None 159016: catalog: add version gates for leased descriptors in views r=fqazi a=fqazi Previously, we lacked version gates for enabling leased descriptors, which could be problematic in mixed version scenarios. This patch adds version gates to determine when this setting can be enabled. Fixes: #159009 Release note: None 159027: vecindex: fix encode metadata value r=yuzefovich a=Lloyd-Pottiger Epic: None Release: None 159081: codeowners: include gitignore'd files in test file lookup r=williamchoe3 a=rickystewart Release note: none Epic: none Co-authored-by: Brendan Gerrity <[email protected]> Co-authored-by: Jason Fong <[email protected]> Co-authored-by: Faizan Qazi <[email protected]> Co-authored-by: Lloyd-Pottiger <[email protected]> Co-authored-by: Ricky Stewart <[email protected]>
6 parents ed931f0 + a15a927 + b5155c6 + d9726f4 + cfcb11b + 509d0d3 commit 7d65bb4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+569
-698
lines changed

‎pkg/ccl/schemachangerccl/testdata/decomp/multiregion‎

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -248,9 +248,7 @@ ElementState:
248248
closedTypeIds: []
249249
columnFamilyOrderFollowsColumnId: 0
250250
columnId: 1
251-
computeExpr: null
252251
elementCreationMetadata:
253-
in243OrLater: true
254252
in261OrLater: true
255253
familyId: 0
256254
isVirtual: false
@@ -277,9 +275,7 @@ ElementState:
277275
closedTypeIds: []
278276
columnFamilyOrderFollowsColumnId: 0
279277
columnId: 2
280-
computeExpr: null
281278
elementCreationMetadata:
282-
in243OrLater: true
283279
in261OrLater: true
284280
familyId: 0
285281
isVirtual: false
@@ -306,9 +302,7 @@ ElementState:
306302
closedTypeIds: []
307303
columnFamilyOrderFollowsColumnId: 0
308304
columnId: 4.294967292e+09
309-
computeExpr: null
310305
elementCreationMetadata:
311-
in243OrLater: true
312306
in261OrLater: true
313307
familyId: 0
314308
isVirtual: false
@@ -335,9 +329,7 @@ ElementState:
335329
closedTypeIds: []
336330
columnFamilyOrderFollowsColumnId: 0
337331
columnId: 4.294967293e+09
338-
computeExpr: null
339332
elementCreationMetadata:
340-
in243OrLater: true
341333
in261OrLater: true
342334
familyId: 0
343335
isVirtual: false
@@ -364,9 +356,7 @@ ElementState:
364356
closedTypeIds: []
365357
columnFamilyOrderFollowsColumnId: 0
366358
columnId: 4.294967294e+09
367-
computeExpr: null
368359
elementCreationMetadata:
369-
in243OrLater: true
370360
in261OrLater: true
371361
familyId: 0
372362
isVirtual: false
@@ -393,9 +383,7 @@ ElementState:
393383
closedTypeIds: []
394384
columnFamilyOrderFollowsColumnId: 0
395385
columnId: 4.294967295e+09
396-
computeExpr: null
397386
elementCreationMetadata:
398-
in243OrLater: true
399387
in261OrLater: true
400388
familyId: 0
401389
isVirtual: false
@@ -662,9 +650,7 @@ ElementState:
662650
closedTypeIds: []
663651
columnFamilyOrderFollowsColumnId: 0
664652
columnId: 1
665-
computeExpr: null
666653
elementCreationMetadata:
667-
in243OrLater: true
668654
in261OrLater: true
669655
familyId: 0
670656
isVirtual: false
@@ -691,9 +677,7 @@ ElementState:
691677
closedTypeIds: []
692678
columnFamilyOrderFollowsColumnId: 0
693679
columnId: 2
694-
computeExpr: null
695680
elementCreationMetadata:
696-
in243OrLater: true
697681
in261OrLater: true
698682
familyId: 0
699683
isVirtual: false
@@ -720,9 +704,7 @@ ElementState:
720704
closedTypeIds: []
721705
columnFamilyOrderFollowsColumnId: 0
722706
columnId: 4.294967292e+09
723-
computeExpr: null
724707
elementCreationMetadata:
725-
in243OrLater: true
726708
in261OrLater: true
727709
familyId: 0
728710
isVirtual: false
@@ -749,9 +731,7 @@ ElementState:
749731
closedTypeIds: []
750732
columnFamilyOrderFollowsColumnId: 0
751733
columnId: 4.294967293e+09
752-
computeExpr: null
753734
elementCreationMetadata:
754-
in243OrLater: true
755735
in261OrLater: true
756736
familyId: 0
757737
isVirtual: false
@@ -778,9 +758,7 @@ ElementState:
778758
closedTypeIds: []
779759
columnFamilyOrderFollowsColumnId: 0
780760
columnId: 4.294967294e+09
781-
computeExpr: null
782761
elementCreationMetadata:
783-
in243OrLater: true
784762
in261OrLater: true
785763
familyId: 0
786764
isVirtual: false
@@ -807,9 +785,7 @@ ElementState:
807785
closedTypeIds: []
808786
columnFamilyOrderFollowsColumnId: 0
809787
columnId: 4.294967295e+09
810-
computeExpr: null
811788
elementCreationMetadata:
812-
in243OrLater: true
813789
in261OrLater: true
814790
familyId: 0
815791
isVirtual: false
@@ -1132,9 +1108,7 @@ ElementState:
11321108
- 107
11331109
columnFamilyOrderFollowsColumnId: 0
11341110
columnId: 3
1135-
computeExpr: null
11361111
elementCreationMetadata:
1137-
in243OrLater: true
11381112
in261OrLater: true
11391113
familyId: 0
11401114
isVirtual: false
@@ -1162,9 +1136,7 @@ ElementState:
11621136
closedTypeIds: []
11631137
columnFamilyOrderFollowsColumnId: 0
11641138
columnId: 1
1165-
computeExpr: null
11661139
elementCreationMetadata:
1167-
in243OrLater: true
11681140
in261OrLater: true
11691141
familyId: 0
11701142
isVirtual: false
@@ -1191,9 +1163,7 @@ ElementState:
11911163
closedTypeIds: []
11921164
columnFamilyOrderFollowsColumnId: 0
11931165
columnId: 2
1194-
computeExpr: null
11951166
elementCreationMetadata:
1196-
in243OrLater: true
11971167
in261OrLater: true
11981168
familyId: 0
11991169
isVirtual: false
@@ -1220,9 +1190,7 @@ ElementState:
12201190
closedTypeIds: []
12211191
columnFamilyOrderFollowsColumnId: 0
12221192
columnId: 4.294967292e+09
1223-
computeExpr: null
12241193
elementCreationMetadata:
1225-
in243OrLater: true
12261194
in261OrLater: true
12271195
familyId: 0
12281196
isVirtual: false
@@ -1249,9 +1217,7 @@ ElementState:
12491217
closedTypeIds: []
12501218
columnFamilyOrderFollowsColumnId: 0
12511219
columnId: 4.294967293e+09
1252-
computeExpr: null
12531220
elementCreationMetadata:
1254-
in243OrLater: true
12551221
in261OrLater: true
12561222
familyId: 0
12571223
isVirtual: false
@@ -1278,9 +1244,7 @@ ElementState:
12781244
closedTypeIds: []
12791245
columnFamilyOrderFollowsColumnId: 0
12801246
columnId: 4.294967294e+09
1281-
computeExpr: null
12821247
elementCreationMetadata:
1283-
in243OrLater: true
12841248
in261OrLater: true
12851249
familyId: 0
12861250
isVirtual: false
@@ -1307,9 +1271,7 @@ ElementState:
13071271
closedTypeIds: []
13081272
columnFamilyOrderFollowsColumnId: 0
13091273
columnId: 4.294967295e+09
1310-
computeExpr: null
13111274
elementCreationMetadata:
1312-
in243OrLater: true
13131275
in261OrLater: true
13141276
familyId: 0
13151277
isVirtual: false

‎pkg/ccl/schemachangerccl/testdata/decomp/partitioning‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -175,9 +175,7 @@ ElementState:
175175
closedTypeIds: []
176176
columnFamilyOrderFollowsColumnId: 0
177177
columnId: 1
178-
computeExpr: null
179178
elementCreationMetadata:
180-
in243OrLater: true
181179
in261OrLater: true
182180
familyId: 0
183181
isVirtual: false
@@ -204,9 +202,7 @@ ElementState:
204202
closedTypeIds: []
205203
columnFamilyOrderFollowsColumnId: 0
206204
columnId: 2
207-
computeExpr: null
208205
elementCreationMetadata:
209-
in243OrLater: true
210206
in261OrLater: true
211207
familyId: 0
212208
isVirtual: false
@@ -233,9 +229,7 @@ ElementState:
233229
closedTypeIds: []
234230
columnFamilyOrderFollowsColumnId: 0
235231
columnId: 3
236-
computeExpr: null
237232
elementCreationMetadata:
238-
in243OrLater: true
239233
in261OrLater: true
240234
familyId: 0
241235
isVirtual: false
@@ -262,9 +256,7 @@ ElementState:
262256
closedTypeIds: []
263257
columnFamilyOrderFollowsColumnId: 0
264258
columnId: 4.294967292e+09
265-
computeExpr: null
266259
elementCreationMetadata:
267-
in243OrLater: true
268260
in261OrLater: true
269261
familyId: 0
270262
isVirtual: false
@@ -291,9 +283,7 @@ ElementState:
291283
closedTypeIds: []
292284
columnFamilyOrderFollowsColumnId: 0
293285
columnId: 4.294967293e+09
294-
computeExpr: null
295286
elementCreationMetadata:
296-
in243OrLater: true
297287
in261OrLater: true
298288
familyId: 0
299289
isVirtual: false
@@ -320,9 +310,7 @@ ElementState:
320310
closedTypeIds: []
321311
columnFamilyOrderFollowsColumnId: 0
322312
columnId: 4.294967294e+09
323-
computeExpr: null
324313
elementCreationMetadata:
325-
in243OrLater: true
326314
in261OrLater: true
327315
familyId: 0
328316
isVirtual: false
@@ -349,9 +337,7 @@ ElementState:
349337
closedTypeIds: []
350338
columnFamilyOrderFollowsColumnId: 0
351339
columnId: 4.294967295e+09
352-
computeExpr: null
353340
elementCreationMetadata:
354-
in243OrLater: true
355341
in261OrLater: true
356342
familyId: 0
357343
isVirtual: false
@@ -696,9 +682,7 @@ ElementState:
696682
closedTypeIds: []
697683
columnFamilyOrderFollowsColumnId: 0
698684
columnId: 1
699-
computeExpr: null
700685
elementCreationMetadata:
701-
in243OrLater: true
702686
in261OrLater: true
703687
familyId: 0
704688
isVirtual: false
@@ -725,9 +709,7 @@ ElementState:
725709
closedTypeIds: []
726710
columnFamilyOrderFollowsColumnId: 0
727711
columnId: 2
728-
computeExpr: null
729712
elementCreationMetadata:
730-
in243OrLater: true
731713
in261OrLater: true
732714
familyId: 0
733715
isVirtual: false
@@ -754,9 +736,7 @@ ElementState:
754736
closedTypeIds: []
755737
columnFamilyOrderFollowsColumnId: 0
756738
columnId: 4.294967292e+09
757-
computeExpr: null
758739
elementCreationMetadata:
759-
in243OrLater: true
760740
in261OrLater: true
761741
familyId: 0
762742
isVirtual: false
@@ -783,9 +763,7 @@ ElementState:
783763
closedTypeIds: []
784764
columnFamilyOrderFollowsColumnId: 0
785765
columnId: 4.294967293e+09
786-
computeExpr: null
787766
elementCreationMetadata:
788-
in243OrLater: true
789767
in261OrLater: true
790768
familyId: 0
791769
isVirtual: false
@@ -812,9 +790,7 @@ ElementState:
812790
closedTypeIds: []
813791
columnFamilyOrderFollowsColumnId: 0
814792
columnId: 4.294967294e+09
815-
computeExpr: null
816793
elementCreationMetadata:
817-
in243OrLater: true
818794
in261OrLater: true
819795
familyId: 0
820796
isVirtual: false
@@ -841,9 +817,7 @@ ElementState:
841817
closedTypeIds: []
842818
columnFamilyOrderFollowsColumnId: 0
843819
columnId: 4.294967295e+09
844-
computeExpr: null
845820
elementCreationMetadata:
846-
in243OrLater: true
847821
in261OrLater: true
848822
familyId: 0
849823
isVirtual: false

‎pkg/cli/testdata/declarative-rules/deprules‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3562,7 +3562,7 @@ deprules
35623562
- $referenced-descriptor[Type] = '*scpb.Sequence'
35633563
- $referenced-descriptor[DescID] = $seqID
35643564
- $referencing-via-expr[ReferencedSequenceIDs] CONTAINS $seqID
3565-
- $referencing-via-expr[Type] IN ['*scpb.CheckConstraintUnvalidated', '*scpb.ColumnComputeExpression', '*scpb.ColumnDefaultExpression', '*scpb.ColumnOnUpdateExpression', '*scpb.ColumnType', '*scpb.PolicyUsingExpr', '*scpb.PolicyWithCheckExpr', '*scpb.UniqueWithoutIndexConstraintUnvalidated']
3565+
- $referencing-via-expr[Type] IN ['*scpb.CheckConstraintUnvalidated', '*scpb.ColumnComputeExpression', '*scpb.ColumnDefaultExpression', '*scpb.ColumnOnUpdateExpression', '*scpb.PolicyUsingExpr', '*scpb.PolicyWithCheckExpr', '*scpb.UniqueWithoutIndexConstraintUnvalidated']
35663566
- toAbsent($referenced-descriptor-Target, $referencing-via-expr-Target)
35673567
- $referenced-descriptor-Node[CurrentStatus] = DROPPED
35683568
- $referencing-via-expr-Node[CurrentStatus] = ABSENT
@@ -3576,7 +3576,7 @@ deprules
35763576
- $referenced-descriptor[Type] = '*scpb.Function'
35773577
- $referenced-descriptor[DescID] = $fromDescID
35783578
- $referencing-via-function[ReferencedFunctionIDs] CONTAINS $fromDescID
3579-
- $referencing-via-function[Type] IN ['*scpb.CheckConstraintUnvalidated', '*scpb.ColumnComputeExpression', '*scpb.ColumnDefaultExpression', '*scpb.ColumnOnUpdateExpression', '*scpb.ColumnType', '*scpb.PolicyUsingExpr', '*scpb.PolicyWithCheckExpr', '*scpb.TriggerDeps', '*scpb.UniqueWithoutIndexConstraintUnvalidated']
3579+
- $referencing-via-function[Type] IN ['*scpb.CheckConstraintUnvalidated', '*scpb.ColumnComputeExpression', '*scpb.ColumnDefaultExpression', '*scpb.ColumnOnUpdateExpression', '*scpb.PolicyUsingExpr', '*scpb.PolicyWithCheckExpr', '*scpb.TriggerDeps', '*scpb.UniqueWithoutIndexConstraintUnvalidated']
35803580
- toAbsent($referenced-descriptor-Target, $referencing-via-function-Target)
35813581
- $referenced-descriptor-Node[CurrentStatus] = DROPPED
35823582
- $referencing-via-function-Node[CurrentStatus] = ABSENT
@@ -3591,7 +3591,7 @@ deprules
35913591
- $referenced-descriptor[DescID] = $fromDescID
35923592
- $referencing-via-type[ReferencedTypeIDs] CONTAINS $fromDescID
35933593
- descriptorIsNotBeingDropped-25.4($referencing-via-type)
3594-
- $referencing-via-type[Type] IN ['*scpb.CheckConstraintUnvalidated', '*scpb.ColumnComputeExpression', '*scpb.ColumnDefaultExpression', '*scpb.ColumnOnUpdateExpression', '*scpb.ColumnType', '*scpb.PolicyUsingExpr', '*scpb.PolicyWithCheckExpr', '*scpb.UniqueWithoutIndexConstraintUnvalidated']
3594+
- $referencing-via-type[Type] IN ['*scpb.CheckConstraintUnvalidated', '*scpb.ColumnComputeExpression', '*scpb.ColumnDefaultExpression', '*scpb.ColumnOnUpdateExpression', '*scpb.PolicyUsingExpr', '*scpb.PolicyWithCheckExpr', '*scpb.UniqueWithoutIndexConstraintUnvalidated']
35953595
- toAbsent($referenced-descriptor-Target, $referencing-via-type-Target)
35963596
- $referenced-descriptor-Node[CurrentStatus] = DROPPED
35973597
- $referencing-via-type-Node[CurrentStatus] = ABSENT

‎pkg/internal/codeowners/codeowners.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ func getFile(packageName, testName string) (res string, logs []string, err error
208208
return
209209
}
210210
cmd := exec.Command(`/bin/bash`, `-c`,
211-
fmt.Sprintf(`cd "$(git rev-parse --show-toplevel)" && git grep -n 'func %s(' '%s/*_test.go'`,
211+
fmt.Sprintf(`cd "$(git rev-parse --show-toplevel)" && git grep --no-index -n 'func %s(' '%s/*_test.go'`,
212212
testName, packageName))
213213
// This command returns output such as:
214214
// ../ccl/storageccl/export_test.go:31:func TestExportCmd(t *testing.T) {

‎pkg/server/status/BUILD.bazel‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ go_library(
6868
"//pkg/util/log/logmetrics",
6969
"//pkg/util/log/severity",
7070
"//pkg/util/metric",
71+
"//pkg/util/metric/aggmetric",
7172
"//pkg/util/syncutil",
7273
"//pkg/util/system",
7374
"@com_github_cockroachdb_crlib//crtime",

0 commit comments

Comments
 (0)