Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

VStreamer Unit Tests: framework to remove the need to specify serialized strings in row events for unit tests #14903

Merged
merged 19 commits into from
Feb 16, 2024
Merged

VStreamer Unit Tests: framework to remove the need to specify serialized strings in row events for unit tests #14903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
9ad374c
Initial commit of framework to replace the current method of specifyi…
rohit-nayak-ps Jan 8, 2024
e618d37
Refactor framework and simplify unit test
rohit-nayak-ps Jan 9, 2024
a6226b9
Modify framework for noblob row images
rohit-nayak-ps Jan 10, 2024
d8fb19b
Remove the need to specify expected event types for each query. At th…
rohit-nayak-ps Jan 10, 2024
0497cd1
Add back specifying event details since many of the other tests requi…
rohit-nayak-ps Jan 10, 2024
c8ae817
Simplify events where the event type can be inferred directly from th…
rohit-nayak-ps Feb 12, 2024
afd9f42
Add abstraction to specify RowEvent befores/afters for complex tests.…
rohit-nayak-ps Feb 13, 2024
1b14a5f
Port TestFilteredVarBinary and TestFilteredInt
rohit-nayak-ps Feb 13, 2024
4a576e5
Port TestCellValuePadding
rohit-nayak-ps Feb 13, 2024
dc31d2c
Port TestSetForeignKeyCheck
rohit-nayak-ps Feb 13, 2024
86534a0
Port TestSavepointWithFilter
rohit-nayak-ps Feb 13, 2024
0bffc0f
Minor refactor
rohit-nayak-ps Feb 14, 2024
4733dae
Remove log.Flush()s that were added previously for debugging flaky tests
rohit-nayak-ps Feb 14, 2024
1f6a446
Revert temp changes
rohit-nayak-ps Feb 14, 2024
1253a26
Rename files
rohit-nayak-ps Feb 14, 2024
931055b
go mod tidy
rohit-nayak-ps Feb 14, 2024
7c884df
Address some review comments
rohit-nayak-ps Feb 16, 2024
646974e
Address review comment
rohit-nayak-ps Feb 16, 2024
8c28eed
Fix merge issue
rohit-nayak-ps Feb 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ require (
github.com/planetscale/pargzip v0.0.0-20201116224723-90c7fc03ea8a
github.com/planetscale/vtprotobuf v0.5.0
github.com/prometheus/client_golang v1.18.0
github.com/prometheus/common v0.46.0 // indirect
github.com/prometheus/common v0.46.0
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475
github.com/sjmudd/stopwatch v0.1.1
github.com/soheilhy/cmux v0.1.5
Expand Down
2 changes: 0 additions & 2 deletions go/cmd/vtadmin/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,8 +221,6 @@ func main() {
if err := rootCmd.Execute(); err != nil {
log.Fatal(err)
}

log.Flush()
mattlord marked this conversation as resolved.
Show resolved Hide resolved
}

type noopCloser struct{}
Expand Down
9 changes: 4 additions & 5 deletions go/vt/vtgate/executor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,12 @@ import (

"github.com/spf13/pflag"

"vitess.io/vitess/go/cache/theine"
"vitess.io/vitess/go/streamlog"
"vitess.io/vitess/go/vt/vtenv"
"vitess.io/vitess/go/vt/vthash"

"vitess.io/vitess/go/acl"
"vitess.io/vitess/go/cache/theine"
"vitess.io/vitess/go/mysql/collations"
"vitess.io/vitess/go/sqltypes"
"vitess.io/vitess/go/stats"
"vitess.io/vitess/go/streamlog"
"vitess.io/vitess/go/trace"
"vitess.io/vitess/go/vt/callerid"
"vitess.io/vitess/go/vt/key"
Expand All @@ -53,6 +50,7 @@ import (
"vitess.io/vitess/go/vt/srvtopo"
"vitess.io/vitess/go/vt/sysvars"
"vitess.io/vitess/go/vt/topo/topoproto"
"vitess.io/vitess/go/vt/vtenv"
"vitess.io/vitess/go/vt/vterrors"
"vitess.io/vitess/go/vt/vtgate/engine"
"vitess.io/vitess/go/vt/vtgate/evalengine"
Expand All @@ -62,6 +60,7 @@ import (
"vitess.io/vitess/go/vt/vtgate/vindexes"
"vitess.io/vitess/go/vt/vtgate/vschemaacl"
"vitess.io/vitess/go/vt/vtgate/vtgateservice"
"vitess.io/vitess/go/vt/vthash"
)

var (
Expand Down
3 changes: 0 additions & 3 deletions go/vt/vttablet/tabletmanager/vreplication/vplayer_flaky_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,6 @@ func TestPlayerInvisibleColumns(t *testing.T) {
output := qh.Expect(tcases.output)
expectNontxQueries(t, output)
time.Sleep(1 * time.Second)
log.Flush()
if tcases.table != "" {
expectData(t, tcases.table, tcases.data)
}
Expand Down Expand Up @@ -3094,7 +3093,6 @@ func TestPlayerNoBlob(t *testing.T) {
output := qh.Expect(tcases.output)
expectNontxQueries(t, output)
time.Sleep(1 * time.Second)
log.Flush()
if tcases.table != "" {
expectData(t, tcases.table, tcases.data)
}
Expand Down Expand Up @@ -3333,7 +3331,6 @@ func TestPlayerBatchMode(t *testing.T) {
}
expectNontxQueries(t, output)
time.Sleep(1 * time.Second)
log.Flush()
if tcase.table != "" {
expectData(t, tcase.table, tcase.data)
}
Expand Down
Loading
Loading