Skip to content

Commit 96ffca4

Browse files
committed
Enable PARTIAL_JSON for vrepl e2e tests
Signed-off-by: Matt Lord <mattalord@gmail.com>
1 parent bd3aa67 commit 96ffca4

18 files changed

+72
-0
lines changed

.github/workflows/cluster_endtoend_onlineddl_vrepl.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,10 @@ jobs:
149149
binlog-transaction-compression=ON
150150
EOF
151151
152+
cat <<-EOF>>./config/mycnf/mysql8026.cnf
153+
binlog-row-value-options=PARTIAL_JSON
154+
EOF
155+
152156
# run the tests however you normally do, then produce a JUnit XML file
153157
eatmydata -- go run test.go -docker=false -follow -shard onlineddl_vrepl | tee -a output.txt | go-junit-report -set-exit-code > report.xml
154158

.github/workflows/cluster_endtoend_onlineddl_vrepl_stress.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,10 @@ jobs:
149149
binlog-transaction-compression=ON
150150
EOF
151151
152+
cat <<-EOF>>./config/mycnf/mysql8026.cnf
153+
binlog-row-value-options=PARTIAL_JSON
154+
EOF
155+
152156
# run the tests however you normally do, then produce a JUnit XML file
153157
eatmydata -- go run test.go -docker=false -follow -shard onlineddl_vrepl_stress | tee -a output.txt | go-junit-report -set-exit-code > report.xml
154158

.github/workflows/cluster_endtoend_onlineddl_vrepl_stress_suite.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,10 @@ jobs:
149149
binlog-transaction-compression=ON
150150
EOF
151151
152+
cat <<-EOF>>./config/mycnf/mysql8026.cnf
153+
binlog-row-value-options=PARTIAL_JSON
154+
EOF
155+
152156
# run the tests however you normally do, then produce a JUnit XML file
153157
eatmydata -- go run test.go -docker=false -follow -shard onlineddl_vrepl_stress_suite | tee -a output.txt | go-junit-report -set-exit-code > report.xml
154158

.github/workflows/cluster_endtoend_onlineddl_vrepl_suite.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,10 @@ jobs:
149149
binlog-transaction-compression=ON
150150
EOF
151151
152+
cat <<-EOF>>./config/mycnf/mysql8026.cnf
153+
binlog-row-value-options=PARTIAL_JSON
154+
EOF
155+
152156
# run the tests however you normally do, then produce a JUnit XML file
153157
eatmydata -- go run test.go -docker=false -follow -shard onlineddl_vrepl_suite | tee -a output.txt | go-junit-report -set-exit-code > report.xml
154158

.github/workflows/cluster_endtoend_schemadiff_vrepl.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,10 @@ jobs:
149149
binlog-transaction-compression=ON
150150
EOF
151151
152+
cat <<-EOF>>./config/mycnf/mysql8026.cnf
153+
binlog-row-value-options=PARTIAL_JSON
154+
EOF
155+
152156
# run the tests however you normally do, then produce a JUnit XML file
153157
eatmydata -- go run test.go -docker=false -follow -shard schemadiff_vrepl | tee -a output.txt | go-junit-report -set-exit-code > report.xml
154158

.github/workflows/cluster_endtoend_vreplication_across_db_versions.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,10 @@ jobs:
166166
binlog-transaction-compression=ON
167167
EOF
168168
169+
cat <<-EOF>>./config/mycnf/mysql8026.cnf
170+
binlog-row-value-options=PARTIAL_JSON
171+
EOF
172+
169173
# run the tests however you normally do, then produce a JUnit XML file
170174
eatmydata -- go run test.go -docker=false -follow -shard vreplication_across_db_versions | tee -a output.txt | go-junit-report -set-exit-code > report.xml
171175

.github/workflows/cluster_endtoend_vreplication_basic.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,10 @@ jobs:
166166
binlog-transaction-compression=ON
167167
EOF
168168
169+
cat <<-EOF>>./config/mycnf/mysql8026.cnf
170+
binlog-row-value-options=PARTIAL_JSON
171+
EOF
172+
169173
# run the tests however you normally do, then produce a JUnit XML file
170174
eatmydata -- go run test.go -docker=false -follow -shard vreplication_basic | tee -a output.txt | go-junit-report -set-exit-code > report.xml
171175

.github/workflows/cluster_endtoend_vreplication_cellalias.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,10 @@ jobs:
166166
binlog-transaction-compression=ON
167167
EOF
168168
169+
cat <<-EOF>>./config/mycnf/mysql8026.cnf
170+
binlog-row-value-options=PARTIAL_JSON
171+
EOF
172+
169173
# run the tests however you normally do, then produce a JUnit XML file
170174
eatmydata -- go run test.go -docker=false -follow -shard vreplication_cellalias | tee -a output.txt | go-junit-report -set-exit-code > report.xml
171175

.github/workflows/cluster_endtoend_vreplication_copy_parallel.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,10 @@ jobs:
166166
binlog-transaction-compression=ON
167167
EOF
168168
169+
cat <<-EOF>>./config/mycnf/mysql8026.cnf
170+
binlog-row-value-options=PARTIAL_JSON
171+
EOF
172+
169173
# run the tests however you normally do, then produce a JUnit XML file
170174
eatmydata -- go run test.go -docker=false -follow -shard vreplication_copy_parallel | tee -a output.txt | go-junit-report -set-exit-code > report.xml
171175

