opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Automatic merge from release/2.0.0 -> release/2.1.0

Browse Source 
* commit '3ec448a8c47931322a571d7076412b0752b21c0b':
  guestnetworks, hostnetworks: avoid subquery in get by address call
This commit is contained in:
邱剑
2018-08-25 13:58:58 +08:00
parent 2df5f3035e 3ec448a8c4
commit 32c58593e6
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/guestnetworks.go
+2 -1
View File
@@ -263,9 +263,10 @@ func (self *SGuestnetwork) GetJsonDescAtHost(host *SHost) jsonutils.JSONObject {
}
func (manager *SGuestnetworkManager) GetGuestByAddress(address string) *SGuest {
networks := manager.Query().SubQuery()
networks := manager.TableSpec().Instance()
guests := GuestManager.Query()
q := guests.Join(networks, sqlchemy.AND(
sqlchemy.IsFalse(networks.Field("deleted")),
sqlchemy.Equals(networks.Field("ip_addr"), address),
sqlchemy.Equals(networks.Field("guest_id"), guests.Field("id")),
))
pkg/compute/models/hostnetworks.go
+2 -1
View File
@@ -107,9 +107,10 @@ func (man *SHostnetworkManager) GetNetworkByAddress(addr string) *SNetwork {
}
func (man *SHostnetworkManager) GetHostByAddress(addr string) *SHost {
networks := man.Query().SubQuery()
networks := man.TableSpec().Instance()
hosts := HostManager.Query()
q := hosts.Join(networks, sqlchemy.AND(
sqlchemy.IsFalse(networks.Field("deleted")),
sqlchemy.Equals(networks.Field("ip_addr"), addr),
sqlchemy.Equals(networks.Field("baremetal_id"), hosts.Field("id")),
))