Просмотр исходного кода

[fix] mapping sub2ip issue

master
extra1563 4 лет назад
Родитель
Сommit
55e485750f
1 измененных файлов: 14 добавлений и 14 удалений
  1. 14
    14
      src/broker/modules/subscription.go

+ 14
- 14
src/broker/modules/subscription.go Просмотреть файл

8
 	list topicList
8
 	list topicList
9
 
9
 
10
 	/* Manage sub# */
10
 	/* Manage sub# */
11
-	count_sub  int                  // Subscription #
11
+	count_sub 	 int               // Subscription #
12
 	emptylist  []int                // To administrate sub #
12
 	emptylist  []int                // To administrate sub #
13
 	ip2sub     map[string][]int     // ip2sub[ip] = sub# ...
13
 	ip2sub     map[string][]int     // ip2sub[ip] = sub# ...
14
-	sub2ip     map[int]string       // sub2ip[sub#] = ip
14
+	sub2ip	   map[int]string		// sub2ip[sub#] = ip
15
 	sub2node   map[int][]*valueNode // sub2node[sub#] = node_addr ...
15
 	sub2node   map[int][]*valueNode // sub2node[sub#] = node_addr ...
16
 	israngesub map[int]bool         // To manage when deleted
16
 	israngesub map[int]bool         // To manage when deleted
17
 }
17
 }
41
 	// * 1. Mapping incoming IP address to sub #
41
 	// * 1. Mapping incoming IP address to sub #
42
 
42
 
43
 	if len(manager.emptylist) == 0 {
43
 	if len(manager.emptylist) == 0 {
44
-		manager.ip2sub[msg.(*SubscriptionMsg).From] = append(manager.ip2sub[msg.(*SubscriptionMsg).From], manager.count_sub)
45
 		subnumber = manager.count_sub
44
 		subnumber = manager.count_sub
45
+		manager.ip2sub[msg.(*SubscriptionMsg).from] = append(manager.ip2sub[msg.(*SubscriptionMsg).from], manager.count_sub)
46
+		manager.sub2ip[subnumber] = msg.(*SubscriptionMsg).from
46
 		manager.count_sub++
47
 		manager.count_sub++
47
 	} else {
48
 	} else {
48
-		subidx := manager.emptylist[len(manager.emptylist)-1]
49
+		subnumber := manager.emptylist[len(manager.emptylist)-1]
49
 		manager.emptylist = manager.emptylist[:len(manager.emptylist)-1]
50
 		manager.emptylist = manager.emptylist[:len(manager.emptylist)-1]
50
-		manager.ip2sub[msg.(*SubscriptionMsg).From] = append(manager.ip2sub[msg.(*SubscriptionMsg).From], subidx)
51
-		subnumber = subidx
51
+		manager.ip2sub[msg.(*SubscriptionMsg).from] = append(manager.ip2sub[msg.(*SubscriptionMsg).from], subnumber)
52
+		manager.sub2ip[subnumber] = msg.(*SubscriptionMsg).from
52
 	}
53
 	}
53
 
54
 
54
 	nameptr := manager.list.head
55
 	nameptr := manager.list.head
70
 		nameptr = manager.list.tail
71
 		nameptr = manager.list.tail
71
 	}
72
 	}
72
 
73
 
73
-	// Add Value to list[name]
74
+	// Add value to list[name]
74
 	if len(operator) == 1 { // if single expression
75
 	if len(operator) == 1 { // if single expression
75
 		valptr := nameptr.list.getValueNodePos(value)
76
 		valptr := nameptr.list.getValueNodePos(value)
76
 		if valptr == nil {
77
 		if valptr == nil {
80
 
81
 
81
 		manager.sub2node[subnumber] = append(manager.sub2node[subnumber], valptr)
82
 		manager.sub2node[subnumber] = append(manager.sub2node[subnumber], valptr)
82
 		valptr.insertSub(operator[0], subnumber, true)
83
 		valptr.insertSub(operator[0], subnumber, true)
83
-
84
 		return nil // AddSubscription ok
84
 		return nil // AddSubscription ok
85
 	} else {
85
 	} else {
86
-
86
+      
87
 		// For compound expressions bounded by '&&' and '||'
87
 		// For compound expressions bounded by '&&' and '||'
88
 		// (ex) { (234 < x) && (x <= 1293) } , { (234 < x) || ( x < 1293) }
88
 		// (ex) { (234 < x) && (x <= 1293) } , { (234 < x) || ( x < 1293) }
89
 		logical_operator := operator[1]
89
 		logical_operator := operator[1]
90
 
90
 
91
-		// Find ValueNode = (namelist[name].list.val == Value)
91
+		// Find ValueNode = (namelist[name].list.val == value)
92
 		valptr1 := nameptr.list.getValueNodePos([]int64{value[0]})
92
 		valptr1 := nameptr.list.getValueNodePos([]int64{value[0]})
93
 		valptr2 := nameptr.list.getValueNodePos([]int64{value[1]})
93
 		valptr2 := nameptr.list.getValueNodePos([]int64{value[1]})
94
 
94
 
105
 		manager.sub2node[subnumber] = append(manager.sub2node[subnumber], valptr2)
105
 		manager.sub2node[subnumber] = append(manager.sub2node[subnumber], valptr2)
106
 
106
 
107
 		if logical_operator == "&&" {
107
 		if logical_operator == "&&" {
108
-			// If they are enclosed in '&&' -> Insert Value to range_operator_list
108
+			// If they are enclosed in '&&' -> Insert value to range_operator_list
109
 			manager.israngesub[subnumber] = true
109
 			manager.israngesub[subnumber] = true
110
 			valptr1.insertSub(operator[0], subnumber, false)
110
 			valptr1.insertSub(operator[0], subnumber, false)
111
 			valptr2.insertSub(operator[2], subnumber, false)
111
 			valptr2.insertSub(operator[2], subnumber, false)
112
 
112
 
113
 		} else {
113
 		} else {
114
-			// if they are enclosed in '||' -> Insert Value to single_operator_list
114
+			// if they are enclosed in '||' -> Insert value to single_operator_list
115
 			valptr1.insertSub(operator[0], subnumber, true)
115
 			valptr1.insertSub(operator[0], subnumber, true)
116
 			valptr2.insertSub(operator[2], subnumber, true)
116
 			valptr2.insertSub(operator[2], subnumber, true)
117
 		}
117
 		}
214
 			}
214
 			}
215
 		}
215
 		}
216
 	}
216
 	}
217
-	manager.ip2sub[ip] = nil // Delete sub#s mapped to Ip address
217
+	manager.ip2sub[ip]=nil // Delete sub#s mapped to Ip address
218
 	return nil
218
 	return nil
219
-}
219
+}

Загрузка…
Отмена
Сохранить