optimize read float64

feature_iter_float.go

@@ -91,25 +91,22 @@ func (iter *Iterator) readPositiveFloat32() (ret float32) {
 func (iter *Iterator) readFloat32SlowPath() (ret float32) {
 	strBuf := [16]byte{}
 	str := strBuf[0:0]
-	hasMore := true
+	load_loop:
-	for hasMore {
+	for {
 		for i := iter.head; i < iter.tail; i++ {
 			c := iter.buf[i]
 			switch c {
-			case '-', '+', '.', 'e', 'E', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9':
+			case '-', '.', 'e', 'E', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9':
 				str = append(str, c)
 				continue
 			default:
-				hasMore = false
+				break load_loop
-				break
 			}
 		}
-		if hasMore {
 		if !iter.loadMore() {
 			break
 		}
 	}
-	}
 	if iter.Error != nil && iter.Error != io.EOF {
 		return
 	}
@@ -121,29 +118,86 @@ func (iter *Iterator) readFloat32SlowPath() (ret float32) {
 	return float32(val)
 }
 
-// ReadFloat64 reads a json object as Float64
 func (iter *Iterator) ReadFloat64() (ret float64) {
-	strBuf := [8]byte{}
+	c := iter.nextToken()
+	if c == '-' {
+		return -iter.readPositiveFloat64()
+	} else {
+		iter.unreadByte()
+		return iter.readPositiveFloat64()
+	}
+}
+
+func (iter *Iterator) readPositiveFloat64() (ret float64) {
+	value := uint64(0)
+	c := byte(' ')
+	i := iter.head
+	non_decimal_loop:
+	for ; i < iter.tail; i++ {
+		c = iter.buf[i]
+		ind := zeroToNineDigits[c]
+		switch ind {
+		case invalidCharForNumber:
+			return iter.readFloat64SlowPath()
+		case endOfNumber:
+			iter.head = i
+			return float64(value)
+		case dotInNumber:
+			break non_decimal_loop
+		}
+		if value > safeToMultiple10 {
+			return iter.readFloat64SlowPath()
+		}
+		value = (value << 3) + (value << 1) + uint64(ind); // value = value * 10 + ind;
+	}
+	if c == '.' {
+		i++
+		decimalPlaces := 0;
+		for ; i < iter.tail; i++ {
+			c = iter.buf[i]
+			ind := zeroToNineDigits[c];
+			switch ind {
+			case endOfNumber:
+				if decimalPlaces > 0 && decimalPlaces < len(POW10) {
+					iter.head = i
+					return float64(value) / float64(POW10[decimalPlaces])
+				}
+				// too many decimal places
+				return iter.readFloat64SlowPath()
+			case invalidCharForNumber:
+				fallthrough
+			case dotInNumber:
+				return iter.readFloat64SlowPath()
+			}
+			decimalPlaces++
+			if value > safeToMultiple10 {
+				return iter.readFloat64SlowPath()
+			}
+			value = (value << 3) + (value << 1) + uint64(ind)
+		}
+	}
+	return iter.readFloat64SlowPath()
+}
+
+func (iter *Iterator) readFloat64SlowPath() (ret float64) {
+	strBuf := [16]byte{}
 	str := strBuf[0:0]
-	hasMore := true
+	load_loop:
-	for hasMore {
+	for {
 		for i := iter.head; i < iter.tail; i++ {
 			c := iter.buf[i]
 			switch c {
-			case '-', '+', '.', 'e', 'E', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9':
+			case '-', '.', 'e', 'E', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9':
 				str = append(str, c)
 				continue
 			default:
-				hasMore = false
+				break load_loop
-				break
 			}
 		}
-		if hasMore {
 		if !iter.loadMore() {
 			break
 		}
 	}
-	}
 	if iter.Error != nil && iter.Error != io.EOF {
 		return
 	}

jsoniter_float_test.go

@@ -9,23 +9,7 @@ import (
 	"strconv"
 )
 
-func Test_float64_0(t *testing.T) {
+func Test_read_float(t *testing.T) {
-	iter := ParseString(`0`)
-	val := iter.ReadFloat64()
-	if val != 0 {
-		t.Fatal(val)
-	}
-}
-
-func Test_float64_1_dot_1(t *testing.T) {
-	iter := ParseString(`1.1`)
-	val := iter.ReadFloat64()
-	if val != 1.1 {
-		t.Fatal(val)
-	}
-}
-
-func Test_read_float32(t *testing.T) {
 	inputs := []string{`1.1`, `1000`, `9223372036854775807`, `12.3`, `-12.3`, `720368.54775807`, `720368.547758075`}
 	for _, input := range inputs {
 		// non-streaming
@@ -36,6 +20,13 @@ func Test_read_float32(t *testing.T) {
 			should.Nil(err)
 			should.Equal(float32(expected), iter.ReadFloat32())
 		})
+		t.Run(fmt.Sprintf("%v", input), func(t *testing.T) {
+			should := require.New(t)
+			iter := ParseString(input + ",")
+			expected, err := strconv.ParseFloat(input, 64)
+			should.Nil(err)
+			should.Equal(expected, iter.ReadFloat64())
+		})
 		// streaming
 		t.Run(fmt.Sprintf("%v", input), func(t *testing.T) {
 			should := require.New(t)
@@ -44,6 +35,13 @@ func Test_read_float32(t *testing.T) {
 			should.Nil(err)
 			should.Equal(float32(expected), iter.ReadFloat32())
 		})
+		t.Run(fmt.Sprintf("%v", input), func(t *testing.T) {
+			should := require.New(t)
+			iter := Parse(bytes.NewBufferString(input + ","), 2)
+			expected, err := strconv.ParseFloat(input, 64)
+			should.Nil(err)
+			should.Equal(expected, iter.ReadFloat64())
+		})
 	}
 }
 
@@ -119,7 +117,7 @@ func Benchmark_jsoniter_float(b *testing.B) {
 	iter := NewIterator()
 	for n := 0; n < b.N; n++ {
 		iter.ResetBytes(input)
-		iter.ReadFloat32()
+		iter.ReadFloat64()
 	}
 }