Skip to content

feat: allow strOut argument to fsst_compress to be NULL #47

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

Open
mhx wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: allow strOut argument to fsst_compress to be NULL #47

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
2 changes: 1 addition & 1 deletion fsst.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ fsst_compress(
size_t outsize, /* IN: byte-length of output buffer. */
unsigned char *output, /* OUT: memory buffer to put the compressed strings in (one after the other). */
size_t lenOut[], /* OUT: byte-lengths of the compressed strings. */
unsigned char *strOut[] /* OUT: output string start pointers. Will all point into [output,output+size). */
unsigned char *strOut[] /* OUT: output string start pointers. Will all point into [output,output+size). Can be NULL. */
);

/* Decompress a single string, inlined for speed. */
Expand Down
9 changes: 5 additions & 4 deletions libfsst.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ static inline size_t compressSIMD(SymbolTable &symbolTable, u8* symbolBase, size
if (((len[curLine]-curOff)*2 + 7) > budget) break; // see below for the +7
else budget -= (len[curLine]-curOff)*2;

strOut[curLine] = (u8*) 0;
if (strOut) strOut[curLine] = (u8*) 0;
lenOut[curLine] = 0;

do {
Expand Down Expand Up @@ -361,7 +361,7 @@ static inline size_t compressSIMD(SymbolTable &symbolTable, u8* symbolBase, size
for(size_t i=0; i<batchPos; i++) {
size_t lineNr = jobLine[i]; // the sort must be order-preserving, as we concatenate results string in order
size_t sz = input[i].end; // had stored compressed lengths here
if (!strOut[lineNr]) strOut[lineNr] = dst; // first segment will be the strOut pointer
if (strOut && !strOut[lineNr]) strOut[lineNr] = dst; // first segment will be the strOut pointer
lenOut[lineNr] += sz; // add segment (lenOut starts at 0 for this reason)
memcpy(dst, codeBase+input[i].out, sz);
dst += sz;
Expand Down Expand Up @@ -422,7 +422,8 @@ static inline size_t compressBulk(SymbolTable &symbolTable, size_t nlines, const

for(curLine=0; curLine<nlines; curLine++) {
size_t chunk, curOff = 0;
strOut[curLine] = out;
auto const lastOut = out;
if (strOut) strOut[curLine] = out;
do {
cur = strIn[curLine] + curOff;
chunk = lenIn[curLine] - curOff;
Expand All @@ -447,7 +448,7 @@ static inline size_t compressBulk(SymbolTable &symbolTable, size_t nlines, const
compressVariant(false, false);
}
} while((curOff += chunk) < lenIn[curLine]);
lenOut[curLine] = (size_t) (out - strOut[curLine]);
lenOut[curLine] = (size_t) (out - lastOut);
}
return curLine;
}
Expand Down