Skip to content

Commit 764fd4b

Browse files
rohit-nayak-psrohit-nayak-ps
committed
LookupVindex bug fix: Fix typos from PR 17301 (#17423)
Signed-off-by: Rohit Nayak <rohit@planetscale.com>
1 parent a07a186 commit 764fd4b

File tree

2 files changed

+43
-43
lines changed

2 files changed

+43
-43
lines changed

‎go/test/endtoend/vreplication/lookupindex_helper_test.go renamed to ‎go/test/endtoend/vreplication/lookup_vindex_helper_test.go

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
binlogdatapb "vitess.io/vitess/go/vt/proto/binlogdata"
3030
)
3131

32-
type lookupIndex struct {
32+
type lookupVindex struct {
3333
typ string
3434
name string
3535
tableKeyspace string
@@ -42,64 +42,64 @@ type lookupIndex struct {
4242
t *testing.T
4343
}
4444

45-
func (li *lookupIndex) String() string {
46-
return li.typ + " " + li.name + " on " + li.tableKeyspace + "." + li.table + " (" + li.columns[0] + ")"
45+
func (lv *lookupVindex) String() string {
46+
return lv.typ + " " + lv.name + " on " + lv.tableKeyspace + "." + lv.table + " (" + lv.columns[0] + ")"
4747
}
4848

49-
func (li *lookupIndex) create() {
50-
cols := strings.Join(li.columns, ",")
49+
func (lv *lookupVindex) create() {
50+
cols := strings.Join(lv.columns, ",")
5151
args := []string{
5252
"LookupVindex",
53-
"--name", li.name,
54-
"--table-keyspace=" + li.ownerTableKeyspace,
53+
"--name", lv.name,
54+
"--table-keyspace=" + lv.ownerTableKeyspace,
5555
"create",
56-
"--keyspace=" + li.tableKeyspace,
57-
"--type=" + li.typ,
58-
"--table-owner=" + li.ownerTable,
56+
"--keyspace=" + lv.tableKeyspace,
57+
"--type=" + lv.typ,
58+
"--table-owner=" + lv.ownerTable,
5959
"--table-owner-columns=" + cols,
6060
"--tablet-types=PRIMARY",
6161
}
62-
if li.ignoreNulls {
62+
if lv.ignoreNulls {
6363
args = append(args, "--ignore-nulls")
6464
}
6565

6666
err := vc.VtctldClient.ExecuteCommand(args...)
67-
require.NoError(li.t, err, "error executing LookupVindex create: %v", err)
68-
waitForWorkflowState(li.t, vc, fmt.Sprintf("%s.%s", li.ownerTableKeyspace, li.name), binlogdatapb.VReplicationWorkflowState_Running.String())
69-
li.expectWriteOnly(true)
67+
require.NoError(lv.t, err, "error executing LookupVindex create: %v", err)
68+
waitForWorkflowState(lv.t, vc, fmt.Sprintf("%s.%s", lv.ownerTableKeyspace, lv.name), binlogdatapb.VReplicationWorkflowState_Running.String())
69+
lv.expectWriteOnly(true)
7070
}
7171

72-
func (li *lookupIndex) cancel() {
72+
func (lv *lookupVindex) cancel() {
7373
panic("not implemented")
7474
}
7575

76-
func (li *lookupIndex) externalize() {
76+
func (lv *lookupVindex) externalize() {
7777
args := []string{
7878
"LookupVindex",
79-
"--name", li.name,
80-
"--table-keyspace=" + li.ownerTableKeyspace,
79+
"--name", lv.name,
80+
"--table-keyspace=" + lv.ownerTableKeyspace,
8181
"externalize",
82-
"--keyspace=" + li.tableKeyspace,
82+
"--keyspace=" + lv.tableKeyspace,
8383
}
8484
err := vc.VtctldClient.ExecuteCommand(args...)
85-
require.NoError(li.t, err, "error executing LookupVindex externalize: %v", err)
86-
li.expectWriteOnly(false)
85+
require.NoError(lv.t, err, "error executing LookupVindex externalize: %v", err)
86+
lv.expectWriteOnly(false)
8787
}
8888

89-
func (li *lookupIndex) show() error {
89+
func (lv *lookupVindex) show() error {
9090
return nil
9191
}
9292

93-
func (li *lookupIndex) expectWriteOnly(expected bool) {
94-
vschema, err := vc.VtctldClient.ExecuteCommandWithOutput("GetVSchema", li.ownerTableKeyspace)
95-
require.NoError(li.t, err, "error executing GetVSchema: %v", err)
96-
vdx := gjson.Get(vschema, fmt.Sprintf("vindexes.%s", li.name))
97-
require.NotNil(li.t, vdx, "lookup vindex %s not found", li.name)
93+
func (lv *lookupVindex) expectWriteOnly(expected bool) {
94+
vschema, err := vc.VtctldClient.ExecuteCommandWithOutput("GetVSchema", lv.ownerTableKeyspace)
95+
require.NoError(lv.t, err, "error executing GetVSchema: %v", err)
96+
vdx := gjson.Get(vschema, fmt.Sprintf("vindexes.%s", lv.name))
97+
require.NotNil(lv.t, vdx, "lookup vindex %s not found", lv.name)
9898
want := ""
9999
if expected {
100100
want = "true"
101101
}
102-
require.Equal(li.t, want, vdx.Get("params.write_only").String(), "expected write_only parameter to be %s", want)
102+
require.Equal(lv.t, want, vdx.Get("params.write_only").String(), "expected write_only parameter to be %s", want)
103103
}
104104

105105
func getNumRowsInQuery(t *testing.T, query string) int {

‎go/test/endtoend/vreplication/lookupindex_test.go renamed to ‎go/test/endtoend/vreplication/lookup_vindex_test.go

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ create table t1(
6363
`,
6464
}
6565

66-
func setupLookupIndexKeyspace(t *testing.T) map[string]*cluster.VttabletProcess {
66+
func setupLookupVindexKeyspace(t *testing.T) map[string]*cluster.VttabletProcess {
6767
tablets := make(map[string]*cluster.VttabletProcess)
6868
if _, err := vc.AddKeyspace(t, []*Cell{vc.Cells["zone1"]}, lookupClusterSpec.keyspaceName, "-80,80-",
6969
lookupClusterSpec.vschema, lookupClusterSpec.schema, defaultReplicas, defaultRdonly, 200, nil); err != nil {
@@ -80,14 +80,14 @@ func setupLookupIndexKeyspace(t *testing.T) map[string]*cluster.VttabletProcess
8080

8181
type lookupTestCase struct {
8282
name string
83-
li *lookupIndex
83+
lv *lookupVindex
8484
initQuery string
8585
runningQuery string
8686
postExternalizeQuery string
8787
cleanupQuery string
8888
}
8989

90-
func TestLookupIndex(t *testing.T) {
90+
func TestLookupVindex(t *testing.T) {
9191
setSidecarDBName("_vt")
9292
origDefaultReplicas := defaultReplicas
9393
origDefaultRdonly := defaultRdonly
@@ -101,7 +101,7 @@ func TestLookupIndex(t *testing.T) {
101101
defer vc.TearDown()
102102
vttablet.InitVReplicationConfigDefaults()
103103

104-
_ = setupLookupIndexKeyspace(t)
104+
_ = setupLookupVindexKeyspace(t)
105105

106106
initQuery := "insert into t1 (c1, c2, val) values (1, 1, 'val1'), (2, 2, 'val2'), (3, 3, 'val3')"
107107
runningQuery := "insert into t1 (c1, c2, val) values (4, 4, 'val4'), (5, 5, 'val5'), (6, 6, 'val6')"
@@ -111,7 +111,7 @@ func TestLookupIndex(t *testing.T) {
111111
testCases := []lookupTestCase{
112112
{
113113
name: "non-unique lookup index, one column",
114-
li: &lookupIndex{
114+
lv: &lookupVindex{
115115
typ: "consistent_lookup",
116116
name: "t1_c2_lookup",
117117
tableKeyspace: lookupClusterSpec.keyspaceName,
@@ -125,7 +125,7 @@ func TestLookupIndex(t *testing.T) {
125125
},
126126
{
127127
name: "lookup index, two columns",
128-
li: &lookupIndex{
128+
lv: &lookupVindex{
129129
typ: "lookup",
130130
name: "t1_c2_val_lookup",
131131
tableKeyspace: lookupClusterSpec.keyspaceName,
@@ -139,7 +139,7 @@ func TestLookupIndex(t *testing.T) {
139139
},
140140
{
141141
name: "unique lookup index, one column",
142-
li: &lookupIndex{
142+
lv: &lookupVindex{
143143
typ: "lookup_unique",
144144
name: "t1_c2_unique_lookup",
145145
tableKeyspace: lookupClusterSpec.keyspaceName,
@@ -168,7 +168,7 @@ func testLookupVindex(t *testing.T, tc *lookupTestCase) {
168168
vtgateConn, cancel := getVTGateConn()
169169
defer cancel()
170170
var totalRows int
171-
li := tc.li
171+
lv := tc.lv
172172

173173
t.Run("init data", func(t *testing.T) {
174174
totalRows += getNumRowsInQuery(t, tc.initQuery)
@@ -177,28 +177,28 @@ func testLookupVindex(t *testing.T, tc *lookupTestCase) {
177177
})
178178

179179
t.Run("create", func(t *testing.T) {
180-
tc.li.create()
180+
tc.lv.create()
181181

182-
lks := li.tableKeyspace
183-
vindexName := li.name
182+
lks := lv.tableKeyspace
183+
vindexName := lv.name
184184
waitForRowCount(t, vtgateConn, lks, vindexName, totalRows)
185185
totalRows += getNumRowsInQuery(t, tc.runningQuery)
186186
_, err := vtgateConn.ExecuteFetch(tc.runningQuery, 1000, false)
187187
require.NoError(t, err)
188-
waitForRowCount(t, vtgateConn, tc.li.ownerTableKeyspace, li.name, totalRows)
188+
waitForRowCount(t, vtgateConn, tc.lv.ownerTableKeyspace, lv.name, totalRows)
189189
})
190190

191191
t.Run("externalize", func(t *testing.T) {
192-
tc.li.externalize()
192+
tc.lv.externalize()
193193
totalRows += getNumRowsInQuery(t, tc.postExternalizeQuery)
194194
_, err := vtgateConn.ExecuteFetch(tc.postExternalizeQuery, 1000, false)
195195
require.NoError(t, err)
196-
waitForRowCount(t, vtgateConn, tc.li.ownerTableKeyspace, li.name, totalRows)
196+
waitForRowCount(t, vtgateConn, tc.lv.ownerTableKeyspace, lv.name, totalRows)
197197
})
198198

199199
t.Run("cleanup", func(t *testing.T) {
200200
_, err := vtgateConn.ExecuteFetch(tc.cleanupQuery, 1000, false)
201201
require.NoError(t, err)
202-
waitForRowCount(t, vtgateConn, tc.li.ownerTableKeyspace, li.name, 0)
202+
waitForRowCount(t, vtgateConn, tc.lv.ownerTableKeyspace, lv.name, 0)
203203
})
204204
}

0 commit comments

Comments
 (0)