bugfix: Adapt the compilation table and grouping table structure changes

1 files changed, 81 insertions, 93 deletions

diff --git a/resource/table_info.conf b/resource/table_info.conf
index 3c67d49..6e8b26d 100644
--- a/resource/table_info.conf
+++ b/resource/table_info.conf
@@ -4,11 +4,11 @@
         "table_name":"TSG_SECURITY_COMPILE",
         "table_type":"compile",
 		"user_region_encoded":"escape",
-        "valid_column":8,
+        "valid_column":9,
         "custom": {
             "compile_id":1,
             "tags":6,
-            "clause_num":9
+            "clause_num":8
         }
     },
     {
@@ -18,11 +18,11 @@
 		"default_compile_table":1,
         "table_type":"compile",
 		"user_region_encoded":"escape",
-        "valid_column":8,
+        "valid_column":9,
         "custom": {
             "compile_id":1,
             "tags":6,
-            "clause_num":9
+            "clause_num":8
         }
     },
     {
@@ -30,7 +30,7 @@
         "table_name":"TSG_SECURITY_COMPILE_PLUGIN",
 		"db_tables":["TSG_SECURITY_COMPILE"],
         "table_type":"plugin",
-        "valid_column":8,
+        "valid_column":9,
         "custom": {
             "key":1,
 	    "key_type":"integer",
@@ -42,13 +42,13 @@
         "table_name":"GROUP_SECURITY_COMPILE_RELATION",
         "table_type":"group2compile",
         "associated_compile_table_id":1,
-        "valid_column":3,
+        "valid_column":6,
         "custom": {
             "group_id":1,
             "compile_id":2,
-            "not_flag":4,
-            "virtual_table_name":5,
-            "clause_index":6
+            "not_flag":3,
+            "virtual_table_name":4,
+            "clause_index":5
         }
     },
     {
@@ -56,11 +56,11 @@
         "table_name":"PXY_CTRL_COMPILE",
         "table_type":"compile",
 		"user_region_encoded":"escape",
-        "valid_column":8,
+        "valid_column":9,
         "custom": {
             "compile_id":1,
             "tags":6,
-            "clause_num":9
+            "clause_num":8
     }
     },
     {
@@ -70,11 +70,11 @@
 		"default_compile_table":1,
         "table_type":"compile",
 		"user_region_encoded":"escape",
-        "valid_column":8,
+        "valid_column":9,
         "custom": {
             "compile_id":1,
             "tags":6,
-            "clause_num":9
+            "clause_num":8
         }
     },
 	{
@@ -82,7 +82,7 @@
         "table_name":"PXY_CTRL_COMPILE_PLUGIN",
 		"db_tables":["PXY_CTRL_COMPILE"],
         "table_type":"plugin",
-        "valid_column":8,
+        "valid_column":9,
         "custom": {
             "key":1,
 			"key_type":"integer",
@@ -94,13 +94,13 @@
         "table_name":"GROUP_PXY_CTRL_COMPILE_RELATION",
         "table_type":"group2compile",
         "associated_compile_table_id":5,
-        "valid_column":3,
+        "valid_column":6,
         "custom": {
             "group_id":1,
             "compile_id":2,
-            "not_flag":4,
-            "virtual_table_name":5,
-            "clause_index":6
+            "not_flag":3,
+            "virtual_table_name":4,
+            "clause_index":5
         }
     },
     {
@@ -108,11 +108,11 @@
         "table_name":"TRAFFIC_SHAPING_COMPILE",
         "table_type":"compile",
 		"user_region_encoded":"escape",
-        "valid_column":8,
+        "valid_column":9,
         "custom": {
             "compile_id":1,
             "tags":6,
-            "clause_num":9
+            "clause_num":8
         }
     },
 	{
@@ -122,11 +122,11 @@
 		"default_compile_table":1,
         "table_type":"compile",
 		"user_region_encoded":"escape",
-        "valid_column":8,
+        "valid_column":9,
         "custom": {
             "compile_id":1,
             "tags":6,
-            "clause_num":9
+            "clause_num":8
         }
     },
 	{
@@ -134,7 +134,7 @@
         "table_name":"TRAFFIC_SHAPING_COMPILE_PLUGIN",
 		"db_tables":["TRAFFIC_SHAPING_COMPILE"],
         "table_type":"plugin",
-        "valid_column":8,
+        "valid_column":9,
         "custom": {
             "key":1,
 			"key_type":"integer",
@@ -146,13 +146,13 @@
         "table_name":"GROUP_SHAPING_COMPILE_RELATION",
         "table_type":"group2compile",
         "associated_compile_table_id":9,
-        "valid_column":3,
+        "valid_column":6,
         "custom": {
             "group_id":1,
             "compile_id":2,
-            "not_flag":4,
-            "virtual_table_name":5,
-            "clause_index":6
+            "not_flag":3,
+            "virtual_table_name":4,
+            "clause_index":5
         }
     },
 	{
@@ -160,11 +160,11 @@
         "table_name":"SERVICE_CHAINING_COMPILE",
         "table_type":"compile",
 		"user_region_encoded":"escape",
-        "valid_column":8,
+        "valid_column":9,
         "custom": {
             "compile_id":1,
             "tags":6,
-            "clause_num":9
+            "clause_num":8
         }
     },
     {
@@ -174,11 +174,11 @@
 		"default_compile_table":1,
         "table_type":"compile",
 		"user_region_encoded":"escape",
-        "valid_column":8,
+        "valid_column":9,
         "custom": {
             "compile_id":1,
             "tags":6,
-            "clause_num":9
+            "clause_num":8
         }
     },
 	{
@@ -186,7 +186,7 @@
         "table_name":"SERVICE_CHAINING_COMPILE_PLUGIN",
 		"db_tables":["SERVICE_CHAINING_COMPILE"],
         "table_type":"plugin",
-        "valid_column":8,
+        "valid_column":9,
         "custom": {
             "key":1,
 			"key_type":"integer",
@@ -198,13 +198,13 @@
         "table_name":"GROUP_SERVICE_CHAINING_COMPILE_RELATION",
         "table_type":"group2compile",
         "associated_compile_table_id":13,
-        "valid_column":3,
+        "valid_column":6,
         "custom": {
             "group_id":1,
             "compile_id":2,
-            "not_flag":4,
-            "virtual_table_name":5,
-            "clause_index":6
+            "not_flag":3,
+            "virtual_table_name":4,
+            "clause_index":5
         }
     },
     {
@@ -212,11 +212,11 @@
         "table_name":"PXY_INTERCEPT_COMPILE",
         "table_type":"compile",
 		"user_region_encoded":"escape",
-        "valid_column":8,
+        "valid_column":9,
         "custom": {
             "compile_id":1,
             "tags":6,
-            "clause_num":9
+            "clause_num":8
         }
     },
     {
@@ -226,11 +226,11 @@
 		"default_compile_table":1,
         "table_type":"compile",
 		"user_region_encoded":"escape",
-        "valid_column":8,
+        "valid_column":9,
         "custom": {
             "compile_id":1,
             "tags":6,
-            "clause_num":9
+            "clause_num":8
 	}
     },
     {
@@ -238,7 +238,7 @@
         "table_name":"PXY_INTERCEPT_COMPILE_PLUGIN",
 		"db_tables":["PXY_INTERCEPT_COMPILE"],
         "table_type":"plugin",
-        "valid_column":8,
+        "valid_column":9,
         "custom": {
             "key":1,
 			"key_type":"integer",
@@ -250,13 +250,13 @@
         "table_name":"GROUP_PXY_INTERCEPT_COMPILE_RELATION",
         "table_type":"group2compile",
         "associated_compile_table_id":17,
-        "valid_column":3,
+        "valid_column":6,
         "custom": {
             "group_id":1,
             "compile_id":2,
-            "not_flag":4,
-            "virtual_table_name":5,
-            "clause_index":6
+            "not_flag":3,
+            "virtual_table_name":4,
+            "clause_index":5
         }
     },
     {
@@ -264,11 +264,11 @@
         "table_name":"STATISTICS_COMPILE",
         "table_type":"compile",
 		"user_region_encoded":"escape",
-        "valid_column":8,
+        "valid_column":9,
         "custom": {
             "compile_id":1,
             "tags":6,
-            "clause_num":9
+            "clause_num":8
         }
     },
     {
@@ -278,11 +278,11 @@
 		"default_compile_table":1,
         "table_type":"compile",
 		"user_region_encoded":"escape",
-        "valid_column":8,
+        "valid_column":9,
         "custom": {
             "compile_id":1,
             "tags":6,
-            "clause_num":9
+            "clause_num":8
         }
     },
     {
@@ -290,7 +290,7 @@
         "table_name":"STATISTICS_COMPILE_PLUGIN",
 		"db_tables":["STATISTICS_COMPILE"],
         "table_type":"plugin",
-        "valid_column":8,
+        "valid_column":9,
         "custom": {
             "key":1,
 			"key_type":"integer",
@@ -302,13 +302,13 @@
         "table_name":"GROUP_STATISTICS_COMPILE_RELATION",
         "table_type":"group2compile",
         "associated_compile_table_id":21,
-        "valid_column":3,
+        "valid_column":6,
         "custom": {
             "group_id":1,
             "compile_id":2,
-            "not_flag":4,
-            "virtual_table_name":5,
-            "clause_index":6
+            "not_flag":3,
+            "virtual_table_name":4,
+            "clause_index":5
         }
     },
     {
@@ -316,11 +316,11 @@
         "table_name":"MONITOR_COMPILE",
         "table_type":"compile",
 		"user_region_encoded":"escape",
-        "valid_column":8,
+        "valid_column":9,
         "custom": {
             "compile_id":1,
             "tags":6,
-            "clause_num":9
+            "clause_num":8
         }
     },
     {
@@ -330,11 +330,11 @@
 		"default_compile_table":1,
         "table_type":"compile",
 		"user_region_encoded":"escape",
-        "valid_column":8,
+        "valid_column":9,
         "custom": {
             "compile_id":1,
             "tags":6,
-            "clause_num":9
+            "clause_num":8
         }
     },
     {
@@ -342,7 +342,7 @@
         "table_name":"MONITOR_COMPILE_PLUGIN",
 		"db_tables":["MONITOR_COMPILE"],
         "table_type":"plugin",
-        "valid_column":8,
+        "valid_column":9,
         "custom": {
             "key":1,
 			"key_type":"integer",
@@ -354,13 +354,13 @@
         "table_name":"GROUP_MONITOR_COMPILE_RELATION",
         "table_type":"group2compile",
         "associated_compile_table_id":25,
-        "valid_column":3,
+        "valid_column":6,
         "custom": {
             "group_id":1,
             "compile_id":2,
-            "not_flag":4,
-            "virtual_table_name":5,
-            "clause_index":6
+            "not_flag":3,
+            "virtual_table_name":4,
+            "clause_index":5
         }
     },
     {
@@ -772,7 +772,7 @@
         "table_id":75,
         "table_name":"TSG_FQDN_CATEGORY_BUILT_IN",
         "table_type":"fqdn_plugin",
-        "valid_column":5,
+        "valid_column":6,
         "custom": {
             "item_id":1,
             "suffix_match_method":4,
@@ -783,7 +783,7 @@
         "table_id":76,
         "table_name":"TSG_FQDN_CATEGORY_USER_DEFINED",
         "table_type":"fqdn_plugin",
-        "valid_column":5,
+        "valid_column":6,
         "custom": {
             "item_id":1,
             "suffix_match_method":4,
@@ -870,28 +870,16 @@
     },
     {
         "table_id":86,
-        "table_name":"TSG_OBJ_TUNNEL_ID",
-        "table_type":"interval",
-        "valid_column":5,
-        "custom": {
-            "item_id":1,
-            "group_id":2,
-            "low_bound":3,
-            "up_bound":4
-        }
-    },
-    {
-        "table_id":87,
         "table_name":"TSG_TUNNEL_CATALOG",
         "table_type":"bool_plugin",
-        "valid_column":5,
+        "valid_column":6,
         "custom": {
             "item_id":1,
             "bool_expr":4
         }
     },	
     {
-        "table_id":88,
+        "table_id":87,
         "table_name":"TSG_TUNNEL_ENDPOINT",
         "table_type":"ip_plugin",
 		"valid_column":6,
@@ -904,7 +892,7 @@
         }
     },
     {
-        "table_id":89,
+        "table_id":88,
         "table_name":"TSG_TUNNEL_LABEL",
         "table_type":"plugin",
         "valid_column":4,
@@ -915,13 +903,13 @@
         }
     },
     {
-        "table_id":90,
+        "table_id":89,
         "table_name":"ATTR_TUNNEL",
         "table_type":"virtual",
-        "physical_table": "TSG_OBJ_TUNNEL_ID"
+        "physical_table": "TSG_TUNNEL_CATALOG"
     },
     {
-        "table_id":91,
+        "table_id":90,
         "table_name":"TSG_OBJ_FLAG",
         "table_type":"flag",
         "valid_column":5,
@@ -933,31 +921,31 @@
         }
     },
     {
-        "table_id":92,
+        "table_id":91,
         "table_name":"ATTR_FLAG",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_FLAG"
     },
     {
-        "table_id":93,
+        "table_id":92,
         "table_name":"ATTR_DOH_QNAME",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_FQDN"
     },
     {
-        "table_id":94,
+        "table_id":93,
         "table_name":"ATTR_DOH_HOST",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_FQDN"
     },
     {
-        "table_id":95,
+        "table_id":94,
         "table_name":"ATTR_DOH_HOST_CAT",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_FQDN_CAT"
     },
     {
-        "table_id":96,
+        "table_id":95,
         "table_name":"TSG_OBJ_IMEI",
         "table_type":"expr",
         "valid_column":7,
@@ -971,16 +959,16 @@
         }
     },
     {
-        "table_id":97,
+        "table_id":96,
         "table_name":"ATTR_GTP_IMEI",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_IMEI"
     },
     {
-        "table_id":98,
+        "table_id":97,
         "table_name": "APP_ID_DICT",
         "table_type": "plugin",
-        "valid_column": 18,
+        "valid_column": 19,
         "custom": {
             "key": 1,
             "key_type": "integer",
@@ -988,13 +976,13 @@
         }
     },
     {
-        "table_id":99,
+        "table_id":98,
         "table_name":"ATTR_SUBSCRIBER_ID",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_SUBSCRIBER_ID"
     },
     {
-        "table_id":100,
+        "table_id":99,
         "table_name":"ATTR_APP_ID",
         "table_type":"virtual",
         "physical_table": "APP_ID_DICT"