-
Notifications
You must be signed in to change notification settings - Fork 171
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #83 from citusdata/develop
version 1.4
- Loading branch information
Showing
16 changed files
with
525 additions
and
116 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,164 @@ | ||
| /*------------------------------------------------------------------------- | ||
| * | ||
| * cstore_compression.c | ||
| * | ||
| * This file contains compression/decompression functions definitions | ||
| * used in cstore_fdw. | ||
| * | ||
| * Copyright (c) 2016, Citus Data, Inc. | ||
| * | ||
| * $Id$ | ||
| * | ||
| *------------------------------------------------------------------------- | ||
| */ | ||
| #include "postgres.h" | ||
| #include "cstore_fdw.h" | ||
|
|
||
| #if PG_VERSION_NUM >= 90500 | ||
| #include "common/pg_lzcompress.h" | ||
| #else | ||
| #include "utils/pg_lzcompress.h" | ||
| #endif | ||
|
|
||
|
|
||
|
|
||
|
|
||
| #if PG_VERSION_NUM >= 90500 | ||
| /* | ||
| * The information at the start of the compressed data. This decription is taken | ||
| * from pg_lzcompress in pre-9.5 version of PostgreSQL. | ||
| */ | ||
| typedef struct CStoreCompressHeader | ||
| { | ||
| int32 vl_len_; /* varlena header (do not touch directly!) */ | ||
| int32 rawsize; | ||
| } CStoreCompressHeader; | ||
|
|
||
| /* | ||
| * Utilities for manipulation of header information for compressed data | ||
| */ | ||
|
|
||
| #define CSTORE_COMPRESS_HDRSZ ((int32) sizeof(CStoreCompressHeader)) | ||
| #define CSTORE_COMPRESS_RAWSIZE(ptr) (((CStoreCompressHeader *) (ptr))->rawsize) | ||
| #define CSTORE_COMPRESS_RAWDATA(ptr) (((char *) (ptr)) + CSTORE_COMPRESS_HDRSZ) | ||
| #define CSTORE_COMPRESS_SET_RAWSIZE(ptr, len) (((CStoreCompressHeader *) (ptr))->rawsize = (len)) | ||
|
|
||
| #else | ||
|
|
||
| #define CSTORE_COMPRESS_HDRSZ (0) | ||
| #define CSTORE_COMPRESS_RAWSIZE(ptr) (PGLZ_RAW_SIZE((PGLZ_Header *) buffer->data)) | ||
| #define CSTORE_COMPRESS_RAWDATA(ptr) (((PGLZ_Header *) (ptr))) | ||
| #define CSTORE_COMPRESS_SET_RAWSIZE(ptr, len) (((CStoreCompressHeader *) (ptr))->rawsize = (len)) | ||
|
|
||
| #endif | ||
|
|
||
|
|
||
|
|
||
| /* | ||
| * CompressBuffer compresses the given buffer with the given compression type | ||
| * outputBuffer enlarged to contain compressed data. The function returns true | ||
| * if compression is done, returns false if compression is not done. | ||
| * outputBuffer is valid only if the function returns true. | ||
| */ | ||
| bool | ||
| CompressBuffer(StringInfo inputBuffer, StringInfo outputBuffer, | ||
| CompressionType compressionType) | ||
| { | ||
| uint64 maximumLength = PGLZ_MAX_OUTPUT(inputBuffer->len) + CSTORE_COMPRESS_HDRSZ; | ||
| bool compressionResult = false; | ||
| #if PG_VERSION_NUM >= 90500 | ||
| int32 compressedByteCount = 0; | ||
| #endif | ||
|
|
||
| if (compressionType != COMPRESSION_PG_LZ) | ||
| { | ||
| return false; | ||
| } | ||
|
|
||
| resetStringInfo(outputBuffer); | ||
| enlargeStringInfo(outputBuffer, maximumLength); | ||
|
|
||
| #if PG_VERSION_NUM >= 90500 | ||
| compressedByteCount = pglz_compress((const char *) inputBuffer->data, | ||
| inputBuffer->len, | ||
| CSTORE_COMPRESS_RAWDATA(outputBuffer->data), | ||
| PGLZ_strategy_always); | ||
| if (compressedByteCount >= 0) | ||
| { | ||
| CSTORE_COMPRESS_SET_RAWSIZE(outputBuffer->data, inputBuffer->len); | ||
| SET_VARSIZE_COMPRESSED(outputBuffer->data, | ||
| compressedByteCount + CSTORE_COMPRESS_HDRSZ); | ||
| compressionResult = true; | ||
| } | ||
| #else | ||
|
|
||
| compressionResult = pglz_compress(inputBuffer->data, inputBuffer->len, | ||
| CSTORE_COMPRESS_RAWDATA(outputBuffer->data), | ||
| PGLZ_strategy_always); | ||
| #endif | ||
|
|
||
| if (compressionResult) | ||
| { | ||
| outputBuffer->len = VARSIZE(outputBuffer->data); | ||
| } | ||
|
|
||
| return compressionResult; | ||
| } | ||
|
|
||
|
|
||
| /* | ||
| * DecompressBuffer decompresses the given buffer with the given compression | ||
| * type. This function returns the buffer as-is when no compression is applied. | ||
| */ | ||
| StringInfo | ||
| DecompressBuffer(StringInfo buffer, CompressionType compressionType) | ||
| { | ||
| StringInfo decompressedBuffer = NULL; | ||
|
|
||
| Assert(compressionType == COMPRESSION_NONE || compressionType == COMPRESSION_PG_LZ); | ||
|
|
||
| if (compressionType == COMPRESSION_NONE) | ||
| { | ||
| /* in case of no compression, return buffer */ | ||
| decompressedBuffer = buffer; | ||
| } | ||
| else if (compressionType == COMPRESSION_PG_LZ) | ||
| { | ||
| uint32 compressedDataSize = VARSIZE(buffer->data) - CSTORE_COMPRESS_HDRSZ; | ||
| uint32 decompressedDataSize = CSTORE_COMPRESS_RAWSIZE(buffer->data); | ||
| char *decompressedData = NULL; | ||
| #if PG_VERSION_NUM >= 90500 | ||
| int32 decompressedByteCount = 0; | ||
| #endif | ||
|
|
||
| if (compressedDataSize + CSTORE_COMPRESS_HDRSZ != buffer->len) | ||
| { | ||
| ereport(ERROR, (errmsg("cannot decompress the buffer"), | ||
| errdetail("Expected %u bytes, but received %u bytes", | ||
| compressedDataSize, buffer->len))); | ||
| } | ||
|
|
||
| decompressedData = palloc0(decompressedDataSize); | ||
|
|
||
| #if PG_VERSION_NUM >= 90500 | ||
| decompressedByteCount = pglz_decompress(CSTORE_COMPRESS_RAWDATA(buffer->data), | ||
| compressedDataSize, | ||
| decompressedData, decompressedDataSize); | ||
|
|
||
| if (decompressedByteCount < 0) | ||
| { | ||
| ereport(ERROR, (errmsg("cannot decompress the buffer"), | ||
| errdetail("compressed data is corrupted"))); | ||
| } | ||
| #else | ||
| pglz_decompress((PGLZ_Header *) buffer->data, decompressedData); | ||
| #endif | ||
|
|
||
| decompressedBuffer = palloc0(sizeof(StringInfoData)); | ||
| decompressedBuffer->data = decompressedData; | ||
| decompressedBuffer->len = decompressedDataSize; | ||
| decompressedBuffer->maxlen = decompressedDataSize; | ||
| } | ||
|
|
||
| return decompressedBuffer; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| /* cstore_fdw/cstore_fdw--1.3--1.4.sql */ | ||
|
|
||
| -- No new functions or definitions were added in 1.4 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.