Redis库列表显示保留有数据的，并加上key的数量

sql/engines/__init__.py

@@ -105,7 +105,7 @@ def server_version(self):
     def kill_connection(self, thread_id):
         """终止数据库连接"""
 
-    def get_all_databases(self):
+    def get_all_databases(self, **kwargs):
         """获取数据库列表, 返回一个ResultSet，rows=list"""
         return ResultSet()
 

sql/engines/redis.py

@@ -62,6 +62,17 @@ def get_all_databases(self, **kwargs):
         获取数据库列表
         :return:
         """
+        request_source = kwargs.get("request_source", "")
+        if request_source == "1":
+            return self.get_all_databases_of_hasdata(**kwargs)
+        else:
+            return self.get_all_databases_of_all(**kwargs)
+
+    def get_all_databases_of_all(self, **kwargs):
+        """
+        获取数据库列表。全部的DB
+        :return:
+        """
         result = ResultSet(full_sql="CONFIG GET databases")
         conn = self.get_connection()
         try:
@@ -88,6 +99,31 @@ def get_all_databases(self, **kwargs):
         result.rows = db_list
         return result
 
+    def get_all_databases_of_hasdata(self, **kwargs):
+        """
+        获取数据库列表。仅有数据的DB列表
+        :return:
+        """
+        result = ResultSet(full_sql="")
+        conn = self.get_connection()
+        db_info_list = []
+        try:
+            info_keyspace = conn.info("Keyspace")
+            # 确保库0的信息被添加
+            if "db0" not in info_keyspace:
+                db_info_list.append({"value": "0", "text": 0})
+            for db, metrics in info_keyspace.items():
+                # 通常metrics字符串形式为 'keys=1,expires=0,avg_ttl=0'
+                keys_count = metrics.get("keys", 0)  # 获取键的数量
+                db_info = {"value": str(db.replace("db", "")), "text": keys_count}
+                db_info_list.append(db_info)
+
+        except Exception as e:
+            logger.warning(f"Redis Keyspace 执行报错，异常信息：{e}")
+            result.message = f"{e}"
+        result.rows = db_info_list
+        return result
+
     def query_check(self, db_name=None, sql="", limit_num=0):
         """提交查询前的检查"""
         result = {"msg": "", "bad_query": True, "filtered_sql": sql, "has_star": False}

sql/engines/tests.py

@@ -327,6 +327,27 @@ def test_get_all_databases(self, _config_get):
         dbs = new_engine.get_all_databases()
         self.assertListEqual(dbs.rows, ["0", "1", "2", "3"])
 
+    @patch("redis.Redis.info")
+    def test_get_all_databases_of_hasdata(self, mock_info):
+        """
+        测试内容：当请求来源是SQL查询时，只返回有数据的DB列表。
+        """
+        # 模拟info方法返回特定的Keyspace信息
+        mock_info.return_value = {
+            "db1": {"keys": 10, "expires": 10, "avg_ttl": 30},
+            "db18": {"keys": 12, "expires": 10, "avg_ttl": 30},
+        }
+        new_engine = RedisEngine(instance=self.ins)
+        request_source = "1"
+        result = new_engine.get_all_databases(request_source=request_source)
+        # 验证返回的数据库列表是否符合预期.
+        expected_dbs = [
+            {"value": "0", "text": 0},
+            {"value": "1", "text": 10},
+            {"value": "18", "text": 12},
+        ]
+        self.assertListEqual(result.rows, expected_dbs)
+
     @patch("redis.Redis.info")
     @patch("redis.Redis.config_get")
     def test_get_all_databases_exception_handling(self, mock_config_get, mock_info):

sql/instance.py

@@ -313,6 +313,8 @@ def instance_resource(request):
     db_name = request.GET.get("db_name", "")
     schema_name = request.GET.get("schema_name", "")
     tb_name = request.GET.get("tb_name", "")
+    # request_source: 请求来源。1. SQL查询。 2.SQL提交
+    request_source = request.GET.get("request_source", "")
 
     resource_type = request.GET.get("resource_type")
     if instance_id:
@@ -331,7 +333,10 @@ def instance_resource(request):
         schema_name = query_engine.escape_string(schema_name)
         tb_name = query_engine.escape_string(tb_name)
         if resource_type == "database":
-            resource = query_engine.get_all_databases()
+            if instance.db_type == "redis":
+                resource = query_engine.get_all_databases(request_source=request_source)
+            else:
+                resource = query_engine.get_all_databases()
         elif resource_type == "schema" and db_name:
             resource = query_engine.get_all_schemas(db_name=db_name)
         elif resource_type == "table" and db_name:

sql/templates/sqlquery.html

@@ -1115,7 +1115,8 @@ <h4 class="modal-title text-danger">收藏语句</h4>
                 async: async,
                 data: {
                     instance_name: $("#instance_name").val(),
-                    resource_type: "database"
+                    resource_type: "database",
+                    request_source: "1" /*数据库查询类型 1.为SQL查询的请求。2.上线的查询请求*/
                 },
                 complete: function () {
                     $("#db_name").selectpicker('val', db_name);
@@ -1127,17 +1128,31 @@ <h4 class="modal-title text-danger">收藏语句</h4>
                     if (data.status === 0) {
                         var result = data.data;
                         var dbs = [];
+                        var options = "";
                         for (var i = 0; i < result.length; i++) {
-                            var name = "<option value=\"" + result[i] + "\">" + result[i] + "</option>";
-                            $("#db_name").append(name);
-                            dbs.push({
+                            // 下拉框显示名称可以自定义，不需要和value一样。
+                            if (typeof result[i] === 'object')
+                            {
+                                options += `<option value="${result[i].value}">db${result[i].value} (${result[i].text})</option>`;
+                                dbs.push({
+                                name: result[i].value,
+                                value: result[i].value,
+                                caption: result[i].value,
+                                meta: 'databases',
+                                score: '100'
+                            })
+                            }else{
+                                options+= "<option value=\"" + result[i] + "\">" + result[i] + "</option>";
+                                dbs.push({
                                 name: result[i],
                                 value: result[i],
                                 caption: result[i],
                                 meta: 'databases',
                                 score: '100'
                             })
+                            }
                         }
+                        $("#db_name").append(options);
                         $('#db_name').selectpicker('render');
                         $('#db_name').selectpicker('refresh');
                         //自动补全提示

sql_api/api_instance.py

@@ -179,6 +179,7 @@ def post(self, request):
 
         instance_id = request.data["instance_id"]
         resource_type = request.data["resource_type"]
+        request_source = request.data["request_source"]
         db_name = request.data["db_name"] if "db_name" in request.data.keys() else ""
         schema_name = (
             request.data["schema_name"] if "schema_name" in request.data.keys() else ""

sql_api/serializers.py

@@ -268,6 +268,7 @@ class InstanceResourceSerializer(serializers.Serializer):
     db_name = serializers.CharField(required=False, label="数据库名")
     schema_name = serializers.CharField(required=False, label="schema名")
     tb_name = serializers.CharField(required=False, label="表名")
+    request_source = serializers.CharField(required=False, label="请求来源")
 
     def validate(self, attrs):
         instance_id = attrs.get("instance_id")