summaryrefslogtreecommitdiff
path: root/bin/conf/table_info.conf
diff options
context:
space:
mode:
Diffstat (limited to 'bin/conf/table_info.conf')
-rw-r--r--bin/conf/table_info.conf40
1 files changed, 10 insertions, 30 deletions
diff --git a/bin/conf/table_info.conf b/bin/conf/table_info.conf
index b1efd85..be3c64c 100644
--- a/bin/conf/table_info.conf
+++ b/bin/conf/table_info.conf
@@ -1,5 +1,5 @@
#each collumn seperate with '\t'
-#id (0~65535)
+#id (0~65535)
#name string
#type one of ip,expr,expr_plus,digest,intval,compile or plugin
#src_charset one of GBK,BIG5,UNICODE,UTF8
@@ -7,37 +7,17 @@
#do_merege [yes/no]
#cross cache [number]
#quick mode [quickon/quickoff], default [quickoff]
-<<<<<<< HEAD
#For ip/intval/digest/compile/group table.
-#id name type
+#id name type
#
#For plugin table. The first column's id is 1. 0 as not speicified.
-#id name type column_define
+#id name type column_define
#
#For expr/expr_plus Table
-#id name type src_charset dst_charset do_merge cross_cache quick_mode
-0 IR_STATIC_NOMINEE_IP plugin {"key":1,"valid":15} --
-1 IR_DYNAMIC_NOMINEE_IP plugin {"key":1,"valid":9} --
-2 IR_DNAT_POLICY plugin {"key":1,"valid":12} --
-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
-
+#id name type src_charset dst_charset do_merge cross_cache quick_mode
+0 IR_STATIC_NOMINEE_IP plugin {"key":1,"valid":15} --
+1 IR_DYNAMIC_NOMINEE_IP plugin {"key":1,"valid":9} --
+2 IR_DNAT_POLICY plugin {"key":1,"valid":12} --
+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} --