thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-20 08:40:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #38087 from ClickHouse/fix-compile-of-self-extracting-executable

Browse Source 
Fix a compile errors in self-extracting-executable (de)compressor
This commit is contained in:
Robert Schulze 2022-06-15 20:15:45 +02:00 committed by GitHub
commit 42cdf1f56e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
utils/self-extracting-executable/compressor.cpp
View File

@ -8,6 +8,7 @@
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include <memory> #include <memory>
#include <iostream>
#include "types.h" #include "types.h"
@ -54,7 +55,7 @@ int doCompress(char * input, char * output, off_t & in_offset, off_t & out_offse
size_t compressed_size = ZSTD_compress2(cctx, output + out_offset, output_size, input + in_offset, input_size); size_t compressed_size = ZSTD_compress2(cctx, output + out_offset, output_size, input + in_offset, input_size);
if (ZSTD_isError(compressed_size)) if (ZSTD_isError(compressed_size))
{ {
fprintf(stderr, "Error (ZSTD): %zu %s\n", compressed_size, ZSTD_getErrorName(compressed_size)); std::cerr << "Error (ZSTD): " << compressed_size << " " << ZSTD_getErrorName(compressed_size) << std::endl;
return 1; return 1;
} }
in_offset += input_size; in_offset += input_size;
@ -79,7 +80,7 @@ int compress(int in_fd, int out_fd, int level, off_t & pointer, const struct sta
ZSTD_CCtx * cctx = ZSTD_createCCtx(); ZSTD_CCtx * cctx = ZSTD_createCCtx();
if (cctx == nullptr) if (cctx == nullptr)
{ {
fprintf(stderr, "Error (ZSTD): failed to create compression context\n"); std::cerr << "Error (ZSTD): failed to create compression context" << std::endl;
return 1; return 1;
} }
@ -89,13 +90,13 @@ int compress(int in_fd, int out_fd, int level, off_t & pointer, const struct sta
check_result = ZSTD_CCtx_setParameter(cctx, ZSTD_c_compressionLevel, level); check_result = ZSTD_CCtx_setParameter(cctx, ZSTD_c_compressionLevel, level);
if (ZSTD_isError(check_result)) if (ZSTD_isError(check_result))
{ {
fprintf(stderr, "Error (ZSTD): %zu %s\n", check_result, ZSTD_getErrorName(check_result)); std::cerr << "Error (ZSTD): " << check_result << " " << ZSTD_getErrorName(check_result) << std::endl;
return 1; return 1;
} }
check_result = ZSTD_CCtx_setParameter(cctx, ZSTD_c_checksumFlag, 1); check_result = ZSTD_CCtx_setParameter(cctx, ZSTD_c_checksumFlag, 1);
if (ZSTD_isError(check_result)) if (ZSTD_isError(check_result))
{ {
fprintf(stderr, "Error (ZSTD): %zu %s\n", check_result, ZSTD_getErrorName(check_result)); std::cerr << "Error (ZSTD): " << check_result << " " << ZSTD_getErrorName(check_result) << std::endl;
return 1; return 1;
} }
@ -254,7 +255,7 @@ int compressFiles(char* filenames[], int count, int output_fd, int level, const
continue; continue;
} }
printf("Size: %td\n", info_in.st_size); std::cout << "Size: " << info_in.st_size << std::endl;
/// Save umask /// Save umask
files_data[i].umask = info_in.st_mode; files_data[i].umask = info_in.st_mode;
@ -317,7 +318,7 @@ int copy_decompressor(const char *self, int output_fd)
if (sz < 0) if (sz < 0)
perror(nullptr); perror(nullptr);
else else
fprintf(stderr, "Error: unable to extract decompressor.\n"); std::cerr << "Error: unable to extract decompressor" << std::endl;
close(input_fd); close(input_fd);
return 1; return 1;
} }
@ -398,7 +399,7 @@ int main(int argc, char* argv[])
struct stat info_out; struct stat info_out;
if (stat(argv[start_of_files], &info_out) != -1 || errno != ENOENT) if (stat(argv[start_of_files], &info_out) != -1 || errno != ENOENT)
{ {
fprintf(stderr, "Error: output file [%s] already exists.\n", argv[start_of_files]); std::cerr << "Error: output file [" << argv[start_of_files] << "] already exists" << std::endl;
return 1; return 1;
} }
@ -419,7 +420,7 @@ int main(int argc, char* argv[])
return 1; return 1;
} }
printf("Compression with level %d\n", level); std::cout << "Compression with level: " << level << std::endl;
if (0 != compressFiles(&argv[start_of_files], argc - start_of_files, output_fd, level, info_out)) if (0 != compressFiles(&argv[start_of_files], argc - start_of_files, output_fd, level, info_out))
{ {
printf("Compression failed.\n"); printf("Compression failed.\n");

12
utils/self-extracting-executable/decompressor.cpp
View File

@ -11,6 +11,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <iostream>
#include "types.h" #include "types.h"
@ -21,7 +22,7 @@ int doDecompress(char * input, char * output, off_t & in_offset, off_t & out_off
size_t decompressed_size = ZSTD_decompressDCtx(dctx, output + out_offset, output_size, input + in_offset, input_size); size_t decompressed_size = ZSTD_decompressDCtx(dctx, output + out_offset, output_size, input + in_offset, input_size);
if (ZSTD_isError(decompressed_size)) if (ZSTD_isError(decompressed_size))
{ {
fprintf(stderr, "Error (ZSTD): %zu %s\n", decompressed_size, ZSTD_getErrorName(decompressed_size)); std::cerr << "Error (ZSTD):" << decompressed_size << " " << ZSTD_getErrorName(decompressed_size) << std::endl;
return 1; return 1;
} }
return 0; return 0;
@ -40,7 +41,7 @@ int decompress(char * input, char * output, off_t start, off_t end, size_t max_n
ZSTD_DCtx * dctx = ZSTD_createDCtx(); ZSTD_DCtx * dctx = ZSTD_createDCtx();
if (dctx == nullptr) if (dctx == nullptr)
{ {
fprintf(stderr, "Error (ZSTD): failed to create decompression context\n"); std::cerr << "Error (ZSTD): failed to create decompression context" << std::endl;
return 1; return 1;
} }
pid_t pid; pid_t pid;
@ -52,7 +53,7 @@ int decompress(char * input, char * output, off_t start, off_t end, size_t max_n
size = ZSTD_findFrameCompressedSize(input + in_pointer, max_block_size); size = ZSTD_findFrameCompressedSize(input + in_pointer, max_block_size);
if (ZSTD_isError(size)) if (ZSTD_isError(size))
{ {
fprintf(stderr, "Error (ZSTD): %td %s\n", size, ZSTD_getErrorName(size)); std::cerr << "Error (ZSTD): " << size << " " << ZSTD_getErrorName(size) << std::endl;
error_happened = true; error_happened = true;
break; break;
} }
@ -60,7 +61,7 @@ int decompress(char * input, char * output, off_t start, off_t end, size_t max_n
decompressed_size = ZSTD_getFrameContentSize(input + in_pointer, max_block_size); decompressed_size = ZSTD_getFrameContentSize(input + in_pointer, max_block_size);
if (ZSTD_isError(decompressed_size)) if (ZSTD_isError(decompressed_size))
{ {
fprintf(stderr, "Error (ZSTD): %td %s\n", decompressed_size, ZSTD_getErrorName(decompressed_size)); std::cerr << "Error (ZSTD): " << decompressed_size << " " << ZSTD_getErrorName(decompressed_size) << std::endl;
error_happened = true; error_happened = true;
break; break;
} }
@ -171,8 +172,7 @@ int decompressFiles(int input_fd, char * path, char * name, bool & have_compress
} }
if (fs_info.f_blocks * info_in.st_blksize < decompressed_full_size) if (fs_info.f_blocks * info_in.st_blksize < decompressed_full_size)
{ {
fprintf(stderr, "Not enough space for decompression. Have %tu, need %zu.", std::cerr << "Not enough space for decompression. Have " << fs_info.f_blocks * info_in.st_blksize << ", need " << decompressed_full_size << std::endl;
fs_info.f_blocks * info_in.st_blksize, decompressed_full_size);
return 1; return 1;
} }