Skip to content

Add file_fdw support for external decompressors #4

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

Closed
wants to merge 9 commits into from
Closed

Add file_fdw support for external decompressors #4

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
541e463
Add "decompressor" option to `file_fdw`
jasonmp85 Dec 30, 2013
5a06bef
Populate decompressor in `fileGetOptions`
jasonmp85 Dec 30, 2013
c50688a
Switch to storing full program/args; pass it along
jasonmp85 Dec 30, 2013
427cfc8
Parse decompressor option and build program
jasonmp85 Dec 31, 2013
a5102c9
Bugfixes for decompressor file_fdw option
jasonmp85 Dec 31, 2013
51fa91a
Fix population of program, null list issue
jasonmp85 Dec 31, 2013
0403974
Add rudimentary `EXPLAIN` support for programs
jasonmp85 Dec 31, 2013
32ab3e2
Add decompressor tests to file_fdw suite
jasonmp85 Dec 31, 2013
b4f5cee
Add filename escaping test for file_fdw
jasonmp85 Dec 31, 2013
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
Prev Previous commit
Next Next commit
Fix population of program, null list issue 
Turns out it's unsafe to modify a list while iterating over it, since
the delete method actually frees the node (and possibly the list, too!)
rather than just updating the next/prev pointers.
  • Loading branch information
@jasonmp85
jasonmp85 committed Dec 31, 2013
commit 51fa91adf1479767c674611d44f9aef9679637e5
29 changes: 19 additions & 10 deletions contrib/file_fdw/file_fdw.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,12 +347,9 @@ fileGetOptions(Oid foreigntableid,
ListCell *lc,
*prev;

char *decompressor = NULL;
char *decompressor;
char *write_ptr, *token, *input, *read_ptr;

bool gzip_found, filename_found;
gzip_found = filename_found = FALSE;

/*
* Extract options from FDW objects. We ignore user mappings because
* file_fdw doesn't have any options that can be specified there.
Expand All @@ -372,7 +369,7 @@ fileGetOptions(Oid foreigntableid,
options = list_concat(options, get_file_fdw_attribute_options(foreigntableid));

/*
* Separate out the filename and decompressor.
* Separate out the filename.
*/
*filename = NULL;
prev = NULL;
Expand All @@ -384,17 +381,29 @@ fileGetOptions(Oid foreigntableid,
{
*filename = defGetString(def);
options = list_delete_cell(options, lc, prev);
filename_found = TRUE;
break;
}
else if (strcmp(def->defname, "decompressor") == 0)

prev = lc;
}

/*
* Separate out the decompressor, which will be used to calculate program.
*/
decompressor = NULL;
*program = NULL;
prev = NULL;
foreach(lc, options)
{
DefElem *def = (DefElem *) lfirst(lc);

if (strcmp(def->defname, "decompressor") == 0)
{
decompressor = defGetString(def);
options = list_delete_cell(options, lc, prev);
gzip_found = TRUE;
break;
}

if (filename_found && gzip_found) break;

prev = lc;
}

Expand Down