Pārlūkot izejas kodu

Merge remote-tracking branch 'origin/master'

master
kidjung 4 gadus atpakaļ
vecāks
revīzija
8bd361e7b8

+ 26
- 24
src/broker/modules/init.go Parādīt failu

@@ -30,55 +30,57 @@ type Moscato struct {
30 30
 	secure_mng secure_manager
31 31
 }
32 32
 
33
-type MicroService struct {
34
-	receivemsg *SubscriptionMsg
33
+type Reply struct {
34
+	ReceiveMsg MsgUnit
35 35
 }
36 36
 
37
-//Recieve - MM가 msg전달 받음
38
-func (moscato *Moscato) Recieve(msg MsgUnit) (MsgUnit, error) {
39
-	msg_type := msg.CheckType()
37
+type Listner int
38
+
39
+
40
+//MS에서 보내는거-rpc call 사용
41
+/*func (l *Listner)MM_Receive(msg MsgUnit, reply *Reply)error{
42
+	reply.ReceiveMsg=msg
43
+
44
+	return nil
45
+}*/
46
+
47
+func (moscato *Moscato)MM_Receive(msg MsgUnit, reply *Reply)error{
48
+	reply.ReceiveMsg=msg
49
+  	go moscato.Receive(reply)
50
+	return nil
51
+}
40 52
 
53
+//Recieve - MM가 msg전달 받음
54
+func (moscato *Moscato)Receive(reply *Reply) (MsgUnit, error) {
55
+	//rpc call
56
+	var msg_type = reply.ReceiveMsg.CheckType()
41 57
 	//메세지 타입에 따라 다르게 처리
42 58
 	switch msg_type {
43 59
 
44 60
 	case KSM: //Key share msg
45 61
 
46 62
 	case PM: //Publish msg
47
-		moscato.queue.push(msg.(*PublishMsg))
63
+		moscato.queue.push(reply.ReceiveMsg.(*PublishMsg))
48 64
 
49 65
 	case SM: //Subscription msg
50
-		moscato.match_mng.add_subscription(msg.(*SubscriptionMsg))
66
+		moscato.match_mng.add_subscription(reply.ReceiveMsg.(*SubscriptionMsg))
51 67
 
52 68
 	case RM: //Register msg
53 69
 		//var newmsg RegisterMsg
54
-		var newmsg = msg.(*RegisterMsg)
70
+		var newmsg = reply.ReceiveMsg.(*RegisterMsg)
55 71
 		newNode := MSnode{newmsg.From(), newmsg.From()}
56 72
 		moscato.ms_mng.add_microservice(newNode)
57 73
 
58 74
 	case WM: //Withdraw msg
59
-		moscato.ms_mng.remove_microservice(msg.(*WithdrawMsg).From())
75
+		moscato.ms_mng.remove_microservice(reply.ReceiveMsg.(*WithdrawMsg).From())
60 76
 
61 77
 	default:
62 78
 		return nil, errors.New("Message type Error: Not registered message type")
63 79
 	}
64 80
 
65
-	return msg, nil
81
+	return reply.ReceiveMsg, nil
66 82
 }
67 83
 
68
-//Receive - MicorService가 msg 받음// MS.go들어가야할 함수
69
-/*func (ms *MicroService)Receive(msg MsgUnit)error{
70
-	msg_type:=msg.CheckType()
71
-
72
-	switch msg_type{
73
-	case KGM://Key Gen Msg
74
-
75
-	case KSM://Key Share Msg
76
-
77
-	case SM://Subscription Msg
78
-		ms.receivemsg=msg.(*SubscriptionMsg)
79
-	}
80
-	return nil
81
-}*/
82 84
 
83 85
 func (moscato *Moscato) Run() {
84 86
 	//모스카토 구조체 변수 초기화

+ 105
- 25
src/broker/modules/list.go Parādīt failu

@@ -4,29 +4,29 @@ package modules
4 4
 	Sub정보들을 관리할 list
5 5
 */
6 6
 
7
-type NameList struct {
8
-	head *NameNode
9
-	tail *NameNode
7
+type topicList struct {
8
+	head *topicNode
9
+	tail *topicNode
10 10
 	size int
11 11
 }
12 12
 
13
-type NameNode struct {
13
+type topicNode struct {
14 14
 	topic []int64 // Encrypt된 topic
15
-	next  *NameNode
16
-	prev  *NameNode
17
-	list  List
15
+	next  *topicNode
16
+	prev  *topicNode
17
+	list  valueList
18 18
 }
19 19
 
20
-type List struct {
21
-	head *Node
22
-	tail *Node
20
+type valueList struct {
21
+	head *valueNode
22
+	tail *valueNode
23 23
 	size int
24 24
 }
25 25
 
26
-type Node struct {
26
+type valueNode struct {
27 27
 	val  []int64 // Encrypt된 value
28
-	next *Node
29
-	prev *Node
28
+	next *valueNode
29
+	prev *valueNode
30 30
 
31 31
 	// single //
32 32
 	single2sub_s  []int // (val < x) sub#
@@ -56,7 +56,20 @@ func findSub(ary []int, sub int) int {
56 56
 	return -1
57 57
 }
58 58
 
59
-func (n *Node) isempty() bool {
59
+func (l *topicList) addTopicNode(topic []int64){
60
+	newNode := &topicNode{topic, nil, nil, valueList{}}
61
+	if l.head == nil{
62
+		l.head = newNode
63
+		l.tail = l.head
64
+	} else{
65
+		newNode.prev = l.tail
66
+		l.tail.next = newNode
67
+		l.tail = newNode
68
+	}
69
+	l.size++
70
+}
71
+
72
+func (n *valueNode) isEmpty() bool {
60 73
 	empty := true
61 74
 	if len(n.single2sub_s) != 0 {
62 75
 		empty = false
@@ -89,7 +102,7 @@ func (n *Node) isempty() bool {
89 102
 }
90 103
 
91 104
 // 노드의 operator리스트에 sub#을 in
92
-func (l *Node) insert_Sub(op string, sub int, issingle bool) {
105
+func (l *valueNode) insertSub(op string, sub int, issingle bool) {
93 106
 	if issingle == true {
94 107
 		switch op {
95 108
 		case "<":
@@ -117,21 +130,88 @@ func (l *Node) insert_Sub(op string, sub int, issingle bool) {
117 130
 	}
118 131
 }
119 132
 
120
-func (l *List) add_ValueNode(value []int64) {
121
-	newValNode := &Node{value, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil}
122
-	l.tail.next = newValNode
123
-	l.tail = newValNode
133
+func (l *valueList) addValueNode(value []int64) {
134
+	newValNode := &valueNode{value, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil}
135
+	if l.head == nil{
136
+		l.head = newValNode
137
+		l.tail = l.head
138
+	} else{
139
+		newValNode.prev = l.tail
140
+		l.tail.next = newValNode
141
+		l.tail = newValNode
142
+	}
124 143
 	l.size++
125 144
 }
126 145
 
127
-func (l *List) getPos(value []int64) *Node {
128
-	valptr := l.head
129
-	for valptr != nil {
146
+func (l *topicList) getTopicNodePos(topic []int64) *topicNode {
147
+	topicPtr := l.head
148
+	for topicPtr != nil {
149
+		if len(topicPtr.topic) == 0{
150
+			topicPtr = topicPtr.next
151
+			continue
152
+		}
130 153
 		// * compare 완성된다면 다시보기
131
-		if compare(valptr.val, value) == 0 { // value와 같은 val을 갖는 노드가 존재한다면
132
-			return valptr
154
+		if l.CompareTopic(topicPtr.topic, topic) == 0 {
155
+			return topicPtr
133 156
 		}
134
-		valptr = valptr.next
157
+		topicPtr = topicPtr.next
135 158
 	}
136 159
 	return nil
137 160
 }
161
+
162
+func (l *topicList)CompareTopic(topic1 []int64, topic2 []int64) int {
163
+	// 길이 같은지 체크
164
+	if len(topic1) != len(topic2) {
165
+		return -1
166
+	}
167
+	for i := 0; i < len(topic2); i++ {
168
+		if topic1[i] != topic2[i] {
169
+			return -1
170
+		}
171
+	}
172
+	return 0
173
+}
174
+
175
+func (l *valueList) getValueNodePos(value []int64, isAlpha bool) *valueNode {
176
+	valPtr := l.head
177
+	for valPtr != nil {
178
+		if len(valPtr.val) == 0{
179
+			valPtr = valPtr.next
180
+			continue
181
+		}
182
+		if isAlpha{
183
+			if CompareAlpha(value, valPtr.val) == 0{
184
+				return valPtr
185
+			}
186
+		} else{
187
+			if CompareDigit(value[0], valPtr.val[0]) == 0{
188
+				return valPtr
189
+			}
190
+		}
191
+		valPtr = valPtr.next
192
+	}
193
+	return nil
194
+}
195
+
196
+
197
+func CompareDigit(value1 int64, value2 int64) int {
198
+	if value1 < value2 {
199
+		return 1
200
+	} else if value1 > value2 {
201
+		return -1
202
+	}
203
+	return 0
204
+}
205
+
206
+func CompareAlpha(value1 []int64, value2 []int64) int {
207
+	// 길이 같은지 체크
208
+	if len(value1) != len(value2) {
209
+		return -1
210
+	}
211
+	for i := 0; i < len(value2); i++ {
212
+		if value1[i] != value2[i] {
213
+			return -1
214
+		}
215
+	}
216
+	return 0
217
+}

+ 175
- 0
src/broker/modules/list_test.go Parādīt failu

@@ -0,0 +1,175 @@
1
+package modules
2
+
3
+import (
4
+	"fmt"
5
+	_ "fmt"
6
+	"testing"
7
+	"github.com/stretchr/testify/assert"
8
+)
9
+
10
+func Test_addTopicNode(t *testing.T) {
11
+
12
+	list := &topicList{nil, nil, 0}
13
+	ary := []int64{123,456,789,1234}
14
+
15
+	for i:=0; i< 4; i++{
16
+		tmp := []int64{ary[i]}
17
+		list.addTopicNode(tmp)
18
+		exp := []int64{ary[i]}
19
+
20
+		assert.Equal(t, list.tail.topic, exp, "add TopicNode failed")
21
+	}
22
+}
23
+
24
+func Test_addValueNode(t *testing.T) {
25
+
26
+	list := &valueList{nil, nil, 0}
27
+	ary := []int64{123,456,789,1234}
28
+
29
+	for i:=0; i< 4; i++{
30
+		tmp := []int64{ary[i]}
31
+		list.addValueNode(tmp)
32
+		exp := []int64{ary[i]}
33
+
34
+		assert.Equal(t, list.tail.val, exp, "add ValueNode failed")
35
+	}
36
+}
37
+
38
+func Test_findSub(t *testing.T){
39
+
40
+	ary := []int{1,2,3,4,5,6}
41
+	for i := 0; i < 6; i++ {
42
+		assert.Equal(t, findSub(ary, i + 1), i, "findSub is failed")
43
+	}
44
+
45
+	// Don't Exist
46
+	assert.Equal(t, findSub(ary, 7), -1, "findSub is failed")
47
+
48
+	// array = {1, 2, 3, 4, 5, 6} -> {1, 2, 4, 5, 6}
49
+	ary = remove(ary, 2)
50
+	assert.Equal(t, findSub(ary, 6), 4)
51
+}
52
+
53
+func Test_remove(t *testing.T){
54
+	l := make([]int, 4)
55
+	var i int
56
+	for i = 0; i < 4; i++{
57
+		l[i] = i
58
+	}
59
+
60
+	// array = {0, 1, 2, 3} -> {0, 1, 3}
61
+	l = remove(l, 2)
62
+	assert.Equal(t, l,[]int{0, 1, 3}, "Array Delete is failed")
63
+
64
+	// array = {0, 1, 3} -> {1, 3}
65
+	l = remove(l, 0)
66
+	assert.Equal(t, l, []int{1, 3}, "Array Delete is failed")
67
+
68
+	// array = {1, 2} -> {1}
69
+	l = remove(l, 1)
70
+	assert.Equal(t, l, []int{1}, "Array Delete is failed")
71
+
72
+	// array = {1} -> {}
73
+	l = remove(l, 0)
74
+	assert.Equal(t, l, []int{}, "Array Delete is failed")
75
+}
76
+
77
+func Test_isempty(t *testing.T){
78
+	node := &valueNode{next : nil, prev : nil}
79
+
80
+	// 1. One element in Node
81
+	node.single2sub_eb = append(node.single2sub_eb, 1)
82
+	assert.Equal(t, node.isEmpty(), false, "isEmpty is failed")
83
+
84
+	// 2. Empty
85
+	node.single2sub_eb = remove(node.single2sub_eb, 0)
86
+	assert.Equal(t, node.isEmpty(), true, "isEmpty is failed")
87
+
88
+	// 3. Many elements in Node
89
+	node.single2sub_b = append(node.single2sub_b, 1)
90
+	node.single2sub_eb = append(node.single2sub_eb, 1)
91
+	node.single2sub_s = append(node.single2sub_s, 1)
92
+	node.single2sub_es = append(node.single2sub_es, 1)
93
+	node.single2sub_e = append(node.single2sub_e, 1)
94
+	assert.Equal(t, node.isEmpty(), false,"isEmpty is failed")
95
+}
96
+
97
+func Test_insertSub(t *testing.T){
98
+	node := &valueNode{next : nil, prev : nil}
99
+
100
+// 1. Single2sub
101
+
102
+	// (1) <
103
+	node.insertSub("<", 1, true)
104
+	assert.Equal(t, 0, findSub(node.single2sub_s, 1),"singleInsertSub (<) is failed")
105
+
106
+	// (2) <=
107
+	node.insertSub("<=", 2, true)
108
+	assert.Equal(t, 0, findSub(node.single2sub_es, 2), "singleInsertSub (<=) is failed")
109
+
110
+	// (3) >
111
+	node.insertSub(">", 3, true)
112
+	assert.Equal(t, 0, findSub(node.single2sub_b, 3), "singleInsertSub (>) is failed")
113
+
114
+	// (4) >=
115
+	node.insertSub(">=", 4, true)
116
+	assert.Equal(t, 0, findSub(node.single2sub_eb, 4), "singleInsertSub (>=) is failed")
117
+
118
+	// (5) ==
119
+	node.insertSub("==", 5, true)
120
+	assert.Equal(t, 0, findSub(node.single2sub_e, 5), "singleInsertSub (==) is failed")
121
+
122
+// 2. range2sub
123
+
124
+	// (1) <
125
+	node.insertSub("<", 1, false)
126
+	assert.Equal(t, 0, findSub(node.range2sub_s, 1),"rangeInsertSub (<) is failed")
127
+
128
+	// (2) <=
129
+	node.insertSub("<=", 2, false)
130
+	assert.Equal(t, 0, findSub(node.range2sub_es, 2), "rangeInsertSub (<=) is failed")
131
+
132
+	// (3) >
133
+	node.insertSub(">", 3, false)
134
+	assert.Equal(t, 0, findSub(node.range2sub_b, 3), "rangeInsertSub (>) is failed")
135
+
136
+	// (4) >=
137
+	node.insertSub(">=", 4, false)
138
+	assert.Equal(t, 0, findSub(node.range2sub_eb, 4), "rangeInsertSub (>=) is failed")
139
+
140
+}
141
+
142
+func Test_getTopicPos(t *testing.T){
143
+	l := topicList{}
144
+	l.addTopicNode(nil)
145
+
146
+	// 1. find Topic in empty topiclist
147
+	if l.head.topic != nil{
148
+		fmt.Println("addTopicNode is failed")
149
+	}
150
+
151
+	// 2. find {{12},{34},{56},{78},{89},{90}} in topiclist
152
+	ary := [][]int64{{12},{34},{56},{78},{89},{90}}
153
+	if l.getTopicNodePos(ary[0]) != nil{
154
+		fmt.Println("getTopicNodePos is failed")
155
+	}
156
+
157
+	for i := 0; i < 5; i++{
158
+		l.addTopicNode(ary[i])
159
+		assert.Equal(t, ary[i], l.tail.topic)
160
+	}
161
+
162
+}
163
+
164
+func Test_getValuePos(t *testing.T){
165
+	l := valueList{}
166
+	l.addValueNode(nil)
167
+
168
+	ary := [][]int64{{12},{34},{56},{78},{89},{90}}
169
+
170
+	// 1. find {{12},{34},{56},{78},{89},{90}} in topiclist
171
+	for i := 0; i < 5; i++{
172
+		l.addValueNode(ary[i])
173
+		assert.Equal(t, ary[i], l.tail.val)
174
+	}
175
+}

+ 1
- 1
src/broker/modules/message.go Parādīt failu

@@ -73,7 +73,7 @@ type SubscriptionMsg struct {
73 73
 	topic []int64 //대주제
74 74
 	value []int64 //피연산자
75 75
 	operator []string //연산자
76
-	isAlpha bool // 범위연산인지 단순비교연산인지 구분 가능하게 함
76
+  	isAlpha bool //value가 숫자인지 문자열인지
77 77
 }
78 78
 
79 79
 //Microservice 등록 메세지

+ 45
- 38
src/broker/modules/subscription.go Parādīt failu

@@ -2,41 +2,55 @@ package modules
2 2
 
3 3
 import (
4 4
 	"errors"
5
+	"fmt"
5 6
 )
6 7
 
7 8
 type sub_manager struct {
8 9
 	// NameList의 노드들이 각각의 list를 갖음
9
-	list NameList
10
+	list topicList
10 11
 
11 12
 	/* sub# 관리 */
12
-	count_sub 	 int              // Subscription #
13
-	emptylist  []int            // To administrate sub #
14
-	sub2ip     map[int]string  // sub2ip[sub#] = ip
15
-	ip2sub     map[string][]int // ip2sub[ip]= sub#...
16
-	sub2node   map[int][]*Node  // sub2node[sub#] = node_addr
17
-	israngesub map[int]bool     // delete시에 관리를 위해
13
+	count_sub 	 int               // Subscription #
14
+	emptylist  []int                // To administrate sub #
15
+	ip2sub     map[string][]int     // ip2sub[ip]= sub#...
16
+	sub2node   map[int][]*valueNode // sub2node[sub#] = node_addr
17
+	israngesub map[int]bool         // delete시에 관리를 위해
18
+}
19
+
20
+// 초기화 시에 하고 싶은 처리
21
+func (self *sub_manager) Initialize() {
22
+	// Some initialize
23
+	self.ip2sub = make(map[string][]int)
24
+	self.sub2node = make(map[int][]*valueNode)
25
+	self.israngesub = make(map[int]bool)
26
+}
27
+
28
+// 생성자 함수를 정의
29
+func newSubmng() *sub_manager {
30
+	sub_mng := &sub_manager{}
31
+	sub_mng.Initialize()
32
+	return sub_mng
18 33
 }
19 34
 
20 35
 //	### To Insert sub#
21
-func (manager *sub_manager) add_subscription(msg MsgUnit) error {
36
+func (manager *sub_manager) addSubscription(msg MsgUnit) error {
22 37
 
23 38
 	topic := msg.(*SubscriptionMsg).topic
24 39
 	value := msg.(*SubscriptionMsg).value
25 40
 	operator := msg.(*SubscriptionMsg).operator
41
+	isAlpha := msg.(*SubscriptionMsg).isAlpha
26 42
 	subnumber := 0
27 43
 
28 44
 	//fmt.Println("message = ", msg)
29 45
 
30
-	// * 1. 들어온 Msg -> sub#, sub# -> Msg로 매핑
46
+	// * 1. 들어온 ipaddr -> sub# 매핑
31 47
 	if len(manager.emptylist) == 0 {
32
-		manager.sub2ip[manager.count_sub] = msg.(*SubscriptionMsg).from
33 48
 		manager.ip2sub[msg.(*SubscriptionMsg).from] = append(manager.ip2sub[msg.(*SubscriptionMsg).from], manager.count_sub)
34 49
 		subnumber = manager.count_sub
35 50
 		manager.count_sub++
36 51
 	} else {
37 52
 		subidx := manager.emptylist[len(manager.emptylist)-1]
38 53
 		manager.emptylist = manager.emptylist[:len(manager.emptylist)-1]
39
-		manager.sub2ip[subidx] = msg.(*SubscriptionMsg).from
40 54
 		manager.ip2sub[msg.(*SubscriptionMsg).from] = append(manager.ip2sub[msg.(*SubscriptionMsg).from], subidx)
41 55
 		subnumber = subidx
42 56
 	}
@@ -48,7 +62,7 @@ func (manager *sub_manager) add_subscription(msg MsgUnit) error {
48 62
 	//namelist에서 name찾고, 없으면 추가
49 63
 	for nameptr != nil {
50 64
 		// *  compare함수 구현되기 전 임시로 끼워넣은 것 (이 부분은 secure.go 완성되면 다시 확인)
51
-		if compare(nameptr.topic, topic) == 0 {
65
+		if nameptr.topic[0] == topic[0] {
52 66
 			findOk = true
53 67
 			break
54 68
 		}
@@ -56,25 +70,23 @@ func (manager *sub_manager) add_subscription(msg MsgUnit) error {
56 70
 	}
57 71
 
58 72
 	if !findOk {
59
-		newNode := &NameNode{topic, nil, nil, List{}}
60
-		manager.list.tail.next = newNode
61
-		manager.list.tail = newNode
62
-		manager.list.size++
73
+		manager.list.addTopicNode(topic)
63 74
 		nameptr = manager.list.tail
64 75
 	}
65 76
 
66 77
 	// list[name]에 value추가
67 78
 	if len(operator) == 1 { // 단일 식이라면 (single)
68
-		valptr := nameptr.list.getPos(value)
79
+		valptr := nameptr.list.getValueNodePos(value, isAlpha)
80
+		fmt.Println("pos = " ,valptr.val)
69 81
 		if valptr == nil {
70
-			nameptr.list.add_ValueNode(value)
82
+			nameptr.list.addValueNode(value)
71 83
 			valptr = nameptr.list.tail
72 84
 		}
73 85
 
74 86
 		manager.sub2node[subnumber] = append(manager.sub2node[subnumber], valptr)
75
-		valptr.insert_Sub(operator[0], subnumber, true)
87
+		valptr.insertSub(operator[0], subnumber, true)
76 88
 
77
-		return nil // add_subscription ok
89
+		return nil // addSubscription ok
78 90
 	} else {
79 91
 
80 92
 		// '&&' , '||'로 묶여 있는 복합식에 대하여
@@ -82,15 +94,15 @@ func (manager *sub_manager) add_subscription(msg MsgUnit) error {
82 94
 
83 95
 		// find(namelist[name].list.val == value)인 노드
84 96
 		// * 이 부분 다시 봐야함..
85
-		valptr1 := nameptr.list.getPos(value)
86
-		valptr2 := nameptr.list.getPos(value)
97
+		valptr1 := nameptr.list.getValueNodePos(value, isAlpha)
98
+		valptr2 := nameptr.list.getValueNodePos(value, isAlpha)
87 99
 
88 100
 		if valptr1 == nil {
89
-			nameptr.list.add_ValueNode(value)
101
+			nameptr.list.addValueNode(value)
90 102
 			valptr1 = nameptr.list.tail
91 103
 		}
92 104
 		if valptr2 == nil {
93
-			nameptr.list.add_ValueNode(value)
105
+			nameptr.list.addValueNode(value)
94 106
 			valptr2 = nameptr.list.tail
95 107
 		}
96 108
 
@@ -100,17 +112,17 @@ func (manager *sub_manager) add_subscription(msg MsgUnit) error {
100 112
 		if logical_operator == "&&" { // '&&'로 묶여있다면
101 113
 			// rangesub check
102 114
 			manager.israngesub[subnumber] = true
103
-			valptr1.insert_Sub(operator[0], subnumber, false)
104
-			valptr2.insert_Sub(operator[2], subnumber, false)
115
+			valptr1.insertSub(operator[0], subnumber, false)
116
+			valptr2.insertSub(operator[2], subnumber, false)
105 117
 
106 118
 		} else {
107 119
 			// '||'로 묶여 있다면 두 식 모두 single로 처리가능
108
-			valptr1.insert_Sub(operator[0], subnumber, true)
109
-			valptr2.insert_Sub(operator[2], subnumber, true)
120
+			valptr1.insertSub(operator[0], subnumber, true)
121
+			valptr2.insertSub(operator[2], subnumber, true)
110 122
 		}
111
-		return nil // add_subscription ok
123
+		return nil // addSubscription ok
112 124
 	}
113
-	return errors.New("Can't add_subscription")
125
+	return errors.New("Can't addSubscription")
114 126
 }
115 127
 
116 128
 //	* To delete subscription
@@ -151,7 +163,7 @@ func (manager *sub_manager) delete(from string) error {
151 163
 				}
152 164
 
153 165
 				// node가 비어있으면 delete
154
-				isempty := node[j].isempty()
166
+				isempty := node[j].isEmpty()
155 167
 				if isempty && node[j] != nil {
156 168
 					prev_node := node[j].prev
157 169
 					next_node := node[j].next
@@ -192,7 +204,7 @@ func (manager *sub_manager) delete(from string) error {
192 204
 					manager.emptylist = append(manager.emptylist, sub)
193 205
 				}
194 206
 
195
-				isempty := node[j].isempty()
207
+				isempty := node[j].isEmpty()
196 208
 				// node가 비어있으면 delete
197 209
 				if isempty && node[j] != nil {
198 210
 					prev_node := node[j].prev
@@ -206,9 +218,4 @@ func (manager *sub_manager) delete(from string) error {
206 218
 	}
207 219
 	manager.ip2sub[ip]=nil
208 220
 	return nil
209
-}
210
-
211
-// * 암호화된 두 value 비교함수 (임시)
212
-func compare(v1 []int64, v2 []int64) int {
213
-	return 1
214
-}
221
+}

+ 145
- 0
src/broker/modules/subscription_test.go Parādīt failu

@@ -0,0 +1,145 @@
1
+package modules
2
+
3
+import (
4
+	"fmt"
5
+	_ "fmt"
6
+	"math/rand"
7
+	"strconv"
8
+	"testing"
9
+	"time"
10
+	"github.com/stretchr/testify/assert"
11
+)
12
+
13
+func dataMake(isalpha bool) MsgUnit{
14
+	rand.Seed(time.Now().UnixNano())
15
+
16
+	// Set Ipaddr
17
+	msg := Message{"", "1.0", "", SM}
18
+	for i := 0; i < 4; i++{
19
+		itoa := strconv.Itoa(rand.Int() % 256)
20
+
21
+		msg.from += itoa
22
+		if i != 3{
23
+			msg.from += "."
24
+		}
25
+	}
26
+
27
+	// Set Time
28
+	msg.time += strconv.Itoa(rand.Int()%24) + ":"
29
+	msg.time += strconv.Itoa(rand.Int()%60)
30
+
31
+	// Set Topic, Value, operator
32
+	topic := []int64{}
33
+	value := []int64{}
34
+	operator := []string{}
35
+	candOp := []string{">", ">=", "<=" ,"<", "=="}
36
+	logicalOp := []string{"&&", "||"}
37
+
38
+	topic = append(topic, rand.Int63())
39
+
40
+	if isalpha{
41
+		value = append(value, rand.Int63())
42
+		operator = append(operator, "==")
43
+	} else{
44
+		len := rand.Int() % 2 + 1
45
+		value = append(value, rand.Int63())
46
+
47
+		if len == 1{
48
+			operator = append(operator, candOp[rand.Int()%5])
49
+		} else{
50
+			value = append(value, rand.Int63())
51
+			op := rand.Int()%2
52
+			operator = append(operator, candOp[rand.Int()%2])
53
+			if op == 0 {
54
+				operator = append(operator, logicalOp[0])
55
+			} else{
56
+				operator = append(operator, logicalOp[1])
57
+			}
58
+			operator = append(operator, candOp[rand.Int()%2 + 2])
59
+		}
60
+	}
61
+
62
+	return &SubscriptionMsg{msg, topic, value, operator, isalpha}
63
+}
64
+
65
+func Test_addSubscription(t *testing.T) {
66
+	rand.Seed(time.Now().UnixNano())
67
+
68
+	// To Init sub_mng
69
+	mos := Moscato{sub_mng : sub_manager{}}
70
+
71
+	// Make Data set(Subscription)
72
+	msgList := []MsgUnit{}
73
+	dataLen:= 3
74
+	for i := 0 ; i < dataLen ; i++{
75
+		seed := rand.Int()%2
76
+		if seed == 0{
77
+			msgList = append(msgList, dataMake(false))
78
+		} else{
79
+			msgList = append(msgList, dataMake(true))
80
+		}
81
+	}
82
+
83
+	// Watch Data set
84
+	for i := 0; i < dataLen ; i++{
85
+		msg := msgList[i]
86
+		fmt.Println(
87
+			" from = ", msg.(*SubscriptionMsg).Message.from,
88
+			" time = ", msg.(*SubscriptionMsg).Message.time,
89
+			" topic = ", msg.(*SubscriptionMsg).topic,
90
+			" value = ", msg.(*SubscriptionMsg).value,
91
+			" operator = ", msg.(*SubscriptionMsg).operator,
92
+			" isAlpha ?= ", msg.(*SubscriptionMsg).isAlpha)
93
+	}
94
+
95
+	// Test addSubScription
96
+	for i := 0; i < dataLen ; i++{
97
+
98
+		msg := msgList[i]
99
+		ip := msg.(*SubscriptionMsg).Message.from
100
+		topic := msg.(*SubscriptionMsg).topic
101
+		value := msg.(*SubscriptionMsg).value
102
+		//operator := msg.(*SubscriptionMsg).operator
103
+		//isAlpha := msg.(*SubscriptionMsg).isAlpha
104
+		subnumber := mos.sub_mng.count_sub
105
+
106
+		mos.sub_mng.addSubscription(msg)
107
+
108
+
109
+		// 1. Check if ip mapping is correct
110
+		assert.Equal(t, subnumber, mos.sub_mng.ip2sub[ip][len(mos.sub_mng.ip2sub[ip]) - 1], "Ip mapping is failed")
111
+
112
+		// 2. Check topicNode
113
+		nameptr := mos.sub_mng.list.head
114
+		for nameptr != nil{
115
+			if nameptr.topic[0] == topic[0]{
116
+				break
117
+			}
118
+			nameptr = nameptr.next
119
+		}
120
+
121
+		for i := 0 ; i < len(topic); i++{
122
+			assert.Equal(t, topic[i], nameptr.topic[i], "topicNode Add is failed")
123
+		}
124
+
125
+		// 3. Check Value in ValueNode
126
+		valptr := nameptr.list.head
127
+		for valptr != nil{
128
+			for i:=0 ; i < len(value); i++{
129
+				find := true
130
+				if value[i] != valptr.val[i]{
131
+					find = false
132
+				}
133
+				if find{
134
+					break
135
+				}
136
+			}
137
+			valptr = valptr.next
138
+		}
139
+		fmt.Println("my value = ", valptr.val, " real value = ", value)
140
+
141
+		for i := 0; i < len(value); i++{
142
+			assert.Equal(t, value[i], valptr.val[i], "ValNode Add is failed")
143
+		}
144
+	}
145
+}

Notiek ielāde…
Atcelt
Saglabāt