将阿里云RDS的功能抽到单独engine

sql/db_diagnostic.py

@@ -11,10 +11,8 @@
 from sql.engines import get_engine
 from common.utils.extend_json_encoder import ExtendJSONEncoder, ExtendJSONEncoderBytes
 from sql.utils.resource_group import user_instances
-from .models import AliyunRdsConfig, Instance
+from .models import Instance
 
-# from .aliyun_rds import process_status as aliyun_process_status, create_kill_session as aliyun_create_kill_session, \
-#    kill_session as aliyun_kill_session, sapce_status as aliyun_sapce_status
 
 logger = logging.getLogger("default")
 
@@ -34,10 +32,6 @@ def process(request):
     query_engine = get_engine(instance=instance)
     query_result = None
     if instance.db_type == "mysql":
-        # 判断是RDS还是其他实例
-        # if AliyunRdsConfig.objects.filter(instance=instance, is_enable=True).exists():
-        #    result = aliyun_process_status(request)
-        # else:
         query_result = query_engine.processlist(command_type)
 
     elif instance.db_type == "mongo":
@@ -81,10 +75,6 @@ def create_kill_session(request):
     result = {"status": 0, "msg": "ok", "data": []}
     query_engine = get_engine(instance=instance)
     if instance.db_type == "mysql":
-        # 判断是RDS还是其他实例
-        # if AliyunRdsConfig.objects.filter(instance=instance, is_enable=True).exists():
-        #    result = aliyun_create_kill_session(request)
-        # else:
         result["data"] = query_engine.get_kill_command(json.loads(thread_ids))
     elif instance.db_type == "mongo":
         kill_command = query_engine.get_kill_command(json.loads(thread_ids))
@@ -110,7 +100,6 @@ def create_kill_session(request):
 def kill_session(request):
     instance_name = request.POST.get("instance_name")
     thread_ids = request.POST.get("ThreadIDs")
-    request_params = request.POST.get("request_params", "{}")
     result = {"status": 0, "msg": "ok", "data": []}
 
     try:
@@ -122,11 +111,7 @@ def kill_session(request):
     engine = get_engine(instance=instance)
     r = None
     if instance.db_type == "mysql":
-        # 判断是RDS还是其他实例
-        # if AliyunRdsConfig.objects.filter(instance=instance, is_enable=True).exists():
-        #    result = aliyun_kill_session(request)
-        # else:
-        r = engine.kill(json.loads(thread_ids), request_params=request_params)
+        r = engine.kill(json.loads(thread_ids))
     elif instance.db_type == "mongo":
         r = engine.kill_op(json.loads(thread_ids))
     elif instance.db_type == "oracle":
@@ -162,10 +147,6 @@ def tablespace(request):
 
     query_engine = get_engine(instance=instance)
     if instance.db_type == "mysql":
-        # 判断是RDS还是其他实例
-        # if AliyunRdsConfig.objects.filter(instance=instance, is_enable=True).exists():
-        #    result = aliyun_sapce_status(request)
-        # else:
         query_result = query_engine.tablespace(offset, limit)
     elif instance.db_type == "oracle":
         query_result = query_engine.tablespace(offset, limit)

sql/engines/cloud/aliyun_rds.py

@@ -52,8 +52,7 @@ def get_kill_command(self, thread_ids):
 
         return kill_sql
 
-    def kill(self, thread_ids, request_params):
-        # request_params = request.POST.get('request_params')
+    def kill(self, thread_ids):
         kill_sql = ""
         for i in thread_ids:
             kill_sql = kill_sql + f"kill {i};"
@@ -64,8 +63,7 @@ def kill(self, thread_ids, request_params):
                 instance__instance_name=self.instance_name
             )
             # 调用aliyun接口获取终止进程
-            request_params = json.loads(request_params)
-            service_request_param = dict({"Language": "zh"}, **request_params)
+            service_request_param = {"Language": "zh"}
             kill_result = Aliyun(rds=instance_info).RequestServiceOfCloudDBA(
                 "ConfirmKillSessionRequest", service_request_param
             )

sql/slowlog.py

@@ -15,8 +15,6 @@
 from common.utils.extend_json_encoder import ExtendJSONEncoder
 from .models import Instance, SlowQuery, SlowQueryHistory, AliyunRdsConfig
 
-# from .aliyun_rds import slowquery_review as aliyun_rds_slowquery_review, \
-#    slowquery_review_history as aliyun_rds_slowquery_review_history
 
 import logging
 
@@ -43,7 +41,6 @@ def slowquery_review(request):
     instance_info = Instance.objects.get(instance_name=instance_name)
     if AliyunRdsConfig.objects.filter(instance=instance_info, is_enable=True).exists():
         # 调用阿里云慢日志接口
-        # result = aliyun_rds_slowquery_review(request)
         query_engine = get_engine(instance=instance_info)
         result = query_engine.slowquery_review(
             self, start_time, end_time, db_name, limit, offset
@@ -134,7 +131,6 @@ def slowquery_review_history(request):
     instance_info = Instance.objects.get(instance_name=instance_name)
     if AliyunRdsConfig.objects.filter(instance=instance_info, is_enable=True).exists():
         # 调用阿里云慢日志接口
-        # result = aliyun_rds_slowquery_review_history(request)
         query_engine = get_engine(instance=instance_info)
         result = query_engine.slowquery_review_history(
             start_time, end_time, db_name, sql_id, limit, offset