Skip to content

Generic sharding : organize llmeta and create views #5079

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
wants to merge 1 commit into
base: main
Choose a base branch
from
+786 −131
Open

Generic sharding : organize llmeta and create views #5079

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
3 changes: 3 additions & 0 deletions bdb/bdb_api.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2496,3 +2496,6 @@ int bdb_keylen(bdb_state_type *bdb_state, int ixnum);

void llmeta_collect_tablename_alias(void);
#endif
int bdb_set_genshard(tran_type *, const char *, char *, int *);
int bdb_get_genshard(tran_type *, const char *, char **, int *, int *);
int bdb_get_genshard_names(tran_type *t, char **names, int *num);
2 changes: 1 addition & 1 deletion bdb/bdb_schemachange.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ int handle_scdone(DB_ENV *dbenv, u_int32_t rectype, llog_scdone_args *scdoneop,
}

if (sctype == rename_table || sctype == alias_table ||
(sctype == add && (strlen(table) + 1 < scdoneop->table.size))) {
((sctype == add || sctype == genshard_add || sctype == genshard_drop) && (strlen(table) + 1 < scdoneop->table.size))) {
strarg = &table[strlen(table) + 1];
}

Expand Down
4 changes: 3 additions & 1 deletion bdb/bdb_schemachange.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,9 @@ typedef enum scdone {
add_queue_file, // 22
del_queue_file, // 23
alias_table, // 24
alias // 25
alias, // 25
genshard_add, // 26
genshard_drop // 27
} scdone_t;

#define BDB_BUMP_DBOPEN_GEN(type, msg) \
Expand Down
237 changes: 237 additions & 0 deletions bdb/llmeta.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@ typedef enum {
LLMETA_SCHEMACHANGE_STATUS_V2 = 56,
LLMETA_SCHEMACHANGE_LIST = 57, /* list of all sc-s in a uuid txh */
LLMETA_SCHEMACHANGE_STATUS_PROTOBUF = 58, /* Indicate protobuf sc */
LLMETA_GEN_SHARD = 59,
} llmetakey_t;

struct llmeta_file_type_key {
Expand Down Expand Up @@ -7354,6 +7355,15 @@ int bdb_llmeta_print_record(bdb_state_type *bdb_state, void *key, int keylen,
if (osql_scl_print((uint8_t*)p_buf_key, p_buf_end_key, (uint8_t*)p_buf_data, p_buf_end_data))
logmsg(LOGMSG_USER, " failed to deserialize object\n");
} break;
case LLMETA_GEN_SHARD: {
char tblname[LLMETA_TBLLEN + 1];
buf_no_net_get(&(tblname), sizeof(tblname), p_buf_key + sizeof(int),
p_buf_end_key);

logmsg(LOGMSG_USER,
"LLMETA_GEN_SHARD table=\"%s\" value=\"%s\"\n",
tblname, (char *)data);
} break;
default:
logmsg(LOGMSG_USER, "Todo (type=%d)\n", type);
break;
Expand Down Expand Up @@ -11372,3 +11382,230 @@ void *buf_get_schemachange(struct schema_change_type *s, void *p_buf, void *p_bu
}
return NULL;
}

struct llmeta_gen_shard_key {
int file_type;
char tablename[LLMETA_TBLLEN];
};


static int make_gen_shard_key(char *key, const char *table)
{

const uint8_t *p_gen_shard_key = NULL;
const uint8_t *p_gen_shard_key_end = NULL;
uint32_t key_type = 0;
assert(sizeof(int) + strlen(table) <= LLMETA_IXLEN);
key_type = LLMETA_GEN_SHARD;
p_gen_shard_key = (uint8_t *)key;
p_gen_shard_key_end = p_gen_shard_key + sizeof(int) + LLMETA_TBLLEN;

if (!llmeta_bdb_state) {
logmsg(LOGMSG_ERROR, "%s: low level meta table not yet "
"open, you must run bdb_llmeta_open\n",
__func__);
return -1;
}

/* put key type */
if (!(p_gen_shard_key =
buf_put(&key_type, sizeof(key_type), (uint8_t *)p_gen_shard_key,
p_gen_shard_key_end))) {
logmsg(LOGMSG_ERROR, "%s:%d error converting to correct "
"endianess\n",
__func__, __LINE__);
return -1;
}

/* put tablename of generic shard */
if (!(p_gen_shard_key =
buf_put(table, strlen(table) , (uint8_t *)p_gen_shard_key, p_gen_shard_key_end))) {
logmsg(LOGMSG_ERROR, "%s:%d error converting to correct "
"endianess\n",
__func__, __LINE__);
return -1;
}
return 0;
}

