Fixed working of --with-zstd option. Fixed compilation with ZSTD compression

vbwagner · vbwagner · commit e39141cb389a · 2016-11-29T17:18:25.000+03:00
diff --git a/src/Makefile.global.in b/src/Makefile.global.in
@@ -193,6 +193,7 @@ with_libxslt	= @with_libxslt@
 with_system_tzdata = @with_system_tzdata@
 with_uuid	= @with_uuid@
 with_zlib	= @with_zlib@
+with_zstd 	= @with_zstd@
 enable_rpath	= @enable_rpath@
 enable_nls	= @enable_nls@
 enable_debug	= @enable_debug@
diff --git a/src/backend/storage/file/cfs.c b/src/backend/storage/file/cfs.c
@@ -164,7 +164,7 @@ size_t cfs_compress(void* dst, size_t dst_size, void const* src, size_t src_size
 
 size_t cfs_decompress(void* dst, size_t dst_size, void const* src, size_t src_size)
 {
-    return ZSTD_decompress(dst, dest_size, src, src_size);
+    return ZSTD_decompress(dst, dst_size, src, src_size);
 }
 
 char const* cfs_algorithm()
diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in
@@ -896,6 +896,9 @@
 /* Define to 1 if `wcstombs_l' requires <xlocale.h>. */
 #undef WCSTOMBS_L_IN_XLOCALE
 
+/* Define to 6 to use zstd compression library */
+#undef CFS_COMPRESSOR
+
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
    significant byte first (like Motorola and SPARC, unlike Intel). */
 #if defined AC_APPLE_UNIVERSAL_BUILD
diff --git a/src/include/storage/cfs.h b/src/include/storage/cfs.h
@@ -1,6 +1,8 @@
 #ifndef __CFS_H__
 #define __CFS_H__
 
+#include "pg_config.h"
+
 #include "port/atomics.h"
 
 #define CFS_VERSION "0.21"

Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ size_t cfs_compress(void* dst, size_t dst_size, void const* src, size_t src_size`
`164`	`164`
`165`	`165`	`size_t cfs_decompress(void* dst, size_t dst_size, void const* src, size_t src_size)`
`166`	`166`	`{`
`167`		`- return ZSTD_decompress(dst, dest_size, src, src_size);`
	`167`	`+ return ZSTD_decompress(dst, dst_size, src, src_size);`
`168`	`168`	`}`
`169`	`169`
`170`	`170`	`char const* cfs_algorithm()`