Skip to content

Commit 895b195

Browse files
yuzefovichyuzefovich
committed
rowexec: add log scopes to all tests
Release note: None
1 parent 2786ad3 commit 895b195

18 files changed

+48
-3
lines changed

‎pkg/sql/rowexec/aggregator_test.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ func aggregations(aggTestSpecs []aggTestSpec) []execinfrapb.AggregatorSpec_Aggre
6060
// VARIANCE
6161
func TestAggregator(t *testing.T) {
6262
defer leaktest.AfterTest(t)()
63+
defer log.Scope(t).Close(t)
6364

6465
var (
6566
col0 = []uint32{0}

‎pkg/sql/rowexec/backfiller_test.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import (
3030
"github.com/cockroachdb/cockroach/pkg/testutils/serverutils"
3131
"github.com/cockroachdb/cockroach/pkg/testutils/sqlutils"
3232
"github.com/cockroachdb/cockroach/pkg/util/leaktest"
33+
"github.com/cockroachdb/cockroach/pkg/util/log"
3334
"github.com/cockroachdb/cockroach/pkg/util/tracing"
3435
"github.com/cockroachdb/errors"
3536
"github.com/stretchr/testify/require"
@@ -65,6 +66,7 @@ func TestingWriteResumeSpan(
6566

6667
func TestWriteResumeSpan(t *testing.T) {
6768
defer leaktest.AfterTest(t)()
69+
defer log.Scope(t).Close(t)
6870

6971
ctx := context.Background()
7072

‎pkg/sql/rowexec/distinct_test.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import (
3030

3131
func TestDistinct(t *testing.T) {
3232
defer leaktest.AfterTest(t)()
33+
defer log.Scope(t).Close(t)
3334

3435
v := [15]rowenc.EncDatum{}
3536
for i := range v {

‎pkg/sql/rowexec/filterer_test.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ import (
3030

3131
func TestFilterer(t *testing.T) {
3232
defer leaktest.AfterTest(t)()
33+
defer log.Scope(t).Close(t)
34+
3335
v := [10]rowenc.EncDatum{}
3436
for i := range v {
3537
v[i] = rowenc.DatumToEncDatum(types.Int, tree.NewDInt(tree.DInt(i)))

‎pkg/sql/rowexec/hashjoiner_test.go‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -991,6 +991,7 @@ func mirrorJoinTypeAndOnExpr(
991991

992992
func TestHashJoiner(t *testing.T) {
993993
defer leaktest.AfterTest(t)()
994+
defer log.Scope(t).Close(t)
994995

995996
testCases := hashJoinerTestCases()
996997

@@ -1101,6 +1102,7 @@ func TestHashJoiner(t *testing.T) {
11011102

11021103
func TestHashJoinerError(t *testing.T) {
11031104
defer leaktest.AfterTest(t)()
1105+
defer log.Scope(t).Close(t)
11041106

11051107
v := [10]rowenc.EncDatum{}
11061108
for i := range v {
@@ -1211,6 +1213,8 @@ func checkExpectedRows(
12111213
// the consumer is draining.
12121214
func TestHashJoinerDrain(t *testing.T) {
12131215
defer leaktest.AfterTest(t)()
1216+
defer log.Scope(t).Close(t)
1217+
12141218
v := [10]rowenc.EncDatum{}
12151219
for i := range v {
12161220
v[i] = rowenc.DatumToEncDatum(types.Int, tree.NewDInt(tree.DInt(i)))
@@ -1319,6 +1323,7 @@ func TestHashJoinerDrain(t *testing.T) {
13191323
// joiner will drain both inputs.
13201324
func TestHashJoinerDrainAfterBuildPhaseError(t *testing.T) {
13211325
defer leaktest.AfterTest(t)()
1326+
defer log.Scope(t).Close(t)
13221327

13231328
v := [10]rowenc.EncDatum{}
13241329
for i := range v {

‎pkg/sql/rowexec/inverted_expr_evaluator_test.go‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import (
1818

1919
"github.com/cockroachdb/cockroach/pkg/sql/inverted"
2020
"github.com/cockroachdb/cockroach/pkg/util/leaktest"
21+
"github.com/cockroachdb/cockroach/pkg/util/log"
2122
"github.com/stretchr/testify/require"
2223
)
2324

@@ -89,6 +90,7 @@ func keyIndexesToString(indexes [][]KeyIndex) string {
8990

9091
func TestSetContainerUnion(t *testing.T) {
9192
defer leaktest.AfterTest(t)()
93+
defer log.Scope(t).Close(t)
9294

9395
type testCase struct {
9496
a setContainer
@@ -111,6 +113,7 @@ func TestSetContainerUnion(t *testing.T) {
111113

112114
func TestSetContainerIntersection(t *testing.T) {
113115
defer leaktest.AfterTest(t)()
116+
defer log.Scope(t).Close(t)
114117

115118
type testCase struct {
116119
a setContainer
@@ -139,6 +142,7 @@ type keyAndIndex struct {
139142
// Tests both invertedExprEvaluator and batchedInvertedExprEvaluator.
140143
func TestInvertedExpressionEvaluator(t *testing.T) {
141144
defer leaktest.AfterTest(t)()
145+
defer log.Scope(t).Close(t)
142146

143147
leaf1 := &spanExpression{
144148
FactoredUnionSpans: []invertedSpan{{Start: []byte("a"), End: []byte("d")}},
@@ -302,6 +306,7 @@ func TestInvertedExpressionEvaluator(t *testing.T) {
302306
// overlapping spans.
303307
func TestFragmentedSpans(t *testing.T) {
304308
defer leaktest.AfterTest(t)()
309+
defer log.Scope(t).Close(t)
305310

306311
expr1 := inverted.SpanExpressionProto{
307312
Node: spanExpression{
@@ -362,6 +367,8 @@ func (t *testPreFilterer) PreFilter(
362367

363368
func TestInvertedExpressionEvaluatorPreFilter(t *testing.T) {
364369
defer leaktest.AfterTest(t)()
370+
defer log.Scope(t).Close(t)
371+
365372
// Setup expressions such that the same expression appears multiple times
366373
// in a span.
367374
leaf1 := &spanExpression{

‎pkg/sql/rowexec/inverted_filterer_test.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323
"github.com/cockroachdb/cockroach/pkg/testutils/serverutils"
2424
"github.com/cockroachdb/cockroach/pkg/util/encoding"
2525
"github.com/cockroachdb/cockroach/pkg/util/leaktest"
26+
"github.com/cockroachdb/cockroach/pkg/util/log"
2627
)
2728

2829
func intToEncodedInvertedVal(v int64) []byte {
@@ -38,6 +39,7 @@ func intSpanToEncodedSpan(start, end int64) inverted.SpanExpressionProto_Span {
3839

3940
func TestInvertedFilterer(t *testing.T) {
4041
defer leaktest.AfterTest(t)()
42+
defer log.Scope(t).Close(t)
4143

4244
// Tests do simple intersection and reordering of columns, to exercise the
4345
// plumbing in invertedFilterer -- all the heavy lifting for filtering is

‎pkg/sql/rowexec/inverted_joiner_test.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ import (
3838
"github.com/cockroachdb/cockroach/pkg/util/encoding"
3939
"github.com/cockroachdb/cockroach/pkg/util/json"
4040
"github.com/cockroachdb/cockroach/pkg/util/leaktest"
41+
"github.com/cockroachdb/cockroach/pkg/util/log"
4142
"github.com/cockroachdb/cockroach/pkg/util/tracing"
4243
"github.com/cockroachdb/cockroach/pkg/util/tracing/tracingpb"
4344
"github.com/cockroachdb/errors"
@@ -199,6 +200,8 @@ func (jsonUnionExpr) PreFilter(_ inverted.EncVal, _ []interface{}, _ []bool) (bo
199200

200201
func TestInvertedJoiner(t *testing.T) {
201202
defer leaktest.AfterTest(t)()
203+
defer log.Scope(t).Close(t)
204+
202205
ctx := context.Background()
203206

204207
s, sqlDB, kvDB := serverutils.StartServer(t, base.TestServerArgs{})
@@ -742,6 +745,7 @@ func TestInvertedJoiner(t *testing.T) {
742745

743746
func TestInvertedJoinerDrain(t *testing.T) {
744747
defer leaktest.AfterTest(t)()
748+
defer log.Scope(t).Close(t)
745749

746750
s, sqlDB, kvDB := serverutils.StartServer(t, base.TestServerArgs{})
747751
defer s.Stopper().Stop(context.Background())

‎pkg/sql/rowexec/mergejoiner_test.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ type mergeJoinerTestCase struct {
4545

4646
func TestMergeJoiner(t *testing.T) {
4747
defer leaktest.AfterTest(t)()
48+
defer log.Scope(t).Close(t)
4849

4950
v := [10]rowenc.EncDatum{}
5051
for i := range v {
@@ -761,6 +762,7 @@ func TestMergeJoiner(t *testing.T) {
761762
// Test that the joiner shuts down fine if the consumer is closed prematurely.
762763
func TestConsumerClosed(t *testing.T) {
763764
defer leaktest.AfterTest(t)()
765+
defer log.Scope(t).Close(t)
764766

765767
v := [10]rowenc.EncDatum{}
766768
for i := range v {

‎pkg/sql/rowexec/ordinality_test.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import (
3030

3131
func TestOrdinality(t *testing.T) {
3232
defer leaktest.AfterTest(t)()
33+
defer log.Scope(t).Close(t)
3334

3435
v := [15]rowenc.EncDatum{}
3536
for i := range v {

0 commit comments

Comments
 (0)