[fix] valptr, intersect issue

src/broker/modules/matching.go

@@ -4,17 +4,18 @@ import (
 	"errors"
 	_ "errors"
 	"github.com/juliangruber/go-intersect"
+	"reflect"
 )
 
 type match_manager struct {
-	match_count int
+	match_count	int
 }
 
-// Returns a list of IP addresses of matched subs
+// Matching -> Return (list of IP addresses of matched subs, Pub Msg, error)
 func (match_mng *match_manager) Matching(queue *MsgQueue, sub_mng *sub_manager) ([]string, MsgUnit, error) {
 	msg := queue.pop(true)
-	topic := msg.(*PublishMsg).Topic
-	value := msg.(*PublishMsg).Value
+	topic := msg.(*PublishMsg).topic
+	value := msg.(*PublishMsg).value
 
 	// list
 	ret := make([]string, 0)
@@ -23,126 +24,129 @@ func (match_mng *match_manager) Matching(queue *MsgQueue, sub_mng *sub_manager)
 	big := make([]int, 0)
 	small := make([]int, 0)
 
-	// 1. Find (topicNode[Topic] == msg.Topic) Node
+	// 1. Find (topicNode[topic] == msg.topic) Node
 	topicPtr := sub_mng.list
 	pos := topicPtr.getTopicNodePos(topic)
 
+
 	// Don't Exist topicNode
-	if pos == nil {
-		return nil, nil, errors.New("Don't Exist topicNode")
+	if pos == nil{
+		return nil,nil,errors.New("Don't Exist topicNode")
 	}
 
 	// 2. Traverse all valueNode -> and Match
 	valPtr := pos.list.head
-	for valPtr != nil {
+	for valPtr != nil{
 		compare := Compare(valPtr.val, value)
 		if compare < 0 { // sub.val > pub.val
-			// single : { >, >= }
+		// single : { >, >= }
 
 			// (1) case : >
-			for i := 0; i < len(valPtr.single2sub_b); i++ {
+			for i := 0; i < len(valPtr.single2sub_b); i++{
 				sub := valPtr.single2sub_b[i]
 				ip := sub_mng.sub2ip[sub]
 				ret = append(ret, ip)
 			}
 
 			// (2) case : >=
-			for i := 0; i < len(valPtr.single2sub_eb); i++ {
+			for i := 0; i < len(valPtr.single2sub_eb); i++{
 				sub := valPtr.single2sub_eb[i]
 				ip := sub_mng.sub2ip[sub]
 				ret = append(ret, ip)
 			}
-			// range : { >, >= }
+		// range : { >, >= }
 
 			// (1) case : >
-			for i := 0; i < len(valPtr.range2sub_b); i++ {
+			for i := 0; i < len(valPtr.range2sub_b); i++{
 				sub := valPtr.range2sub_b[i]
 				big = append(big, sub)
 			}
 
 			// (2) case : >=
-			for i := 0; i < len(valPtr.range2sub_eb); i++ {
+			for i := 0; i < len(valPtr.range2sub_eb); i++{
 				sub := valPtr.range2sub_eb[i]
 				big = append(big, sub)
 			}
 
 		} else if compare > 0 { // sub.val < pub.val
 
-			// single : { <, <= }
+		// single : { <, <= }
 
 			// (1) case : <
-			for i := 0; i < len(valPtr.single2sub_s); i++ {
+			for i := 0; i < len(valPtr.single2sub_s); i++{
 				sub := valPtr.single2sub_s[i]
 				ip := sub_mng.sub2ip[sub]
 				ret = append(ret, ip)
 			}
 
 			// (2) case : <=
-			for i := 0; i < len(valPtr.single2sub_es); i++ {
+			for i := 0; i < len(valPtr.single2sub_es); i++{
 				sub := valPtr.single2sub_es[i]
 				ip := sub_mng.sub2ip[sub]
 				ret = append(ret, ip)
 			}
 
-			// range : { <, <= }
+		// range : { <, <= }
 
 			// (1) case : <
-			for i := 0; i < len(valPtr.range2sub_s); i++ {
+			for i := 0; i < len(valPtr.range2sub_s); i++{
 				sub := valPtr.range2sub_s[i]
 				small = append(small, sub)
 			}
 			// (2) case : <=
-			for i := 0; i < len(valPtr.range2sub_es); i++ {
+			for i := 0; i < len(valPtr.range2sub_es); i++{
 				sub := valPtr.range2sub_es[i]
 				small = append(small, sub)
 			}
 
-		} else { // sub.val == pub.val
+		} else{ // sub.val == pub.val
 
-			// single : { <=, >=, ==}
+		// single : { <=, >=, ==}
 
 			// (1) case : <=
-			for i := 0; i < len(valPtr.single2sub_es); i++ {
+			for i := 0; i < len(valPtr.single2sub_es); i++{
 				sub := valPtr.single2sub_es[i]
 				ip := sub_mng.sub2ip[sub]
 				ret = append(ret, ip)
 			}
 
 			// (2) case : >=
-			for i := 0; i < len(valPtr.single2sub_eb); i++ {
+			for i := 0; i < len(valPtr.single2sub_eb); i++{
 				sub := valPtr.single2sub_eb[i]
 				ip := sub_mng.sub2ip[sub]
 				ret = append(ret, ip)
 			}
 
 			// (3) case : ==
-			for i := 0; i < len(valPtr.single2sub_e); i++ {
+			for i := 0; i < len(valPtr.single2sub_e); i++{
 				sub := valPtr.single2sub_e[i]
 				ip := sub_mng.sub2ip[sub]
 				ret = append(ret, ip)
 			}
 
-			// range : { <=, >= }
+		// range : { <=, >= }
 
 			// (1) case : <=
-			for i := 0; i < len(valPtr.range2sub_es); i++ {
+			for i := 0; i < len(valPtr.range2sub_es); i++{
 				sub := valPtr.range2sub_es[i]
 				small = append(small, sub)
 			}
 
 			// (2) case : >=
-			for i := 0; i < len(valPtr.range2sub_eb); i++ {
+			for i := 0; i < len(valPtr.range2sub_eb); i++{
 				sub := valPtr.range2sub_eb[i]
 				big = append(big, sub)
 			}
 
 		}
+		valPtr = valPtr.next
 	}
 
 	// Add the intersection IP address of two sets (large and small) to the return list
 	hash := intersect.Hash(small, big)
-	for i := 0; i < len(hash); i++ {
-		sub := hash[i].(int)
+	list := reflect.ValueOf(hash)
+	for i := 0;  i < list.Len(); i++{
+		sub := list.Index(i).Interface().(int)
 		ip := sub_mng.sub2ip[sub]
 		ret = append(ret, ip)
 	}
@@ -150,4 +154,4 @@ func (match_mng *match_manager) Matching(queue *MsgQueue, sub_mng *sub_manager)
 	match_mng.match_count++
 
 	return ret, msg, nil
-}
+}