int bdb_set_genshard(tran_type *input_tran, const char *table, char *str, int *bdberr) {
uint32_t retries = 0;
int rc=0;
char key[LLMETA_IXLEN] = {0};
tran_type *tran;
if (make_gen_shard_key(key, table)) {
*bdberr = BDBERR_BADARGS;
return -1;
}
/*const uint8_t *p_gen_shard_key = NULL;
const uint8_t *p_gen_shard_key_end = NULL;

assert(sizeof(int) + strlen(table) <= LLMETA_IXLEN);
key_type = LLMETA_GEN_SHARD;
p_gen_shard_key = (uint8_t *)key;
p_gen_shard_key_end = p_gen_shard_key + sizeof(int) + LLMETA_TBLLEN;

if (!llmeta_bdb_state) {
logmsg(LOGMSG_ERROR, "%s: low level meta table not yet "
"open, you must run bdb_llmeta_open\n",
__func__);
*bdberr = BDBERR_MISC;
return -1;
}

if (!(p_gen_shard_key =
buf_put(&key_type, sizeof(key_type), (uint8_t *)p_gen_shard_key,
p_gen_shard_key_end))) {
logmsg(LOGMSG_ERROR, "%s:%d error converting to correct "
"endianess\n",
__func__, __LINE__);
*bdberr = BDBERR_MISC;
return -1;
}

if (!(p_gen_shard_key =
buf_put(table, strlen(table) , (uint8_t *)p_gen_shard_key, p_gen_shard_key_end))) {
logmsg(LOGMSG_ERROR, "%s:%d error converting to correct "
"endianess\n",
__func__, __LINE__);
*bdberr = BDBERR_MISC;
return -1;
}*/
retry:
if (++retries >= gbl_maxretries) {
logmsg(LOGMSG_ERROR, "%s: giving up after %d retries\n", __func__, retries);
return -1;
}
/*if the user didn't give us a transaction, create our own*/
if (!input_tran) {
tran = bdb_tran_begin(llmeta_bdb_state, NULL, bdberr);
if (!tran) {
if (*bdberr == BDBERR_DEADLOCK) {
int dp = gbl_llmeta_deadlock_poll;
if (dp > 1)
poll(NULL, 0, rand() % dp);
goto retry;
}

logmsg(LOGMSG_ERROR, "%s: failed to get "
"transaction\n",
__func__);
goto cleanup;
}
} else {
tran = input_tran;
}

/* write the shard string */
if (str) {
rc = bdb_lite_add(llmeta_bdb_state, tran, str,
strlen(str) + 1, key, bdberr);
} else {
rc = bdb_lite_exact_del(llmeta_bdb_state, tran, key, bdberr);
}
if (rc && *bdberr != BDBERR_NOERROR)
goto backout;

/*commit if we created our own transaction*/
if (!input_tran) {
rc = bdb_tran_commit(llmeta_bdb_state, tran, bdberr);
if (rc && *bdberr != BDBERR_NOERROR)
goto cleanup;
}

*bdberr = BDBERR_NOERROR;
return 0;

backout:
/*if we created the transaction*/
if (!input_tran) {
/*kill the transaction*/
rc = bdb_tran_abort(llmeta_bdb_state, tran, bdberr);
if (rc && !BDBERR_NOERROR) {
logmsg(LOGMSG_ERROR, "%s: trans abort failed with "
"bdberr %d\n",
__func__, *bdberr);
return -1;
}
if (*bdberr == BDBERR_DEADLOCK) {
int dp = gbl_llmeta_deadlock_poll;
if (dp > 1)
poll(NULL, 0, rand() % dp);
goto retry;
}

logmsg(LOGMSG_ERROR, "%s:%d failed with bdberr %d\n", __func__,__LINE__, *bdberr);
}
cleanup:
return -1;
}


int bdb_get_genshard(tran_type *tran, const char *table, char **str, int *size, int *bdberr) {
char key[LLMETA_IXLEN] = {0};
if (make_gen_shard_key(key, table)) {
*bdberr = BDBERR_BADARGS;
return -1;
}
/*const uint8_t *p_gen_shard_key = NULL;
const uint8_t *p_gen_shard_key_end = NULL;

assert(sizeof(int) + strlen(table) <= LLMETA_IXLEN);
key_type = LLMETA_GEN_SHARD;
p_gen_shard_key = (uint8_t *)key;
p_gen_shard_key_end = p_gen_shard_key + sizeof(int) + LLMETA_TBLLEN;

if (!llmeta_bdb_state) {
logmsg(LOGMSG_ERROR, "%s: low level meta table not yet "
"open, you must run bdb_llmeta_open\n",
__func__);
*bdberr = BDBERR_MISC;
return -1;
}

if (!(p_gen_shard_key =
buf_put(&key_type, sizeof(key_type), (uint8_t *)p_gen_shard_key,
p_gen_shard_key_end))) {
logmsg(LOGMSG_ERROR, "%s:%d error converting to correct "
"endianess\n",
__func__, __LINE__);
*bdberr = BDBERR_MISC;
return -1;
}

if (!(p_gen_shard_key =
buf_put(table, strlen(table) , (uint8_t *)p_gen_shard_key, p_gen_shard_key_end))) {
logmsg(LOGMSG_ERROR, "%s:%d error converting to correct "
"endianess\n",
__func__, __LINE__);
*bdberr = BDBERR_MISC;
return -1;
}*/
return bdb_lite_exact_var_fetch_tran(llmeta_bdb_state, tran, key, (void **)str, size, bdberr);
}

/* Fetch all generic shard names */
int bdb_get_genshard_names(tran_type *t, char **names, int *num)
{
union {
struct llmeta_gen_shard_key key;
uint8_t buf[LLMETA_IXLEN];
} * *shards;
int rc, n, bdberr;
llmetakey_t k;

k = htonl(LLMETA_GEN_SHARD);
rc = kv_get_keys(t, &k, sizeof(k), (void ***)&shards, &n, &bdberr);
if (rc || (n == 0)) {
*num = 0;
return rc;
}

for (int i = 0; i < n; ++i) {
names[i] = strdup(shards[i]->key.tablename);
free(shards[i]);
}
free(shards);
*num = n;
return rc;
}
Loading