# HG changeset patch # User sugi # Date 1382261209 -32400 # Node ID f5d7654b90ffeba228edae7038aac4a414ee6309 # Parent 8e36904676af544e03e55786ba0da0802d5fe222 remove unused method diff -r 8e36904676af -r f5d7654b90ff src/alice/datasegment/DataSegmentManager.java --- a/src/alice/datasegment/DataSegmentManager.java Fri Oct 18 03:28:34 2013 +0900 +++ b/src/alice/datasegment/DataSegmentManager.java Sun Oct 20 18:26:49 2013 +0900 @@ -50,9 +50,8 @@ } } - public abstract void put(String key, byte[] val); + public abstract void put(String key, Object val); - public abstract void update(String key, byte[] val); public abstract void update(String key, Object val); public abstract void take(Receiver receiver, CodeSegment cs); public abstract void peek(Receiver receiver, CodeSegment cs); @@ -61,9 +60,7 @@ public abstract void close(); public abstract void finish(); - public abstract void quickPut(String key, byte[] val); public abstract void quickPut(String key, Object val); - public abstract void quickUpdate(String key, byte[] val); public abstract void quickUpdate(String key, Object val); public abstract void quickPeek(Receiver receiver, CodeSegment cs); diff -r 8e36904676af -r f5d7654b90ff src/alice/datasegment/LocalDataSegmentManager.java --- a/src/alice/datasegment/LocalDataSegmentManager.java Fri Oct 18 03:28:34 2013 +0900 +++ b/src/alice/datasegment/LocalDataSegmentManager.java Sun Oct 20 18:26:49 2013 +0900 @@ -60,11 +60,6 @@ } @Override - public void put(String key, byte[] val) { - put(key, val); - } - - @Override public void put(String key, Object val) { DataSegmentKey dataSegmentKey = getDataSegmentKey(key); Command cmd = new Command(CommandType.PUT, null, key, val, 0, 0, null, null, reverseKey); @@ -74,11 +69,6 @@ } @Override - public void quickPut(String key, byte[] val) { - put(key, val); - } - - @Override public void quickPut(String key, Object val) { put(key, val); } @@ -88,11 +78,6 @@ */ @Override - public void update(String key, byte[] val) { - update(key, val); - } - - @Override public void update(String key, Object val) { DataSegmentKey dataSegmentKey = getDataSegmentKey(key); Command cmd = new Command(CommandType.UPDATE, null, key, val, 0, 0, null, null, reverseKey); @@ -101,10 +86,6 @@ logger.debug(cmd.getCommandString()); } - @Override - public void quickUpdate(String key, byte[] val) { - update(key, val); - } @Override public void quickUpdate(String key, Object val) { diff -r 8e36904676af -r f5d7654b90ff src/alice/datasegment/RemoteDataSegmentManager.java --- a/src/alice/datasegment/RemoteDataSegmentManager.java Fri Oct 18 03:28:34 2013 +0900 +++ b/src/alice/datasegment/RemoteDataSegmentManager.java Sun Oct 20 18:26:49 2013 +0900 @@ -56,28 +56,12 @@ * send put command to target DataSegment */ @Override - public void put(String key, byte[] val) { - Command cmd = new Command(CommandType.PUT, null, key, val, 0, 0, null, null, null); - connection.sendCommand(cmd); // put command on the transmission thread - if (logger.isDebugEnabled()) - logger.debug(cmd.getCommandString()); - } - - @Override public void put(String key, Object val) { Command cmd = new Command(CommandType.PUT, null, key, val, 0, 0, null, null, null); connection.sendCommand(cmd); // put command on the transmission thread if (logger.isDebugEnabled()) logger.debug(cmd.getCommandString()); } - - @Override - public void quickPut(String key, byte[] val) { - Command cmd = new Command(CommandType.PUT, null, key, val, 0, 0, null, null, null); - connection.write(cmd); // put command is executed right now - if (logger.isDebugEnabled()) - logger.debug(cmd.getCommandString()); - } @Override public void quickPut(String key, Object val) { @@ -88,14 +72,6 @@ } @Override - public void update(String key, byte[] val) { - Command cmd = new Command(CommandType.UPDATE, null, key, val, 0, 0, null, null, null); - connection.sendCommand(cmd); - if (logger.isDebugEnabled()) - logger.debug(cmd.getCommandString()); - } - - @Override public void update(String key, Object val) { Command cmd = new Command(CommandType.UPDATE, null, key, val, 0, 0, null, null, null); connection.sendCommand(cmd); @@ -104,14 +80,6 @@ } @Override - public void quickUpdate(String key, byte[] val) { - Command cmd = new Command(CommandType.UPDATE, null, key, val, 0, 0, null, null, null); - connection.write(cmd); - if (logger.isDebugEnabled()) - logger.debug(cmd.getCommandString()); - } - - @Override public void quickUpdate(String key, Object val) { Command cmd = new Command(CommandType.UPDATE, null, key, val, 0, 0, null, null, null); connection.write(cmd); diff -r 8e36904676af -r f5d7654b90ff src/alice/test/codesegment/local/bitonicsort/SortPhase.java --- a/src/alice/test/codesegment/local/bitonicsort/SortPhase.java Fri Oct 18 03:28:34 2013 +0900 +++ b/src/alice/test/codesegment/local/bitonicsort/SortPhase.java Sun Oct 20 18:26:49 2013 +0900 @@ -43,9 +43,7 @@ ods.flip(info1); ods.flip(info2); - if (count+1>=sort_count/2){ - - } else if (count%2==0&&info.lastFlag&&count+2