Merge pull request #8 from tdakkota/feat/improve-bce-for-int-decoding

feat(proto): improve BCE in int decoding
ClickHouse · Dec 26, 2021 · 400f324 · 400f324
2 parents c86f7ec + 76c2213
commit 400f324
Show file tree

Hide file tree

Showing 54 changed files with 363 additions and 24 deletions.
diff --git a/proto/cmd/ch-gen-col/main.tpl b/proto/cmd/ch-gen-col/main.tpl
@@ -85,6 +85,9 @@ func (c {{ .Type }}) EncodeColumn(b *Buffer) {
 
 // DecodeColumn decodes {{ .Name }} rows from *Reader.
 func (c *{{ .Type }}) DecodeColumn(r *Reader, rows int) error {
+  if rows == 0 {
+    return nil
+  }
   {{- if .SingleByte }}
   data, err := r.ReadRaw(rows)
   {{- else }}
@@ -105,7 +108,11 @@ func (c *{{ .Type }}) DecodeColumn(r *Reader, rows int) error {
   *c = v
   {{- else }}
   v := *c
-  for i := 0; i < len(data); i += size {
+  // Move bound check out of loop.
+  //
+  // See https://github.com/golang/go/issues/30945.
+  _ = data[len(data)-size]
+  for i := 0; i <= len(data)-size; i += size {
     v = append(v,
     {{- if .IsFloat }}
       math.{{ .Name }}frombits(bin.{{ .BinFunc }}(data[i:i+size])),

diff --git a/proto/cmd/ch-gen-col/test.tpl b/proto/cmd/ch-gen-col/test.tpl
@@ -37,6 +37,12 @@ func Test{{ .Type }}_DecodeColumn(t *testing.T) {
     require.Equal(t, 0, dec.Rows())
     require.Equal(t, {{ .ColumnType }}, dec.Type())
   })
+  t.Run("ZeroRows", func(t *testing.T) {
+    r := NewReader(bytes.NewReader(nil))
+
+    var dec {{ .Type }}
+    require.NoError(t, dec.DecodeColumn(r, 0))
+  })
   t.Run("ErrUnexpectedEOF", func(t *testing.T) {
     r := NewReader(bytes.NewReader(nil))
 

diff --git a/proto/col_date32_gen.go b/proto/col_date32_gen.go
diff --git a/proto/col_date32_gen_test.go b/proto/col_date32_gen_test.go
diff --git a/proto/col_date_gen.go b/proto/col_date_gen.go
diff --git a/proto/col_date_gen_test.go b/proto/col_date_gen_test.go
diff --git a/proto/col_datetime64_gen.go b/proto/col_datetime64_gen.go
diff --git a/proto/col_datetime64_gen_test.go b/proto/col_datetime64_gen_test.go
diff --git a/proto/col_datetime_gen.go b/proto/col_datetime_gen.go
diff --git a/proto/col_datetime_gen_test.go b/proto/col_datetime_gen_test.go
diff --git a/proto/col_decimal128_gen.go b/proto/col_decimal128_gen.go
diff --git a/proto/col_decimal128_gen_test.go b/proto/col_decimal128_gen_test.go
diff --git a/proto/col_decimal256_gen.go b/proto/col_decimal256_gen.go
diff --git a/proto/col_decimal256_gen_test.go b/proto/col_decimal256_gen_test.go
diff --git a/proto/col_decimal32_gen.go b/proto/col_decimal32_gen.go
diff --git a/proto/col_decimal32_gen_test.go b/proto/col_decimal32_gen_test.go
diff --git a/proto/col_decimal64_gen.go b/proto/col_decimal64_gen.go
diff --git a/proto/col_decimal64_gen_test.go b/proto/col_decimal64_gen_test.go
diff --git a/proto/col_enum16_gen.go b/proto/col_enum16_gen.go
diff --git a/proto/col_enum16_gen_test.go b/proto/col_enum16_gen_test.go
diff --git a/proto/col_enum8_gen.go b/proto/col_enum8_gen.go
diff --git a/proto/col_enum8_gen_test.go b/proto/col_enum8_gen_test.go
diff --git a/proto/col_float32_gen.go b/proto/col_float32_gen.go