Revert changes for messageids back to map

Given the memory increase from using a preallocated array and yet we still have the same problem of looking up messageids that we don't have I'm reverting back to the map for messageIDs but leaving in the dummy token in the case that we do a lookup and get nothing.
resolve#124

Author: alsm

client.go

@@ -104,7 +104,7 @@ func NewClient(o *ClientOptions) Client {
 	}
 	c.persist = c.options.Store
 	c.status = disconnected
-	c.messageIds = messageIds{index: [65535]Token{}}
+	c.messageIds = messageIds{index: make(map[uint16]Token)}
 	c.msgRouter, c.stopRouter = newRouter()
 	c.msgRouter.setDefaultHandler(c.options.DefaultPublishHandler)
 	if !c.options.AutoReconnect {

fvt_client_test.go

@@ -1030,10 +1030,8 @@ func Test_cleanUpMids(t *testing.T) {
 		t.Fail()
 	}
 
-	for i, token := range c.(*client).messageIds.index {
-		if token != nil {
-			t.Fatalf("Should have cleaned up messageIDs, slot %d still has token", i)
-		}
+	if len(c.(*client).messageIds.index) > 0 {
+		t.Fatalf("Should have cleaned up messageIDs, have %d left", len(c.(*client).messageIds.index))
 	}
 	if token.Error() == nil {
 		t.Fatal("token should have received an error on connection loss")

messageids.go

@@ -27,9 +27,14 @@ type MId uint16
 
 type messageIds struct {
 	sync.RWMutex
-	index [65535]Token
+	index map[uint16]Token
 }
 
+const (
+	midMin uint16 = 1
+	midMax uint16 = 65535
+)
+
 func (mids *messageIds) cleanUp() {
 	mids.Lock()
 	for _, token := range mids.index {
@@ -45,23 +50,23 @@ func (mids *messageIds) cleanUp() {
 		}
 		token.flowComplete()
 	}
-	mids.index = [65535]Token{}
+	mids.index = make(map[uint16]Token)
 	mids.Unlock()
 }
 
 func (mids *messageIds) freeID(id uint16) {
 	mids.Lock()
-	mids.index[id-1] = nil
+	delete(mids.index, id)
 	mids.Unlock()
 }
 
 func (mids *messageIds) getID(t Token) uint16 {
 	mids.Lock()
 	defer mids.Unlock()
-	for i, s := range mids.index {
-		if s == nil {
+	for i := midMin; i < midMax; i++ {
+		if _, ok := mids.index[i]; !ok {
 			mids.index[i] = t
-			return uint16(i + 1)
+			return i
 		}
 	}
 	return 0
@@ -70,11 +75,10 @@ func (mids *messageIds) getID(t Token) uint16 {
 func (mids *messageIds) getToken(id uint16) Token {
 	mids.RLock()
 	defer mids.RUnlock()
-	t := mids.index[id-1]
-	if t == nil {
-		t = &DummyToken{id: id}
+	if token, ok := mids.index[id]; ok {
+		return token
 	}
-	return t
+	return &DummyToken{id: id}
 }
 
 type DummyToken struct {

net.go

@@ -231,17 +231,19 @@ func alllogic(c *client) {
 				c.pingResp.Broadcast()
 			case *packets.SubackPacket:
 				DEBUG.Println(NET, "received suback, id:", m.MessageID)
-				token := c.getToken(m.MessageID).(*SubscribeToken)
-				DEBUG.Println(NET, "granted qoss", m.ReturnCodes)
-				for i, qos := range m.ReturnCodes {
-					token.subResult[token.subs[i]] = qos
+				token := c.getToken(m.MessageID)
+				switch t := token.(type) {
+				case *SubscribeToken:
+					DEBUG.Println(NET, "granted qoss", m.ReturnCodes)
+					for i, qos := range m.ReturnCodes {
+						t.subResult[t.subs[i]] = qos
+					}
 				}
 				token.flowComplete()
 				c.freeID(m.MessageID)
 			case *packets.UnsubackPacket:
 				DEBUG.Println(NET, "received unsuback, id:", m.MessageID)
-				token := c.getToken(m.MessageID).(*UnsubscribeToken)
-				token.flowComplete()
+				c.getToken(m.MessageID).flowComplete()
 				c.freeID(m.MessageID)
 			case *packets.PublishPacket:
 				DEBUG.Println(NET, "received publish, msgId:", m.MessageID)

unit_messageids_test.go

@@ -20,7 +20,7 @@ import (
 )
 
 func Test_getID(t *testing.T) {
-	mids := &messageIds{index: [65535]Token{}}
+	mids := &messageIds{index: make(map[uint16]Token)}
 
 	i1 := mids.getID(&DummyToken{})
 
@@ -43,7 +43,7 @@ func Test_getID(t *testing.T) {
 }
 
 func Test_freeID(t *testing.T) {
-	mids := &messageIds{index: [65535]Token{}}
+	mids := &messageIds{index: make(map[uint16]Token)}
 
 	i1 := mids.getID(&DummyToken{})
 	mids.freeID(i1)