Replace lcfse to lzfse

knizhnik · knizhnik · commit 3ede63c755bc · 2017-06-22T12:26:40.000+03:00
diff --git a/src/backend/storage/file/cfs.c b/src/backend/storage/file/cfs.c
@@ -112,7 +112,7 @@ static int  cfs_gc_processed_segments;
  * - ZLIB_COMPRESSOR - default choice
  * - LZ4_COMPRESSOR
  * - SNAPPY_COMPRESSOR
- * - LCFSE_COMPRESSOR
+ * - LZFSE_COMPRESSOR
  * - ZSTD_COMPRESSOR
  * - LZ_COMPRESSOR - if none of options is chosen, use standard pglz_compress
  *					 which is slow and non-efficient in comparison with others,
@@ -181,29 +181,29 @@ char const* cfs_algorithm()
 	return "snappy";
 }
 
-#elif CFS_COMPRESSOR == LCFSE_COMPRESSOR
+#elif CFS_COMPRESSOR == LZFSE_COMPRESSOR
 
-#include <lcfse.h>
+#include <lzfse.h>
 
 size_t cfs_compress(void* dst, size_t dst_size, void const* src, size_t src_size)
 {
-	char* scratch_buf = palloc(lcfse_encode_scratch_size());
-	size_t rc = lcfse_encode_buffer(dst, dst_size, src, src_size, scratch_buf);
+	char* scratch_buf = palloc(lzfse_encode_scratch_size());
+	size_t rc = lzfse_encode_buffer(dst, dst_size, src, src_size, scratch_buf);
 	pfree(scratch_buf);
 	return rc;
 }
 
 size_t cfs_decompress(void* dst, size_t dst_size, void const* src, size_t src_size)
 {
-	char* scratch_buf = palloc(lcfse_encode_scratch_size());
-	size_t rc = lcfse_decode_buffer(dst, dst_size, src, src_size, scratch_buf);
+	char* scratch_buf = palloc(lzfse_encode_scratch_size());
+	size_t rc = lzfse_decode_buffer(dst, dst_size, src, src_size, scratch_buf);
 	pfree(scratch_buf);
 	return rc;
 }
 
 char const* cfs_algorithm()
 {
-	return "lcfse";
+	return "lzfse";
 }
 
 #elif CFS_COMPRESSOR == ZSTD_COMPRESSOR
diff --git a/src/include/storage/cfs.h b/src/include/storage/cfs.h
@@ -32,7 +32,7 @@
 #define ZLIB_COMPRESSOR   2
 #define LZ4_COMPRESSOR    3
 #define SNAPPY_COMPRESSOR 4
-#define LCFSE_COMPRESSOR  5
+#define LZFSE_COMPRESSOR  5
 #define ZSTD_COMPRESSOR   6
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ static int cfs_gc_processed_segments;`
`112`	`112`	`* - ZLIB_COMPRESSOR - default choice`
`113`	`113`	`* - LZ4_COMPRESSOR`
`114`	`114`	`* - SNAPPY_COMPRESSOR`
`115`		`- * - LCFSE_COMPRESSOR`
	`115`	`+ * - LZFSE_COMPRESSOR`
`116`	`116`	`* - ZSTD_COMPRESSOR`
`117`	`117`	`* - LZ_COMPRESSOR - if none of options is chosen, use standard pglz_compress`
`118`	`118`	`* which is slow and non-efficient in comparison with others,`
`@@ -181,29 +181,29 @@ char const* cfs_algorithm()`
`181`	`181`	`return "snappy";`
`182`	`182`	`}`
`183`	`183`
`184`		`-#elif CFS_COMPRESSOR == LCFSE_COMPRESSOR`
	`184`	`+#elif CFS_COMPRESSOR == LZFSE_COMPRESSOR`
`185`	`185`
`186`		`-#include <lcfse.h>`
	`186`	`+#include <lzfse.h>`
`187`	`187`
`188`	`188`	`size_t cfs_compress(void* dst, size_t dst_size, void const* src, size_t src_size)`
`189`	`189`	`{`
`190`		`- char* scratch_buf = palloc(lcfse_encode_scratch_size());`
`191`		`- size_t rc = lcfse_encode_buffer(dst, dst_size, src, src_size, scratch_buf);`
	`190`	`+ char* scratch_buf = palloc(lzfse_encode_scratch_size());`
	`191`	`+ size_t rc = lzfse_encode_buffer(dst, dst_size, src, src_size, scratch_buf);`
`192`	`192`	`pfree(scratch_buf);`
`193`	`193`	`return rc;`
`194`	`194`	`}`
`195`	`195`
`196`	`196`	`size_t cfs_decompress(void* dst, size_t dst_size, void const* src, size_t src_size)`
`197`	`197`	`{`
`198`		`- char* scratch_buf = palloc(lcfse_encode_scratch_size());`
`199`		`- size_t rc = lcfse_decode_buffer(dst, dst_size, src, src_size, scratch_buf);`
	`198`	`+ char* scratch_buf = palloc(lzfse_encode_scratch_size());`
	`199`	`+ size_t rc = lzfse_decode_buffer(dst, dst_size, src, src_size, scratch_buf);`
`200`	`200`	`pfree(scratch_buf);`
`201`	`201`	`return rc;`
`202`	`202`	`}`
`203`	`203`
`204`	`204`	`char const* cfs_algorithm()`
`205`	`205`	`{`
`206`		`- return "lcfse";`
	`206`	`+ return "lzfse";`
`207`	`207`	`}`
`208`	`208`
`209`	`209`	`#elif CFS_COMPRESSOR == ZSTD_COMPRESSOR`