Skip to content

Commit 1dda6b2

Browse files
ZhengYa-0110SongZhen0704
authored andcommitted
fix: invalid mysql statement in recorder cache
1 parent 109b8da commit 1dda6b2

1 file changed

Lines changed: 8 additions & 12 deletions

File tree

  • server/controller/recorder/cache

server/controller/recorder/cache/cache.go

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -519,9 +519,7 @@ func (c *Cache) DeleteVPCs(lcuuids []string) {
519519

520520
func (c *Cache) refreshVPCs() {
521521
log.Info(refreshResource(ctrlrcommon.RESOURCE_TYPE_VPC_EN), c.metadata.LogPrefixes)
522-
var vpcs []*metadbmodel.VPC
523-
524-
err := c.metadata.DB.Where(c.getConditonDomainCreateMethod()).Find(&vpcs).Error
522+
vpcs, err := rcommon.PageWhereFind[metadbmodel.VPC](c.metadata, c.getConditonDomainCreateMethod())
525523
if err != nil {
526524
c.refreshFailed = true
527525
log.Error(dbQueryResourceFailed(ctrlrcommon.RESOURCE_TYPE_VPC_EN, err), c.metadata.LogPrefixes)
@@ -662,7 +660,7 @@ func (c *Cache) DeleteRoutingTables(lcuuids []string) {
662660

663661
func (c *Cache) refreshRoutingTables(vrouterIDs []int) {
664662
log.Info(refreshResource(ctrlrcommon.RESOURCE_TYPE_ROUTING_TABLE_EN), c.metadata.LogPrefixes)
665-
routingTables, err := rcommon.PageWhereFind[metadbmodel.RoutingTable](c.metadata, "vnet_id IN ?", vrouterIDs)
663+
routingTables, err := rcommon.PageWhereFind[metadbmodel.RoutingTable](c.metadata, c.getConditionDomain())
666664
if err != nil {
667665
c.refreshFailed = true
668666
log.Error(dbQueryResourceFailed(ctrlrcommon.RESOURCE_TYPE_ROUTING_TABLE_EN, err), c.metadata.LogPrefixes)
@@ -693,9 +691,7 @@ func (c *Cache) DeleteDHCPPorts(lcuuids []string) {
693691

694692
func (c *Cache) refreshDHCPPorts() {
695693
log.Info(refreshResource(ctrlrcommon.RESOURCE_TYPE_DHCP_PORT_EN), c.metadata.LogPrefixes)
696-
var dhcpPorts []*metadbmodel.DHCPPort
697-
698-
err := c.metadata.DB.Where(c.getConditionDomain()).Find(&dhcpPorts).Error
694+
dhcpPorts, err := rcommon.PageWhereFind[metadbmodel.DHCPPort](c.metadata, c.getConditionDomain())
699695
if err != nil {
700696
c.refreshFailed = true
701697
log.Error(dbQueryResourceFailed(ctrlrcommon.RESOURCE_TYPE_DHCP_PORT_EN, err), c.metadata.LogPrefixes)
@@ -1303,7 +1299,7 @@ func (c *Cache) refreshPodIngressRules(podIngressIDs []int) {
13031299
return
13041300
}
13051301

1306-
podIngressRules, err := rcommon.PageWhereFind[metadbmodel.PodIngressRule](c.metadata, "pod_ingress_id IN ?", podIngressIDs)
1302+
podIngressRules, err := rcommon.PageWhereFind[metadbmodel.PodIngressRule](c.metadata, "domain = ? AND (sub_domain = ? OR sub_domain IS NULL)", c.metadata.GetDomainLcuuid(), c.metadata.GetSubDomainLcuuid())
13071303
if err != nil {
13081304
c.refreshFailed = true
13091305
log.Error(dbQueryResourceFailed(ctrlrcommon.RESOURCE_TYPE_POD_INGRESS_RULE_EN, err), c.metadata.LogPrefixes)
@@ -1332,7 +1328,7 @@ func (c *Cache) refreshPodIngresseRuleBackends(podIngressIDs []int) {
13321328
return
13331329
}
13341330

1335-
podIngressRuleBackends, err := rcommon.PageWhereFind[metadbmodel.PodIngressRuleBackend](c.metadata, "pod_ingress_id IN ?", podIngressIDs)
1331+
podIngressRuleBackends, err := rcommon.PageWhereFind[metadbmodel.PodIngressRuleBackend](c.metadata, "domain = ? AND (sub_domain = ? OR sub_domain IS NULL)", c.metadata.GetDomainLcuuid(), c.metadata.GetSubDomainLcuuid())
13361332
if err != nil {
13371333
c.refreshFailed = true
13381334
log.Error(dbQueryResourceFailed(ctrlrcommon.RESOURCE_TYPE_POD_INGRESS_RULE_BACKEND_EN, err), c.metadata.LogPrefixes)
@@ -1401,7 +1397,7 @@ func (c *Cache) refreshPodServicePorts(podServiceIDs []int) {
14011397
return
14021398
}
14031399

1404-
podServicePorts, err := rcommon.PageWhereFind[metadbmodel.PodServicePort](c.metadata, "pod_service_id IN ?", podServiceIDs)
1400+
podServicePorts, err := rcommon.PageWhereFind[metadbmodel.PodServicePort](c.metadata, "domain = ? AND (sub_domain = ? OR sub_domain IS NULL)", c.metadata.GetDomainLcuuid(), c.metadata.GetSubDomainLcuuid())
14051401
if err != nil {
14061402
c.refreshFailed = true
14071403
log.Error(dbQueryResourceFailed(ctrlrcommon.RESOURCE_TYPE_POD_SERVICE_PORT_EN, err), c.metadata.LogPrefixes)
@@ -1457,7 +1453,7 @@ func (c *Cache) refreshPodGroupPorts(podServiceIDs []int) {
14571453
return
14581454
}
14591455

1460-
podGroupPorts, err := rcommon.PageWhereFind[metadbmodel.PodGroupPort](c.metadata, "pod_service_id IN ?", podServiceIDs)
1456+
podGroupPorts, err := rcommon.PageWhereFind[metadbmodel.PodGroupPort](c.metadata, "domain = ? AND (sub_domain = ? OR sub_domain IS NULL)", c.metadata.GetDomainLcuuid(), c.metadata.GetSubDomainLcuuid())
14611457
if err != nil {
14621458
c.refreshFailed = true
14631459
log.Error(dbQueryResourceFailed(ctrlrcommon.RESOURCE_TYPE_POD_GROUP_PORT_EN, err), c.metadata.LogPrefixes)
@@ -1569,7 +1565,7 @@ func (c *Cache) DeletePodGroupConfigMapConnections(lcuuids []string) {
15691565
func (c *Cache) refreshPodGroupConfigMapConnections() {
15701566
log.Info(refreshResource(ctrlrcommon.RESOURCE_TYPE_POD_GROUP_CONFIG_MAP_CONNECTION_EN), c.metadata.LogPrefixes)
15711567
var items []*metadbmodel.PodGroupConfigMapConnection
1572-
err := c.metadata.DB.Where("domain = ? AND (sub_domain = ? OR sub_domain IS NULL)", c.metadata.GetDomainLcuuid(), c.metadata.GetSubDomainLcuuid()).Find(&items).Error
1568+
items, err := rcommon.PageWhereFind[metadbmodel.PodGroupConfigMapConnection](c.metadata, "domain = ? AND (sub_domain = ? OR sub_domain IS NULL)", c.metadata.GetDomainLcuuid(), c.metadata.GetSubDomainLcuuid())
15731569
if err != nil {
15741570
c.refreshFailed = true
15751571
log.Error(dbQueryResourceFailed(ctrlrcommon.RESOURCE_TYPE_POD_GROUP_CONFIG_MAP_CONNECTION_EN, err), c.metadata.LogPrefixes)

0 commit comments

Comments
 (0)