annotate rep/handler/Translator.java @ 427:622a8e15ff40

Merge Worked ?
author one
date Sat, 02 Jan 2010 03:20:23 +0900
parents 1acc3dfde5d3
children 1bb59652d89c
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
390
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
1 package rep.handler;
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
2
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
3 import java.util.Comparator;
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
4 import java.util.LinkedList;
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
5 import java.util.List;
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
6 import java.util.TreeSet;
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
7
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
8 import rep.REP;
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
9 import rep.REPCommand;
407
de4ef4313adc looks like working...
one
parents: 397
diff changeset
10 import rep.SessionManager;
421
f8916a96a373 (no commit message)
one
parents: 411
diff changeset
11 import rep.channel.REPLogger;
390
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
12 import rep.optimizers.REPCommandOptimizer;
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
13
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
14 public class Translator {
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
15 public int eid;
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
16
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
17 public REPCommandOptimizer optimizer;
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
18 private LinkedList<REPCommand> unMergedCmds;
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
19 public LinkedList<REPCommand> sentMergedList;
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
20 private LinkedList<REPCommand> mergeAgainList;
421
f8916a96a373 (no commit message)
one
parents: 411
diff changeset
21 public REPLogger logger = SessionManager.logger;
390
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
22 boolean merge_mode = false;
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
23
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
24 public Translator(int _eid,REPCommandOptimizer opt){
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
25 eid = _eid;
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
26 optimizer = opt;
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
27 unMergedCmds = new LinkedList<REPCommand>();
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
28 mergeAgainList = new LinkedList<REPCommand>();
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
29 sentMergedList = new LinkedList<REPCommand>();
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
30 }
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
31
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
32 /**
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
33 * New command from an editor
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
34 * The command is sent to the next editor
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
35 * @param cmd
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
36 * @return translated command.
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
37 */
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
38 public REPCommand transSendCmd(REPCommand cmd){
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
39 assert(cmd.eid==eid);
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
40 unMergedCmds.add(cmd);
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
41
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
42 //マージ中にユーザから割り込みがあった場合
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
43 if(isMerging()){
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
44 mergeAgainList.add(cmd);
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
45 }
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
46
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
47 return cmd;
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
48 }
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
49 /**
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
50 * My command is returned from the session ring, and START_MERGE_ACK
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
51 * is returned. At this
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
52 * stage my writeQueue is empty, our editor is waiting for me.
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
53 * Start merge process.
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
54 * @param cmd
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
55 */
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
56 public boolean catchOwnCommand(REPNode editor){
427
622a8e15ff40 Merge Worked ?
one
parents: 426
diff changeset
57 logger.writeLog("beforeMerge:"+unMergedCmds);
390
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
58 LinkedList<REPCommand> output = new LinkedList<REPCommand>();
427
622a8e15ff40 Merge Worked ?
one
parents: 426
diff changeset
59 TreeSet<REPCommand> cmds = new TreeSet<REPCommand>(new REPCommandComparator());
622a8e15ff40 Merge Worked ?
one
parents: 426
diff changeset
60 // merge queue上にあるコマンドを全部undoコマンドするのと同時に
622a8e15ff40 Merge Worked ?
one
parents: 426
diff changeset
61 // sort したコマンド列を生成する
622a8e15ff40 Merge Worked ?
one
parents: 426
diff changeset
62 for( REPCommand cmd0 : unMergedCmds) {
390
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
63 output.add( createUndo(cmd0) );
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
64 cmds.add(cmd0);
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
65 }
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
66 output.addAll(cmds);
427
622a8e15ff40 Merge Worked ?
one
parents: 426
diff changeset
67 // ACKが来たものは必ず先頭
622a8e15ff40 Merge Worked ?
one
parents: 426
diff changeset
68 unMergedCmds.removeFirst();
426
1acc3dfde5d3 minor fix.
one
parents: 421
diff changeset
69 logger.writeLog("outputMerge:"+output);
1acc3dfde5d3 minor fix.
one
parents: 421
diff changeset
70 logger.writeLog("afterMerge:"+unMergedCmds);
390
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
71 return optimizedSend(editor,output);
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
72 }
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
73
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
74 /**
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
75 * Sent optimized merged command list
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
76 * @param editor
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
77 * @param output
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
78 * @return if any sent commands output
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
79 */
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
80 public boolean optimizedSend(REPNode editor, LinkedList<REPCommand> output) {
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
81 List<REPCommand> output1 = optimizer.optimize(output);
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
82 if (output1.size()==0) {
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
83 merge_mode = false;
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
84 return false;
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
85 }
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
86 for(REPCommand c:output1) {
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
87 REPCommand m = new REPCommand(c);
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
88 m.setEID(REP.MERGE_EID.id);
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
89 m.setSEQID(editor.seq());
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
90 sentMergedList.add(m);
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
91 editor.send(m);
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
92 }
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
93 merge_mode = true;
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
94 return true;
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
95 }
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
96
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
97 private REPCommand createUndo(REPCommand cmd){
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
98 REPCommand retCmd = new REPCommand(cmd);
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
99 if (cmd.cmd==REP.REPCMD_INSERT) retCmd.cmd=REP.REPCMD_DELETE;
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
100 else if (cmd.cmd==REP.REPCMD_DELETE) retCmd.cmd=REP.REPCMD_INSERT;
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
101 return retCmd;
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
102 }
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
103
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
104 class REPCommandComparator implements Comparator<REPCommand>{
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
105
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
106 public int compare(REPCommand o1, REPCommand o2) {
427
622a8e15ff40 Merge Worked ?
one
parents: 426
diff changeset
107 if ( o1.eid<o2.eid ) return -1;
622a8e15ff40 Merge Worked ?
one
parents: 426
diff changeset
108 if ( o1.eid>o2.eid ) return 1;
622a8e15ff40 Merge Worked ?
one
parents: 426
diff changeset
109 if ( o1.seq<o2.seq ) return -1;
622a8e15ff40 Merge Worked ?
one
parents: 426
diff changeset
110 if ( o1.seq>o2.seq ) return 1;
622a8e15ff40 Merge Worked ?
one
parents: 426
diff changeset
111 assert(false);
622a8e15ff40 Merge Worked ?
one
parents: 426
diff changeset
112 return 0;
390
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
113 }
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
114 }
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
115
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
116 /**
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
117 * Translate Command cmd that was received from SeMa.
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
118 * @param cmd the command to be translated.
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
119 * @return translated commannd.
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
120 */
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
121 public void transReceiveCmd(REPNode nextEditor,REPCommand cmd){
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
122 assert (cmd.eid != eid);
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
123 unMergedCmds.add(cmd);
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
124 }
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
125
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
126 public void setEid(int _eid){
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
127 eid = _eid;
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
128 }
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
129
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
130 public boolean checkMergeConflict(REPCommand command) {
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
131 REPCommand prev = sentMergedList.remove();
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
132 assert (prev.seq==command.seq);
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
133
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
134 if(mergeAgainList.size() > 0){
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
135 mergeAgainList.add(command);
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
136 return true;
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
137 }
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
138 if(sentMergedList.size()==0) {
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
139 merge_mode=false;
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
140 }
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
141 return false;
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
142 }
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
143
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
144 public void getMergeAgain(REPNode editor) {
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
145 LinkedList<REPCommand> returnCommand = new LinkedList<REPCommand>();
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
146 for(int i = 0; i < mergeAgainList.size(); i++){
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
147 //eid = REP.MEGE_EID
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
148 returnCommand.add(createUndo(mergeAgainList.get(mergeAgainList.size() - i -1)));
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
149 }
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
150 for(REPCommand command : mergeAgainList){
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
151 if(command.eid == REP.MERGE_EID.id){
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
152 returnCommand.add(command);
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
153 }
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
154 }
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
155 for(REPCommand command : mergeAgainList){
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
156 if(command.eid == eid){
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
157 command.eid = REP.MERGE_EID.id;
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
158 returnCommand.add(command);
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
159 }
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
160 }
411
795ef563f2a0 add commnets
one
parents: 407
diff changeset
161 // int count = 0;
795ef563f2a0 add commnets
one
parents: 407
diff changeset
162 // for(REPCommand command: returnCommand) {
795ef563f2a0 add commnets
one
parents: 407
diff changeset
163 // switch(command.cmd) {
795ef563f2a0 add commnets
one
parents: 407
diff changeset
164 // case REPCMD_INSERT: count++; break;
795ef563f2a0 add commnets
one
parents: 407
diff changeset
165 // case REPCMD_DELETE: count--; break;
795ef563f2a0 add commnets
one
parents: 407
diff changeset
166 // default: assert false;
795ef563f2a0 add commnets
one
parents: 407
diff changeset
167 // }
795ef563f2a0 add commnets
one
parents: 407
diff changeset
168 // }
421
f8916a96a373 (no commit message)
one
parents: 411
diff changeset
169 logger.writeLog("MergeAgain ret="+returnCommand.size());
411
795ef563f2a0 add commnets
one
parents: 407
diff changeset
170 // +" increment="+count);
390
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
171 mergeAgainList.clear();
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
172 optimizedSend(editor, returnCommand);
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
173 }
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
174
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
175 public boolean isFinished() {
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
176 if(unMergedCmds.size() > 0) return false;
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
177 if(sentMergedList.size() > 0) return false;
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
178 return true;
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
179 }
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
180
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
181 public boolean isMerging() {
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
182 return merge_mode;
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
183 }
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
184
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
185 public void startMerge(REPCommand cmd) {
427
622a8e15ff40 Merge Worked ?
one
parents: 426
diff changeset
186 logger.writeLog("START MERGE command ="+cmd+" and top of unMergedCmds = "+ unMergedCmds.getFirst());
390
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
187 merge_mode = true;
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
188 }
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
189
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
190 public void mergeAck() {
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
191 }
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
192
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
193
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
194
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
195 }