Skip to content

Commit fc96a83

Browse files
committed
Fixed up the README to point to the correct new path for vitess.
1 parent 258984e commit fc96a83

File tree

1 file changed

+21
-15
lines changed

1 file changed

+21
-15
lines changed

README.md

+21-15
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ You only need the below if you plan to try and keep this library up to date with
6060

6161
```bash
6262
shopt -s nullglob
63-
VITESS=${GOPATH?}/src/github.com/vitessio/vitess/go/
63+
VITESS=${GOPATH?}/src/vitess.io/vitess/go/
6464
XWB1989=${GOPATH?}/src/github.com/xwb1989/sqlparser/
6565

6666
# Create patches for everything that changed
@@ -95,25 +95,29 @@ rm ${VITESS?}/{sqltypes,bytes2,hack}/*.patch ${VITESS?}/*.patch
9595
TODO: Change these instructions to use git to copy the files, that'll make later patching easier.
9696

9797
```bash
98-
cd $GOPATH/src/github.com/xwb1989/sqlparser
98+
VITESS=${GOPATH?}/src/vitess.io/vitess/go/
99+
XWB1989=${GOPATH?}/src/github.com/xwb1989/sqlparser/
100+
101+
cd ${XWB1989?}
99102

100103
# Copy all the code
101-
cp -pr ../../vitessio/vitess/go/vt/sqlparser/ .
102-
cp -pr ../../vitessio/vitess/go/sqltypes dependency
103-
cp -pr ../../vitessio/vitess/go/bytes2 dependency
104-
cp -pr ../../vitessio/vitess/go/hack dependency
104+
cp -pr ${VITESS?}/vt/sqlparser/ .
105+
cp -pr ${VITESS?}/sqltypes dependency
106+
cp -pr ${VITESS?}/bytes2 dependency
107+
cp -pr ${VITESS?}/hack dependency
105108

106109
# Delete some code we haven't ported
107110
rm dependency/sqltypes/arithmetic.go dependency/sqltypes/arithmetic_test.go dependency/sqltypes/event_token.go dependency/sqltypes/event_token_test.go dependency/sqltypes/proto3.go dependency/sqltypes/proto3_test.go dependency/sqltypes/query_response.go dependency/sqltypes/result.go dependency/sqltypes/result_test.go
108111

109112
# Some automated fixes
110113

111114
# Fix imports
112-
sed -i '.bak' 's_github.com/vitessio/vitess/go/vt/proto/query_github.com/xwb1989/sqlparser/dependency/querypb_g' *.go dependency/sqltypes/*.go
113-
sed -i '.bak' 's_github.com/vitessio/vitess/go/_github.com/xwb1989/sqlparser/dependency/_g' *.go dependency/sqltypes/*.go
115+
sed -i '.bak' 's_vitess.io/vitess/go/vt/proto/query_github.com/xwb1989/sqlparser/dependency/querypb_g' *.go dependency/sqltypes/*.go
116+
sed -i '.bak' 's_vitess.io/vitess/go/_github.com/xwb1989/sqlparser/dependency/_g' *.go dependency/sqltypes/*.go
114117

115118
# Copy the proto, but basically drop everything we don't want
116-
cp -pr ../../vitessio/vitess/go/vt/proto/query dependency/querypb
119+
cp -pr ${VITESS?}/vt/proto/query dependency/querypb
120+
117121
sed -i '.bak' 's_.*Descriptor.*__g' dependency/querypb/*.go
118122
sed -i '.bak' 's_.*ProtoMessage.*__g' dependency/querypb/*.go
119123

@@ -130,15 +134,17 @@ sed -i '.bak' 's/vterrors.New([^,]*, /errors.New(/g' *.go dependency/sqltypes/*.
130134
### Testing
131135

132136
```bash
133-
cd $GOPATH/src/github.com/xwb1989/sqlparser
137+
VITESS=${GOPATH?}/src/vitess.io/vitess/go/
138+
XWB1989=${GOPATH?}/src/github.com/xwb1989/sqlparser/
139+
140+
cd ${XWB1989?}
134141

135142
# Test, fix and repeat
136143
go test ./...
137144

138145
# Finally make some diffs (for later reference)
139-
cd $GOPATH/src/github.com
140-
diff -u vitessio/vitess/go/sqltypes/ xwb1989/sqlparser/dependency/sqltypes/ > xwb1989/sqlparser/patches/sqltypes.patch
141-
diff -u vitessio/vitess/go/bytes2/ xwb1989/sqlparser/dependency/bytes2/ > xwb1989/sqlparser/patches/bytes2.patch
142-
diff -u vitessio/vitess/go/vt/proto/query/ xwb1989/sqlparser/dependency/querypb/ > xwb1989/sqlparser/patches/querypb.patch
143-
diff -u vitessio/vitess/go/vt/sqlparser/ xwb1989/sqlparser/ > xwb1989/sqlparser/patches/sqlparser.patch
146+
diff -u ${VITESS?}/sqltypes/ ${XWB1989?}/dependency/sqltypes/ > ${XWB1989?}/patches/sqltypes.patch
147+
diff -u ${VITESS?}/bytes2/ ${XWB1989?}/dependency/bytes2/ > ${XWB1989?}/patches/bytes2.patch
148+
diff -u ${VITESS?}/vt/proto/query/ ${XWB1989?}/dependency/querypb/ > ${XWB1989?}/patches/querypb.patch
149+
diff -u ${VITESS?}/vt/sqlparser/ ${XWB1989?}/ > ${XWB1989?}/patches/sqlparser.patch
144150
```

0 commit comments

Comments
 (0)