.github/workflows/cluster_endtoend_vreplication_foreign_key_stress.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,10 @@ jobs:
166166
binlog-transaction-compression=ON
167167
EOF
168168
169+
cat <<-EOF>>./config/mycnf/mysql8026.cnf
170+
binlog-row-value-options=PARTIAL_JSON
171+
EOF
172+
169173
# run the tests however you normally do, then produce a JUnit XML file
170174
eatmydata -- go run test.go -docker=false -follow -shard vreplication_foreign_key_stress | tee -a output.txt | go-junit-report -set-exit-code > report.xml
171175

.github/workflows/cluster_endtoend_vreplication_mariadb_to_mysql.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,10 @@ jobs:
166166
binlog-transaction-compression=ON
167167
EOF
168168
169+
cat <<-EOF>>./config/mycnf/mysql8026.cnf
170+
binlog-row-value-options=PARTIAL_JSON
171+
EOF
172+
169173
# run the tests however you normally do, then produce a JUnit XML file
170174
eatmydata -- go run test.go -docker=false -follow -shard vreplication_mariadb_to_mysql | tee -a output.txt | go-junit-report -set-exit-code > report.xml
171175

.github/workflows/cluster_endtoend_vreplication_migrate.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,10 @@ jobs:
166166
binlog-transaction-compression=ON
167167
EOF
168168
169+
cat <<-EOF>>./config/mycnf/mysql8026.cnf
170+
binlog-row-value-options=PARTIAL_JSON
171+
EOF
172+
169173
# run the tests however you normally do, then produce a JUnit XML file
170174
eatmydata -- go run test.go -docker=false -follow -shard vreplication_migrate | tee -a output.txt | go-junit-report -set-exit-code > report.xml
171175

.github/workflows/cluster_endtoend_vreplication_multi_tenant.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,10 @@ jobs:
166166
binlog-transaction-compression=ON
167167
EOF
168168
169+
cat <<-EOF>>./config/mycnf/mysql8026.cnf
170+
binlog-row-value-options=PARTIAL_JSON
171+
EOF
172+
169173
# run the tests however you normally do, then produce a JUnit XML file
170174
eatmydata -- go run test.go -docker=false -follow -shard vreplication_multi_tenant | tee -a output.txt | go-junit-report -set-exit-code > report.xml
171175

.github/workflows/cluster_endtoend_vreplication_partial_movetables_and_materialize.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,10 @@ jobs:
166166
binlog-transaction-compression=ON
167167
EOF
168168
169+
cat <<-EOF>>./config/mycnf/mysql8026.cnf
170+
binlog-row-value-options=PARTIAL_JSON
171+
EOF
172+
169173
# run the tests however you normally do, then produce a JUnit XML file
170174
eatmydata -- go run test.go -docker=false -follow -shard vreplication_partial_movetables_and_materialize | tee -a output.txt | go-junit-report -set-exit-code > report.xml
171175

.github/workflows/cluster_endtoend_vreplication_v2.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,10 @@ jobs:
166166
binlog-transaction-compression=ON
167167
EOF
168168
169+
cat <<-EOF>>./config/mycnf/mysql8026.cnf
170+
binlog-row-value-options=PARTIAL_JSON
171+
EOF
172+
169173
# run the tests however you normally do, then produce a JUnit XML file
170174
eatmydata -- go run test.go -docker=false -follow -shard vreplication_v2 | tee -a output.txt | go-junit-report -set-exit-code > report.xml
171175

.github/workflows/cluster_endtoend_vreplication_vtctldclient_vdiff2_movetables_tz.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,10 @@ jobs:
166166
binlog-transaction-compression=ON
167167
EOF
168168
169+
cat <<-EOF>>./config/mycnf/mysql8026.cnf
170+
binlog-row-value-options=PARTIAL_JSON
171+
EOF
172+
169173
# run the tests however you normally do, then produce a JUnit XML file
170174
eatmydata -- go run test.go -docker=false -follow -shard vreplication_vtctldclient_vdiff2_movetables_tz | tee -a output.txt | go-junit-report -set-exit-code > report.xml
171175

test/ci_workflow_gen.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@ type clusterTest struct {
172172
Docker bool
173173
LimitResourceUsage bool
174174
EnableBinlogTransactionCompression bool
175+
EnablePartialJSON bool
175176
PartialKeyspace bool
176177
Cores16 bool
177178
}
@@ -294,6 +295,7 @@ func generateClusterWorkflows(list []string, tpl string) {
294295
}
295296
if strings.Contains(cluster, "vrepl") {
296297
test.EnableBinlogTransactionCompression = true
298+
test.EnablePartialJSON = true
297299
}
298300
mysqlVersionIndicator := ""
299301
if mysqlVersion != defaultMySQLVersion && len(clusterMySQLVersions()) > 1 {

test/templates/cluster_endtoend_test.tpl

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,12 @@ jobs:
215215
EOF
216216
{{end}}
217217

218+
{{if .EnablePartialJSON}}
219+
cat <<-EOF>>./config/mycnf/mysql8026.cnf
220+
binlog-row-value-options=PARTIAL_JSON
221+
EOF
222+
{{end}}
223+
218224
# run the tests however you normally do, then produce a JUnit XML file
219225
eatmydata -- go run test.go -docker={{if .Docker}}true -flavor={{.Platform}}{{else}}false{{end}} -follow -shard {{.Shard}}{{if .PartialKeyspace}} -partial-keyspace=true {{end}}{{if .BuildTag}} -build-tag={{.BuildTag}} {{end}} | tee -a output.txt | go-junit-report -set-exit-code > report.xml
220226

0 commit comments

Comments
 (0)