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 parquet_file_range && replace cb with aio. #824

Merged
merged 4 commits into from
Jan 24, 2024
Merged

Add parquet_file_range && replace cb with aio. #824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9846ba2
* MDF [parquet] rewrite parquet_object_free.
xinyi-xs Jan 24, 2024
0c298cb
* MDF [parquet] add parquet_file_range_alloc/free function.
xinyi-xs Jan 24, 2024
99ff2b5
* MDF [parquet] update header file.
xinyi-xs Jan 24, 2024
4172a09
* FIX [parquet] add some fix.
xinyi-xs Jan 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
33 changes: 21 additions & 12 deletions include/nng/supplemental/nanolib/parquet.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,31 @@ typedef void (*parquet_cb)(parquet_object *arg);
#define PARQUET_WRITE_SUCCESS 1
#define PARQUET_WRITE_FAILURE 0

typedef struct {
uint32_t start_idx;
uint32_t end_idx;
char *filename;
} parquet_file_range;

typedef enum {
HOOK_WRITE,
EXCHANGE_WRITE
} parquet_write_type;

struct parquet_object {
uint64_t *keys;
uint8_t **darray;
uint32_t *dsize;
uint32_t size;
nng_aio *aio;
void *arg;
int result;
int file_size;
char **file_list;
parquet_cb cb;
uint64_t *keys;
uint8_t **darray;
uint32_t *dsize;
uint32_t size;
nng_aio *aio;
void *arg;
parquet_write_type type;
int file_size;
parquet_file_range **file_ranges;
};

parquet_object *parquet_object_alloc(uint64_t *keys, uint8_t **darray,
uint32_t *dsize, uint32_t size, nng_aio *aio, void *arg);
uint32_t *dsize, uint32_t size, nng_aio *aio, void *arg, parquet_write_type type);
void parquet_object_free(parquet_object *elem);

void parquet_object_set_cb(parquet_object *obj, parquet_cb cb);
Expand All @@ -39,7 +49,6 @@ const char *parquet_find(uint64_t key);
const char **parquet_find_span(
uint64_t start_key, uint64_t end_key, uint32_t *size);

nng_msg *parquet_find_msg(char *filename, uint64_t key);

#ifdef __cplusplus
}
Expand Down
82 changes: 54 additions & 28 deletions src/supplemental/nanolib/parquet/parquet.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,29 @@ setup_schema()
GroupNode::Make("schema", Repetition::REQUIRED, fields));
}

parquet_file_range *
parquet_file_range_alloc(uint32_t start_idx, uint32_t end_idx, char *filename)
{
parquet_file_range *range = new parquet_file_range;
range->start_idx = start_idx;
range->end_idx = end_idx;
range->filename = nng_strdup(filename);
return range;
}

void
parquet_file_range_free(parquet_file_range *range)
{
if (range) {
FREE_IF_NOT_NULL(
range->filename, strlen(range->filename));
delete range;
}
}

