summaryrefslogtreecommitdiff
path: root/bin/conf
diff options
context:
space:
mode:
authorjixinyi <[email protected]>2019-01-18 16:37:51 +0800
committerjixinyi <[email protected]>2019-01-18 16:37:51 +0800
commit2e83f0db5a94ba44cbbcd9d41863215934a738c0 (patch)
tree20c25957e655e18308b2ceb1285562874c9b89aa /bin/conf
parent6c370f68c7b54973f24558a7f51d6611337fc3e9 (diff)
parent263cdc86b5b2f58bd3003f0af3234bc4ea4690a4 (diff)
重构调用maat新接口
Diffstat (limited to 'bin/conf')
-rw-r--r--bin/conf/table_info.conf19
1 files changed, 19 insertions, 0 deletions
diff --git a/bin/conf/table_info.conf b/bin/conf/table_info.conf
index 78e1268..b1efd85 100644
--- a/bin/conf/table_info.conf
+++ b/bin/conf/table_info.conf
@@ -7,6 +7,7 @@
#do_merege [yes/no]
#cross cache [number]
#quick mode [quickon/quickoff], default [quickoff]
+<<<<<<< HEAD
#For ip/intval/digest/compile/group table.
#id name type
#
@@ -21,4 +22,22 @@
3 IR_NOMINEE_IP plugin {"key":1,"valid":5} --
4 IR_INTERCEPT_IP plugin {"key":1,"valid":14} --
5 IR_CANDIDATE_IP plugin {"key":1,"valid":6} --
+=======
+#For ip/intval/digest/compile/group
+#id name type
+#
+#For plugin table
+#id name type valid_column
+#
+#For expr/expr_plus Table
+#id name type src_charset dst_charset do_merge cross_cache quick_mode
+0 IR_STATIC_NOMINEE_IP plugin 15 --
+1 IR_DYNAMIC_NOMINEE_IP plugin 9 --
+2 IR_DNAT_POLICY plugin 12 --
+3 IR_INTERCEPT_IP plugin 14 --
+4 IR_NOMINEE_IP plugin 5 --
+5 IR_CANDIDATE_IP plugin 6 --
+
+
+>>>>>>> 263cdc86b5b2f58bd3003f0af3234bc4ea4690a4