-
Notifications
You must be signed in to change notification settings - Fork 0
/
patch
executable file
·114 lines (112 loc) · 4.16 KB
/
patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
diff --cc gen-java/project1/NodeServiceHandler.java
index 3e61caa,ad6fbcb..0000000
--- a/gen-java/project1/NodeServiceHandler.java
+++ b/gen-java/project1/NodeServiceHandler.java
@@@ -235,21 -215,28 +235,36 @@@ public class NodeServiceHandler impleme
fingerTable[i].findSuccessor(myName, ListOfNodes, numDHT);
}
}
-
+
System.out.println("My ID is.."+myName.getID());
}
-
+
public static void printFingerTable(){
++<<<<<<< HEAD
+
+ System.out.println(" | "+"Start"+" | "+"Interval Begin"+" | "+"Interval End"+" | "+"Successor"+" | ");
+ for(int i = 1; i <= m ; i++){
+
+ System.out.println(" | "+fingerTable[i].getStart()+" | "+fingerTable[i].getIntervalBegin()+" | "+fingerTable[i].getIntervalEnd()+" | "+fingerTable[i].getSuccessor().getID()+" | ");
++=======
+
+ System.out.println("Node ID is "+myName.getID());
+ System.out.println("Range of Keys: " + (predecessor.getID()+1)%numDHT + " - " + myName.getID());
+ System.out.println("Predecessor Node: "+predecessor.getIP()+":"+predecessor.getPort()+":"+predecessor.getID());
+ System.out.println("Successor Node: "+fingerTable[1].getSuccessor().getIP()+":"+fingerTable[1].getSuccessor().getPort()+":"+fingerTable[1].getSuccessor().getID());
+ System.out.println("Number of Files Stored:");
+ System.out.println("List of Files Stored:");
+ System.out.println("Finger Table after the update:");
+ System.out.println(" | "+"Start"+" | "+"Interval Begin"+" | "+"Interval End"+" | "+"Successor"+" | ");
+ for(int i = 1; i <= m ; i++){
+
+ System.out.println(" | "+fingerTable[i].getStart()+" | "+fingerTable[i].getIntervalBegin()+" | "+fingerTable[i].getIntervalEnd()+" | "+fingerTable[i].getSuccessor().getID()+" | ");
++>>>>>>> 60fe05b18c341d145816e8473d7fe184deef60aa
}
-
+
}
-
-
+
+
public static NodeName strToNodeName(String input)
{
String data[] = input.split(":");
@@@ -458,59 -447,14 +477,64 @@@ public int isSuccessor(int hash
NodeService.Client nodeclient = new NodeService.Client(NodeProtocol);
-
+
String readVal = nodeclient.Read(Filename);
-
+
NodeTransport.close();
-
+
return readVal;
++<<<<<<< HEAD
+ }
+
+ /*
+ for(int i=1;i<=m;i++){
+
+ System.out.println("Iterating to ID "+fingerTable[i].getSuccessor().getID());
+ if(myName.getID() < predecessor.getID()){
+ if(hash>=fingerTable[i].getStart() || hash<=fingerTable[i].getSuccessor().getID()){
+ TTransport NodeTransport;
+ System.out.println("Request forwarded to.." +fingerTable[i].getSuccessor().getIP()+" "+fingerTable[i].getSuccessor().getPort()+ " "+fingerTable[i].getSuccessor().getID() );
+ NodeTransport = new TSocket(fingerTable[i].getSuccessor().getIP(), fingerTable[i].getSuccessor().getPort()); //map nodes in the ports
+ NodeTransport.open();
+
+ TProtocol NodeProtocol = new TBinaryProtocol(NodeTransport);
+
+ NodeService.Client nodeclient = new NodeService.Client(NodeProtocol);
+
+
+ String readVal = nodeclient.Read(Filename);
+
+ NodeTransport.close();
+
+ return readVal;
+ }
+ }
+
+ if(myName.getID() >= predecessor.getID()){
+ if(hash>=fingerTable[i].getStart() && hash<=fingerTable[i].getSuccessor().getID()){
+ TTransport NodeTransport;
+ System.out.println("Request forwarded to.." +fingerTable[i].getSuccessor().getIP()+" "+fingerTable[i].getSuccessor().getPort()+ " "+fingerTable[i].getSuccessor().getID() );
+ NodeTransport = new TSocket(fingerTable[i].getSuccessor().getIP(), fingerTable[i].getSuccessor().getPort()); //map nodes in the ports
+ NodeTransport.open();
+
+ TProtocol NodeProtocol = new TBinaryProtocol(NodeTransport);
+
+ NodeService.Client nodeclient = new NodeService.Client(NodeProtocol);
+
+
+ String readVal = nodeclient.Read(Filename);
+
+ NodeTransport.close();
+
+ return readVal;
+ }
+ }
+ }
+ */
++=======
+ }
+
++>>>>>>> 60fe05b18c341d145816e8473d7fe184deef60aa
}
return "File not Found..";
}