2.4.7-release

leonchen83 · Feb 8, 2018 · 606ab54 · 606ab54
1 parent 48e70cf
commit 606ab54
Showing 1 changed file with 13 additions and 8 deletions.
diff --git a/examples/com/moilioncircle/examples/migration/MigrationExample.java b/examples/com/moilioncircle/examples/migration/MigrationExample.java
@@ -73,7 +73,7 @@ public static void sync(String sourceUri, String targetUri) throws IOException,
         final ExampleClient target = new ExampleClient(turi.getHost(), turi.getPort());
         Configuration tconfig = Configuration.valueOf(turi);
         if (tconfig.getAuthPassword() != null) {
-            String auth = target.send(AUTH, tconfig.getAuthPassword().getBytes());
+            Object auth = target.send(AUTH, tconfig.getAuthPassword().getBytes());
             System.out.println("AUTH:" + auth);
         }
         final AtomicInteger dbnum = new AtomicInteger(-1);
@@ -94,12 +94,12 @@ public void handle(Replicator replicator, KeyValuePair<?> kv) {
                 // Step2: restore dump data
                 DumpKeyValuePair mkv = (DumpKeyValuePair) kv;
                 if (mkv.getExpiredMs() == null) {
-                    String r = target.restore(mkv.getRawKey(), 0L, mkv.getValue(), true);
+                    Object r = target.restore(mkv.getRawKey(), 0L, mkv.getValue(), true);
                     System.out.println(r);
                 } else {
                     long ms = mkv.getExpiredMs() - System.currentTimeMillis();
                     if (ms <= 0) return;
-                    String r = target.restore(mkv.getRawKey(), ms, mkv.getValue(), true);
+                    Object r = target.restore(mkv.getRawKey(), ms, mkv.getValue(), true);
                     System.out.println(r);
                 }
             }
@@ -110,7 +110,7 @@ public void handle(Replicator replicator, Command command) {
                 if (!(command instanceof DefaultCommand)) return;
                 // Step3: sync aof command
                 DefaultCommand dc = (DefaultCommand) command;
-                String r = target.send(dc.getCommand(), dc.getArgs());
+                Object r = target.send(dc.getCommand(), dc.getArgs());
                 System.out.println(r);
             }
         });
@@ -213,16 +213,21 @@ public ExampleClient(final String host, final int port) {
             super(host, port);
         }
 
-        public String send(Protocol.Command cmd, final byte[]... args) {
+        public Object send(Protocol.Command cmd, final byte[]... args) {
             sendCommand(cmd, args);
-            return getStatusCodeReply();
+            Object r = getOne();
+            if (r instanceof byte[]) {
+                return new String((byte[]) r, UTF_8);
+            } else {
+                return r;
+            }
         }
 
-        public String send(final byte[] cmd, final byte[]... args) {
+        public Object send(final byte[] cmd, final byte[]... args) {
             return send(Protocol.Command.valueOf(new String(cmd, UTF_8).toUpperCase()), args);
         }
 
-        public String restore(byte[] key, long expired, byte[] dumped, boolean replace) {
+        public Object restore(byte[] key, long expired, byte[] dumped, boolean replace) {
             if (!replace) {
                 return send(RESTORE, key, toByteArray(expired), dumped);
             } else {