Skip to content

Commit a64613d

Browse files
author
Shlomi Noach
committed
Merge branch 'master' into reject-rename-table-addendum
2 parents 8cbfa26 + a79109b commit a64613d

File tree

6 files changed

+25
-24
lines changed

6 files changed

+25
-24
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ Please see [Coding gh-ost](doc/coding-ghost.md) for a guide to getting started d
9494

9595
[Download latest release here](https://github.com/github/gh-ost/releases/latest)
9696

97-
`gh-ost` is a Go project; it is built with Go `1.8` (though `1.7` should work as well). To build on your own, use either:
97+
`gh-ost` is a Go project; it is built with Go `1.9` and above. To build on your own, use either:
9898
- [script/build](https://github.com/github/gh-ost/blob/master/script/build) - this is the same build script used by CI hence the authoritative; artifact is `./bin/gh-ost` binary.
9999
- [build.sh](https://github.com/github/gh-ost/blob/master/build.sh) for building `tar.gz` artifacts in `/tmp/gh-ost`
100100

build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ function build {
1010
GOOS=$3
1111
GOARCH=$4
1212

13-
if [[ $(go version | egrep "go1[.][012345678]") ]]; then
13+
if ! go version | egrep -q 'go(1[.]9|1[.]1[0-9])' ; then
1414
echo "go version is too low. Must use 1.9 or above"
1515
exit 1
1616
fi

go/base/context.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,23 +28,23 @@ type RowsEstimateMethod string
2828

2929
const (
3030
TableStatusRowsEstimate RowsEstimateMethod = "TableStatusRowsEstimate"
31-
ExplainRowsEstimate = "ExplainRowsEstimate"
32-
CountRowsEstimate = "CountRowsEstimate"
31+
ExplainRowsEstimate RowsEstimateMethod = "ExplainRowsEstimate"
32+
CountRowsEstimate RowsEstimateMethod = "CountRowsEstimate"
3333
)
3434

3535
type CutOver int
3636

3737
const (
38-
CutOverAtomic CutOver = iota
39-
CutOverTwoStep = iota
38+
CutOverAtomic CutOver = iota
39+
CutOverTwoStep
4040
)
4141

4242
type ThrottleReasonHint string
4343

4444
const (
4545
NoThrottleReasonHint ThrottleReasonHint = "NoThrottleReasonHint"
46-
UserCommandThrottleReasonHint = "UserCommandThrottleReasonHint"
47-
LeavingHibernationThrottleReasonHint = "LeavingHibernationThrottleReasonHint"
46+
UserCommandThrottleReasonHint ThrottleReasonHint = "UserCommandThrottleReasonHint"
47+
LeavingHibernationThrottleReasonHint ThrottleReasonHint = "LeavingHibernationThrottleReasonHint"
4848
)
4949

5050
const (

go/binlog/binlog_dml_event.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,18 @@ package binlog
77

88
import (
99
"fmt"
10-
"github.com/github/gh-ost/go/sql"
1110
"strings"
11+
12+
"github.com/github/gh-ost/go/sql"
1213
)
1314

1415
type EventDML string
1516

1617
const (
1718
NotDML EventDML = "NoDML"
18-
InsertDML = "Insert"
19-
UpdateDML = "Update"
20-
DeleteDML = "Delete"
19+
InsertDML EventDML = "Insert"
20+
UpdateDML EventDML = "Update"
21+
DeleteDML EventDML = "Delete"
2122
)
2223

2324
func ToEventDML(description string) EventDML {

go/sql/builder.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ type ValueComparisonSign string
1515

1616
const (
1717
LessThanComparisonSign ValueComparisonSign = "<"
18-
LessThanOrEqualsComparisonSign = "<="
19-
EqualsComparisonSign = "="
20-
GreaterThanOrEqualsComparisonSign = ">="
21-
GreaterThanComparisonSign = ">"
22-
NotEqualsComparisonSign = "!="
18+
LessThanOrEqualsComparisonSign ValueComparisonSign = "<="
19+
EqualsComparisonSign ValueComparisonSign = "="
20+
GreaterThanOrEqualsComparisonSign ValueComparisonSign = ">="
21+
GreaterThanComparisonSign ValueComparisonSign = ">"
22+
NotEqualsComparisonSign ValueComparisonSign = "!="
2323
)
2424

2525
// EscapeName will escape a db/table/column/... name by wrapping with backticks.

go/sql/types.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ import (
1515
type ColumnType int
1616

1717
const (
18-
UnknownColumnType ColumnType = iota
19-
TimestampColumnType = iota
20-
DateTimeColumnType = iota
21-
EnumColumnType = iota
22-
MediumIntColumnType = iota
23-
JSONColumnType = iota
24-
FloatColumnType = iota
18+
UnknownColumnType ColumnType = iota
19+
TimestampColumnType
20+
DateTimeColumnType
21+
EnumColumnType
22+
MediumIntColumnType
23+
JSONColumnType
24+
FloatColumnType
2525
)
2626

2727
const maxMediumintUnsigned int32 = 16777215

0 commit comments

Comments
 (0)