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

Jump to bottom

Add zchunk support to modifyrepo_c as well as for mergerepo_c and createrepo_c for extra metadata #115

Merged
merged 6 commits into from
Feb 4, 2019
Merged

Add zchunk support to modifyrepo_c as well as for mergerepo_c and createrepo_c for extra metadata #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b9bd5f7
zck_end_chunk returns number of bytes written or -1 for error
jdieter Jan 6, 2019
defe062
Add support for zchunking extra metadata files
jdieter Jan 13, 2019
61d2dce
Add zchunk support to mergerepo_c for extra files
jdieter Jan 15, 2019
fed36d5
Add missing sentinal
jdieter Jan 15, 2019
5e3aa71
Fix misc test
jdieter Jan 15, 2019
0b2080c
Add space after if statement
jdieter Jan 16, 2019
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 src/cmd_parser.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@ check_arguments(struct CmdOptions *options,
}

// Zchunk options
if(options->zck_dict_dir && !options->zck_compression) {
if (options->zck_dict_dir && !options->zck_compression) {
g_set_error(err, ERR_DOMAIN, CRE_BADARG,
"Cannot use --zck-dict-dir without setting --zck");
return FALSE;
Expand Down
90 changes: 70 additions & 20 deletions src/compression_wrapper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,18 +296,18 @@ cr_ChecksumType
cr_cktype_from_zck(zckCtx *zck, GError **err)
{
int cktype = zck_get_full_hash_type(zck);
if(cktype < 0) {
if (cktype < 0) {
g_set_error(err, ERR_DOMAIN, CRE_ZCK,
"Unable to read hash from zchunk file");
return CR_CHECKSUM_UNKNOWN;
}
if(cktype == ZCK_HASH_SHA1)
if (cktype == ZCK_HASH_SHA1)
return CR_CHECKSUM_SHA1;
else if(cktype == ZCK_HASH_SHA256)
else if (cktype == ZCK_HASH_SHA256)
return CR_CHECKSUM_SHA256;
else {
const char *ckname = zck_hash_name_from_type(cktype);
if(ckname == NULL)
if (ckname == NULL)
ckname = "Unknown";
g_set_error(err, ERR_DOMAIN, CRE_ZCK,
"Unknown zchunk checksum type: %s", ckname);
Expand Down Expand Up @@ -600,7 +600,7 @@ cr_sopen(const char *filename,
file->FILE = (void *) zck_create();
zckCtx *zck = file->FILE;
if (mode == CR_CW_MODE_WRITE) {
if(!file->FILE || !zck_init_write(zck, fd) ||
if (!file->FILE || !zck_init_write(zck, fd) ||
!zck_set_ioption(zck, ZCK_MANUAL_CHUNK, 1)) {
zck_set_log_fd(STDOUT_FILENO);
g_set_error(err, ERR_DOMAIN, CRE_IO, "%s",
Expand Down Expand Up @@ -654,18 +654,18 @@ cr_sopen(const char *filename,

#ifdef WITH_ZCHUNK
/* Fill zchunk header_stat with header information */
if(mode == CR_CW_MODE_READ && type == CR_CW_ZCK_COMPRESSION) {
if (mode == CR_CW_MODE_READ && type == CR_CW_ZCK_COMPRESSION) {
zckCtx *zck = (zckCtx *)file->FILE;
cr_ChecksumType cktype = cr_cktype_from_zck(zck, err);
if(cktype == CR_CHECKSUM_UNKNOWN) {
if (cktype == CR_CHECKSUM_UNKNOWN) {
/* Error is already set in cr_cktype_from_zck */
g_free(file);
return NULL;
}
file->stat->hdr_checksum_type = cktype;
file->stat->hdr_checksum = zck_get_header_digest(zck);
file->stat->hdr_size = zck_get_header_length(zck);
if(*err != NULL || file->stat->hdr_checksum == NULL ||
if (*err != NULL || file->stat->hdr_checksum == NULL ||
file->stat->hdr_size < 0) {
g_free(file);
return NULL;
Expand All @@ -685,7 +685,7 @@ cr_set_dict(CR_FILE *cr_file, const void *dict, unsigned int len, GError **err)
int ret = CRE_OK;
assert(!err || *err == NULL);

if(len == 0)
if (len == 0)
return CRE_OK;

switch (cr_file->type) {
Expand All @@ -694,7 +694,7 @@ cr_set_dict(CR_FILE *cr_file, const void *dict, unsigned int len, GError **err)
#ifdef WITH_ZCHUNK
zckCtx *zck = (zckCtx *)cr_file->FILE;
size_t wlen = (size_t)len;
if(!zck_set_soption(zck, ZCK_COMP_DICT, dict, wlen)) {
if (!zck_set_soption(zck, ZCK_COMP_DICT, dict, wlen)) {
ret = CRE_ERROR;
g_set_error(err, ERR_DOMAIN, CRE_ZCK,
"Error setting dict");
Expand Down Expand Up @@ -815,7 +815,7 @@ cr_close(CR_FILE *cr_file, GError **err)

rc = lzma_code(stream, LZMA_FINISH);

if(rc != LZMA_OK && rc != LZMA_STREAM_END) {
if (rc != LZMA_OK && rc != LZMA_STREAM_END) {
// Error while coding
const char *err_msg;

Expand Down Expand Up @@ -860,7 +860,7 @@ cr_close(CR_FILE *cr_file, GError **err)
break;
}

if(rc == LZMA_STREAM_END) {
if (rc == LZMA_STREAM_END) {
// Everything all right
ret = CRE_OK;
break;
Expand All @@ -880,7 +880,7 @@ cr_close(CR_FILE *cr_file, GError **err)
zckCtx *zck = (zckCtx *) cr_file->FILE;
ret = CRE_OK;
if (cr_file->mode == CR_CW_MODE_WRITE) {
if(!zck_end_chunk(zck)) {
if (zck_end_chunk(zck) < 0) {
ret = CRE_ZCK;
g_set_error(err, ERR_DOMAIN, CRE_ZCK,
"Unable to end final chunk: %s", zck_get_error(zck));
Expand All @@ -892,15 +892,15 @@ cr_close(CR_FILE *cr_file, GError **err)
"Unable to close zchunk file: %s", zck_get_error(zck));
}
cr_ChecksumType cktype = cr_cktype_from_zck(zck, err);
if(cktype == CR_CHECKSUM_UNKNOWN) {
if (cktype == CR_CHECKSUM_UNKNOWN) {
/* Error is already set in cr_cktype_from_zck */
break;
}
if(cr_file->stat) {
if (cr_file->stat) {
cr_file->stat->hdr_checksum_type = cktype;
cr_file->stat->hdr_checksum = zck_get_header_digest(zck);
cr_file->stat->hdr_size = zck_get_header_length(zck);
if((err && *err) || cr_file->stat->hdr_checksum == NULL ||
if ((err && *err) || cr_file->stat->hdr_checksum == NULL ||
cr_file->stat->hdr_size < 0) {
ret = CRE_ZCK;
g_set_error(err, ERR_DOMAIN, CRE_ZCK,
Expand Down Expand Up @@ -1121,7 +1121,7 @@ cr_read(CR_FILE *cr_file, void *buffer, unsigned int len, GError **err)
#ifdef WITH_ZCHUNK
zckCtx *zck = (zckCtx *) cr_file->FILE;
ssize_t rb = zck_read(zck, buffer, len);
if(rb < 0) {
if (rb < 0) {
ret = CR_CW_ERR;
g_set_error(err, ERR_DOMAIN, CRE_ZCK, "ZCK: Unable to read: %s",
zck_get_error(zck));
Expand Down Expand Up @@ -1307,7 +1307,7 @@ cr_write(CR_FILE *cr_file, const void *buffer, unsigned int len, GError **err)
#ifdef WITH_ZCHUNK
zckCtx *zck = (zckCtx *) cr_file->FILE;
ssize_t wb = zck_write(zck, buffer, len);
if(wb < 0) {
if (wb < 0) {
ret = CR_CW_ERR;
g_set_error(err, ERR_DOMAIN, CRE_ZCK,
"ZCK: Unable to write: %s", zck_get_error(zck));
Expand Down Expand Up @@ -1403,9 +1403,10 @@ cr_end_chunk(CR_FILE *cr_file, GError **err)
#ifdef WITH_ZCHUNK
zckCtx *zck = (zckCtx *) cr_file->FILE;
ssize_t wb = zck_end_chunk(zck);
if(wb < 0) {
if (wb < 0) {
g_set_error(err, ERR_DOMAIN, CRE_ZCK,
"Error ending chunk");
"Error ending chunk: %s",
zck_get_error(zck));
return CR_CW_ERR;
}
ret = wb;
Expand All @@ -1430,6 +1431,55 @@ cr_end_chunk(CR_FILE *cr_file, GError **err)
return ret;
}

int
cr_set_autochunk(CR_FILE *cr_file, gboolean auto_chunk, GError **err)
{
int ret = CRE_OK;

assert(cr_file);
assert(!err || *err == NULL);

if (cr_file->mode != CR_CW_MODE_WRITE) {
g_set_error(err, ERR_DOMAIN, CRE_BADARG,
"File is not opened in write mode");
return CR_CW_ERR;
}

switch (cr_file->type) {
case (CR_CW_NO_COMPRESSION): // ---------------------------------------
case (CR_CW_GZ_COMPRESSION): // ---------------------------------------
case (CR_CW_BZ2_COMPRESSION): // --------------------------------------
case (CR_CW_XZ_COMPRESSION): // ---------------------------------------
break;
case (CR_CW_ZCK_COMPRESSION): { // ------------------------------------
#ifdef WITH_ZCHUNK
zckCtx *zck = (zckCtx *) cr_file->FILE;
if (!zck_set_ioption(zck, ZCK_MANUAL_CHUNK, !auto_chunk)) {
g_set_error(err, ERR_DOMAIN, CRE_ZCK,
"Error setting auto_chunk: %s",
zck_get_error(zck));
return CR_CW_ERR;
}
break;
#else
g_set_error(err, ERR_DOMAIN, CRE_IO, "createrepo_c wasn't compiled "
"with zchunk support");
break;
#endif // WITH_ZCHUNK
}

default: // -----------------------------------------------------------
g_set_error(err, ERR_DOMAIN, CRE_BADARG,
"Bad compressed file type");
return CR_CW_ERR;
break;
}

assert(!err || (ret == CR_CW_ERR && *err != NULL)
|| (ret != CR_CW_ERR && *err == NULL));

return ret;
}

int
cr_printf(GError **err, CR_FILE *cr_file, const char *format, ...)
Expand Down
8 changes: 8 additions & 0 deletions src/compression_wrapper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,14 @@ int cr_puts(CR_FILE *cr_file, const char *str, GError **err);
*/
int cr_end_chunk(CR_FILE *cr_file, GError **err);

/** Set zchunk auto-chunk algorithm. Must be done before first byte is written
* @param cr_file CR_FILE pointer
* @param auto_chunk Whether auto-chunking should be enabled
* @param err GError **
* @return CRE_OK or CR_CW_ERR
*/
int cr_set_autochunk(CR_FILE *cr_file, gboolean auto_chunk, GError **err);

/** Writes a formatted string into the cr_file.
* @param err GError **
* @param cr_file CR_FILE pointer
Expand Down
Loading