[fix] delete

src/broker/modules/subscription.go

@@ -4,16 +4,15 @@ import (
 	"errors"
 )
 
+// Structure for managing subscriptions
 type sub_manager struct {
-	list topicList
-
-	/* Manage sub# */
-	count_sub  int                  // Subscription #
-	emptylist  []int                // To administrate sub #
-	ip2sub     map[string][]int     // ip2sub[ip] = sub# ...
-	sub2ip     map[int]string       // sub2ip[sub#] = ip
-	sub2node   map[int][]nodeInfo // sub2node[sub#] = node_addr ...
-	israngesub map[int]bool         // To manage when deleted
+	list 	   	topicList			// Data Structure for Manage TopicNode
+	count_sub  	int                 // Subscription#
+	emptylist  	[]int               // For administrate Subscription#(Deleted)
+	ip2sub     	map[string][]int    // For mapping {ip : Sub#s List}
+	sub2ip     	map[int]string      // For mapping {Sub# : ip}
+	sub2node   	map[int][]nodeInfo 	// For mapping {Sub# : NodeInfo List}
+	israngesub 	map[int]bool        // To manage when deleted
 }
 
 type nodeInfo struct{
@@ -180,6 +179,7 @@ func (manager *sub_manager) addSubscription(msg MsgUnit) error {
 		}
 		addValNodeList = append(addValNodeList, valptr)
 		manager.sub2node[subnumber] = append(manager.sub2node[subnumber], nodeInfo{addValNodeList, topic})
+		manager.israngesub[subnumber] = false
 		valptr.insertSub(operator[0], subnumber, true)
 		return nil // AddSubscription ok
 	} else {
@@ -214,6 +214,7 @@ func (manager *sub_manager) addSubscription(msg MsgUnit) error {
 
 		} else {
 			// if they are enclosed in '||' -> Insert Value to single_operator_list
+			manager.israngesub[subnumber] = false
 			valptr1.insertSub(operator[0], subnumber, true)
 			valptr2.insertSub(operator[2], subnumber, true)
 		}
@@ -235,6 +236,7 @@ func (manager *sub_manager) delete(from string) error {
 		for j := 0; j < len(manager.sub2node[sub]); j++ {
 			nodeinfo := manager.sub2node[sub][j]
 			node := nodeinfo.valNodeList
+
 			if manager.israngesub[sub] {
 				for k := 0; k < len(node); k++ {
 					pos := findSub(node[k].range2sub_s, sub)
@@ -260,17 +262,6 @@ func (manager *sub_manager) delete(from string) error {
 						node[k].range2sub_eb = remove(node[k].range2sub_eb, pos)
 						manager.emptylist = append(manager.emptylist, sub)
 					}
-
-					isempty := node[k].isEmpty()
-
-					// Delete if Value Node is empty
-					if isempty && node[k] != nil {
-						prev_node := node[k].prev
-						next_node := node[k].next
-
-						prev_node.next = node[k].next
-						next_node.prev = node[k].prev
-					}
 				}
 			} else {
 				for k := 0; k < len(node); k++ {
@@ -304,16 +295,6 @@ func (manager *sub_manager) delete(from string) error {
 						manager.emptylist = append(manager.emptylist, sub)
 					}
 
-					isempty := node[k].isEmpty()
-
-					// Delete if Value Node is empty
-					if isempty && node[k] != nil {
-						prevNode := node[k].prev
-						nextNode := node[k].next
-
-						prevNode.next = node[k].next
-						nextNode.prev = node[k].prev
-					}
 				}
 			}
 		}