[fin] subscription.go

src/broker/modules/subscription.go

@@ -2,34 +2,32 @@ package modules
 
 import (
 	"errors"
-	"fmt"
 )
 
 type sub_manager struct {
-	// NameList의 노드들이 각각의 list를 갖음
 	list topicList
 
-	/* sub# 관리 */
+	/* Manage sub# */
 	count_sub 	 int               // Subscription #
 	emptylist  []int                // To administrate sub #
-	ip2sub     map[string][]int     // ip2sub[ip]= sub#...
-	sub2node   map[int][]*valueNode // sub2node[sub#] = node_addr
-	israngesub map[int]bool         // delete시에 관리를 위해
+	ip2sub     map[string][]int     // ip2sub[ip] = sub# ...
+	sub2ip	   map[int]string		// sub2ip[sub#] = ip
+	sub2node   map[int][]*valueNode // sub2node[sub#] = node_addr ...
+	israngesub map[int]bool         // To manage when deleted
 }
 
-// 초기화 시에 하고 싶은 처리
-func (self *sub_manager) Initialize() {
+func (manager *sub_manager) Initialize() {
 	// Some initialize
-	self.ip2sub = make(map[string][]int)
-	self.sub2node = make(map[int][]*valueNode)
-	self.israngesub = make(map[int]bool)
+	manager.ip2sub = make(map[string][]int)
+	manager.sub2ip = make(map[int]string)
+	manager.sub2node = make(map[int][]*valueNode)
+	manager.israngesub = make(map[int]bool)
 }
 
-// 생성자 함수를 정의
 func newSubmng() *sub_manager {
-	sub_mng := &sub_manager{}
-	sub_mng.Initialize()
-	return sub_mng
+	subMng := &sub_manager{}
+	subMng.Initialize()
+	return subMng
 }
 
 //	### To Insert sub#
@@ -38,12 +36,10 @@ func (manager *sub_manager) addSubscription(msg MsgUnit) error {
 	topic := msg.(*SubscriptionMsg).topic
 	value := msg.(*SubscriptionMsg).value
 	operator := msg.(*SubscriptionMsg).operator
-	isAlpha := msg.(*SubscriptionMsg).isAlpha
 	subnumber := 0
 
-	//fmt.Println("message = ", msg)
+	// * 1. Mapping incoming IP address to sub #
 
-	// * 1. 들어온 ipaddr -> sub# 매핑
 	if len(manager.emptylist) == 0 {
 		manager.ip2sub[msg.(*SubscriptionMsg).from] = append(manager.ip2sub[msg.(*SubscriptionMsg).from], manager.count_sub)
 		subnumber = manager.count_sub
@@ -55,14 +51,14 @@ func (manager *sub_manager) addSubscription(msg MsgUnit) error {
 		subnumber = subidx
 	}
 
-	// * 2. Sub 추가
 	nameptr := manager.list.head
 	findOk := false
 
-	//namelist에서 name찾고, 없으면 추가
+	// * 2. Add Subscription
+
+	// Find name in namelist, add if not found
 	for nameptr != nil {
-		// *  compare함수 구현되기 전 임시로 끼워넣은 것 (이 부분은 secure.go 완성되면 다시 확인)
-		if nameptr.topic[0] == topic[0] {
+		if Compare(nameptr.topic, topic) == 0 {
 			findOk = true
 			break
 		}
@@ -74,10 +70,9 @@ func (manager *sub_manager) addSubscription(msg MsgUnit) error {
 		nameptr = manager.list.tail
 	}
 
-	// list[name]에 value추가
-	if len(operator) == 1 { // 단일 식이라면 (single)
-		valptr := nameptr.list.getValueNodePos(value, isAlpha)
-		fmt.Println("pos = " ,valptr.val)
+	// Add value to list[name]
+	if len(operator) == 1 { // if single expression
+		valptr := nameptr.list.getValueNodePos(value)
 		if valptr == nil {
 			nameptr.list.addValueNode(value)
 			valptr = nameptr.list.tail
@@ -86,46 +81,47 @@ func (manager *sub_manager) addSubscription(msg MsgUnit) error {
 		manager.sub2node[subnumber] = append(manager.sub2node[subnumber], valptr)
 		valptr.insertSub(operator[0], subnumber, true)
 
-		return nil // addSubscription ok
+		return nil // AddSubscription ok
 	} else {
 
-		// '&&' , '||'로 묶여 있는 복합식에 대하여
+		// For compound expressions bounded by '&&' and '||'
+		// (ex) { (234 < x) && (x <= 1293) } , { (234 < x) || ( x < 1293) }
 		logical_operator := operator[1]
 
-		// find(namelist[name].list.val == value)인 노드
-		// * 이 부분 다시 봐야함..
-		valptr1 := nameptr.list.getValueNodePos(value, isAlpha)
-		valptr2 := nameptr.list.getValueNodePos(value, isAlpha)
+		// Find ValueNode = (namelist[name].list.val == value)
+		valptr1 := nameptr.list.getValueNodePos([]int64{value[0]})
+		valptr2 := nameptr.list.getValueNodePos([]int64{value[1]})
 
 		if valptr1 == nil {
-			nameptr.list.addValueNode(value)
+			nameptr.list.addValueNode([]int64{value[0]})
 			valptr1 = nameptr.list.tail
 		}
 		if valptr2 == nil {
-			nameptr.list.addValueNode(value)
+			nameptr.list.addValueNode([]int64{value[1]})
 			valptr2 = nameptr.list.tail
 		}
 
 		manager.sub2node[subnumber] = append(manager.sub2node[subnumber], valptr1)
 		manager.sub2node[subnumber] = append(manager.sub2node[subnumber], valptr2)
 
-		if logical_operator == "&&" { // '&&'로 묶여있다면
-			// rangesub check
+		if logical_operator == "&&" {
+			// If they are enclosed in '&&' -> Insert value to range_operator_list
 			manager.israngesub[subnumber] = true
 			valptr1.insertSub(operator[0], subnumber, false)
 			valptr2.insertSub(operator[2], subnumber, false)
 
 		} else {
-			// '||'로 묶여 있다면 두 식 모두 single로 처리가능
+			// if they are enclosed in '||' -> Insert value to single_operator_list
 			valptr1.insertSub(operator[0], subnumber, true)
 			valptr2.insertSub(operator[2], subnumber, true)
 		}
+
 		return nil // addSubscription ok
 	}
 	return errors.New("Can't addSubscription")
 }
 
-//	* To delete subscription
+// To delete subscription
 func (manager *sub_manager) delete(from string) error {
 
 	ip := from
@@ -162,8 +158,9 @@ func (manager *sub_manager) delete(from string) error {
 					manager.emptylist = append(manager.emptylist, sub)
 				}
 
-				// node가 비어있으면 delete
 				isempty := node[j].isEmpty()
+
+				// Delete if Value Node is empty
 				if isempty && node[j] != nil {
 					prev_node := node[j].prev
 					next_node := node[j].next
@@ -205,17 +202,18 @@ func (manager *sub_manager) delete(from string) error {
 				}
 
 				isempty := node[j].isEmpty()
-				// node가 비어있으면 delete
+
+				// Delete if Value Node is empty
 				if isempty && node[j] != nil {
-					prev_node := node[j].prev
-					next_node := node[j].next
+					prevNode := node[j].prev
+					nextNode := node[j].next
 
-					prev_node.next = node[j].next
-					next_node.prev = node[j].prev
+					prevNode.next = node[j].next
+					nextNode.prev = node[j].prev
 				}
 			}
 		}
 	}
-	manager.ip2sub[ip]=nil
+	manager.ip2sub[ip]=nil // Delete sub#s mapped to Ip address
 	return nil
 }