[style] change var name

src/broker/modules/list.go

@@ -55,6 +55,41 @@ func findSub(ary []int, sub int) int {
 	return -1
 }
 
+
+// Compare ->  To compare (topics, values) in a node
+func Compare(a []int64, b []int64) int {
+	if len(a) < len(b) {
+		return 1
+	} else if len(a) > len(b) {
+		return -1
+	} else {
+		for i := 0; i < len(a); i++ {
+			if a[i] < b[i] {
+				return 1
+			} else if a[i] > b[i] {
+				return -1
+			}
+		}
+		return 0
+	}
+}
+
+// To get the position of a Topic node with a specific Topic
+func (l *topicList) getTopicNodePos(topic []int64) *topicNode {
+	topicPtr := l.head
+	for topicPtr != nil {
+		if len(topicPtr.topic) == 0 {
+			topicPtr = topicPtr.next
+			continue
+		}
+		if Compare(topicPtr.topic, topic) == 0 {
+			return topicPtr
+		}
+		topicPtr = topicPtr.next
+	}
+	return nil
+}
+
 // To add a Topic node to the Topic list
 func (l *topicList) addTopicNode(topic []int64) {
 	newNode := &topicNode{topic, nil, nil, valueList{}}
@@ -69,67 +104,6 @@ func (l *topicList) addTopicNode(topic []int64) {
 	l.size++
 }
 
-// To check if a specific Value node is empty
-func (n *valueNode) isEmpty() bool {
-	empty := true
-	if len(n.single2sub_s) != 0 {
-		empty = false
-	}
-	if len(n.single2sub_es) != 0 {
-		empty = false
-	}
-	if len(n.single2sub_b) != 0 {
-		empty = false
-	}
-	if len(n.single2sub_eb) != 0 {
-		empty = false
-	}
-	if len(n.single2sub_e) != 0 {
-		empty = false
-	}
-	if len(n.range2sub_s) != 0 {
-		empty = false
-	}
-	if len(n.range2sub_es) != 0 {
-		empty = false
-	}
-	if len(n.range2sub_b) != 0 {
-		empty = false
-	}
-	if len(n.range2sub_eb) != 0 {
-		empty = false
-	}
-	return empty
-}
-
-// To insert sub# into the Operator list of the Value node
-func (n *valueNode) insertSub(op string, sub int, issingle bool) {
-	if issingle == true {
-		switch op {
-		case "<":
-			n.single2sub_s = append(n.single2sub_s, sub)
-		case "<=":
-			n.single2sub_es = append(n.single2sub_es, sub)
-		case ">":
-			n.single2sub_b = append(n.single2sub_b, sub)
-		case ">=":
-			n.single2sub_eb = append(n.single2sub_eb, sub)
-		case "==":
-			n.single2sub_e = append(n.single2sub_e, sub)
-		}
-	} else {
-		switch op {
-		case "<":
-			n.range2sub_s = append(n.range2sub_s, sub)
-		case "<=":
-			n.range2sub_es = append(n.range2sub_es, sub)
-		case ">":
-			n.range2sub_b = append(n.range2sub_b, sub)
-		case ">=":
-			n.range2sub_eb = append(n.range2sub_eb, sub)
-		}
-	}
-}
 
 // To add a Value node to the Value list
 func (l *valueList) addValueNode(value []int64) {
@@ -145,22 +119,6 @@ func (l *valueList) addValueNode(value []int64) {
 	l.size++
 }
 
-// To get the position of a Topic node with a specific Topic
-func (l *topicList) getTopicNodePos(topic []int64) *topicNode {
-	topicPtr := l.head
-	for topicPtr != nil {
-		if len(topicPtr.topic) == 0 {
-			topicPtr = topicPtr.next
-			continue
-		}
-		if Compare(topicPtr.topic, topic) == 0 {
-			return topicPtr
-		}
-		topicPtr = topicPtr.next
-	}
-	return nil
-}
-
 // To get the position of a Value node with a specific Value
 func (l *valueList) getValueNodePos(value []int64) *valueNode {
 	valPtr := l.head
@@ -177,20 +135,100 @@ func (l *valueList) getValueNodePos(value []int64) *valueNode {
 	return nil
 }
 
-// Compare ->  To compare (topics, values) in a node
-func Compare(a []int64, b []int64) int {
-	if len(a) < len(b) {
-		return 1
-	} else if len(a) > len(b) {
-		return -1
+// To insert sub# into the Operator list of the Value node
+func (node *valueNode) insertSub(op string, sub int, issingle bool) {
+	if issingle == true {
+		switch op {
+		case "<":
+			node.single2sub_s = append(node.single2sub_s, sub)
+		case "<=":
+			node.single2sub_es = append(node.single2sub_es, sub)
+		case ">":
+			node.single2sub_b = append(node.single2sub_b, sub)
+		case ">=":
+			node.single2sub_eb = append(node.single2sub_eb, sub)
+		case "==":
+			node.single2sub_e = append(node.single2sub_e, sub)
+		}
 	} else {
-		for i := 0; i < len(a); i++ {
-			if a[i] < b[i] {
-				return 1
-			} else if a[i] > b[i] {
-				return -1
-			}
+		switch op {
+		case "<":
+			node.range2sub_s = append(node.range2sub_s, sub)
+		case "<=":
+			node.range2sub_es = append(node.range2sub_es, sub)
+		case ">":
+			node.range2sub_b = append(node.range2sub_b, sub)
+		case ">=":
+			node.range2sub_eb = append(node.range2sub_eb, sub)
+		}
+	}
+}
+
+// op와 같은 node내의 operator리스트에서 sub가 있다면 리턴
+func (node *valueNode) findOperatorList(op string, sub int, issingle bool) int {
+	ret := -1
+	if issingle == true {
+		switch op {
+		case "<":
+			ret = findSub(node.single2sub_s, sub)
+		case "<=":
+			ret = findSub(node.single2sub_es, sub)
+		case ">":
+			ret = findSub(node.single2sub_b, sub)
+		case ">=":
+			ret = findSub(node.single2sub_eb, sub)
+		case "==":
+			ret = findSub(node.single2sub_e, sub)
+		}
+	} else {
+		switch op {
+		case "<":
+			ret = findSub(node.range2sub_s, sub)
+		case "<=":
+			ret = findSub(node.range2sub_es, sub)
+		case ">":
+			ret = findSub(node.range2sub_b, sub)
+		case ">=":
+			ret = findSub(node.range2sub_eb, sub)
 		}
+	}
+	if ret < 0{
 		return 0
+	} else{
+		return 1
 	}
 }
+
+
+// To check if a specific Value node is empty
+func (node *valueNode) isEmpty() bool {
+	empty := true
+	if len(node.single2sub_s) != 0 {
+		empty = false
+	}
+	if len(node.single2sub_es) != 0 {
+		empty = false
+	}
+	if len(node.single2sub_b) != 0 {
+		empty = false
+	}
+	if len(node.single2sub_eb) != 0 {
+		empty = false
+	}
+	if len(node.single2sub_e) != 0 {
+		empty = false
+	}
+	if len(node.range2sub_s) != 0 {
+		empty = false
+	}
+	if len(node.range2sub_es) != 0 {
+		empty = false
+	}
+	if len(node.range2sub_b) != 0 {
+		empty = false
+	}
+	if len(node.range2sub_eb) != 0 {
+		empty = false
+	}
+	return empty
+}