Changeset 267 in code for trunk

Timestamp:

Apr 23, 2020, 2:36:20 PM (5 years ago)

Author:

contact

Message:

Add network.channels, remove DB.GetChannel

Store the list of configured channels in the network data structure.
This removes the need for a database lookup and will be useful for
detached channels.

Location:

trunk

Files:

• db.go (modified) (2 diffs)
• upstream.go (modified) (1 diff)
• user.go (modified) (5 diffs)

trunk/db.go

@@ -48 +48 @@
         Key  string
 }
-
-var ErrNoSuchChannel = fmt.Errorf("soju: no such channel")
 
 const schema = `
@@ -372 +370 @@
 }
 
-func (db *DB) GetChannel(networkID int64, name string) (*Channel, error) {
-        db.lock.RLock()
-        defer db.lock.RUnlock()
-
-        ch := &Channel{Name: name}
-
-        var key *string
-        row := db.db.QueryRow("SELECT id, key FROM Channel WHERE network = ? AND name = ?", networkID, name)
-        if err := row.Scan(&ch.ID, &key); err == sql.ErrNoRows {
-                return nil, ErrNoSuchChannel
-        } else if err != nil {
-                return nil, err
-        }
-        ch.Key = fromStringPtr(key)
-        return ch, nil
-}
-
 func (db *DB) StoreChannel(networkID int64, ch *Channel) error {
         db.lock.Lock()

trunk/upstream.go

@@ -422 +422 @@
                 uc.logger.Printf("connection registered")
 
-                channels, err := uc.srv.db.ListChannels(uc.network.ID)
-                if err != nil {
-                        uc.logger.Printf("failed to list channels from database: %v", err)
-                        break
-                }
-
-                for _, ch := range channels {
+                for _, ch := range uc.network.channels {
                         params := []string{ch.Name}
                         if ch.Key != "" {

trunk/user.go

@@ -57 +57 @@
 
         conn           *upstreamConn
+        channels       map[string]*Channel
         history        map[string]*networkHistory // indexed by entity
         offlineClients map[string]struct{}        // indexed by client name
@@ -62 +63 @@
 }
 
-func newNetwork(user *user, record *Network) *network {
+func newNetwork(user *user, record *Network, channels []Channel) *network {
+        m := make(map[string]*Channel, len(channels))
+        for _, ch := range channels {
+                m[ch.Name] = &ch
+        }
+
         return &network{
                 Network:        *record,
                 user:           user,
                 stopped:        make(chan struct{}),
+                channels:       m,
                 history:        make(map[string]*networkHistory),
                 offlineClients: make(map[string]struct{}),
@@ -141 +148 @@
 
 func (net *network) createUpdateChannel(ch *Channel) error {
-        if dbCh, err := net.user.srv.db.GetChannel(net.ID, ch.Name); err == nil {
-                ch.ID = dbCh.ID
-        } else if err != ErrNoSuchChannel {
+        if current, ok := net.channels[ch.Name]; ok {
+                ch.ID = current.ID // update channel if it already exists
+        }
+        if err := net.user.srv.db.StoreChannel(net.ID, ch); err != nil {
                 return err
         }
-        return net.user.srv.db.StoreChannel(net.ID, ch)
+        net.channels[ch.Name] = ch
+        return nil
 }
 
 func (net *network) deleteChannel(name string) error {
-        return net.user.srv.db.DeleteChannel(net.ID, name)
+        if err := net.user.srv.db.DeleteChannel(net.ID, name); err != nil {
+                return err
+        }
+        delete(net.channels, name)
+        return nil
 }
 
@@ -222 +235 @@
 
         for _, record := range networks {
-                network := newNetwork(u, &record)
+                channels, err := u.srv.db.ListChannels(record.ID)
+                if err != nil {
+                        u.srv.Logger.Printf("failed to list channels for user %q, network %q: %v", u.Username, record.GetName(), err)
+                }
+
+                network := newNetwork(u, &record, channels)
                 u.networks = append(u.networks, network)
 
@@ -354 +372 @@
         }
 
-        network := newNetwork(u, net)
+        network := newNetwork(u, net, nil)
         err := u.srv.db.StoreNetwork(u.Username, &network.Network)
         if err != nil {