Merge pull request #179 from jtroy/compression-fix

Fix compressed data read for Read()s that span multiple compressed payloads
ClickHouse · Jun 7, 2019 · 3f4d8fd · 3f4d8fd
2 parents 6e001b8 + 6e8aea1
commit 3f4d8fd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 16 deletions.
diff --git a/lib/binary/compress_reader.go b/lib/binary/compress_reader.go
@@ -52,13 +52,10 @@ func (cr *compressReader) Read(buf []byte) (n int, err error) {
 		if err = cr.readCompressedData(); err != nil {
 			return bytesRead, err
 		}
-		if len(cr.data) < n-bytesRead {
-			bytesRead += len(cr.data)
-		} else {
-			bytesRead += n - bytesRead
-			cr.pos += n - bytesRead
-			break
-		}
+		copyedSize := copy(buf[bytesRead:], cr.data)
+
+		bytesRead += copyedSize
+		cr.pos = copyedSize
 	}
 	return n, nil
 }
@@ -103,7 +100,7 @@ func (cr *compressReader) readCompressedData() (err error) {
 			return
 		}
 	} else {
-		return fmt.Errorf("Unknown compression method: %d ", cr.header[0])
+		return fmt.Errorf("Unknown compression method: 0x%02x ", cr.header[16])
 	}
 
 	return nil

diff --git a/lib/binary/compress_reader_clz4.go b/lib/binary/compress_reader_clz4.go
@@ -52,13 +52,10 @@ func (cr *compressReader) Read(buf []byte) (n int, err error) {
 		if err = cr.readCompressedData(); err != nil {
 			return bytesRead, err
 		}
-		if len(cr.data) < n-bytesRead {
-			bytesRead += len(cr.data)
-		} else {
-			bytesRead += n - bytesRead
-			cr.pos += n - bytesRead
-			break
-		}
+		copyedSize := copy(buf[bytesRead:], cr.data)
+
+		bytesRead += copyedSize
+		cr.pos = copyedSize
 	}
 	return n, nil
 }
@@ -103,7 +100,7 @@ func (cr *compressReader) readCompressedData() (err error) {
 			return
 		}
 	} else {
-		return fmt.Errorf("Unknown compression method: %d ", cr.header[0])
+		return fmt.Errorf("Unknown compression method: 0x%02x ", cr.header[16])
 	}
 
 	return nil