Skip to content

Allow case where parity shard count is greater than data shard count #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

Merged
sleepybishop merged 2 commits into from
Jan 12, 2023
Merged

Allow case where parity shard count is greater than data shard count #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b7799dd
rs: support ps > ds
cgutman Jan 12, 2023
40d30e1
update tests to cover ps > ds case
cgutman Jan 12, 2023
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 rs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ void reed_solomon_init(void)
reed_solomon *reed_solomon_new(int ds, int ps)
{
reed_solomon *rs = NULL;
if ((ds + ps) > DATA_SHARDS_MAX || ds <= 0 || ps <= 0 || ps > ds)
if ((ds + ps) > DATA_SHARDS_MAX || ds <= 0 || ps <= 0)
return NULL;
rs = calloc(1, sizeof(reed_solomon) + 2 * ps * ds);
if (!rs)
Expand Down
16 changes: 8 additions & 8 deletions t/00util/bench.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ double now(time_t epoch)
}

typedef reed_solomon rs_t;
void cleanup(uint8_t **buf, uint8_t **cmp, uint8_t *marks, int K)
void cleanup(uint8_t **buf, uint8_t **cmp, uint8_t *marks, int K, int N)
{
for (int i = 0; i < 2 * K; i++) {
for (int i = 0; i < K + N; i++) {
free(buf[i]);
free(cmp[i]);
}
Expand All @@ -31,12 +31,12 @@ void cleanup(uint8_t **buf, uint8_t **cmp, uint8_t *marks, int K)

int run(int seed, int K, int N, int T, double *et, double *dt)
{
uint8_t **buf = calloc(2 * K, T * sizeof(uint8_t *));
uint8_t **cmp = calloc(2 * K, T * sizeof(uint8_t *));
uint8_t *marks = calloc(1, 2 * K);
uint8_t **buf = calloc(K + N, T * sizeof(uint8_t *));
uint8_t **cmp = calloc(K + N, T * sizeof(uint8_t *));
uint8_t *marks = calloc(1, K + N);
int ret = 0;

for (int i = 0; i < 2 * K; i++) {
for (int i = 0; i < K + N; i++) {
buf[i] = calloc(1, T);
cmp[i] = calloc(1, T);
}
Expand All @@ -51,7 +51,7 @@ int run(int seed, int K, int N, int T, double *et, double *dt)
reed_solomon_init();
rs_t *rs = reed_solomon_new(K, N);
if (!rs) {
cleanup(buf, cmp, marks, K);
cleanup(buf, cmp, marks, K, N);
printf("failed to init codec\n");
return -1;
}
Expand Down Expand Up @@ -87,7 +87,7 @@ int run(int seed, int K, int N, int T, double *et, double *dt)
}
assert(failed == 0);

cleanup(buf, cmp, marks, K);
cleanup(buf, cmp, marks, K, N);
return ret;
}

Expand Down
75 changes: 41 additions & 34 deletions t/00util/test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ typedef reed_solomon rs_t;

int run(int seed, int K, int N, int T)
{
uint8_t **buf = calloc(2 * K, T * sizeof(uint8_t *));
uint8_t **cmp = calloc(2 * K, T * sizeof(uint8_t *));
uint8_t *marks = calloc(1, 2 * K);
uint8_t **buf = calloc(K + N, T * sizeof(uint8_t *));
uint8_t **cmp = calloc(K + N, T * sizeof(uint8_t *));
uint8_t *marks = calloc(1, K + N);
int ret = 0;

for (int i = 0; i < 2 * K; i++) {
for (int i = 0; i < K + N; i++) {
buf[i] = calloc(1, T);
cmp[i] = calloc(1, T);
}
Expand All @@ -33,40 +33,38 @@ int run(int seed, int K, int N, int T)

reed_solomon_init();
rs_t *rs = reed_solomon_new(K, N);
if (!rs) {
free(buf);
free(cmp);
free(marks);
return -1;
}
reed_solomon_encode(rs, buf, K + N, T);
int failed = 0;
if (rs) {
reed_solomon_encode(rs, buf, K + N, T);

for (int i = 0; i < K + N; i++) {
marks[i] = 0;
}
for (int i = 0; i < K + N; i++) {
marks[i] = 0;
}

for (int i = 0; i < N; i++) {
int at = rand() % (K + N);
memset(buf[at], 0, T);
marks[at] = 1;
}
for (int i = 0; i < N; i++) {
int at = rand() % (K + N);
memset(buf[at], 0, T);
marks[at] = 1;
}

ret = reed_solomon_reconstruct(rs, buf, marks, K + N, T);
reed_solomon_release(rs);
ret = reed_solomon_reconstruct(rs, buf, marks, K + N, T);
reed_solomon_release(rs);

int failed = 0;
for (int i = 0; i < K; i++) {
for (int j = 0; j < T; j++) {
if (cmp[i][j] != buf[i][j]) {
printf("mismatch at row %d col %d\n", i, j);
failed = 1;
break;
for (int i = 0; i < K; i++) {
for (int j = 0; j < T; j++) {
if (cmp[i][j] != buf[i][j]) {
printf("mismatch at row %d col %d\n", i, j);
failed = 1;
break;
}
}
}
} else {
failed = 1;
}

printf("===%s===P SEED: %d K: %d N: %d T: %d\n", failed ? "FAILED" : "OK", seed, K, N, T);
for (int i = 0; i < 2 * K; i++) {
for (int i = 0; i < K + N; i++) {
free(buf[i]);
free(cmp[i]);
}
Expand All @@ -85,11 +83,20 @@ int main(int argc, char *argv[])
}
srand(seed);

K = MAP(rand(), RAND_MAX, 4, 256);
N = MAP(rand(), RAND_MAX, 4, (K / 4) + 4);
if ((K + N) > 255)
K -= N;
T = MAP(rand(), RAND_MAX, 200, 1460);
K = MAP(rand(), RAND_MAX, 1, 256);
N = MAP(rand(), RAND_MAX, 1, 256);
if ((K + N) > 255) {
if (rand() % 2 == 0) {
if (N == 255)
N--;
K = 255 - N;
} else {
if (K == 255)
K--;
N = 255 - K;
}
}
T = MAP(rand(), RAND_MAX, 1, 1460);

printf("===BEGIN===P SEED: %d K: %d N: %d T: %d\n", seed, K, N, T);

Expand Down