Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: report and handle errors #2

Merged
merged 1 commit into from
Dec 17, 2023
Merged

fix: report and handle errors #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions nix/pgScript.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@ let
cp ${../test/samples/all_movies.csv} $tmpdir/all_movies.csv
cp ${../test/samples/all_movies.csv.bz2} $tmpdir/all_movies.csv.bz2

dd if=$tmpdir/all_movies.csv.bz2 of=$tmpdir/damaged_all_movies.csv.bz2 bs=1 count=1K

dd if=$tmpdir/all_movies.csv.bz2 of=$tmpdir/empty_file count=0

dd if=$tmpdir/all_movies.csv.bz2 of=$tmpdir/wrong_header_all_movies.csv.bz2 bs=1 skip=2

"$@"
'';
in
Expand Down
34 changes: 30 additions & 4 deletions src/pg_bzip.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,26 @@ PG_MODULE_MAGIC;
PG_FUNCTION_INFO_V1(bzcat);
PG_FUNCTION_INFO_V1(bzip2);

/*error handling*/
typedef struct {
char buf[40];
} bz2_error_msg;

static bz2_error_msg get_bz2_error_msg(int bz2_code){
switch(bz2_code){
case BZ_SEQUENCE_ERROR: return (bz2_error_msg){"internal error"};
case BZ_PARAM_ERROR: return (bz2_error_msg){"incorrect parameter"};
case BZ_MEM_ERROR: return (bz2_error_msg){"memory allocation failed"};
case BZ_DATA_ERROR: return (bz2_error_msg){"integrity error"};
case BZ_DATA_ERROR_MAGIC: return (bz2_error_msg){"data is not in bzip2 format"};
case BZ_IO_ERROR: return (bz2_error_msg){"i/o error"};
case BZ_UNEXPECTED_EOF: return (bz2_error_msg){"compressed data ends unexpectedly"};
case BZ_OUTBUFF_FULL: return (bz2_error_msg){"buffer size exceeded"};
case BZ_CONFIG_ERROR: return (bz2_error_msg){"bad bzlib library"};
default: return (bz2_error_msg){"unknown"};
}
}

/*
*custom memory allocators for bzip2
*/
Expand Down Expand Up @@ -60,7 +80,7 @@ Datum bzip2(PG_FUNCTION_ARGS){
0); // according to the man pages (on --repetitive-fast --repetitive-best), the workFactor is unused, so we just leave it at 0 which will take the default.

if ( status != BZ_OK ) {
ereport(ERROR, errmsg("bzip2 compression initialization failed"));
ereport(ERROR, errmsg("bzip2 compression initialization failed: %s", get_bz2_error_msg(status).buf));
}

StringInfoData si;
Expand All @@ -82,7 +102,7 @@ Datum bzip2(PG_FUNCTION_ARGS){

if ( status != BZ_STREAM_END) {
BZ2_bzCompressEnd(&stream);
ereport(ERROR, errmsg("bzip2 compression failed"));
ereport(ERROR, errmsg("bzip2 compression failed: %s", get_bz2_error_msg(status).buf));
}

BZ2_bzCompressEnd(&stream);
Expand Down Expand Up @@ -114,7 +134,7 @@ Datum bzcat(PG_FUNCTION_ARGS){
status = BZ2_bzDecompressInit(&stream, BZ2_VERBOSITY, 0);

if ( status != BZ_OK ) {
ereport(ERROR, errmsg("bzip2 decompression initialization failed"));
ereport(ERROR, errmsg("bzip2 decompression initialization failed: %s", get_bz2_error_msg(status).buf));
}

StringInfoData si;
Expand All @@ -127,11 +147,17 @@ Datum bzcat(PG_FUNCTION_ARGS){

stream.avail_out = BZ_MAX_UNUSED;
stream.next_out = buffer;

if (status == BZ_OK && stream.avail_in == 0 && stream.avail_out > 0){
status = BZ_UNEXPECTED_EOF;
break;
};

} while (status == BZ_OK);

if ( status != BZ_STREAM_END ){
BZ2_bzDecompressEnd(&stream);
ereport(ERROR, errmsg("bzip2 decompression failed"));
ereport(ERROR, errmsg("bzip2 decompression failed: %s", get_bz2_error_msg(status).buf));
}

BZ2_bzDecompressEnd(&stream);
Expand Down
14 changes: 14 additions & 0 deletions test/expected/errors.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
create extension if not exists bzip;
NOTICE: extension "bzip" already exists, skipping
\echo

select bzcat(pg_read_binary_file('./damaged_all_movies.csv.bz2'));
ERROR: bzip2 decompression failed: compressed data ends unexpectedly
\echo

select bzcat(pg_read_binary_file('./empty_file'));
ERROR: bzip2 decompression failed: compressed data ends unexpectedly
\echo

select bzcat(pg_read_binary_file('./wrong_header_all_movies.csv.bz2'));
ERROR: bzip2 decompression failed: data is not in bzip2 format
3 changes: 3 additions & 0 deletions test/samples/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
## Sample bz2 files

`all_movies.csv.bz2` was downloaded from https://www.omdb.org/en/us/content/Help:DataDownload.
Empty file added test/samples/empty_file
View file
Open in desktop
Empty file.
10 changes: 10 additions & 0 deletions test/sql/errors.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
create extension if not exists bzip;
\echo

select bzcat(pg_read_binary_file('./damaged_all_movies.csv.bz2'));
\echo

select bzcat(pg_read_binary_file('./empty_file'));
\echo

select bzcat(pg_read_binary_file('./wrong_header_all_movies.csv.bz2'));