Merge pull request #1026 from bobrik/correct-last-offset-delta

Correctly encode RecordBatch.LastOffsetDelta
IBM · Feb 2, 2018 · 75fd5ac · 75fd5ac
2 parents 0f333e6 + 939043e
commit 75fd5ac
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 18 deletions.
diff --git a/produce_request_test.go b/produce_request_test.go
@@ -48,9 +48,9 @@ var (
 		0x00, 0x00, 0x00, 0x46,
 		0x00, 0x00, 0x00, 0x00,
 		0x02,
-		0x54, 0x79, 0x61, 0xFD,
+		0xCA, 0x33, 0xBC, 0x05,
 		0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x01,
 		0x00, 0x00, 0x01, 0x58, 0x8D, 0xCD, 0x59, 0x38,
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -83,9 +83,10 @@ func TestProduceRequest(t *testing.T) {
 
 	request.Version = 3
 	batch := &RecordBatch{
-		Version:        2,
-		FirstTimestamp: time.Unix(1479847795, 0),
-		MaxTimestamp:   time.Unix(0, 0),
+		LastOffsetDelta: 1,
+		Version:         2,
+		FirstTimestamp:  time.Unix(1479847795, 0),
+		MaxTimestamp:    time.Unix(0, 0),
 		Records: []*Record{{
 			TimestampDelta: 5 * time.Millisecond,
 			Key:            []byte{0x01, 0x02, 0x03, 0x04},

diff --git a/record_batch.go b/record_batch.go
@@ -64,7 +64,7 @@ func (b *RecordBatch) encode(pe packetEncoder) error {
 	pe.putInt8(b.Version)
 	pe.push(newCRC32Field(crcCastagnoli))
 	pe.putInt16(b.computeAttributes())
-	pe.putInt32(b.LastOffsetDelta)
+	pe.putInt32(int32(len(b.Records)))
 
 	if err := (Timestamp{&b.FirstTimestamp}).encode(pe); err != nil {
 		return err

diff --git a/record_test.go b/record_test.go
@@ -87,10 +87,10 @@ var recordBatchTestCases = []struct {
 			0, 0, 0, 0, 0, 0, 0, 0, // First Offset
 			0, 0, 0, 70, // Length
 			0, 0, 0, 0, // Partition Leader Epoch
-			2,                // Version
-			84, 121, 97, 253, // CRC
+			2,               // Version
+			202, 51, 188, 5, // CRC
 			0, 0, // Attributes
-			0, 0, 0, 0, // Last Offset Delta
+			0, 0, 0, 1, // Last Offset Delta
 			0, 0, 1, 88, 141, 205, 89, 56, // First Timestamp
 			0, 0, 0, 0, 0, 0, 0, 0, // Max Timestamp
 			0, 0, 0, 0, 0, 0, 0, 0, // Producer ID
@@ -134,10 +134,10 @@ var recordBatchTestCases = []struct {
 			0, 0, 0, 0, 0, 0, 0, 0, // First Offset
 			0, 0, 0, 94, // Length
 			0, 0, 0, 0, // Partition Leader Epoch
-			2,                  // Version
-			159, 236, 182, 189, // CRC
+			2,                 // Version
+			151, 214, 216, 81, // CRC
 			0, 1, // Attributes
-			0, 0, 0, 0, // Last Offset Delta
+			0, 0, 0, 1, // Last Offset Delta
 			0, 0, 1, 88, 141, 205, 89, 56, // First Timestamp
 			0, 0, 0, 0, 0, 0, 0, 0, // Max Timestamp
 			0, 0, 0, 0, 0, 0, 0, 0, // Producer ID
@@ -187,10 +187,10 @@ var recordBatchTestCases = []struct {
 			0, 0, 0, 0, 0, 0, 0, 0, // First Offset
 			0, 0, 0, 72, // Length
 			0, 0, 0, 0, // Partition Leader Epoch
-			2,              // Version
-			21, 0, 159, 97, // CRC
+			2,                 // Version
+			160, 117, 65, 149, // CRC
 			0, 2, // Attributes
-			0, 0, 0, 0, // Last Offset Delta
+			0, 0, 0, 1, // Last Offset Delta
 			0, 0, 1, 88, 141, 205, 89, 56, // First Timestamp
 			0, 0, 0, 0, 0, 0, 0, 0, // Max Timestamp
 			0, 0, 0, 0, 0, 0, 0, 0, // Producer ID
@@ -222,10 +222,10 @@ var recordBatchTestCases = []struct {
 			0, 0, 0, 0, 0, 0, 0, 0, // First Offset
 			0, 0, 0, 89, // Length
 			0, 0, 0, 0, // Partition Leader Epoch
-			2,                 // Version
-			169, 74, 119, 197, // CRC
+			2,                // Version
+			223, 53, 65, 233, // CRC
 			0, 3, // Attributes
-			0, 0, 0, 0, // Last Offset Delta
+			0, 0, 0, 1, // Last Offset Delta
 			0, 0, 1, 88, 141, 205, 89, 56, // First Timestamp
 			0, 0, 0, 0, 0, 0, 0, 0, // Max Timestamp
 			0, 0, 0, 0, 0, 0, 0, 0, // Producer ID