optimize district & support virtual table conjunction

src/inc_internal/maat_ex_data.h

@@ -36,6 +36,7 @@ struct ex_data_schema {
 struct ex_container_schema {
     int table_id;
     struct ex_data_schema *ex_schema;
+    void (*user_data_free)(void *);
 };
 
 struct ex_data_runtime;

src/inc_internal/maat_expr.h

@@ -52,6 +52,9 @@ int expr_runtime_stream_scan(struct expr_runtime *expr_rt, struct adapter_hs_str
                              int vtable_id, struct maat_state *state);
 void expr_runtime_stream_close(struct adapter_hs_stream *s_handle);
 
+int expr_runtime_set_scan_district(struct expr_runtime *expr_rt, const char *district, 
+                                   size_t district_len, long long *district_id);
+
 void expr_runtime_scan_hit_inc(struct expr_runtime *expr_rt, int thread_id);
 long long expr_runtime_scan_hit_sum(struct expr_runtime *expr_rt, int n_thread);
 

src/inc_internal/maat_flag.h

@@ -48,6 +48,9 @@ int flag_runtime_commit(void *flag_runtime, const char *table_name);
 int flag_runtime_scan(struct flag_runtime *flag_rt, int thread_id, long long flag,
                       int vtable_id, struct maat_state *state);
 
+int flag_runtime_set_scan_district(struct flag_runtime *flag_rt, const char *district, 
+                                    size_t district_len, long long *district_id);
+
 void flag_runtime_scan_hit_inc(struct flag_runtime *flag_rt, int thread_id);
 long long flag_runtime_scan_hit_sum(struct flag_runtime *flag_rt, int n_thread);
 

src/inc_internal/maat_interval.h

@@ -46,6 +46,9 @@ int interval_runtime_commit(void *interval_runtime, const char *table_name);
 int interval_runtime_scan(struct interval_runtime *interval_rt, int thread_id, 
                           long long integer, int vtable_id, struct maat_state *state);
 
+int interval_runtime_set_scan_district(struct interval_runtime *interval_rt, const char *district, 
+                                       size_t district_len, long long *district_id);
+                                       
 void interval_runtime_scan_hit_inc(struct interval_runtime *interval_rt, int thread_id);
 long long interval_runtime_scan_hit_sum(struct interval_runtime *interval_rt, int n_thread);
 

src/inc_internal/maat_rule.h

@@ -321,6 +321,7 @@ void maat_cmd_set_serial_rule(struct serial_rule *rule, enum maat_operation op,
 void garbage_ip_matcher_free(void *ip_matcher, void *arg);
 void garbage_interval_matcher_free(void *ip_matcher, void *arg);
 void garbage_bool_matcher_free(void *bool_matcher, void *arg);
+void garbage_maat_kv_store_free(void *kv_store, void *arg);
 
 #ifdef __cplusplus
 }

src/inc_internal/maat_table.h

@@ -66,10 +66,6 @@ int table_manager_get_valid_column(struct table_manager *tbl_mgr, int table_id);
 size_t table_manager_accept_tags_count(struct table_manager *tbl_mgr);
 int table_manager_accept_tags_match(struct table_manager *tbl_mgr, const char *tags);
 
-int table_manager_set_scan_district(struct table_manager *tbl_mgr, const char *district_str, 
-                                    size_t district_str_len, long long *district_id);
-long long table_manager_get_district_id(struct table_manager *tbl_mgr, const char *district);
-
 void *table_manager_get_schema(struct table_manager *tbl_mgr, int table_id);
 void *table_manager_get_runtime(struct table_manager *tbl_mgr, int table_id);
 

src/inc_internal/maat_virtual.h

@@ -38,7 +38,6 @@ void *virtual_schema_new(cJSON *json, struct table_manager *tbl_mgr,
 
 void virtual_schema_free(void *virtual_schema);
 
-int virtual_table_get_id(void *virtual_schema);
 int virtual_table_get_physical_table_id(void *virtual_schema);
 
 #ifdef __cplusplus