From 4e1b044edc8a714a8cdb9b65e31189c0583efb66 Mon Sep 17 00:00:00 2001 From: Bo Du Date: Fri, 21 Dec 2018 13:36:59 -0500 Subject: [PATCH] Embed const and change first value check variable. --- encoding/delta_int_encode.gen.go | 3 ++- encoding/delta_int_iterator.gen.go | 11 ++++++----- encoding/delta_time_encode.gen.go | 3 ++- encoding/delta_time_iterator.gen.go | 11 ++++++----- encoding/encoding.go | 1 - encoding/template/delta_encode.go | 3 ++- encoding/template/delta_iterator.go | 11 ++++++----- encoding/template/template.go | 3 --- 8 files changed, 24 insertions(+), 22 deletions(-) delete mode 100644 encoding/template/template.go diff --git a/encoding/delta_int_encode.gen.go b/encoding/delta_int_encode.gen.go index 5347c71..1e77fb1 100644 --- a/encoding/delta_int_encode.gen.go +++ b/encoding/delta_int_encode.gen.go @@ -41,7 +41,8 @@ func encodeDeltaInt( } firstValue := valuesIt.Current() - if err := bitWriter.WriteBits(asUint64Fn(firstValue), uint64NumBits); err != nil { + // Need 64 bits to write out uint64 values. + if err := bitWriter.WriteBits(asUint64Fn(firstValue), 64); err != nil { return err } diff --git a/encoding/delta_int_iterator.gen.go b/encoding/delta_int_iterator.gen.go index 3ab0e7e..b5ecc71 100644 --- a/encoding/delta_int_iterator.gen.go +++ b/encoding/delta_int_iterator.gen.go @@ -40,7 +40,7 @@ type DeltaIntIterator struct { curr int err error closed bool - isFirstValue bool + isDeltaValue bool } func newDeltaIntIterator( @@ -55,7 +55,6 @@ func newDeltaIntIterator( subFn: subFn, addFn: addFn, negativeBit: 1 << uint(bitsPerEncodedValue-1), - isFirstValue: true, } } @@ -66,14 +65,16 @@ func (it *DeltaIntIterator) Next() bool { } // First value is special and written as 64 bits. - if it.isFirstValue { + if !it.isDeltaValue { var firstValue uint64 - firstValue, it.err = it.bitReader.ReadBits(uint64NumBits) + // Read 64 bits to read in a uint64 value. + firstValue, it.err = it.bitReader.ReadBits(64) if it.err != nil { return false } it.curr = int(firstValue) - it.isFirstValue = false + // The remaining values are delta values. + it.isDeltaValue = true return true } diff --git a/encoding/delta_time_encode.gen.go b/encoding/delta_time_encode.gen.go index 7d1456b..b640c97 100644 --- a/encoding/delta_time_encode.gen.go +++ b/encoding/delta_time_encode.gen.go @@ -41,7 +41,8 @@ func encodeDeltaTime( } firstValue := valuesIt.Current() - if err := bitWriter.WriteBits(asUint64Fn(firstValue), uint64NumBits); err != nil { + // Need 64 bits to write out uint64 values. + if err := bitWriter.WriteBits(asUint64Fn(firstValue), 64); err != nil { return err } diff --git a/encoding/delta_time_iterator.gen.go b/encoding/delta_time_iterator.gen.go index 6dfad7b..4a58e88 100644 --- a/encoding/delta_time_iterator.gen.go +++ b/encoding/delta_time_iterator.gen.go @@ -40,7 +40,7 @@ type DeltaTimeIterator struct { curr int64 err error closed bool - isFirstValue bool + isDeltaValue bool } func newDeltaTimeIterator( @@ -55,7 +55,6 @@ func newDeltaTimeIterator( subFn: subFn, addFn: addFn, negativeBit: 1 << uint(bitsPerEncodedValue-1), - isFirstValue: true, } } @@ -66,14 +65,16 @@ func (it *DeltaTimeIterator) Next() bool { } // First value is special and written as 64 bits. - if it.isFirstValue { + if !it.isDeltaValue { var firstValue uint64 - firstValue, it.err = it.bitReader.ReadBits(uint64NumBits) + // Read 64 bits to read in a uint64 value. + firstValue, it.err = it.bitReader.ReadBits(64) if it.err != nil { return false } it.curr = int64(firstValue) - it.isFirstValue = false + // The remaining values are delta values. + it.isDeltaValue = true return true } diff --git a/encoding/encoding.go b/encoding/encoding.go index 86043e2..2cc48ad 100644 --- a/encoding/encoding.go +++ b/encoding/encoding.go @@ -3,5 +3,4 @@ package encoding // For allocating a buffer large enough to hold uint64 values. const ( uint64SizeBytes = 8 - uint64NumBits = 64 ) diff --git a/encoding/template/delta_encode.go b/encoding/template/delta_encode.go index a09c38f..3817c97 100644 --- a/encoding/template/delta_encode.go +++ b/encoding/template/delta_encode.go @@ -17,7 +17,8 @@ func encodeDeltaValue( } firstValue := valuesIt.Current() - if err := bitWriter.WriteBits(asUint64Fn(firstValue), uint64NumBits); err != nil { + // Need 64 bits to write out uint64 values. + if err := bitWriter.WriteBits(asUint64Fn(firstValue), 64); err != nil { return err } diff --git a/encoding/template/delta_iterator.go b/encoding/template/delta_iterator.go index 6474d5d..b63b6af 100644 --- a/encoding/template/delta_iterator.go +++ b/encoding/template/delta_iterator.go @@ -16,7 +16,7 @@ type DeltaValueIterator struct { curr GenericValue err error closed bool - isFirstValue bool + isDeltaValue bool } func newValueIteratorDelta( @@ -31,7 +31,6 @@ func newValueIteratorDelta( subFn: subFn, addFn: addFn, negativeBit: 1 << uint(bitsPerEncodedValue-1), - isFirstValue: true, } } @@ -42,14 +41,16 @@ func (it *DeltaValueIterator) Next() bool { } // First value is special and written as 64 bits. - if it.isFirstValue { + if !it.isDeltaValue { var firstValue uint64 - firstValue, it.err = it.bitReader.ReadBits(uint64NumBits) + // Read 64 bits to read in a uint64 value. + firstValue, it.err = it.bitReader.ReadBits(64) if it.err != nil { return false } it.curr = GenericValue(firstValue) - it.isFirstValue = false + // The remaining values are delta values. + it.isDeltaValue = true return true } diff --git a/encoding/template/template.go b/encoding/template/template.go deleted file mode 100644 index 12c8b91..0000000 --- a/encoding/template/template.go +++ /dev/null @@ -1,3 +0,0 @@ -package template - -const uint64NumBits = 64