Skip to content

Commit

Permalink
Merge pull request #382 from illia-li/il/fix/marshal/make_const_for_n…
Browse files Browse the repository at this point in the history 
…egative_ints

Fix unmarshall, make const for negative ints
  • Loading branch information
@dkropachev
dkropachev authored Jan 12, 2025
2 parents ec61494 + 15d8da3 commit 5712671
Show file tree
Hide file tree
Showing 4 changed files with 69 additions and 27 deletions.
9 changes: 7 additions & 2 deletions serialization/cqlint/unmarshal_utils.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ import (
"strconv"
)

const (
negInt64 = int64(-1) << 32
negInt = int(-1) << 32
)

var errWrongDataLen = fmt.Errorf("failed to unmarshal int: the length of the data should be 0 or 4")

func errNilReference(v interface{}) error {
Expand Down Expand Up @@ -750,14 +755,14 @@ func decInt32(p []byte) int32 {

func decInt64(p []byte) int64 {
if p[0] > math.MaxInt8 {
return int64(-1)<<32 | int64(p[0])<<24 | int64(p[1])<<16 | int64(p[2])<<8 | int64(p[3])
return negInt64 | int64(p[0])<<24 | int64(p[1])<<16 | int64(p[2])<<8 | int64(p[3])
}
return int64(p[0])<<24 | int64(p[1])<<16 | int64(p[2])<<8 | int64(p[3])
}

func decInt(p []byte) int {
if p[0] > math.MaxInt8 {
return int(-1)<<32 | int(p[0])<<24 | int(p[1])<<16 | int(p[2])<<8 | int(p[3])
return negInt | int(p[0])<<24 | int(p[1])<<16 | int(p[2])<<8 | int(p[3])
}
return int(p[0])<<24 | int(p[1])<<16 | int(p[2])<<8 | int(p[3])
}
Expand Down
12 changes: 9 additions & 3 deletions serialization/smallint/unmarshal_utils.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@ import (
"strconv"
)

const (
negInt32 = int32(-1) << 16
negInt64 = int64(-1) << 16
negInt = int(-1) << 16
)

var errWrongDataLen = fmt.Errorf("failed to unmarshal smallint: the length of the data should be 0 or 2")

func errNilReference(v interface{}) error {
Expand Down Expand Up @@ -662,21 +668,21 @@ func decInt16(p []byte) int16 {

func decInt32(p []byte) int32 {
if p[0] > math.MaxInt8 {
return -65536 + int32(p[0])<<8 | int32(p[1])
return negInt32 | int32(p[0])<<8 | int32(p[1])
}
return int32(p[0])<<8 | int32(p[1])
}

func decInt64(p []byte) int64 {
if p[0] > math.MaxInt8 {
return -65536 + int64(p[0])<<8 | int64(p[1])
return negInt64 | int64(p[0])<<8 | int64(p[1])
}
return int64(p[0])<<8 | int64(p[1])
}

func decInt(p []byte) int {
if p[0] > math.MaxInt8 {
return -65536 + int(p[0])<<8 | int(p[1])
return negInt | int(p[0])<<8 | int(p[1])
}
return int(p[0])<<8 | int(p[1])
}
Expand Down
15 changes: 11 additions & 4 deletions serialization/tinyint/unmarshal_utils.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,13 @@ import (
"strconv"
)

const (
negInt16 = int16(-1) << 8
negInt32 = int32(-1) << 8
negInt64 = int64(-1) << 8
negInt = int(-1) << 8
)

var errWrongDataLen = fmt.Errorf("failed to unmarshal tinyint: the length of the data should less or equal then 1")

func errNilReference(v interface{}) error {
Expand Down Expand Up @@ -570,28 +577,28 @@ func decReflectNullableR(p []byte, v reflect.Value) reflect.Value {

func decInt16(p []byte) int16 {
if p[0] > math.MaxInt8 {
return int16(p[0]) - 256
return negInt16 | int16(p[0])
}
return int16(p[0])
}

func decInt32(p []byte) int32 {
if p[0] > math.MaxInt8 {
return int32(p[0]) - 256
return negInt32 | int32(p[0])
}
return int32(p[0])
}

func decInt64(p []byte) int64 {
if p[0] > math.MaxInt8 {
return int64(p[0]) - 256
return negInt64 | int64(p[0])
}
return int64(p[0])
}

func decInt(p []byte) int {
if p[0] > math.MaxInt8 {
return int(p[0]) - 256
return negInt | int(p[0])
}
return int(p[0])
}
60 changes: 42 additions & 18 deletions serialization/varint/unmarshal_ints.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,30 @@ import (
"fmt"
)

const (
negInt16s8 = int16(-1) << 8

negInt32s8 = int32(-1) << 8
negInt32s16 = int32(-1) << 16
negInt32s24 = int32(-1) << 24

negInt64s8 = int64(-1) << 8
negInt64s16 = int64(-1) << 16
negInt64s24 = int64(-1) << 24
negInt64s32 = int64(-1) << 32
negInt64s40 = int64(-1) << 40
negInt64s48 = int64(-1) << 48
negInt64s56 = int64(-1) << 56

negIntS8 = int(-1) << 8
negIntS16 = int(-1) << 16
negIntS24 = int(-1) << 24
negIntS32 = int(-1) << 32
negIntS40 = int(-1) << 40
negIntS48 = int(-1) << 48
negIntS56 = int(-1) << 56
)

func DecInt8(p []byte, v *int8) error {
if v == nil {
return errNilReference(v)
Expand Down Expand Up @@ -291,28 +315,28 @@ func dec1toInt8(p []byte) int8 {

func dec1toInt16(p []byte) int16 {
if p[0] > 127 {
return int16(-1)<<8 | int16(p[0])
return negInt16s8 | int16(p[0])
}
return int16(p[0])
}

func dec1toInt32(p []byte) int32 {
if p[0] > 127 {
return int32(-1)<<8 | int32(p[0])
return negInt32s8 | int32(p[0])
}
return int32(p[0])
}

func dec1toInt64(p []byte) int64 {
if p[0] > 127 {
return int64(-1)<<8 | int64(p[0])
return negInt64s8 | int64(p[0])
}
return int64(p[0])
}

func dec1toInt(p []byte) int {
if p[0] > 127 {
return int(-1)<<8 | int(p[0])
return negIntS8 | int(p[0])
}
return int(p[0])
}
Expand All @@ -323,42 +347,42 @@ func dec2toInt16(p []byte) int16 {

func dec2toInt32(p []byte) int32 {
if p[0] > 127 {
return int32(-1)<<16 | int32(p[0])<<8 | int32(p[1])
return negInt32s16 | int32(p[0])<<8 | int32(p[1])
}
return int32(p[0])<<8 | int32(p[1])
}

func dec2toInt64(p []byte) int64 {
if p[0] > 127 {
return int64(-1)<<16 | int64(p[0])<<8 | int64(p[1])
return negInt64s16 | int64(p[0])<<8 | int64(p[1])
}
return int64(p[0])<<8 | int64(p[1])
}

func dec2toInt(p []byte) int {
if p[0] > 127 {
return int(-1)<<16 | int(p[0])<<8 | int(p[1])
return negIntS16 | int(p[0])<<8 | int(p[1])
}
return int(p[0])<<8 | int(p[1])
}

func dec3toInt32(p []byte) int32 {
if p[0] > 127 {
return int32(-1)<<24 | int32(p[0])<<16 | int32(p[1])<<8 | int32(p[2])
return negInt32s24 | int32(p[0])<<16 | int32(p[1])<<8 | int32(p[2])
}
return int32(p[0])<<16 | int32(p[1])<<8 | int32(p[2])
}

func dec3toInt64(p []byte) int64 {
if p[0] > 127 {
return int64(-1)<<24 | int64(p[0])<<16 | int64(p[1])<<8 | int64(p[2])
return negInt64s24 | int64(p[0])<<16 | int64(p[1])<<8 | int64(p[2])
}
return int64(p[0])<<16 | int64(p[1])<<8 | int64(p[2])
}

func dec3toInt(p []byte) int {
if p[0] > 127 {
return int(-1)<<24 | int(p[0])<<16 | int(p[1])<<8 | int(p[2])
return negIntS24 | int(p[0])<<16 | int(p[1])<<8 | int(p[2])
}
return int(p[0])<<16 | int(p[1])<<8 | int(p[2])
}
Expand All @@ -369,56 +393,56 @@ func dec4toInt32(p []byte) int32 {

func dec4toInt64(p []byte) int64 {
if p[0] > 127 {
return int64(-1)<<32 | int64(p[0])<<24 | int64(p[1])<<16 | int64(p[2])<<8 | int64(p[3])
return negInt64s32 | int64(p[0])<<24 | int64(p[1])<<16 | int64(p[2])<<8 | int64(p[3])
}
return int64(p[0])<<24 | int64(p[1])<<16 | int64(p[2])<<8 | int64(p[3])
}

func dec4toInt(p []byte) int {
if p[0] > 127 {
return int(-1)<<32 | int(p[0])<<24 | int(p[1])<<16 | int(p[2])<<8 | int(p[3])
return negIntS32 | int(p[0])<<24 | int(p[1])<<16 | int(p[2])<<8 | int(p[3])
}
return int(p[0])<<24 | int(p[1])<<16 | int(p[2])<<8 | int(p[3])
}

func dec5toInt64(p []byte) int64 {
if p[0] > 127 {
return int64(-1)<<40 | int64(p[0])<<32 | int64(p[1])<<24 | int64(p[2])<<16 | int64(p[3])<<8 | int64(p[4])
return negInt64s40 | int64(p[0])<<32 | int64(p[1])<<24 | int64(p[2])<<16 | int64(p[3])<<8 | int64(p[4])
}
return int64(p[0])<<32 | int64(p[1])<<24 | int64(p[2])<<16 | int64(p[3])<<8 | int64(p[4])
}

func dec5toInt(p []byte) int {
if p[0] > 127 {
return int(-1)<<40 | int(p[0])<<32 | int(p[1])<<24 | int(p[2])<<16 | int(p[3])<<8 | int(p[4])
return negIntS40 | int(p[0])<<32 | int(p[1])<<24 | int(p[2])<<16 | int(p[3])<<8 | int(p[4])
}
return int(p[0])<<32 | int(p[1])<<24 | int(p[2])<<16 | int(p[3])<<8 | int(p[4])
}

func dec6toInt64(p []byte) int64 {
if p[0] > 127 {
return int64(-1)<<48 | int64(p[0])<<40 | int64(p[1])<<32 | int64(p[2])<<24 | int64(p[3])<<16 | int64(p[4])<<8 | int64(p[5])
return negInt64s48 | int64(p[0])<<40 | int64(p[1])<<32 | int64(p[2])<<24 | int64(p[3])<<16 | int64(p[4])<<8 | int64(p[5])
}
return int64(p[0])<<40 | int64(p[1])<<32 | int64(p[2])<<24 | int64(p[3])<<16 | int64(p[4])<<8 | int64(p[5])
}

func dec6toInt(p []byte) int {
if p[0] > 127 {
return int(-1)<<48 | int(p[0])<<40 | int(p[1])<<32 | int(p[2])<<24 | int(p[3])<<16 | int(p[4])<<8 | int(p[5])
return negIntS48 | int(p[0])<<40 | int(p[1])<<32 | int(p[2])<<24 | int(p[3])<<16 | int(p[4])<<8 | int(p[5])
}
return int(p[0])<<40 | int(p[1])<<32 | int(p[2])<<24 | int(p[3])<<16 | int(p[4])<<8 | int(p[5])
}

func dec7toInt64(p []byte) int64 {
if p[0] > 127 {
return int64(-1)<<56 | int64(p[0])<<48 | int64(p[1])<<40 | int64(p[2])<<32 | int64(p[3])<<24 | int64(p[4])<<16 | int64(p[5])<<8 | int64(p[6])
return negInt64s56 | int64(p[0])<<48 | int64(p[1])<<40 | int64(p[2])<<32 | int64(p[3])<<24 | int64(p[4])<<16 | int64(p[5])<<8 | int64(p[6])
}
return int64(p[0])<<48 | int64(p[1])<<40 | int64(p[2])<<32 | int64(p[3])<<24 | int64(p[4])<<16 | int64(p[5])<<8 | int64(p[6])
}

func dec7toInt(p []byte) int {
if p[0] > 127 {
return int(-1)<<56 | int(p[0])<<48 | int(p[1])<<40 | int(p[2])<<32 | int(p[3])<<24 | int(p[4])<<16 | int(p[5])<<8 | int(p[6])
return negIntS56 | int(p[0])<<48 | int(p[1])<<40 | int(p[2])<<32 | int(p[3])<<24 | int(p[4])<<16 | int(p[5])<<8 | int(p[6])
}
return int(p[0])<<48 | int(p[1])<<40 | int(p[2])<<32 | int(p[3])<<24 | int(p[4])<<16 | int(p[5])<<8 | int(p[6])
}
Expand Down

0 comments on commit 5712671

Please sign in to comment.