parquet_object *
parquet_object_alloc(uint64_t *keys, uint8_t **darray, uint32_t *dsize,
uint32_t size, nng_aio *aio, void *arg)
uint32_t size, nng_aio *aio, void *arg, parquet_write_type type)
{
parquet_object *elem = new parquet_object;
elem->keys = keys;
Expand All @@ -121,9 +141,9 @@ parquet_object_alloc(uint64_t *keys, uint8_t **darray, uint32_t *dsize,
elem->size = size;
elem->aio = aio;
elem->arg = arg;
elem->result = PARQUET_WRITE_FAILURE;
elem->type = type;
elem->file_ranges = NULL;
elem->file_size = 0;
elem->file_list = NULL;
return elem;
}

Expand All @@ -134,14 +154,31 @@ parquet_object_free(parquet_object *elem)
FREE_IF_NOT_NULL(elem->keys, elem->size);
FREE_IF_NOT_NULL(elem->darray, elem->size);
FREE_IF_NOT_NULL(elem->dsize, elem->size);
nng_aio_set_prov_data(elem->aio, elem->arg);
uint32_t *szp = (uint32_t *) malloc(sizeof(uint32_t));
*szp = elem->size;
nng_aio_set_msg(elem->aio, (nng_msg *) szp);
switch (elem->type)
{
case HOOK_WRITE:
{
nng_aio_set_prov_data(elem->aio, elem->arg);
uint32_t *szp = (uint32_t *) malloc(sizeof(uint32_t));
*szp = elem->size;
nng_aio_set_msg(elem->aio, (nng_msg *) szp);
break;

}
case EXCHANGE_WRITE:
{
nng_aio_set_prov_data(elem->aio, elem->file_ranges);
uint32_t *szp = (uint32_t *) malloc(sizeof(uint32_t));
*szp = elem->file_size;
nng_aio_set_msg(elem->aio, (nng_msg *) szp);
break;
}
default:
break;
}
DO_IT_IF_NOT_NULL(nng_aio_finish_sync, elem->aio, 0);
for (int i = 0; i < elem->file_size && elem->file_list; i++) {
FREE_IF_NOT_NULL(
elem->file_list[i], strlen(elem->file_list[i]));
for (int i = 0; i < elem->file_size && elem->file_ranges; i++) {
parquet_file_range_free(elem->file_ranges[i]);
}
delete elem;
}
Expand Down Expand Up @@ -216,10 +253,10 @@ parquet_write(
uint32_t old_index = 0;
uint32_t new_index = 0;
again:

new_index = compute_new_index(elem, old_index, conf->file_size);
uint64_t key_start = elem->keys[old_index];
uint64_t key_end = elem->keys[new_index];

pthread_mutex_lock(&parquet_queue_mutex);
char *filename = get_file_name(conf, key_start, key_end);
if (filename == NULL) {
Expand All @@ -234,11 +271,11 @@ parquet_write(
pthread_mutex_unlock(&parquet_queue_mutex);

{
parquet_file_range *range = parquet_file_range_alloc(old_index, new_index, filename);

elem->file_list = (char **) realloc(
elem->file_list, sizeof(char *) * (++elem->file_size));
*(elem->file_list + elem->file_size - 1) =
nng_strdup(filename);
elem->file_ranges = (parquet_file_range **) realloc(
elem->file_ranges, sizeof(parquet_file_range*) * (++elem->file_size));
*elem->file_ranges = range;
// Create a ParquetFileWriter instance
parquet::WriterProperties::Builder builder;

Expand Down Expand Up @@ -271,7 +308,7 @@ parquet_write(
parquet::Int64Writer *int64_writer =
static_cast<parquet::Int64Writer *>(
rg_writer->NextColumn());
for (uint32_t i = old_index; i < new_index; i++) {
for (uint32_t i = old_index; i <= new_index; i++) {
int64_t value = elem->keys[i];
int16_t definition_level = 1;
int64_writer->WriteBatch(
Expand All @@ -282,7 +319,7 @@ parquet_write(
parquet::ByteArrayWriter *ba_writer =
static_cast<parquet::ByteArrayWriter *>(
rg_writer->NextColumn());
for (uint32_t i = old_index; i < new_index; i++) {
for (uint32_t i = old_index; i <= new_index; i++) {
parquet::ByteArray value;
int16_t definition_level = 1;
value.ptr = elem->darray[i];
Expand All @@ -297,11 +334,6 @@ parquet_write(
goto again;
}

elem->result = PARQUET_WRITE_SUCCESS;

if (elem->cb) {
elem->cb(elem);
}
parquet_object_free(elem);
return 0;
}
Expand Down Expand Up @@ -432,10 +464,4 @@ parquet_find_span(uint64_t start_key, uint64_t end_key, uint32_t *size)
pthread_mutex_unlock(&parquet_queue_mutex);
(*size) = local_size;
return ret;
}

void
parquet_object_set_cb(parquet_object *obj, parquet_cb cb)
{
obj->cb = cb;
}