fix(obcluster): list obcluster parameters group by name

oceanbase · Dec 19, 2024 · 683a4f6 · 683a4f6
1 parent 26e8db6
commit 683a4f6
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/internal/dashboard/business/oceanbase/obcluster.go b/internal/dashboard/business/oceanbase/obcluster.go
@@ -934,7 +934,7 @@ func ListOBClusterParameters(ctx context.Context, nn *param.K8sObjectIdentity) (
 		logger.Info("Failed to get OceanBase database connection")
 		return nil, errors.Wrap(err, "Get OceanBase database connection")
 	}
-	parameters, err := conn.ListParametersWithTenantID(ctx, 1)
+	parameters, err := conn.ListClusterParameters(ctx)
 	if err != nil {
 		logger.WithError(err).Error("Failed to query parameters")
 		return nil, errors.Wrap(err, "Query parameters")

diff --git a/pkg/oceanbase-sdk/const/sql/parameter.go b/pkg/oceanbase-sdk/const/sql/parameter.go
@@ -22,4 +22,5 @@ const (
 const (
 	ListParametersWithTenantID = "select name, value, data_type, info, section, default_value, isdefault, edit_level, scope from GV$OB_PARAMETERS where tenant_id = ?"
 	SelectCompatibleOfTenants  = "select name, value, tenant_id from GV$OB_PARAMETERS where name = 'compatible'"
+	ListParametersGroupByName  = "select name, value, data_type, info, section, default_value, isdefault, edit_level, scope, svr_ip, zone, svr_port, IFNULL(tenant_id, 0) from GV$OB_PARAMETERS group by name"
 )
diff --git a/pkg/oceanbase-sdk/operation/cluster.go b/pkg/oceanbase-sdk/operation/cluster.go
@@ -60,3 +60,12 @@ func (m *OceanbaseOperationManager) GetVersion(ctx context.Context) (*model.OBVe
 	}
 	return version, nil
 }
+
+func (m *OceanbaseOperationManager) ListClusterParameters(ctx context.Context) ([]*model.Parameter, error) {
+	params := make([]*model.Parameter, 0)
+	err := m.QueryList(ctx, &params, sql.ListParametersGroupByName)
+	if err != nil {
+		return nil, errors.Wrap(err, "List cluster parameters")
+	}
+	return params, nil
+}