gfwleak/tango-maat
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FEATURE]add maat_get_table_schema_tag API => TSG-17872

Browse Source
This commit is contained in:
liuwentan
2023-12-18 08:43:54 +00:00
parent df7505fa7f
commit b7d6eb16a1
8 changed files with 231 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/inc_internal/maat_limits.h
View File

@@ -16,10 +16,11 @@ extern "C"
{
#endif
#define MAX_KEYWORDS_STR_LEN 1024
#define MAX_MAAT_STAT_NUM 64
#define MAX_NAME_STR_LEN 64
#define MAX_IP_STR_LEN 64
#define MAX_KEYWORDS_STR_LEN 1024
#define MAX_TAG_STR_LEN 2048
#define MAX_MAAT_STAT_NUM 64
#define MAX_NAME_STR_LEN 64
#define MAX_IP_STR_LEN 64
#define MAX_INSTANCE_NAME_LEN 15
#define MAX_GROUP_IDS_STR_LEN 256

2
src/inc_internal/maat_table.h
View File

@@ -79,6 +79,8 @@ int table_manager_get_conj_parent_table_ids(struct table_manager *tbl_mgr, const
const char *table_manager_get_table_name(struct table_manager *tbl_mgr, int table_id);
const char *table_manager_get_table_schema_tag(struct table_manager *tbl_mgr, int table_id);
enum table_type table_manager_get_table_type(struct table_manager *tbl_mgr, int table_id);
int table_manager_get_default_compile_table_id(struct table_manager *tbl_mgr);

10
src/maat_api.c
View File

@@ -493,6 +493,16 @@ int maat_get_table_id(struct maat *maat_inst, const char *table_name)
return table_manager_get_table_id(table_mgr, table_name);
}
const char *maat_get_table_schema_tag(struct maat *maat_inst, int table_id)
{
if (NULL == maat_inst || table_id < 0) {
return NULL;
}
struct table_manager *table_mgr = maat_inst->tbl_mgr;
return table_manager_get_table_schema_tag(table_mgr, table_id);
}
static inline void maat_runtime_ref_inc(struct maat_runtime *maat_rt, int thread_id)
{
if (NULL == maat_rt) {

55
src/maat_table.c
View File

@@ -34,7 +34,9 @@
struct maat_table {
int table_id;
char table_name[MAX_NAME_STR_LEN];
char table_name[MAX_NAME_STR_LEN + 1];
char schema_tag[MAX_TAG_STR_LEN + 1];
size_t schema_tag_len;
enum table_type table_type;
int valid_column;
void *schema;
@@ -517,15 +519,45 @@ maat_table_new(cJSON *json, struct maat_kv_store *reserved_word_map,
}
ptable->table_id = item->valueint;
size_t str_len = 0;
item = cJSON_GetObjectItem(json, "table_name");
// already validate in register_tbl_name2id
if (item->type == cJSON_Array) {
cJSON *tmp_item = cJSON_GetArrayItem(item, 0);
memcpy(ptable->table_name, tmp_item->valuestring,
strlen(tmp_item->valuestring));
str_len = strlen(tmp_item->valuestring);
if (str_len > MAX_NAME_STR_LEN) {
log_fatal(logger, MODULE_TABLE,
"[%s:%d] table:%s name length exceed maximum:%d",
__FUNCTION__, __LINE__, tmp_item->valuestring,
MAX_NAME_STR_LEN);
goto error;
}
memcpy(ptable->table_name, tmp_item->valuestring, str_len);
} else {
//cJSON_String
memcpy(ptable->table_name, item->valuestring, strlen(item->valuestring));
str_len = strlen(item->valuestring);
if (str_len > MAX_NAME_STR_LEN) {
log_fatal(logger, MODULE_TABLE,
"[%s:%d] table:%s name length exceed maximum:%d",
__FUNCTION__, __LINE__, item->valuestring,
MAX_NAME_STR_LEN);
goto error;
}
memcpy(ptable->table_name, item->valuestring, str_len);
}
item = cJSON_GetObjectItem(json, "schema_tag");
if (item != NULL && item->type == cJSON_String) {
str_len = strlen(item->valuestring);
if (str_len > MAX_TAG_STR_LEN) {
log_fatal(logger, MODULE_TABLE,
"[%s:%d] table:%s tag length exceed maximum:%d",
__FUNCTION__, __LINE__, item->valuestring,
MAX_TAG_STR_LEN);
goto error;
}
memcpy(ptable->schema_tag, item->valuestring, str_len);
ptable->schema_tag_len = str_len;
}
item = cJSON_GetObjectItem(json, "table_type");
@@ -537,7 +569,7 @@ maat_table_new(cJSON *json, struct maat_kv_store *reserved_word_map,
}
ret = maat_kv_read(reserved_word_map, item->valuestring,
(long long *)&(ptable->table_type), 1);
(long long *)&(ptable->table_type), 1);
if (ret < 0) {
log_fatal(logger, MODULE_TABLE,
"[%s:%d] table:%s table_type %s is illegal",
@@ -1078,6 +1110,19 @@ const char *table_manager_get_table_name(struct table_manager *tbl_mgr, int tabl
return tbl_mgr->tbl[table_id]->table_name;
}
const char *table_manager_get_table_schema_tag(struct table_manager *tbl_mgr, int table_id)
{
if (NULL == tbl_mgr || table_id < 0) {
return NULL;
}
if (NULL == tbl_mgr->tbl[table_id] || 0 == tbl_mgr->tbl[table_id]->schema_tag_len) {
return NULL;
}
return tbl_mgr->tbl[table_id]->schema_tag;
}
enum table_type table_manager_get_table_type(struct table_manager *tbl_mgr, int table_id)
{
if (NULL == tbl_mgr || table_id < 0 || table_id >= MAX_TABLE_NUM) {

1
src/version.map
View File

@@ -6,6 +6,7 @@ global:
maat_new;
maat_free;
maat_get_table_id;
maat_get_table_schema_tag;
maat_reload_log_level;
maat_table*;
maat_compile_table*;