Skip to content

Commit

Permalink
optimize
Browse files Browse the repository at this point in the history
  • Loading branch information
wshwsh12 committed Nov 1, 2024
1 parent 2233dbf commit ec6ff80
Show file tree
Hide file tree
Showing 3 changed files with 52 additions and 199 deletions.
2 changes: 0 additions & 2 deletions pkg/executor/join/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -115,13 +115,11 @@ go_test(
"//pkg/util/codec",
"//pkg/util/disk",
"//pkg/util/hack",
"//pkg/util/logutil",
"//pkg/util/memory",
"//pkg/util/mock",
"//pkg/util/sqlkiller",
"@com_github_pingcap_errors//:errors",
"@com_github_pingcap_failpoint//:failpoint",
"@com_github_stretchr_testify//require",
"@org_uber_go_zap//:zap",
],
)
7 changes: 1 addition & 6 deletions pkg/executor/join/inner_join_probe_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,9 @@ import (
"github.com/pingcap/tidb/pkg/types"
"github.com/pingcap/tidb/pkg/util/chunk"
"github.com/pingcap/tidb/pkg/util/codec"
"github.com/pingcap/tidb/pkg/util/logutil"
"github.com/pingcap/tidb/pkg/util/mock"
"github.com/pingcap/tidb/pkg/util/sqlkiller"
"github.com/stretchr/testify/require"
"go.uber.org/zap"
)

func toNullableTypes(tps []*types.FieldType) []*types.FieldType {
Expand Down Expand Up @@ -194,9 +192,6 @@ func checkChunksEqual(t *testing.T, expectedChunks []*chunk.Chunk, resultChunks
// used for debug
x = cmp(expectedRows[i], resultRows[i])
}
if x != 0 {
logutil.BgLogger().Info("expected", zap.Any("expected", expectedRows[i].ToString(schema)), zap.Any("result", resultRows[i].ToString(schema)))
}
require.Equal(t, 0, x, "result index = "+strconv.Itoa(i))
}
}
Expand Down Expand Up @@ -307,7 +302,7 @@ func testJoinProbe(t *testing.T, withSel bool, leftKeyIndex []int, rightKeyIndex
}
}
if joinType == logicalop.LeftOuterSemiJoin {
resultTypes = append(resultTypes, types.NewFieldType(mysql.TypeLonglong))
resultTypes = append(resultTypes, types.NewFieldType(mysql.TypeTiny))
}

meta := newTableMeta(buildKeyIndex, buildTypes, buildKeyTypes, probeKeyTypes, buildUsedByOtherCondition, buildUsed, needUsedFlag)
Expand Down
Loading

0 comments on commit ec6ff80

Please sign in to comment.