Skip to content

Fix build on 32 bit systems #3184

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix build on 32 bit systems #3184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions .github/workflows/server-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@ jobs:
env:
CI_TEST: "true"
SERVER_ENGINE_TEST: "true"
- name: Test using Server Engine (32 bit)
run: go test ./...
env:
GOARCH: "386"
CI_TEST: "true"
SERVER_ENGINE_TEST: "true"
- name: Test using Server Engine
run: go test -race ./...
env:
Expand Down
2 changes: 1 addition & 1 deletion sql/expression/function/export_set_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ func TestExportSet(t *testing.T) {
{"negative number of bits", []interface{}{5, "1", "0", ",", -5}, "1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0", false},

// Large numbers
{"large number", []interface{}{4294967295, "1", "0", ",", 32}, "1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1", false},
{"large number", []interface{}{int64(4294967295), "1", "0", ",", 32}, "1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1", false},
{"powers of 2", []interface{}{1024, "1", "0", ",", 12}, "0,0,0,0,0,0,0,0,0,0,1,0", false},

// NULL handling
Expand Down
24 changes: 12 additions & 12 deletions sql/expression/function/extract.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,11 +169,11 @@ func (td *Extract) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
ss := dateTime.Second()
return dd + hh + mm + ss, nil
case "DAY_MICROSECOND":
dd := dateTime.Day() * 1_00_00_00_000000
hh := dateTime.Hour() * 1_00_00_000000
mm := dateTime.Minute() * 1_00_000000
ss := dateTime.Second() * 1_000000
mmmmmm := dateTime.Nanosecond() / 1000
dd := int64(dateTime.Day()) * 1_00_00_00_000000
hh := int64(dateTime.Hour()) * 1_00_00_000000
mm := int64(dateTime.Minute()) * 1_00_000000
ss := int64(dateTime.Second()) * 1_000000
mmmmmm := int64(dateTime.Nanosecond()) / 1000
return dd + hh + mm + ss + mmmmmm, nil
case "HOUR_MINUTE":
hh := dateTime.Hour() * 1_00
Expand All @@ -185,19 +185,19 @@ func (td *Extract) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
ss := dateTime.Second()
return hh + mm + ss, nil
case "HOUR_MICROSECOND":
hh := dateTime.Hour() * 1_00_00_000000
mm := dateTime.Minute() * 1_00_000000
ss := dateTime.Second() * 1_000000
mmmmmm := dateTime.Nanosecond() / 1000
hh := int64(dateTime.Hour()) * 1_00_00_000000
mm := int64(dateTime.Minute()) * 1_00_000000
ss := int64(dateTime.Second()) * 1_000000
mmmmmm := int64(dateTime.Nanosecond()) / 1000
return hh + mm + ss + mmmmmm, nil
case "MINUTE_SECOND":
mm := dateTime.Minute() * 1_00
ss := dateTime.Second()
return mm + ss, nil
case "MINUTE_MICROSECOND":
mm := dateTime.Minute() * 1_00_000000
ss := dateTime.Second() * 1_000000
mmmmmm := dateTime.Nanosecond() / 1000
mm := int64(dateTime.Minute()) * 1_00_000000
ss := int64(dateTime.Second()) * 1_000000
mmmmmm := int64(dateTime.Nanosecond()) / 1000
return mm + ss + mmmmmm, nil
case "SECOND_MICROSECOND":
ss := dateTime.Second() * 1_000000
Expand Down
6 changes: 3 additions & 3 deletions sql/expression/function/extract_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ func TestExtract(t *testing.T) {
name: "get day_microsecond",
unit: "DAY_MICROSECOND",
dateTime: "2023-11-12 11:22:33.445566",
expected: 12112233445566,
expected: int64(12112233445566),
},
{
name: "get hour_minute",
Expand All @@ -150,7 +150,7 @@ func TestExtract(t *testing.T) {
name: "get hour_microsecond",
unit: "HOUR_MICROSECOND",
dateTime: "2023-11-12 11:22:33.445566",
expected: 112233445566,
expected: int64(112233445566),
},
{
name: "get minute_second",
Expand All @@ -162,7 +162,7 @@ func TestExtract(t *testing.T) {
name: "get minute_microsecond",
unit: "MINUTE_MICROSECOND",
dateTime: "2023-11-12 11:22:33.445566",
expected: 2233445566,
expected: int64(2233445566),
},
{
name: "get second_microsecond",
Expand Down
2 changes: 1 addition & 1 deletion sql/expression/function/make_set_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ func TestMakeSet(t *testing.T) {

// Large numbers
{"max uint64 bits", []interface{}{^uint64(0), "a", "b", "c"}, "a,b,c", false},
{"large positive number", []interface{}{4294967295, "a", "b", "c"}, "a,b,c", false},
{"large positive number", []interface{}{int64(4294967295), "a", "b", "c"}, "a,b,c", false},

// Empty strings
{"empty string values", []interface{}{3, "", "test", ""}, ",test", false},
Expand Down
4 changes: 2 additions & 2 deletions sql/expression/function/oct_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ func TestOct(t *testing.T) {
// Edge cases
{"max int32", types.Int32, sql.NewRow(math.MaxInt32), "17777777777"},
{"min int32", types.Int32, sql.NewRow(math.MinInt32), "1777777777760000000000"},
{"max int64", types.Int64, sql.NewRow(math.MaxInt64), "777777777777777777777"},
{"min int64", types.Int64, sql.NewRow(math.MinInt64), "1000000000000000000000"},
{"max int64", types.Int64, sql.NewRow(int64(math.MaxInt64)), "777777777777777777777"},
{"min int64", types.Int64, sql.NewRow(int64(math.MinInt64)), "1000000000000000000000"},

// Decimal numbers
{"decimal", types.Float64, sql.NewRow(15.5), "17"},
Expand Down
3 changes: 2 additions & 1 deletion sql/rowexec/ddl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (
"bufio"
"fmt"
"io"
"math"
"os"
"strings"
"time"
Expand Down Expand Up @@ -94,7 +95,7 @@ func (b *BaseBuilder) buildLoadData(ctx *sql.Context, n *plan.LoadData, row sql.
}

scanner := bufio.NewScanner(reader)
scanner.Buffer(nil, int(types.LongTextBlobMax))
scanner.Buffer(nil, int(min(types.LongTextBlobMax, math.MaxInt)))
scanner.Split(n.SplitLines)

sch := n.Schema()
Expand Down
2 changes: 1 addition & 1 deletion sql/rowexec/proc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ func (b *BaseBuilder) buildLoop(ctx *sql.Context, n *plan.Loop, row sql.Row) (sq
// It's technically valid to make an infinite loop, but we don't want to actually allow that
const maxIterationCount = 10_000_000_000

for loopIteration := 0; loopIteration <= maxIterationCount; loopIteration++ {
for loopIteration := int64(0); loopIteration <= maxIterationCount; loopIteration++ {
if loopIteration >= maxIterationCount {
return nil, fmt.Errorf("infinite LOOP detected")
}
Expand Down
2 changes: 1 addition & 1 deletion sql/types/geometry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,7 +546,7 @@ func (t GeometryType) MatchSRID(v interface{}) error {
}

func ValidateSRID(srid int, funcName string) error {
if srid < 0 || srid > math.MaxUint32 {
if srid < 0 || srid > min(math.MaxUint32, math.MaxInt) {
return sql.ErrInvalidSRID.New(funcName)
}
if _, ok := SupportedSRIDs[uint32(srid)]; !ok {
Expand Down
18 changes: 9 additions & 9 deletions sql/types/number.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1114,27 +1114,27 @@ func convertToUint64(t NumberTypeImpl_, v interface{}) (uint64, sql.ConvertInRan
return uint64(v.UTC().Unix()), sql.InRange, nil
case int:
if v < 0 {
return uint64(math.MaxUint64 - uint(-v-1)), sql.OutOfRange, nil
return math.MaxUint64 - uint64(-v-1), sql.OutOfRange, nil
}
return uint64(v), sql.InRange, nil
case int8:
if v < 0 {
return uint64(math.MaxUint64 - uint(-v-1)), sql.OutOfRange, nil
return math.MaxUint64 - uint64(-v-1), sql.OutOfRange, nil
}
return uint64(v), sql.InRange, nil
case int16:
if v < 0 {
return uint64(math.MaxUint64 - uint(-v-1)), sql.OutOfRange, nil
return math.MaxUint64 - uint64(-v-1), sql.OutOfRange, nil
}
return uint64(v), sql.InRange, nil
case int32:
if v < 0 {
return uint64(math.MaxUint64 - uint(-v-1)), sql.OutOfRange, nil
return math.MaxUint64 - uint64(-v-1), sql.OutOfRange, nil
}
return uint64(v), sql.InRange, nil
case int64:
if v < 0 {
return uint64(math.MaxUint64 - uint(-v-1)), sql.OutOfRange, nil
return math.MaxUint64 - uint64(-v-1), sql.OutOfRange, nil
}
return uint64(v), sql.InRange, nil
case uint:
Expand Down Expand Up @@ -1205,28 +1205,28 @@ func convertToUint32(t NumberTypeImpl_, v interface{}) (uint32, sql.ConvertInRan
case int:
if v < 0 {
return uint32(math.MaxUint32 - uint(-v-1)), sql.OutOfRange, nil
} else if v > math.MaxUint32 {
} else if v > min(math.MaxUint32, math.MaxInt) {
return uint32(math.MaxUint32), sql.OutOfRange, nil
}
return uint32(v), sql.InRange, nil
case int8:
if v < 0 {
return uint32(math.MaxUint32 - uint(-v-1)), sql.OutOfRange, nil
} else if int(v) > math.MaxUint32 {
} else if int(v) > min(math.MaxUint32, math.MaxInt) {
return uint32(math.MaxUint32), sql.OutOfRange, nil
}
return uint32(v), sql.InRange, nil
case int16:
if v < 0 {
return uint32(math.MaxUint32 - uint(-v-1)), sql.OutOfRange, nil
} else if int(v) > math.MaxUint32 {
} else if int(v) > min(math.MaxUint32, math.MaxInt) {
return uint32(math.MaxUint32), sql.OutOfRange, nil
}
return uint32(v), sql.InRange, nil
case int32:
if v < 0 {
return uint32(math.MaxUint32 - uint(-v-1)), sql.OutOfRange, nil
} else if int(v) > math.MaxUint32 {
} else if int(v) > min(math.MaxUint32, math.MaxInt) {
return uint32(math.MaxUint32), sql.OutOfRange, nil
}
return uint32(v), sql.InRange, nil
Expand Down
6 changes: 3 additions & 3 deletions sql/types/number_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,16 +204,16 @@ func TestNumberConvert(t *testing.T) {
{typ: Int16, inp: math.MinInt16 - 1, exp: int16(math.MinInt16), err: false, inRange: sql.OutOfRange},
{typ: Int24, inp: 1 << 24, exp: int32(1<<23 - 1), err: false, inRange: sql.OutOfRange},
{typ: Int24, inp: -1 << 24, exp: int32(-1 << 23), err: false, inRange: sql.OutOfRange},
{typ: Int32, inp: math.MaxInt32 + 1, exp: int32(math.MaxInt32), err: false, inRange: sql.OutOfRange},
{typ: Int32, inp: math.MinInt32 - 1, exp: int32(math.MinInt32), err: false, inRange: sql.OutOfRange},
{typ: Int32, inp: int64(math.MaxInt32 + 1), exp: int32(math.MaxInt32), err: false, inRange: sql.OutOfRange},
{typ: Int32, inp: int64(math.MinInt32 - 1), exp: int32(math.MinInt32), err: false, inRange: sql.OutOfRange},
{typ: Int64, inp: uint64(math.MaxInt64 + 1), exp: int64(math.MaxInt64), err: false, inRange: sql.OutOfRange},
{typ: Uint8, inp: math.MaxUint8 + 1, exp: uint8(math.MaxUint8), err: false, inRange: sql.OutOfRange},
{typ: Uint8, inp: -1, exp: uint8(math.MaxUint8), err: false, inRange: sql.OutOfRange},
{typ: Uint16, inp: math.MaxUint16 + 1, exp: uint16(math.MaxUint16), err: false, inRange: sql.OutOfRange},
{typ: Uint16, inp: -1, exp: uint16(math.MaxUint16), err: false, inRange: sql.OutOfRange},
{typ: Uint24, inp: 1 << 24, exp: uint32(1<<24 - 1), err: false, inRange: sql.OutOfRange},
{typ: Uint24, inp: -1, exp: uint32(1<<24 - 1), err: false, inRange: sql.OutOfRange},
{typ: Uint32, inp: math.MaxUint32 + 1, exp: uint32(math.MaxUint32), err: false, inRange: sql.OutOfRange},
{typ: Uint32, inp: int64(math.MaxUint32 + 1), exp: uint32(math.MaxUint32), err: false, inRange: sql.OutOfRange},
{typ: Uint32, inp: -1, exp: uint32(math.MaxUint32), err: false, inRange: sql.OutOfRange},
{typ: Uint64, inp: -1, exp: uint64(math.MaxUint64), err: false, inRange: sql.OutOfRange},
{typ: Float32, inp: math.MaxFloat32 * 2, exp: float32(math.MaxFloat32), err: false, inRange: sql.OutOfRange},
Expand Down
Loading