Merge branch 'master' of gitee.com:fastdfs100/fastdfs-client-java

HISTORY

@@ -1,7 +1,13 @@
 
+Version 1.28  2019-12-30
+  * support connection pool. you can use connection pool or a short connection.
+    configuration items please see fdfs_client.conf and client.properties
+  * you must upgrade your FastDFS server to V6.06 or higher version
+
 Version 1.27  2019-11-11
   * StorageClient add function: regenerate_filename for appender file
     StorageClient1 add function: regenerate_filename1 for appender file
+  * you must upgrade your FastDFS server to V6.02 or higher version
 
 Version 1.26  2017-04-17
   * IniFileReader use getResourceAsStream first

LICENSE

@@ -0,0 +1,29 @@
+BSD 3-Clause License
+
+Copyright (c) 2019, happyfish100
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of the copyright holder nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

README.md

@@ -26,7 +26,7 @@ mvn install:install-file -DgroupId=org.csource -DartifactId=fastdfs-client-java
 <dependency>
     <groupId>org.csource</groupId>
     <artifactId>fastdfs-client-java</artifactId>
-    <version>1.27-SNAPSHOT</version>
+    <version>1.28-SNAPSHOT</version>
 </dependency>
 ```
 
@@ -53,6 +53,11 @@ http.secret_key = FastDFS1234567890
 tracker_server = 10.0.11.247:22122
 tracker_server = 10.0.11.248:22122
 tracker_server = 10.0.11.249:22122
+
+connection_pool.enabled = true
+connection_pool.max_count_per_entry = 500
+connection_pool.max_idle_time = 3600
+connection_pool.max_wait_time_in_ms = 1000
 ```
 
     注1：tracker_server指向您自己IP地址和端口，1-n个
@@ -80,6 +85,11 @@ fastdfs.http_secret_key = FastDFS1234567890
 fastdfs.http_tracker_http_port = 80
 
 fastdfs.tracker_servers = 10.0.11.201:22122,10.0.11.202:22122,10.0.11.203:22122
+
+fastdfs.connection_pool.enabled = true
+fastdfs.connection_pool.max_count_per_entry = 500
+fastdfs.connection_pool.max_idle_time = 3600
+fastdfs.connection_pool.max_wait_time_in_ms = 1000
 ```
 
     注1：properties 配置文件中属性名跟 conf 配置文件不尽相同，并且统一加前缀"fastdfs."，便于整合到用户项目配置文件
@@ -122,6 +132,10 @@ ClientGlobal.configInfo(): {
   g_anti_steal_token = false
   g_secret_key = FastDFS1234567890
   g_tracker_http_port = 80
+  g_connection_pool_enabled = true
+  g_connection_pool_max_count_per_entry = 500
+  g_connection_pool_max_idle_time(ms) = 3600000
+  g_connection_pool_max_wait_time_in_ms(ms) = 1000
   trackerServers = 10.0.11.101:22122,10.0.11.102:22122
 }
 ```

fastdfs-client.properties

@@ -11,3 +11,14 @@ fastdfs.http_tracker_http_port = 80
 
 fastdfs.tracker_servers = 10.0.11.201:22122,10.0.11.202:22122,10.0.11.203:22122
 
+## Whether to open the connection pool, if not, create a new connection every time
+fastdfs.connection_pool.enabled = true
+
+## max_count_per_entry: max connection count per host:port , 0 is not limit
+fastdfs.connection_pool.max_count_per_entry = 500
+
+## connections whose the idle time exceeds this time will be closed, unit: second, default value is 3600
+fastdfs.connection_pool.max_idle_time = 3600
+
+## Maximum waiting time when the maximum number of connections is reached, unit: millisecond, default value is 1000
+fastdfs.connection_pool.max_wait_time_in_ms = 1000

fdfs_client.conf

@@ -8,3 +8,8 @@ http.secret_key = FastDFS1234567890
 tracker_server = 10.0.11.247:22122
 tracker_server = 10.0.11.248:22122
 tracker_server = 10.0.11.249:22122
+
+connection_pool.enabled = true
+connection_pool.max_count_per_entry = 500
+connection_pool.max_idle_time = 3600
+connection_pool.max_wait_time_in_ms = 1000

pom.xml

@@ -4,7 +4,7 @@
 
   <groupId>org.csource</groupId>
   <artifactId>fastdfs-client-java</artifactId>
-  <version>1.27-SNAPSHOT</version>
+  <version>1.28-SNAPSHOT</version>
   <name>fastdfs-client-java</name>
   <description>fastdfs client for java</description>
   <packaging>jar</packaging>

src/main/java/org/csource/common/MyException.java

@@ -15,7 +15,7 @@ package org.csource.common;
  * @version Version 1.0
  */
 public class MyException extends Exception {
-  public MyException() {
+  public MyException(String s, Exception e) {
   }
 
   public MyException(String message) {

src/main/java/org/csource/fastdfs/ClientGlobal.java

@@ -34,7 +34,6 @@ public class ClientGlobal {
   public static final String CONF_KEY_HTTP_SECRET_KEY = "http.secret_key";
   public static final String CONF_KEY_HTTP_TRACKER_HTTP_PORT = "http.tracker_http_port";
   public static final String CONF_KEY_TRACKER_SERVER = "tracker_server";
-
   public static final String PROP_KEY_CONNECT_TIMEOUT_IN_SECONDS = "fastdfs.connect_timeout_in_seconds";
   public static final String PROP_KEY_NETWORK_TIMEOUT_IN_SECONDS = "fastdfs.network_timeout_in_seconds";
   public static final String PROP_KEY_CHARSET = "fastdfs.charset";
@@ -43,6 +42,13 @@ public class ClientGlobal {
   public static final String PROP_KEY_HTTP_TRACKER_HTTP_PORT = "fastdfs.http_tracker_http_port";
   public static final String PROP_KEY_TRACKER_SERVERS = "fastdfs.tracker_servers";
 
+
+  public static final String PROP_KEY_CONNECTION_POOL_ENABLED = "fastdfs.connection_pool.enabled";
+  public static final String PROP_KEY_CONNECTION_POOL_MAX_COUNT_PER_ENTRY = "fastdfs.connection_pool.max_count_per_entry";
+  public static final String PROP_KEY_CONNECTION_POOL_MAX_IDLE_TIME = "fastdfs.connection_pool.max_idle_time";
+  public static final String PROP_KEY_CONNECTION_POOL_MAX_WAIT_TIME_IN_MS = "fastdfs.connection_pool.max_wait_time_in_ms";
+
+
   public static final int DEFAULT_CONNECT_TIMEOUT = 5; //second
   public static final int DEFAULT_NETWORK_TIMEOUT = 30; //second
   public static final String DEFAULT_CHARSET = "UTF-8";
@@ -50,6 +56,11 @@ public class ClientGlobal {
   public static final String DEFAULT_HTTP_SECRET_KEY = "FastDFS1234567890";
   public static final int DEFAULT_HTTP_TRACKER_HTTP_PORT = 80;
 
+  public static final boolean DEFAULT_CONNECTION_POOL_ENABLED = true;
+  public static final int DEFAULT_CONNECTION_POOL_MAX_COUNT_PER_ENTRY = 100;
+  public static final int DEFAULT_CONNECTION_POOL_MAX_IDLE_TIME = 3600 ;//second
+  public static final int DEFAULT_CONNECTION_POOL_MAX_WAIT_TIME_IN_MS = 1000 ;//millisecond
+
   public static int g_connect_timeout = DEFAULT_CONNECT_TIMEOUT * 1000; //millisecond
   public static int g_network_timeout = DEFAULT_NETWORK_TIMEOUT * 1000; //millisecond
   public static String g_charset = DEFAULT_CHARSET;
@@ -57,6 +68,11 @@ public class ClientGlobal {
   public static String g_secret_key = DEFAULT_HTTP_SECRET_KEY; //generage token secret key
   public static int g_tracker_http_port = DEFAULT_HTTP_TRACKER_HTTP_PORT;
 
+  public static boolean g_connection_pool_enabled = DEFAULT_CONNECTION_POOL_ENABLED;
+  public static int g_connection_pool_max_count_per_entry = DEFAULT_CONNECTION_POOL_MAX_COUNT_PER_ENTRY;
+  public static int g_connection_pool_max_idle_time = DEFAULT_CONNECTION_POOL_MAX_IDLE_TIME * 1000; //millisecond
+  public static int g_connection_pool_max_wait_time_in_ms = DEFAULT_CONNECTION_POOL_MAX_WAIT_TIME_IN_MS; //millisecond
+
   public static TrackerGroup g_tracker_group;
 
   private ClientGlobal() {
@@ -112,6 +128,17 @@ public class ClientGlobal {
     if (g_anti_steal_token) {
       g_secret_key = iniReader.getStrValue("http.secret_key");
     }
+    g_connection_pool_enabled = iniReader.getBoolValue("connection_pool.enabled", DEFAULT_CONNECTION_POOL_ENABLED);
+    g_connection_pool_max_count_per_entry = iniReader.getIntValue("connection_pool.max_count_per_entry", DEFAULT_CONNECTION_POOL_MAX_COUNT_PER_ENTRY);
+    g_connection_pool_max_idle_time = iniReader.getIntValue("connection_pool.max_idle_time", DEFAULT_CONNECTION_POOL_MAX_IDLE_TIME);
+    if (g_connection_pool_max_idle_time < 0) {
+      g_connection_pool_max_idle_time = DEFAULT_CONNECTION_POOL_MAX_IDLE_TIME;
+    }
+    g_connection_pool_max_idle_time *= 1000;
+    g_connection_pool_max_wait_time_in_ms = iniReader.getIntValue("connection_pool.max_wait_time_in_ms", DEFAULT_CONNECTION_POOL_MAX_WAIT_TIME_IN_MS);
+    if (g_connection_pool_max_wait_time_in_ms < 0) {
+      g_connection_pool_max_wait_time_in_ms = DEFAULT_CONNECTION_POOL_MAX_WAIT_TIME_IN_MS;
+    }
   }
 
   /**
@@ -149,6 +176,11 @@ public class ClientGlobal {
     String httpAntiStealTokenConf = props.getProperty(PROP_KEY_HTTP_ANTI_STEAL_TOKEN);
     String httpSecretKeyConf = props.getProperty(PROP_KEY_HTTP_SECRET_KEY);
     String httpTrackerHttpPortConf = props.getProperty(PROP_KEY_HTTP_TRACKER_HTTP_PORT);
+    String poolEnabled = props.getProperty(PROP_KEY_CONNECTION_POOL_ENABLED);
+    String poolMaxCountPerEntry = props.getProperty(PROP_KEY_CONNECTION_POOL_MAX_COUNT_PER_ENTRY);
+    String poolMaxIdleTime  = props.getProperty(PROP_KEY_CONNECTION_POOL_MAX_IDLE_TIME);
+    String poolMaxWaitTimeInMS = props.getProperty(PROP_KEY_CONNECTION_POOL_MAX_WAIT_TIME_IN_MS);
+
     if (connectTimeoutInSecondsConf != null && connectTimeoutInSecondsConf.trim().length() != 0) {
       g_connect_timeout = Integer.parseInt(connectTimeoutInSecondsConf.trim()) * 1000;
     }
@@ -167,6 +199,18 @@ public class ClientGlobal {
     if (httpTrackerHttpPortConf != null && httpTrackerHttpPortConf.trim().length() != 0) {
       g_tracker_http_port = Integer.parseInt(httpTrackerHttpPortConf);
     }
+    if (poolEnabled != null && poolEnabled.trim().length() != 0) {
+      g_connection_pool_enabled = Boolean.parseBoolean(poolEnabled);
+    }
+    if (poolMaxCountPerEntry != null && poolMaxCountPerEntry.trim().length() != 0 ) {
+      g_connection_pool_max_count_per_entry = Integer.parseInt(poolMaxCountPerEntry);
+    }
+    if (poolMaxIdleTime != null && poolMaxIdleTime.trim().length() != 0) {
+      g_connection_pool_max_idle_time = Integer.parseInt(poolMaxIdleTime) * 1000;
+    }
+    if (poolMaxWaitTimeInMS != null && poolMaxWaitTimeInMS.trim().length() != 0) {
+      g_connection_pool_max_wait_time_in_ms = Integer.parseInt(poolMaxWaitTimeInMS);
+    }
   }
 
   /**
@@ -217,6 +261,7 @@ public class ClientGlobal {
    */
   public static Socket getSocket(InetSocketAddress addr) throws IOException {
     Socket sock = new Socket();
+    sock.setReuseAddress(true);
     sock.setSoTimeout(ClientGlobal.g_network_timeout);
     sock.connect(addr, ClientGlobal.g_connect_timeout);
     return sock;
@@ -282,6 +327,10 @@ public class ClientGlobal {
     ClientGlobal.g_tracker_group = tracker_group;
   }
 
+  public static boolean isG_connection_pool_enabled() {
+    return g_connection_pool_enabled;
+  }
+
   public static String configInfo() {
     String trackerServers = "";
     if (g_tracker_group != null) {
@@ -298,6 +347,10 @@ public class ClientGlobal {
       + "\n  g_anti_steal_token = " + g_anti_steal_token
       + "\n  g_secret_key = " + g_secret_key
       + "\n  g_tracker_http_port = " + g_tracker_http_port
+      + "\n  g_connection_pool_enabled = " + g_connection_pool_enabled
+      + "\n  g_connection_pool_max_count_per_entry = " + g_connection_pool_max_count_per_entry
+      + "\n  g_connection_pool_max_idle_time(ms) = " + g_connection_pool_max_idle_time
+      + "\n  g_connection_pool_max_wait_time_in_ms(ms) = " + g_connection_pool_max_wait_time_in_ms
       + "\n  trackerServers = " + trackerServers
       + "\n}";
   }

src/main/java/org/csource/fastdfs/StorageServer.java

@@ -28,7 +28,7 @@ public class StorageServer extends TrackerServer {
    * @param store_path the store path index on the storage server
    */
   public StorageServer(String ip_addr, int port, int store_path) throws IOException {
-    super(ClientGlobal.getSocket(ip_addr, port), new InetSocketAddress(ip_addr, port));
+    super(new InetSocketAddress(ip_addr, port));
     this.store_path_index = store_path;
   }
 
@@ -40,7 +40,7 @@ public class StorageServer extends TrackerServer {
    * @param store_path the store path index on the storage server
    */
   public StorageServer(String ip_addr, int port, byte store_path) throws IOException {
-    super(ClientGlobal.getSocket(ip_addr, port), new InetSocketAddress(ip_addr, port));
+    super(new InetSocketAddress(ip_addr, port));
     if (store_path < 0) {
       this.store_path_index = 256 + store_path;
     } else {

src/main/java/org/csource/fastdfs/TrackerGroup.java

@@ -10,7 +10,6 @@ package org.csource.fastdfs;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
-import java.net.Socket;
 
 /**
  * Tracker server group
@@ -39,12 +38,8 @@ public class TrackerGroup {
    *
    * @return connected tracker server, null for fail
    */
-  public TrackerServer getConnection(int serverIndex) throws IOException {
-    Socket sock = new Socket();
-    sock.setReuseAddress(true);
-    sock.setSoTimeout(ClientGlobal.g_network_timeout);
-    sock.connect(this.tracker_servers[serverIndex], ClientGlobal.g_connect_timeout);
-    return new TrackerServer(sock, this.tracker_servers[serverIndex]);
+  public TrackerServer getTrackerServer(int serverIndex) throws IOException {
+    return new TrackerServer(this.tracker_servers[serverIndex]);
   }
 
   /**
@@ -52,7 +47,7 @@ public class TrackerGroup {
    *
    * @return connected tracker server, null for fail
    */
-  public TrackerServer getConnection() throws IOException {
+  public TrackerServer getTrackerServer() throws IOException {
     int current_index;
 
     synchronized (this.lock) {
@@ -65,7 +60,7 @@ public class TrackerGroup {
     }
 
     try {
-      return this.getConnection(current_index);
+      return this.getTrackerServer(current_index);
     } catch (IOException ex) {
       System.err.println("connect to server " + this.tracker_servers[current_index].getAddress().getHostAddress() + ":" + this.tracker_servers[current_index].getPort() + " fail");
       ex.printStackTrace(System.err);
@@ -77,7 +72,7 @@ public class TrackerGroup {
       }
 
       try {
-        TrackerServer trackerServer = this.getConnection(i);
+        TrackerServer trackerServer = this.getTrackerServer(i);
 
         synchronized (this.lock) {
           if (this.tracker_server_index == current_index) {

src/main/java/org/csource/fastdfs/TrackerServer.java

@@ -8,11 +8,13 @@
 
 package org.csource.fastdfs;
 
+import org.csource.common.MyException;
+import org.csource.fastdfs.pool.Connection;
+import org.csource.fastdfs.pool.ConnectionPool;
+import org.csource.fastdfs.pool.ConnectionFactory;
+
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
 import java.net.InetSocketAddress;
-import java.net.Socket;
 
 /**
  * Tracker Server Info
@@ -21,93 +23,29 @@ import java.net.Socket;
  * @version Version 1.11
  */
 public class TrackerServer {
-  protected Socket sock;
-  protected InetSocketAddress inetSockAddr;
+    protected InetSocketAddress inetSockAddr;
 
-  /**
-   * Constructor
-   *
-   * @param sock         Socket of server
-   * @param inetSockAddr the server info
-   */
-  public TrackerServer(Socket sock, InetSocketAddress inetSockAddr) {
-    this.sock = sock;
-    this.inetSockAddr = inetSockAddr;
-  }
 
-  /**
-   * get the connected socket
-   *
-   * @return the socket
-   */
-  public Socket getSocket() throws IOException {
-    if (this.sock == null) {
-      this.sock = ClientGlobal.getSocket(this.inetSockAddr);
+    public TrackerServer(InetSocketAddress inetSockAddr) throws IOException {
+        this.inetSockAddr = inetSockAddr;
     }
 
-    return this.sock;
-  }
-
-  /**
-   * get the server info
-   *
-   * @return the server info
-   */
-  public InetSocketAddress getInetSocketAddress() {
-    return this.inetSockAddr;
-  }
-
-  public OutputStream getOutputStream() throws IOException {
-    return this.sock.getOutputStream();
-  }
-
-  public InputStream getInputStream() throws IOException {
-    return this.sock.getInputStream();
-  }
-
-  public void close() throws IOException {
-    if (this.sock != null) {
-      try {
-        ProtoCommon.closeSocket(this.sock);
-      } finally {
-        this.sock = null;
-      }
+    public Connection getConnection() throws MyException, IOException {
+        Connection connection;
+        if (ClientGlobal.g_connection_pool_enabled) {
+            connection = ConnectionPool.getConnection(this.inetSockAddr);
+        } else {
+            connection = ConnectionFactory.create(this.inetSockAddr);
+        }
+        return connection;
     }
-  }
-
-  protected void finalize() throws Throwable {
-    this.close();
-  }
-
-  public boolean isConnected(){
-    boolean isConnected = false;
-    if (sock != null) {
-      if (sock.isConnected()) {
-        isConnected = true;
-      }
+    /**
+     * get the server info
+     *
+     * @return the server info
+     */
+    public InetSocketAddress getInetSocketAddress() {
+        return this.inetSockAddr;
     }
-    return isConnected;
-  }
 
-  public boolean isAvaliable() {
-    if (isConnected()) {
-      if (sock.getPort() == 0) {
-        return false;
-      }
-      if (sock.getInetAddress() == null) {
-        return false;
-      }
-      if (sock.getRemoteSocketAddress() == null) {
-        return false;
-      }
-      if (sock.isInputShutdown()) {
-        return false;
-      }
-      if (sock.isOutputShutdown()) {
-        return false;
-      }
-      return true;
-    }
-    return false;
-  }
 }

src/main/java/org/csource/fastdfs/pool/Connection.java

@@ -0,0 +1,127 @@
+package org.csource.fastdfs.pool;
+
+import org.csource.fastdfs.ClientGlobal;
+import org.csource.fastdfs.ProtoCommon;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+
+public class Connection {
+
+    private Socket sock;
+    private InetSocketAddress inetSockAddr;
+    private Long lastAccessTime = System.currentTimeMillis();
+
+    public Connection(Socket sock, InetSocketAddress inetSockAddr) {
+        this.sock = sock;
+        this.inetSockAddr = inetSockAddr;
+    }
+
+    /**
+     * get the server info
+     *
+     * @return the server info
+     */
+    public InetSocketAddress getInetSocketAddress() {
+        return this.inetSockAddr;
+    }
+
+    public OutputStream getOutputStream() throws IOException {
+        return this.sock.getOutputStream();
+    }
+
+    public InputStream getInputStream() throws IOException {
+        return this.sock.getInputStream();
+    }
+
+    public Long getLastAccessTime() {
+        return lastAccessTime;
+    }
+
+    public void setLastAccessTime(Long lastAccessTime) {
+        this.lastAccessTime = lastAccessTime;
+    }
+
+    /**
+     *
+     * @throws IOException
+     */
+    public void close() throws IOException {
+        //if connection enabled get from connection pool
+        if (ClientGlobal.g_connection_pool_enabled) {
+            ConnectionPool.closeConnection(this);
+        } else {
+            this.closeDirectly();
+        }
+    }
+
+    public void release() throws IOException {
+        if (ClientGlobal.g_connection_pool_enabled) {
+            ConnectionPool.releaseConnection(this);
+        } else {
+            this.closeDirectly();
+        }
+    }
+
+    /**
+     * force close socket,
+     */
+    public void closeDirectly() throws IOException {
+        if (this.sock != null) {
+            try {
+                ProtoCommon.closeSocket(this.sock);
+            } finally {
+                this.sock = null;
+            }
+        }
+    }
+
+    public boolean activeTest() throws IOException {
+        if (this.sock == null) {
+            return false;
+        }
+        return ProtoCommon.activeTest(this.sock);
+    }
+
+    public boolean isConnected() {
+        boolean isConnected = false;
+        if (sock != null) {
+            if (sock.isConnected()) {
+                isConnected = true;
+            }
+        }
+        return isConnected;
+    }
+    public boolean isAvaliable() {
+        if (isConnected()) {
+            if (sock.getPort() == 0) {
+                return false;
+            }
+            if (sock.getInetAddress() == null) {
+                return false;
+            }
+            if (sock.getRemoteSocketAddress() == null) {
+                return false;
+            }
+            if (sock.isInputShutdown()) {
+                return false;
+            }
+            if (sock.isOutputShutdown()) {
+                return false;
+            }
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public String toString() {
+        return "TrackerServer{" +
+                "sock=" + sock +
+                ", inetSockAddr=" + inetSockAddr +
+                '}';
+    }
+}

src/main/java/org/csource/fastdfs/pool/ConnectionFactory.java

@@ -0,0 +1,29 @@
+package org.csource.fastdfs.pool;
+
+import org.csource.common.MyException;
+import org.csource.fastdfs.ClientGlobal;
+
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+
+public class ConnectionFactory {
+    /**
+     * create from InetSocketAddress
+     *
+     * @param socketAddress
+     * @return
+     * @throws IOException
+     */
+    public static Connection create(InetSocketAddress socketAddress) throws MyException {
+        try {
+            Socket sock = new Socket();
+            sock.setReuseAddress(true);
+            sock.setSoTimeout(ClientGlobal.g_network_timeout);
+            sock.connect(socketAddress, ClientGlobal.g_connect_timeout);
+            return new Connection(sock, socketAddress);
+        } catch (Exception e) {
+            throw new MyException("connect to server " + socketAddress.getAddress().getHostAddress() + ":" + socketAddress.getPort() + " fail, emsg:" + e.getMessage());
+        }
+    }
+}

src/main/java/org/csource/fastdfs/pool/ConnectionManager.java

@@ -0,0 +1,119 @@
+package org.csource.fastdfs.pool;
+
+import org.csource.common.MyException;
+import org.csource.fastdfs.ClientGlobal;
+
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.util.LinkedList;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.ReentrantLock;
+
+public class ConnectionManager {
+
+    private InetSocketAddress inetSocketAddress;
+
+    /**
+     * total create connection pool
+     */
+    private AtomicInteger totalCount = new AtomicInteger();
+
+    /**
+     * free connection count
+     */
+    private AtomicInteger freeCount = new AtomicInteger();
+
+    /**
+     * lock
+     */
+    private ReentrantLock lock = new ReentrantLock(true);
+
+    private Condition condition = lock.newCondition();
+
+    /**
+     * free connections
+     */
+    private LinkedList<Connection> freeConnections = new LinkedList<Connection>();
+
+    private ConnectionManager() {
+
+    }
+
+    public ConnectionManager(InetSocketAddress socketAddress) {
+        this.inetSocketAddress = socketAddress;
+    }
+
+    public Connection getConnection() throws MyException {
+        lock.lock();
+        try {
+            Connection connection = null;
+            while (true) {
+                if (freeCount.get() > 0) {
+                    freeCount.decrementAndGet();
+                    connection = freeConnections.poll();
+                    if (!connection.isAvaliable() || (System.currentTimeMillis() - connection.getLastAccessTime()) > ClientGlobal.g_connection_pool_max_idle_time) {
+                        closeConnection(connection);
+                        continue;
+                    }
+                } else if (ClientGlobal.g_connection_pool_max_count_per_entry == 0 || totalCount.get() < ClientGlobal.g_connection_pool_max_count_per_entry) {
+                    connection = ConnectionFactory.create(this.inetSocketAddress);
+                    totalCount.incrementAndGet();
+                } else {
+                    try {
+                        if (condition.await(ClientGlobal.g_connection_pool_max_wait_time_in_ms, TimeUnit.MILLISECONDS)) {
+                            //wait single success
+                            continue;
+                        }
+                        throw new MyException("connect to server " + inetSocketAddress.getAddress().getHostAddress() + ":" + inetSocketAddress.getPort() + " fail, wait_time > " + ClientGlobal.g_connection_pool_max_wait_time_in_ms + "ms");
+                    } catch (InterruptedException e) {
+                        e.printStackTrace();
+                        throw new MyException("connect to server " + inetSocketAddress.getAddress().getHostAddress() + ":" + inetSocketAddress.getPort() + " fail, emsg:" + e.getMessage());
+                    }
+                }
+                return connection;
+            }
+        } finally {
+            lock.unlock();
+        }
+    }
+
+    public void releaseConnection(Connection connection) {
+        if (connection == null) {
+            return;
+        }
+        lock.lock();
+        try {
+            connection.setLastAccessTime(System.currentTimeMillis());
+            freeConnections.add(connection);
+            freeCount.incrementAndGet();
+            condition.signal();
+        } finally {
+            lock.unlock();
+        }
+
+    }
+
+    public void closeConnection(Connection connection) {
+        try {
+            if (connection != null) {
+                totalCount.decrementAndGet();
+                connection.closeDirectly();
+            }
+        } catch (IOException e) {
+            System.err.println("close socket[" + inetSocketAddress.getAddress().getHostAddress() + ":" + inetSocketAddress.getPort() + "] error ,emsg:" + e.getMessage());
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public String toString() {
+        return "ConnectionManager{" +
+                "ip:port='" + inetSocketAddress.getAddress().getHostAddress() + ":" + inetSocketAddress.getPort() +
+                ", totalCount=" + totalCount +
+                ", freeCount=" + freeCount +
+                ", freeConnections =" + freeConnections +
+                '}';
+    }
+}

src/main/java/org/csource/fastdfs/pool/ConnectionPool.java

@@ -0,0 +1,80 @@
+package org.csource.fastdfs.pool;
+
+import org.csource.common.MyException;
+
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+public class ConnectionPool {
+    /**
+     * key is ip:port, value is ConnectionManager
+     */
+    private final static ConcurrentHashMap<String, ConnectionManager> CP = new ConcurrentHashMap<String, ConnectionManager>();
+
+    public static Connection getConnection(InetSocketAddress socketAddress) throws MyException {
+        if (socketAddress == null) {
+            return null;
+        }
+        String key = getKey(socketAddress);
+        ConnectionManager connectionManager;
+        connectionManager = CP.get(key);
+        if (connectionManager == null) {
+            synchronized (ConnectionPool.class) {
+                connectionManager = CP.get(key);
+                if (connectionManager == null) {
+                    connectionManager = new ConnectionManager(socketAddress);
+                    CP.put(key, connectionManager);
+                }
+            }
+        }
+        return connectionManager.getConnection();
+    }
+
+    public static void releaseConnection(Connection connection) throws IOException {
+        if (connection == null) {
+            return;
+        }
+        String key = getKey(connection.getInetSocketAddress());
+        ConnectionManager connectionManager = CP.get(key);
+        if (connectionManager != null) {
+            connectionManager.releaseConnection(connection);
+        } else {
+            connection.closeDirectly();
+        }
+
+    }
+
+    public static void closeConnection(Connection connection) throws IOException {
+        if (connection == null) {
+            return;
+        }
+        String key = getKey(connection.getInetSocketAddress());
+        ConnectionManager connectionManager = CP.get(key);
+        if (connectionManager != null) {
+            connectionManager.closeConnection(connection);
+        } else {
+            connection.closeDirectly();
+        }
+    }
+
+    private static String getKey(InetSocketAddress socketAddress) {
+        if (socketAddress == null) {
+            return null;
+        }
+        return String.format("%s:%s", socketAddress.getAddress().getHostAddress(), socketAddress.getPort());
+    }
+
+    @Override
+    public String toString() {
+        if (!CP.isEmpty()) {
+            StringBuilder builder = new StringBuilder();
+            for (Map.Entry<String, ConnectionManager> managerEntry : CP.entrySet()) {
+                builder.append("key:[" + managerEntry.getKey() + " ]-------- entry:" + managerEntry.getValue() + "\n");
+            }
+            return builder.toString();
+        }
+        return null;
+    }
+}

src/main/resources/fastdfs-client.properties.sample

@@ -9,5 +9,16 @@ fastdfs.http_anti_steal_token = false
 fastdfs.http_secret_key = FastDFS1234567890
 fastdfs.http_tracker_http_port = 80
 
-fastdfs.tracker_servers = 10.0.11.201:22122,10.0.11.202:22122,10.0.11.203:22122
+fastdfs.tracker_servers = 185.245.40.70:22122
 
+## Whether to open the connection pool, if not, create a new connection every time
+fastdfs.connection_pool.enabled = true
+
+## max_count_per_entry: max connection count per host:port , 0 is not limit
+fastdfs.connection_pool.max_count_per_entry = 500
+
+## connections whose the idle time exceeds this time will be closed, unit: second, default value is 3600
+fastdfs.connection_pool.max_idle_time = 3600
+
+## Maximum waiting time when the maximum number of connections is reached, unit: millisecond, default value is 1000
+fastdfs.connection_pool.max_wait_time_in_ms = 1000

src/main/resources/fdfs_client.conf.sample

@@ -7,3 +7,8 @@ http.secret_key = FastDFS1234567890
 
 tracker_server = 10.0.11.243:22122
 tracker_server = 10.0.11.244:22122
+
+connection_pool.enabled = true
+connection_pool.max_count_per_entry = 500
+connection_pool.max_idle_time = 3600
+connection_pool.max_wait_time_in_ms = 1000

src/test/java/org/csource/fastdfs/FdfsTest.java

@@ -31,7 +31,7 @@ public class FdfsTest {
         LOGGER.info("network_timeout=" + ClientGlobal.g_network_timeout + "ms");
         LOGGER.info("charset=" + ClientGlobal.g_charset);
         TrackerClient tracker = new TrackerClient();
-        trackerServer = tracker.getConnection();
+        trackerServer = tracker.getTrackerServer();
         StorageServer storageServer = null;
         storageClient = new StorageClient(trackerServer, storageServer);
     }

src/test/java/org/csource/fastdfs/Monitor.java

@@ -8,8 +8,6 @@
 
 package org.csource.fastdfs;
 
-import org.csource.fastdfs.*;
-
 import java.text.SimpleDateFormat;
 
 /**
@@ -48,7 +46,7 @@ public class Monitor {
   		System.out.println("delete storage errno: " + tracker.getErrorCode());
   		*/
 
-      TrackerServer trackerServer = tracker.getConnection();
+      TrackerServer trackerServer = tracker.getTrackerServer();
       if (trackerServer == null) {
         return;
       }
@@ -157,8 +155,6 @@ public class Monitor {
           System.out.println("\t\tlast_synced_timestamp = " + df.format(storageStat.getLastSyncedTimestamp()) + getSyncedDelayString(storageStats, storageStat));
         }
       }
-
-      trackerServer.close();
     } catch (Exception ex) {
       ex.printStackTrace();
     }

src/test/java/org/csource/fastdfs/Test.java

@@ -9,7 +9,6 @@
 package org.csource.fastdfs;
 
 import org.csource.common.NameValuePair;
-import org.csource.fastdfs.*;
 
 /**
  * client test
@@ -46,7 +45,7 @@ public class Test {
       System.out.println("charset=" + ClientGlobal.g_charset);
 
       TrackerClient tracker = new TrackerClient();
-      TrackerServer trackerServer = tracker.getConnection();
+      TrackerServer trackerServer = tracker.getTrackerServer();
       StorageServer storageServer = null;
       StorageClient1 client = new StorageClient1(trackerServer, storageServer);
 
@@ -60,8 +59,6 @@ public class Test {
         byte[] result = client.download_file1(fileId);
         System.out.println(i + ", download result is: " + result.length);
       }
-
-      trackerServer.close();
     } catch (Exception ex) {
       ex.printStackTrace();
     }

src/test/java/org/csource/fastdfs/Test1.java

@@ -1,7 +1,6 @@
 package org.csource.fastdfs;
 
 import org.csource.common.NameValuePair;
-import org.csource.fastdfs.*;
 
 import java.net.InetSocketAddress;
 
@@ -39,9 +38,9 @@ public class Test1 {
             TrackerGroup tg = new TrackerGroup(new InetSocketAddress[]{new InetSocketAddress("47.95.221.159", 22122)});
             TrackerClient tc = new TrackerClient(tg);
 
-            TrackerServer ts = tc.getConnection();
+            TrackerServer ts = tc.getTrackerServer();
             if (ts == null) {
-                System.out.println("getConnection return null");
+                System.out.println("getTrackerServer return null");
                 return;
             }
 

src/test/java/org/csource/fastdfs/TestAppender.java

@@ -9,7 +9,6 @@
 package org.csource.fastdfs;
 
 import org.csource.common.NameValuePair;
-import org.csource.fastdfs.*;
 
 import java.io.File;
 import java.net.InetSocketAddress;
@@ -53,7 +52,7 @@ public class TestAppender {
       String remote_filename;
       ServerInfo[] servers;
       TrackerClient tracker = new TrackerClient();
-      TrackerServer trackerServer = tracker.getConnection();
+      TrackerServer trackerServer = tracker.getTrackerServer();
 
       StorageServer storageServer = null;
 
@@ -298,14 +297,10 @@ public class TestAppender {
         return;
       }
   		/* for test only */
-      System.out.println("active test to storage server: " + ProtoCommon.activeTest(storageServer.getSocket()));
-
-      storageServer.close();
+      System.out.println("active test to storage server: " + storageServer.getConnection().activeTest());
 
   		/* for test only */
-      System.out.println("active test to tracker server: " + ProtoCommon.activeTest(trackerServer.getSocket()));
-
-      trackerServer.close();
+      System.out.println("active test to tracker server: " + trackerServer.getConnection().activeTest());
     } catch (Exception ex) {
       ex.printStackTrace();
     }

src/test/java/org/csource/fastdfs/TestAppender1.java

@@ -9,7 +9,6 @@
 package org.csource.fastdfs;
 
 import org.csource.common.NameValuePair;
-import org.csource.fastdfs.*;
 
 import java.io.File;
 import java.net.InetSocketAddress;
@@ -21,39 +20,39 @@ import java.net.InetSocketAddress;
  * @version Version 1.20
  */
 public class TestAppender1 {
-  private TestAppender1() {
-  }
-
-  /**
-   * entry point
-   *
-   * @param args comand arguments
-   *             <ul><li>args[0]: config filename</li></ul>
-   *             <ul><li>args[1]: local filename to upload</li></ul>
-   */
-  public static void main(String args[]) {
-    if (args.length < 2) {
-      System.out.println("Error: Must have 2 parameters, one is config filename, "
-        + "the other is the local filename to upload");
-      return;
+    private TestAppender1() {
     }
 
-    System.out.println("java.version=" + System.getProperty("java.version"));
+    /**
+     * entry point
+     *
+     * @param args comand arguments
+     *             <ul><li>args[0]: config filename</li></ul>
+     *             <ul><li>args[1]: local filename to upload</li></ul>
+     */
+    public static void main(String args[]) {
+        if (args.length < 2) {
+            System.out.println("Error: Must have 2 parameters, one is config filename, "
+                    + "the other is the local filename to upload");
+            return;
+        }
 
-    String conf_filename = args[0];
-    String local_filename = args[1];
+        System.out.println("java.version=" + System.getProperty("java.version"));
 
-    try {
-      ClientGlobal.init(conf_filename);
-      System.out.println("network_timeout=" + ClientGlobal.g_network_timeout + "ms");
-      System.out.println("charset=" + ClientGlobal.g_charset);
+        String conf_filename = args[0];
+        String local_filename = args[1];
 
-      long startTime;
-      ServerInfo[] servers;
-      TrackerClient tracker = new TrackerClient();
-      TrackerServer trackerServer = tracker.getConnection();
+        try {
+            ClientGlobal.init(conf_filename);
+            System.out.println("network_timeout=" + ClientGlobal.g_network_timeout + "ms");
+            System.out.println("charset=" + ClientGlobal.g_charset);
 
-      StorageServer storageServer = null;
+            long startTime;
+            ServerInfo[] servers;
+            TrackerClient tracker = new TrackerClient();
+            TrackerServer trackerServer = tracker.getTrackerServer();
+
+            StorageServer storageServer = null;
 
   		/*
       storageServer = tracker.getStoreStorage(trackerServer);
@@ -64,229 +63,226 @@ public class TestAppender1 {
   		}
   		*/
 
-      StorageClient1 client = new StorageClient1(trackerServer, storageServer);
-      byte[] file_buff;
-      NameValuePair[] meta_list;
-      String group_name;
-      String appender_file_id;
-      String file_ext_name;
-      int errno;
+            StorageClient1 client = new StorageClient1(trackerServer, storageServer);
+            byte[] file_buff;
+            NameValuePair[] meta_list;
+            String group_name;
+            String appender_file_id;
+            String file_ext_name;
+            int errno;
 
-      meta_list = new NameValuePair[4];
-      meta_list[0] = new NameValuePair("width", "800");
-      meta_list[1] = new NameValuePair("heigth", "600");
-      meta_list[2] = new NameValuePair("bgcolor", "#FFFFFF");
-      meta_list[3] = new NameValuePair("author", "Mike");
+            meta_list = new NameValuePair[4];
+            meta_list[0] = new NameValuePair("width", "800");
+            meta_list[1] = new NameValuePair("heigth", "600");
+            meta_list[2] = new NameValuePair("bgcolor", "#FFFFFF");
+            meta_list[3] = new NameValuePair("author", "Mike");
 
-      file_buff = "this is a test".getBytes(ClientGlobal.g_charset);
-      System.out.println("file length: " + file_buff.length);
+            file_buff = "this is a test".getBytes(ClientGlobal.g_charset);
+            System.out.println("file length: " + file_buff.length);
 
-      group_name = null;
-      StorageServer[] storageServers = tracker.getStoreStorages(trackerServer, group_name);
-      if (storageServers == null) {
-        System.err.println("get store storage servers fail, error code: " + tracker.getErrorCode());
-      } else {
-        System.err.println("store storage servers count: " + storageServers.length);
-        for (int k = 0; k < storageServers.length; k++) {
-          System.err.println((k + 1) + ". " + storageServers[k].getInetSocketAddress().getAddress().getHostAddress() + ":" + storageServers[k].getInetSocketAddress().getPort());
-        }
-        System.err.println("");
-      }
+            group_name = null;
+            StorageServer[] storageServers = tracker.getStoreStorages(trackerServer, group_name);
+            if (storageServers == null) {
+                System.err.println("get store storage servers fail, error code: " + tracker.getErrorCode());
+            } else {
+                System.err.println("store storage servers count: " + storageServers.length);
+                for (int k = 0; k < storageServers.length; k++) {
+                    System.err.println((k + 1) + ". " + storageServers[k].getInetSocketAddress().getAddress().getHostAddress() + ":" + storageServers[k].getInetSocketAddress().getPort());
+                }
+                System.err.println("");
+            }
 
-      startTime = System.currentTimeMillis();
-      appender_file_id = client.upload_appender_file1(file_buff, "txt", meta_list);
-      System.out.println("upload_appender_file1 time used: " + (System.currentTimeMillis() - startTime) + " ms");
+            startTime = System.currentTimeMillis();
+            appender_file_id = client.upload_appender_file1(file_buff, "txt", meta_list);
+            System.out.println("upload_appender_file1 time used: " + (System.currentTimeMillis() - startTime) + " ms");
 
   		/*
   		group_name = "";
   		appender_file_id = client.upload_appender_file1(group_name, file_buff, "txt", meta_list);
   		*/
-      if (appender_file_id == null) {
-        System.err.println("upload file fail, error code: " + client.getErrorCode());
-        return;
-      } else {
-        System.err.println(client.get_file_info1(appender_file_id));
+            if (appender_file_id == null) {
+                System.err.println("upload file fail, error code: " + client.getErrorCode());
+                return;
+            } else {
+                System.err.println(client.get_file_info1(appender_file_id));
 
-        servers = tracker.getFetchStorages1(trackerServer, appender_file_id);
-        if (servers == null) {
-          System.err.println("get storage servers fail, error code: " + tracker.getErrorCode());
-        } else {
-          System.err.println("storage servers count: " + servers.length);
-          for (int k = 0; k < servers.length; k++) {
-            System.err.println((k + 1) + ". " + servers[k].getIpAddr() + ":" + servers[k].getPort());
-          }
-          System.err.println("");
+                servers = tracker.getFetchStorages1(trackerServer, appender_file_id);
+                if (servers == null) {
+                    System.err.println("get storage servers fail, error code: " + tracker.getErrorCode());
+                } else {
+                    System.err.println("storage servers count: " + servers.length);
+                    for (int k = 0; k < servers.length; k++) {
+                        System.err.println((k + 1) + ". " + servers[k].getIpAddr() + ":" + servers[k].getPort());
+                    }
+                    System.err.println("");
+                }
+
+                meta_list = new NameValuePair[4];
+                meta_list[0] = new NameValuePair("width", "1024");
+                meta_list[1] = new NameValuePair("heigth", "768");
+                meta_list[2] = new NameValuePair("bgcolor", "#000000");
+                meta_list[3] = new NameValuePair("title", "Untitle");
+
+                startTime = System.currentTimeMillis();
+                errno = client.set_metadata1(appender_file_id, meta_list, ProtoCommon.STORAGE_SET_METADATA_FLAG_MERGE);
+                System.out.println("set_metadata time used: " + (System.currentTimeMillis() - startTime) + " ms");
+                if (errno == 0) {
+                    System.err.println("set_metadata success");
+                } else {
+                    System.err.println("set_metadata fail, error no: " + errno);
+                }
+
+                meta_list = client.get_metadata1(appender_file_id);
+                if (meta_list != null) {
+                    for (int i = 0; i < meta_list.length; i++) {
+                        System.out.println(meta_list[i].getName() + " " + meta_list[i].getValue());
+                    }
+                }
+
+                startTime = System.currentTimeMillis();
+                file_buff = client.download_file1(appender_file_id);
+                System.out.println("download_file time used: " + (System.currentTimeMillis() - startTime) + " ms");
+
+                if (file_buff != null) {
+                    System.out.println("file length:" + file_buff.length);
+                    System.out.println((new String(file_buff)));
+                }
+
+                file_buff = "this is a slave buff".getBytes(ClientGlobal.g_charset);
+                file_ext_name = "txt";
+                startTime = System.currentTimeMillis();
+                errno = client.append_file1(appender_file_id, file_buff);
+                System.out.println("append_file time used: " + (System.currentTimeMillis() - startTime) + " ms");
+                if (errno == 0) {
+                    System.err.println(client.get_file_info1(appender_file_id));
+                } else {
+                    System.err.println("append file fail, error no: " + errno);
+                }
+
+                startTime = System.currentTimeMillis();
+                String new_file_id = client.regenerate_appender_filename1(appender_file_id);
+                System.out.println("regenerate_appender_filename time used: " + (System.currentTimeMillis() - startTime) + " ms");
+                if (errno == 0) {
+                    appender_file_id = new_file_id;
+                    System.err.println(client.get_file_info1(appender_file_id));
+                } else {
+                    System.err.println("regenerate_appender_filename fail, error no: " + errno);
+                }
+
+                startTime = System.currentTimeMillis();
+                errno = client.delete_file1(appender_file_id);
+                System.out.println("delete_file time used: " + (System.currentTimeMillis() - startTime) + " ms");
+                if (errno == 0) {
+                    System.err.println("Delete file success");
+                } else {
+                    System.err.println("Delete file fail, error no: " + errno);
+                }
+            }
+
+            appender_file_id = client.upload_appender_file1(local_filename, null, meta_list);
+            if (appender_file_id != null) {
+                int ts;
+                String token;
+                String file_url;
+                InetSocketAddress inetSockAddr;
+
+                inetSockAddr = trackerServer.getInetSocketAddress();
+                file_url = "http://" + inetSockAddr.getAddress().getHostAddress();
+                if (ClientGlobal.g_tracker_http_port != 80) {
+                    file_url += ":" + ClientGlobal.g_tracker_http_port;
+                }
+                file_url += "/" + appender_file_id;
+                if (ClientGlobal.g_anti_steal_token) {
+                    ts = (int) (System.currentTimeMillis() / 1000);
+                    token = ProtoCommon.getToken(appender_file_id, ts, ClientGlobal.g_secret_key);
+                    file_url += "?token=" + token + "&ts=" + ts;
+                }
+
+                System.err.println(client.get_file_info1(appender_file_id));
+                System.err.println("file url: " + file_url);
+
+                errno = client.download_file1(appender_file_id, 0, 0, "c:\\" + appender_file_id.replaceAll("/", "_"));
+                if (errno == 0) {
+                    System.err.println("Download file success");
+                } else {
+                    System.err.println("Download file fail, error no: " + errno);
+                }
+
+                errno = client.download_file1(appender_file_id, 0, 0, new DownloadFileWriter("c:\\" + appender_file_id.replaceAll("/", "-")));
+                if (errno == 0) {
+                    System.err.println("Download file success");
+                } else {
+                    System.err.println("Download file fail, error no: " + errno);
+                }
+
+                file_ext_name = null;
+                startTime = System.currentTimeMillis();
+                errno = client.append_file1(appender_file_id, local_filename);
+                System.out.println("append_file time used: " + (System.currentTimeMillis() - startTime) + " ms");
+                if (errno == 0) {
+                    System.err.println(client.get_file_info1(appender_file_id));
+                } else {
+                    System.err.println("append file fail, error no: " + errno);
+                }
+            }
+
+            File f;
+            f = new File(local_filename);
+            int nPos = local_filename.lastIndexOf('.');
+            if (nPos > 0 && local_filename.length() - nPos <= ProtoCommon.FDFS_FILE_EXT_NAME_MAX_LEN + 1) {
+                file_ext_name = local_filename.substring(nPos + 1);
+            } else {
+                file_ext_name = null;
+            }
+
+            appender_file_id = client.upload_appender_file1(null, f.length(),
+                    new UploadLocalFileSender(local_filename), file_ext_name, meta_list);
+            if (appender_file_id != null) {
+                System.out.println(client.get_file_info1(appender_file_id));
+
+                startTime = System.currentTimeMillis();
+                errno = client.append_file1(appender_file_id, f.length(), new UploadLocalFileSender(local_filename));
+                System.out.println("append_file time used: " + (System.currentTimeMillis() - startTime) + " ms");
+                if (errno == 0) {
+                    System.err.println(client.get_file_info1(appender_file_id));
+                } else {
+                    System.err.println("append file fail, error no: " + errno);
+                }
+
+                startTime = System.currentTimeMillis();
+                errno = client.modify_file1(appender_file_id, 0, f.length(), new UploadLocalFileSender(local_filename));
+                System.out.println("modify_file time used: " + (System.currentTimeMillis() - startTime) + " ms");
+                if (errno == 0) {
+                    System.err.println(client.get_file_info1(appender_file_id));
+                } else {
+                    System.err.println("modify file fail, error no: " + errno);
+                }
+
+                startTime = System.currentTimeMillis();
+                errno = client.truncate_file1(appender_file_id, 0);
+                System.out.println("truncate_file time used: " + (System.currentTimeMillis() - startTime) + " ms");
+                if (errno == 0) {
+                    System.err.println(client.get_file_info1(appender_file_id));
+                } else {
+                    System.err.println("truncate file fail, error no: " + errno);
+                }
+            } else {
+                System.err.println("Upload file fail, error no: " + errno);
+            }
+
+            storageServer = tracker.getFetchStorage1(trackerServer, appender_file_id);
+            if (storageServer == null) {
+                System.out.println("getFetchStorage fail, errno code: " + tracker.getErrorCode());
+                return;
+            }
+
+            /* for test only */
+            System.out.println("active test to storage server: " + storageServer.getConnection().activeTest());
+
+            /* for test only */
+            System.out.println("active test to tracker server: " + trackerServer.getConnection().activeTest());
+        } catch (Exception ex) {
+            ex.printStackTrace();
         }
-
-        meta_list = new NameValuePair[4];
-        meta_list[0] = new NameValuePair("width", "1024");
-        meta_list[1] = new NameValuePair("heigth", "768");
-        meta_list[2] = new NameValuePair("bgcolor", "#000000");
-        meta_list[3] = new NameValuePair("title", "Untitle");
-
-        startTime = System.currentTimeMillis();
-        errno = client.set_metadata1(appender_file_id, meta_list, ProtoCommon.STORAGE_SET_METADATA_FLAG_MERGE);
-        System.out.println("set_metadata time used: " + (System.currentTimeMillis() - startTime) + " ms");
-        if (errno == 0) {
-          System.err.println("set_metadata success");
-        } else {
-          System.err.println("set_metadata fail, error no: " + errno);
-        }
-
-        meta_list = client.get_metadata1(appender_file_id);
-        if (meta_list != null) {
-          for (int i = 0; i < meta_list.length; i++) {
-            System.out.println(meta_list[i].getName() + " " + meta_list[i].getValue());
-          }
-        }
-
-        startTime = System.currentTimeMillis();
-        file_buff = client.download_file1(appender_file_id);
-        System.out.println("download_file time used: " + (System.currentTimeMillis() - startTime) + " ms");
-
-        if (file_buff != null) {
-          System.out.println("file length:" + file_buff.length);
-          System.out.println((new String(file_buff)));
-        }
-
-        file_buff = "this is a slave buff".getBytes(ClientGlobal.g_charset);
-        file_ext_name = "txt";
-        startTime = System.currentTimeMillis();
-        errno = client.append_file1(appender_file_id, file_buff);
-        System.out.println("append_file time used: " + (System.currentTimeMillis() - startTime) + " ms");
-        if (errno == 0) {
-          System.err.println(client.get_file_info1(appender_file_id));
-        } else {
-          System.err.println("append file fail, error no: " + errno);
-        }
-
-        startTime = System.currentTimeMillis();
-        String new_file_id = client.regenerate_appender_filename1(appender_file_id);
-        System.out.println("regenerate_appender_filename time used: " + (System.currentTimeMillis() - startTime) + " ms");
-        if (errno == 0) {
-          appender_file_id = new_file_id;
-          System.err.println(client.get_file_info1(appender_file_id));
-        } else {
-          System.err.println("regenerate_appender_filename fail, error no: " + errno);
-        }
-
-        startTime = System.currentTimeMillis();
-        errno = client.delete_file1(appender_file_id);
-        System.out.println("delete_file time used: " + (System.currentTimeMillis() - startTime) + " ms");
-        if (errno == 0) {
-          System.err.println("Delete file success");
-        } else {
-          System.err.println("Delete file fail, error no: " + errno);
-        }
-      }
-
-      appender_file_id = client.upload_appender_file1(local_filename, null, meta_list);
-      if (appender_file_id != null) {
-        int ts;
-        String token;
-        String file_url;
-        InetSocketAddress inetSockAddr;
-
-        inetSockAddr = trackerServer.getInetSocketAddress();
-        file_url = "http://" + inetSockAddr.getAddress().getHostAddress();
-        if (ClientGlobal.g_tracker_http_port != 80) {
-          file_url += ":" + ClientGlobal.g_tracker_http_port;
-        }
-        file_url += "/" + appender_file_id;
-        if (ClientGlobal.g_anti_steal_token) {
-          ts = (int) (System.currentTimeMillis() / 1000);
-          token = ProtoCommon.getToken(appender_file_id, ts, ClientGlobal.g_secret_key);
-          file_url += "?token=" + token + "&ts=" + ts;
-        }
-
-        System.err.println(client.get_file_info1(appender_file_id));
-        System.err.println("file url: " + file_url);
-
-        errno = client.download_file1(appender_file_id, 0, 0, "c:\\" + appender_file_id.replaceAll("/", "_"));
-        if (errno == 0) {
-          System.err.println("Download file success");
-        } else {
-          System.err.println("Download file fail, error no: " + errno);
-        }
-
-        errno = client.download_file1(appender_file_id, 0, 0, new DownloadFileWriter("c:\\" + appender_file_id.replaceAll("/", "-")));
-        if (errno == 0) {
-          System.err.println("Download file success");
-        } else {
-          System.err.println("Download file fail, error no: " + errno);
-        }
-
-        file_ext_name = null;
-        startTime = System.currentTimeMillis();
-        errno = client.append_file1(appender_file_id, local_filename);
-        System.out.println("append_file time used: " + (System.currentTimeMillis() - startTime) + " ms");
-        if (errno == 0) {
-          System.err.println(client.get_file_info1(appender_file_id));
-        } else {
-          System.err.println("append file fail, error no: " + errno);
-        }
-      }
-
-      File f;
-      f = new File(local_filename);
-      int nPos = local_filename.lastIndexOf('.');
-      if (nPos > 0 && local_filename.length() - nPos <= ProtoCommon.FDFS_FILE_EXT_NAME_MAX_LEN + 1) {
-        file_ext_name = local_filename.substring(nPos + 1);
-      } else {
-        file_ext_name = null;
-      }
-
-      appender_file_id = client.upload_appender_file1(null, f.length(),
-        new UploadLocalFileSender(local_filename), file_ext_name, meta_list);
-      if (appender_file_id != null) {
-        System.out.println(client.get_file_info1(appender_file_id));
-
-        startTime = System.currentTimeMillis();
-        errno = client.append_file1(appender_file_id, f.length(), new UploadLocalFileSender(local_filename));
-        System.out.println("append_file time used: " + (System.currentTimeMillis() - startTime) + " ms");
-        if (errno == 0) {
-          System.err.println(client.get_file_info1(appender_file_id));
-        } else {
-          System.err.println("append file fail, error no: " + errno);
-        }
-
-        startTime = System.currentTimeMillis();
-        errno = client.modify_file1(appender_file_id, 0, f.length(), new UploadLocalFileSender(local_filename));
-        System.out.println("modify_file time used: " + (System.currentTimeMillis() - startTime) + " ms");
-        if (errno == 0) {
-          System.err.println(client.get_file_info1(appender_file_id));
-        } else {
-          System.err.println("modify file fail, error no: " + errno);
-        }
-
-        startTime = System.currentTimeMillis();
-        errno = client.truncate_file1(appender_file_id, 0);
-        System.out.println("truncate_file time used: " + (System.currentTimeMillis() - startTime) + " ms");
-        if (errno == 0) {
-          System.err.println(client.get_file_info1(appender_file_id));
-        } else {
-          System.err.println("truncate file fail, error no: " + errno);
-        }
-      } else {
-        System.err.println("Upload file fail, error no: " + errno);
-      }
-
-      storageServer = tracker.getFetchStorage1(trackerServer, appender_file_id);
-      if (storageServer == null) {
-        System.out.println("getFetchStorage fail, errno code: " + tracker.getErrorCode());
-        return;
-      }
-  		/* for test only */
-      System.out.println("active test to storage server: " + ProtoCommon.activeTest(storageServer.getSocket()));
-
-      storageServer.close();
-
-  		/* for test only */
-      System.out.println("active test to tracker server: " + ProtoCommon.activeTest(trackerServer.getSocket()));
-
-      trackerServer.close();
-    } catch (Exception ex) {
-      ex.printStackTrace();
     }
-  }
 }

src/test/java/org/csource/fastdfs/TestClient.java

@@ -9,7 +9,6 @@
 package org.csource.fastdfs;
 
 import org.csource.common.NameValuePair;
-import org.csource.fastdfs.*;
 
 import java.io.File;
 import java.net.InetSocketAddress;
@@ -21,41 +20,41 @@ import java.net.InetSocketAddress;
  * @version Version 1.18
  */
 public class TestClient {
-  private TestClient() {
-  }
-
-  /**
-   * entry point
-   *
-   * @param args comand arguments
-   *             <ul><li>args[0]: config filename</li></ul>
-   *             <ul><li>args[1]: local filename to upload</li></ul>
-   */
-  public static void main(String args[]) {
-    if (args.length < 2) {
-      System.out.println("Error: Must have 2 parameters, one is config filename, "
-        + "the other is the local filename to upload");
-      return;
+    private TestClient() {
     }
 
-    System.out.println("java.version=" + System.getProperty("java.version"));
+    /**
+     * entry point
+     *
+     * @param args comand arguments
+     *             <ul><li>args[0]: config filename</li></ul>
+     *             <ul><li>args[1]: local filename to upload</li></ul>
+     */
+    public static void main(String args[]) {
+        if (args.length < 2) {
+            System.out.println("Error: Must have 2 parameters, one is config filename, "
+                    + "the other is the local filename to upload");
+            return;
+        }
 
-    String conf_filename = args[0];
-    String local_filename = args[1];
+        System.out.println("java.version=" + System.getProperty("java.version"));
 
-    try {
-      ClientGlobal.init(conf_filename);
-      System.out.println("network_timeout=" + ClientGlobal.g_network_timeout + "ms");
-      System.out.println("charset=" + ClientGlobal.g_charset);
+        String conf_filename = args[0];
+        String local_filename = args[1];
 
-      long startTime;
-      String group_name;
-      String remote_filename;
-      ServerInfo[] servers;
-      TrackerClient tracker = new TrackerClient();
-      TrackerServer trackerServer = tracker.getConnection();
+        try {
+            ClientGlobal.init(conf_filename);
+            System.out.println("network_timeout=" + ClientGlobal.g_network_timeout + "ms");
+            System.out.println("charset=" + ClientGlobal.g_charset);
 
-      StorageServer storageServer = null;
+            long startTime;
+            String group_name;
+            String remote_filename;
+            ServerInfo[] servers;
+            TrackerClient tracker = new TrackerClient();
+            TrackerServer trackerServer = tracker.getTrackerServer();
+
+            StorageServer storageServer = null;
 
   		/*
       storageServer = tracker.getStoreStorage(trackerServer);
@@ -66,239 +65,236 @@ public class TestClient {
   		}
   		*/
 
-      StorageClient client = new StorageClient(trackerServer, storageServer);
-      byte[] file_buff;
-      NameValuePair[] meta_list;
-      String[] results;
-      String master_filename;
-      String prefix_name;
-      String file_ext_name;
-      String generated_slave_filename;
-      int errno;
+            StorageClient client = new StorageClient(trackerServer, storageServer);
+            byte[] file_buff;
+            NameValuePair[] meta_list;
+            String[] results;
+            String master_filename;
+            String prefix_name;
+            String file_ext_name;
+            String generated_slave_filename;
+            int errno;
 
-      meta_list = new NameValuePair[4];
-      meta_list[0] = new NameValuePair("width", "800");
-      meta_list[1] = new NameValuePair("heigth", "600");
-      meta_list[2] = new NameValuePair("bgcolor", "#FFFFFF");
-      meta_list[3] = new NameValuePair("author", "Mike");
+            meta_list = new NameValuePair[4];
+            meta_list[0] = new NameValuePair("width", "800");
+            meta_list[1] = new NameValuePair("heigth", "600");
+            meta_list[2] = new NameValuePair("bgcolor", "#FFFFFF");
+            meta_list[3] = new NameValuePair("author", "Mike");
 
-      file_buff = "this is a test".getBytes(ClientGlobal.g_charset);
-      System.out.println("file length: " + file_buff.length);
+            file_buff = "this is a test".getBytes(ClientGlobal.g_charset);
+            System.out.println("file length: " + file_buff.length);
 
-      group_name = null;
-      StorageServer[] storageServers = tracker.getStoreStorages(trackerServer, group_name);
-      if (storageServers == null) {
-        System.err.println("get store storage servers fail, error code: " + tracker.getErrorCode());
-      } else {
-        System.err.println("store storage servers count: " + storageServers.length);
-        for (int k = 0; k < storageServers.length; k++) {
-          System.err.println((k + 1) + ". " + storageServers[k].getInetSocketAddress().getAddress().getHostAddress() + ":" + storageServers[k].getInetSocketAddress().getPort());
-        }
-        System.err.println("");
-      }
+            group_name = null;
+            StorageServer[] storageServers = tracker.getStoreStorages(trackerServer, group_name);
+            if (storageServers == null) {
+                System.err.println("get store storage servers fail, error code: " + tracker.getErrorCode());
+            } else {
+                System.err.println("store storage servers count: " + storageServers.length);
+                for (int k = 0; k < storageServers.length; k++) {
+                    System.err.println((k + 1) + ". " + storageServers[k].getInetSocketAddress().getAddress().getHostAddress() + ":" + storageServers[k].getInetSocketAddress().getPort());
+                }
+                System.err.println("");
+            }
 
-      startTime = System.currentTimeMillis();
-      results = client.upload_file(file_buff, "txt", meta_list);
-      System.out.println("upload_file time used: " + (System.currentTimeMillis() - startTime) + " ms");
+            startTime = System.currentTimeMillis();
+            results = client.upload_file(file_buff, "txt", meta_list);
+            System.out.println("upload_file time used: " + (System.currentTimeMillis() - startTime) + " ms");
 
   		/*
   		group_name = "";
   		results = client.upload_file(group_name, file_buff, "txt", meta_list);
   		*/
-      if (results == null) {
-        System.err.println("upload file fail, error code: " + client.getErrorCode());
-        return;
-      } else {
-        group_name = results[0];
-        remote_filename = results[1];
-        System.err.println("group_name: " + group_name + ", remote_filename: " + remote_filename);
-        System.err.println(client.get_file_info(group_name, remote_filename));
+            if (results == null) {
+                System.err.println("upload file fail, error code: " + client.getErrorCode());
+                return;
+            } else {
+                group_name = results[0];
+                remote_filename = results[1];
+                System.err.println("group_name: " + group_name + ", remote_filename: " + remote_filename);
+                System.err.println(client.get_file_info(group_name, remote_filename));
 
-        servers = tracker.getFetchStorages(trackerServer, group_name, remote_filename);
-        if (servers == null) {
-          System.err.println("get storage servers fail, error code: " + tracker.getErrorCode());
-        } else {
-          System.err.println("storage servers count: " + servers.length);
-          for (int k = 0; k < servers.length; k++) {
-            System.err.println((k + 1) + ". " + servers[k].getIpAddr() + ":" + servers[k].getPort());
-          }
-          System.err.println("");
+                servers = tracker.getFetchStorages(trackerServer, group_name, remote_filename);
+                if (servers == null) {
+                    System.err.println("get storage servers fail, error code: " + tracker.getErrorCode());
+                } else {
+                    System.err.println("storage servers count: " + servers.length);
+                    for (int k = 0; k < servers.length; k++) {
+                        System.err.println((k + 1) + ". " + servers[k].getIpAddr() + ":" + servers[k].getPort());
+                    }
+                    System.err.println("");
+                }
+
+                meta_list = new NameValuePair[4];
+                meta_list[0] = new NameValuePair("width", "1024");
+                meta_list[1] = new NameValuePair("heigth", "768");
+                meta_list[2] = new NameValuePair("bgcolor", "#000000");
+                meta_list[3] = new NameValuePair("title", "Untitle");
+
+                startTime = System.currentTimeMillis();
+                errno = client.set_metadata(group_name, remote_filename, meta_list, ProtoCommon.STORAGE_SET_METADATA_FLAG_MERGE);
+                System.out.println("set_metadata time used: " + (System.currentTimeMillis() - startTime) + " ms");
+                if (errno == 0) {
+                    System.err.println("set_metadata success");
+                } else {
+                    System.err.println("set_metadata fail, error no: " + errno);
+                }
+
+                meta_list = client.get_metadata(group_name, remote_filename);
+                if (meta_list != null) {
+                    for (int i = 0; i < meta_list.length; i++) {
+                        System.out.println(meta_list[i].getName() + " " + meta_list[i].getValue());
+                    }
+                }
+
+                //Thread.sleep(30000);
+
+                startTime = System.currentTimeMillis();
+                file_buff = client.download_file(group_name, remote_filename);
+                System.out.println("download_file time used: " + (System.currentTimeMillis() - startTime) + " ms");
+
+                if (file_buff != null) {
+                    System.out.println("file length:" + file_buff.length);
+                    System.out.println((new String(file_buff)));
+                }
+
+                file_buff = "this is a slave buff".getBytes(ClientGlobal.g_charset);
+                master_filename = remote_filename;
+                prefix_name = "-part1";
+                file_ext_name = "txt";
+                startTime = System.currentTimeMillis();
+                results = client.upload_file(group_name, master_filename, prefix_name, file_buff, file_ext_name, meta_list);
+                System.out.println("upload_file time used: " + (System.currentTimeMillis() - startTime) + " ms");
+                if (results != null) {
+                    System.err.println("slave file group_name: " + results[0] + ", remote_filename: " + results[1]);
+
+                    generated_slave_filename = ProtoCommon.genSlaveFilename(master_filename, prefix_name, file_ext_name);
+                    if (!generated_slave_filename.equals(results[1])) {
+                        System.err.println("generated slave file: " + generated_slave_filename + "\n != returned slave file: " + results[1]);
+                    }
+
+                    System.err.println(client.get_file_info(results[0], results[1]));
+                }
+
+                startTime = System.currentTimeMillis();
+                errno = client.delete_file(group_name, remote_filename);
+                System.out.println("delete_file time used: " + (System.currentTimeMillis() - startTime) + " ms");
+                if (errno == 0) {
+                    System.err.println("Delete file success");
+                } else {
+                    System.err.println("Delete file fail, error no: " + errno);
+                }
+            }
+
+            results = client.upload_file(local_filename, null, meta_list);
+            if (results != null) {
+                String file_id;
+                int ts;
+                String token;
+                String file_url;
+                InetSocketAddress inetSockAddr;
+
+                group_name = results[0];
+                remote_filename = results[1];
+                file_id = group_name + StorageClient1.SPLIT_GROUP_NAME_AND_FILENAME_SEPERATOR + remote_filename;
+
+                inetSockAddr = trackerServer.getInetSocketAddress();
+                file_url = "http://" + inetSockAddr.getAddress().getHostAddress();
+                if (ClientGlobal.g_tracker_http_port != 80) {
+                    file_url += ":" + ClientGlobal.g_tracker_http_port;
+                }
+                file_url += "/" + file_id;
+                if (ClientGlobal.g_anti_steal_token) {
+                    ts = (int) (System.currentTimeMillis() / 1000);
+                    token = ProtoCommon.getToken(file_id, ts, ClientGlobal.g_secret_key);
+                    file_url += "?token=" + token + "&ts=" + ts;
+                }
+
+                System.err.println("group_name: " + group_name + ", remote_filename: " + remote_filename);
+                System.err.println(client.get_file_info(group_name, remote_filename));
+                System.err.println("file url: " + file_url);
+
+                errno = client.download_file(group_name, remote_filename, 0, 0, "c:\\" + remote_filename.replaceAll("/", "_"));
+                if (errno == 0) {
+                    System.err.println("Download file success");
+                } else {
+                    System.err.println("Download file fail, error no: " + errno);
+                }
+
+                errno = client.download_file(group_name, remote_filename, 0, 0, new DownloadFileWriter("c:\\" + remote_filename.replaceAll("/", "-")));
+                if (errno == 0) {
+                    System.err.println("Download file success");
+                } else {
+                    System.err.println("Download file fail, error no: " + errno);
+                }
+
+                master_filename = remote_filename;
+                prefix_name = "-part2";
+                file_ext_name = null;
+                startTime = System.currentTimeMillis();
+                results = client.upload_file(group_name, master_filename, prefix_name, local_filename, null, meta_list);
+                System.out.println("upload_file time used: " + (System.currentTimeMillis() - startTime) + " ms");
+                if (results != null) {
+                    System.err.println("slave file group_name: " + results[0] + ", remote_filename: " + results[1]);
+
+                    generated_slave_filename = ProtoCommon.genSlaveFilename(master_filename, prefix_name, file_ext_name);
+                    if (!generated_slave_filename.equals(results[1])) {
+                        System.err.println("generated slave file: " + generated_slave_filename + "\n != returned slave file: " + results[1]);
+                    }
+
+                    System.err.println(client.get_file_info(results[0], results[1]));
+                }
+            }
+
+            File f;
+            f = new File(local_filename);
+            int nPos = local_filename.lastIndexOf('.');
+            if (nPos > 0 && local_filename.length() - nPos <= ProtoCommon.FDFS_FILE_EXT_NAME_MAX_LEN + 1) {
+                file_ext_name = local_filename.substring(nPos + 1);
+            } else {
+                file_ext_name = null;
+            }
+
+            results = client.upload_file(null, f.length(),
+                    new UploadLocalFileSender(local_filename), file_ext_name, meta_list);
+            if (results != null) {
+                group_name = results[0];
+                remote_filename = results[1];
+
+                System.out.println("group name: " + group_name + ", remote filename: " + remote_filename);
+                System.out.println(client.get_file_info(group_name, remote_filename));
+
+                master_filename = remote_filename;
+                prefix_name = "-part3";
+                startTime = System.currentTimeMillis();
+                results = client.upload_file(group_name, master_filename, prefix_name, f.length(), new UploadLocalFileSender(local_filename), file_ext_name, meta_list);
+                System.out.println("upload_file time used: " + (System.currentTimeMillis() - startTime) + " ms");
+                if (results != null) {
+                    System.err.println("slave file group_name: " + results[0] + ", remote_filename: " + results[1]);
+
+                    generated_slave_filename = ProtoCommon.genSlaveFilename(master_filename, prefix_name, file_ext_name);
+                    if (!generated_slave_filename.equals(results[1])) {
+                        System.err.println("generated slave file: " + generated_slave_filename + "\n != returned slave file: " + results[1]);
+                    }
+
+                    System.err.println(client.get_file_info(results[0], results[1]));
+                }
+            } else {
+                System.err.println("Upload file fail, error no: " + errno);
+            }
+
+            storageServer = tracker.getFetchStorage(trackerServer, group_name, remote_filename);
+            if (storageServer == null) {
+                System.out.println("getFetchStorage fail, errno code: " + tracker.getErrorCode());
+                return;
+            }
+
+            /* for test only */
+            System.out.println("active test to storage server: " + storageServer.getConnection().activeTest());
+
+            /* for test only */
+            System.out.println("active test to tracker server: " + trackerServer.getConnection().activeTest());
+        } catch (Exception ex) {
+            ex.printStackTrace();
         }
-
-        meta_list = new NameValuePair[4];
-        meta_list[0] = new NameValuePair("width", "1024");
-        meta_list[1] = new NameValuePair("heigth", "768");
-        meta_list[2] = new NameValuePair("bgcolor", "#000000");
-        meta_list[3] = new NameValuePair("title", "Untitle");
-
-        startTime = System.currentTimeMillis();
-        errno = client.set_metadata(group_name, remote_filename, meta_list, ProtoCommon.STORAGE_SET_METADATA_FLAG_MERGE);
-        System.out.println("set_metadata time used: " + (System.currentTimeMillis() - startTime) + " ms");
-        if (errno == 0) {
-          System.err.println("set_metadata success");
-        } else {
-          System.err.println("set_metadata fail, error no: " + errno);
-        }
-
-        meta_list = client.get_metadata(group_name, remote_filename);
-        if (meta_list != null) {
-          for (int i = 0; i < meta_list.length; i++) {
-            System.out.println(meta_list[i].getName() + " " + meta_list[i].getValue());
-          }
-        }
-
-        //Thread.sleep(30000);
-
-        startTime = System.currentTimeMillis();
-        file_buff = client.download_file(group_name, remote_filename);
-        System.out.println("download_file time used: " + (System.currentTimeMillis() - startTime) + " ms");
-
-        if (file_buff != null) {
-          System.out.println("file length:" + file_buff.length);
-          System.out.println((new String(file_buff)));
-        }
-
-        file_buff = "this is a slave buff".getBytes(ClientGlobal.g_charset);
-        master_filename = remote_filename;
-        prefix_name = "-part1";
-        file_ext_name = "txt";
-        startTime = System.currentTimeMillis();
-        results = client.upload_file(group_name, master_filename, prefix_name, file_buff, file_ext_name, meta_list);
-        System.out.println("upload_file time used: " + (System.currentTimeMillis() - startTime) + " ms");
-        if (results != null) {
-          System.err.println("slave file group_name: " + results[0] + ", remote_filename: " + results[1]);
-
-          generated_slave_filename = ProtoCommon.genSlaveFilename(master_filename, prefix_name, file_ext_name);
-          if (!generated_slave_filename.equals(results[1])) {
-            System.err.println("generated slave file: " + generated_slave_filename + "\n != returned slave file: " + results[1]);
-          }
-
-          System.err.println(client.get_file_info(results[0], results[1]));
-        }
-
-        startTime = System.currentTimeMillis();
-        errno = client.delete_file(group_name, remote_filename);
-        System.out.println("delete_file time used: " + (System.currentTimeMillis() - startTime) + " ms");
-        if (errno == 0) {
-          System.err.println("Delete file success");
-        } else {
-          System.err.println("Delete file fail, error no: " + errno);
-        }
-      }
-
-      results = client.upload_file(local_filename, null, meta_list);
-      if (results != null) {
-        String file_id;
-        int ts;
-        String token;
-        String file_url;
-        InetSocketAddress inetSockAddr;
-
-        group_name = results[0];
-        remote_filename = results[1];
-        file_id = group_name + StorageClient1.SPLIT_GROUP_NAME_AND_FILENAME_SEPERATOR + remote_filename;
-
-        inetSockAddr = trackerServer.getInetSocketAddress();
-        file_url = "http://" + inetSockAddr.getAddress().getHostAddress();
-        if (ClientGlobal.g_tracker_http_port != 80) {
-          file_url += ":" + ClientGlobal.g_tracker_http_port;
-        }
-        file_url += "/" + file_id;
-        if (ClientGlobal.g_anti_steal_token) {
-          ts = (int) (System.currentTimeMillis() / 1000);
-          token = ProtoCommon.getToken(file_id, ts, ClientGlobal.g_secret_key);
-          file_url += "?token=" + token + "&ts=" + ts;
-        }
-
-        System.err.println("group_name: " + group_name + ", remote_filename: " + remote_filename);
-        System.err.println(client.get_file_info(group_name, remote_filename));
-        System.err.println("file url: " + file_url);
-
-        errno = client.download_file(group_name, remote_filename, 0, 0, "c:\\" + remote_filename.replaceAll("/", "_"));
-        if (errno == 0) {
-          System.err.println("Download file success");
-        } else {
-          System.err.println("Download file fail, error no: " + errno);
-        }
-
-        errno = client.download_file(group_name, remote_filename, 0, 0, new DownloadFileWriter("c:\\" + remote_filename.replaceAll("/", "-")));
-        if (errno == 0) {
-          System.err.println("Download file success");
-        } else {
-          System.err.println("Download file fail, error no: " + errno);
-        }
-
-        master_filename = remote_filename;
-        prefix_name = "-part2";
-        file_ext_name = null;
-        startTime = System.currentTimeMillis();
-        results = client.upload_file(group_name, master_filename, prefix_name, local_filename, null, meta_list);
-        System.out.println("upload_file time used: " + (System.currentTimeMillis() - startTime) + " ms");
-        if (results != null) {
-          System.err.println("slave file group_name: " + results[0] + ", remote_filename: " + results[1]);
-
-          generated_slave_filename = ProtoCommon.genSlaveFilename(master_filename, prefix_name, file_ext_name);
-          if (!generated_slave_filename.equals(results[1])) {
-            System.err.println("generated slave file: " + generated_slave_filename + "\n != returned slave file: " + results[1]);
-          }
-
-          System.err.println(client.get_file_info(results[0], results[1]));
-        }
-      }
-
-      File f;
-      f = new File(local_filename);
-      int nPos = local_filename.lastIndexOf('.');
-      if (nPos > 0 && local_filename.length() - nPos <= ProtoCommon.FDFS_FILE_EXT_NAME_MAX_LEN + 1) {
-        file_ext_name = local_filename.substring(nPos + 1);
-      } else {
-        file_ext_name = null;
-      }
-
-      results = client.upload_file(null, f.length(),
-        new UploadLocalFileSender(local_filename), file_ext_name, meta_list);
-      if (results != null) {
-        group_name = results[0];
-        remote_filename = results[1];
-
-        System.out.println("group name: " + group_name + ", remote filename: " + remote_filename);
-        System.out.println(client.get_file_info(group_name, remote_filename));
-
-        master_filename = remote_filename;
-        prefix_name = "-part3";
-        startTime = System.currentTimeMillis();
-        results = client.upload_file(group_name, master_filename, prefix_name, f.length(), new UploadLocalFileSender(local_filename), file_ext_name, meta_list);
-        System.out.println("upload_file time used: " + (System.currentTimeMillis() - startTime) + " ms");
-        if (results != null) {
-          System.err.println("slave file group_name: " + results[0] + ", remote_filename: " + results[1]);
-
-          generated_slave_filename = ProtoCommon.genSlaveFilename(master_filename, prefix_name, file_ext_name);
-          if (!generated_slave_filename.equals(results[1])) {
-            System.err.println("generated slave file: " + generated_slave_filename + "\n != returned slave file: " + results[1]);
-          }
-
-          System.err.println(client.get_file_info(results[0], results[1]));
-        }
-      } else {
-        System.err.println("Upload file fail, error no: " + errno);
-      }
-
-      storageServer = tracker.getFetchStorage(trackerServer, group_name, remote_filename);
-      if (storageServer == null) {
-        System.out.println("getFetchStorage fail, errno code: " + tracker.getErrorCode());
-        return;
-      }
-  		/* for test only */
-      System.out.println("active test to storage server: " + ProtoCommon.activeTest(storageServer.getSocket()));
-
-      storageServer.close();
-
-  		/* for test only */
-      System.out.println("active test to tracker server: " + ProtoCommon.activeTest(trackerServer.getSocket()));
-
-      trackerServer.close();
-    } catch (Exception ex) {
-      ex.printStackTrace();
     }
-  }
 }

src/test/java/org/csource/fastdfs/TestClient1.java

@@ -9,7 +9,6 @@
 package org.csource.fastdfs;
 
 import org.csource.common.NameValuePair;
-import org.csource.fastdfs.*;
 
 import java.io.File;
 import java.net.InetSocketAddress;
@@ -21,40 +20,40 @@ import java.net.InetSocketAddress;
  * @version Version 1.16
  */
 public class TestClient1 {
-  private TestClient1() {
-  }
-
-  /**
-   * entry point
-   *
-   * @param args comand arguments
-   *             <ul><li>args[0]: config filename</li></ul>
-   *             <ul><li>args[1]: local filename to upload</li></ul>
-   */
-  public static void main(String args[]) {
-    if (args.length < 2) {
-      System.out.println("Error: Must have 2 parameters, one is config filename, "
-        + "the other is the local filename to upload");
-      return;
+    private TestClient1() {
     }
 
-    System.out.println("java.version=" + System.getProperty("java.version"));
+    /**
+     * entry point
+     *
+     * @param args comand arguments
+     *             <ul><li>args[0]: config filename</li></ul>
+     *             <ul><li>args[1]: local filename to upload</li></ul>
+     */
+    public static void main(String args[]) {
+        if (args.length < 2) {
+            System.out.println("Error: Must have 2 parameters, one is config filename, "
+                    + "the other is the local filename to upload");
+            return;
+        }
 
-    String conf_filename = args[0];
-    String local_filename = args[1];
-    String group_name;
+        System.out.println("java.version=" + System.getProperty("java.version"));
 
-    try {
-      ClientGlobal.init(conf_filename);
-      System.out.println("network_timeout=" + ClientGlobal.g_network_timeout + "ms");
-      System.out.println("charset=" + ClientGlobal.g_charset);
+        String conf_filename = args[0];
+        String local_filename = args[1];
+        String group_name;
 
-      String file_id;
+        try {
+            ClientGlobal.init(conf_filename);
+            System.out.println("network_timeout=" + ClientGlobal.g_network_timeout + "ms");
+            System.out.println("charset=" + ClientGlobal.g_charset);
 
-      TrackerClient tracker = new TrackerClient();
-      TrackerServer trackerServer = tracker.getConnection();
+            String file_id;
 
-      StorageServer storageServer = null;
+            TrackerClient tracker = new TrackerClient();
+            TrackerServer trackerServer = tracker.getTrackerServer();
+
+            StorageServer storageServer = null;
       /*
       storageServer = tracker.getStoreStorage(trackerServer);
   		if (storageServer == null)
@@ -63,204 +62,202 @@ public class TestClient1 {
   			return;
   		}
   		*/
-      StorageClient1 client = new StorageClient1(trackerServer, storageServer);
-      byte[] file_buff;
-      NameValuePair[] meta_list;
-      String master_file_id;
-      String prefix_name;
-      String file_ext_name;
-      String slave_file_id;
-      String generated_slave_file_id;
-      int errno;
+            StorageClient1 client = new StorageClient1(trackerServer, storageServer);
+            byte[] file_buff;
+            NameValuePair[] meta_list;
+            String master_file_id;
+            String prefix_name;
+            String file_ext_name;
+            String slave_file_id;
+            String generated_slave_file_id;
+            int errno;
 
-      group_name = "group1";
-      StorageServer[] storageServers = tracker.getStoreStorages(trackerServer, group_name);
-      if (storageServers == null) {
-        System.err.println("get store storage servers fail, error code: " + tracker.getErrorCode());
-      } else {
-        System.err.println("store storage servers count: " + storageServers.length);
-        for (int k = 0; k < storageServers.length; k++) {
-          System.err.println((k + 1) + ". " + storageServers[k].getInetSocketAddress().getAddress().getHostAddress() + ":" + storageServers[k].getInetSocketAddress().getPort());
-        }
-        System.err.println("");
-      }
+            group_name = "group1";
+            StorageServer[] storageServers = tracker.getStoreStorages(trackerServer, group_name);
+            if (storageServers == null) {
+                System.err.println("get store storage servers fail, error code: " + tracker.getErrorCode());
+            } else {
+                System.err.println("store storage servers count: " + storageServers.length);
+                for (int k = 0; k < storageServers.length; k++) {
+                    System.err.println((k + 1) + ". " + storageServers[k].getInetSocketAddress().getAddress().getHostAddress() + ":" + storageServers[k].getInetSocketAddress().getPort());
+                }
+                System.err.println("");
+            }
 
-      meta_list = new NameValuePair[4];
-      meta_list[0] = new NameValuePair("width", "800");
-      meta_list[1] = new NameValuePair("heigth", "600");
-      meta_list[2] = new NameValuePair("bgcolor", "#FFFFFF");
-      meta_list[3] = new NameValuePair("author", "Mike");
+            meta_list = new NameValuePair[4];
+            meta_list[0] = new NameValuePair("width", "800");
+            meta_list[1] = new NameValuePair("heigth", "600");
+            meta_list[2] = new NameValuePair("bgcolor", "#FFFFFF");
+            meta_list[3] = new NameValuePair("author", "Mike");
 
-      file_buff = "this is a test".getBytes(ClientGlobal.g_charset);
-      System.out.println("file length: " + file_buff.length);
+            file_buff = "this is a test".getBytes(ClientGlobal.g_charset);
+            System.out.println("file length: " + file_buff.length);
 
-      file_id = client.upload_file1(file_buff, "txt", meta_list);
+            file_id = client.upload_file1(file_buff, "txt", meta_list);
   		/*
   		group_name = "group1";
   		file_id = client.upload_file1(group_name, file_buff, "txt", meta_list);
   		*/
-      if (file_id == null) {
-        System.err.println("upload file fail, error code: " + client.getErrorCode());
-        return;
-      } else {
-        System.err.println("file_id: " + file_id);
-        System.err.println(client.get_file_info1(file_id));
+            if (file_id == null) {
+                System.err.println("upload file fail, error code: " + client.getErrorCode());
+                return;
+            } else {
+                System.err.println("file_id: " + file_id);
+                System.err.println(client.get_file_info1(file_id));
 
-        ServerInfo[] servers = tracker.getFetchStorages1(trackerServer, file_id);
-        if (servers == null) {
-          System.err.println("get storage servers fail, error code: " + tracker.getErrorCode());
-        } else {
-          System.err.println("storage servers count: " + servers.length);
-          for (int k = 0; k < servers.length; k++) {
-            System.err.println((k + 1) + ". " + servers[k].getIpAddr() + ":" + servers[k].getPort());
-          }
-          System.err.println("");
+                ServerInfo[] servers = tracker.getFetchStorages1(trackerServer, file_id);
+                if (servers == null) {
+                    System.err.println("get storage servers fail, error code: " + tracker.getErrorCode());
+                } else {
+                    System.err.println("storage servers count: " + servers.length);
+                    for (int k = 0; k < servers.length; k++) {
+                        System.err.println((k + 1) + ". " + servers[k].getIpAddr() + ":" + servers[k].getPort());
+                    }
+                    System.err.println("");
+                }
+
+                meta_list = new NameValuePair[4];
+                meta_list[0] = new NameValuePair("width", "1024");
+                meta_list[1] = new NameValuePair("heigth", "768");
+                meta_list[2] = new NameValuePair("bgcolor", "#000000");
+                meta_list[3] = new NameValuePair("title", "Untitle");
+
+                if ((errno = client.set_metadata1(file_id, meta_list, ProtoCommon.STORAGE_SET_METADATA_FLAG_MERGE)) == 0) {
+                    System.err.println("set_metadata success");
+                } else {
+                    System.err.println("set_metadata fail, error no: " + errno);
+                }
+
+                meta_list = client.get_metadata1(file_id);
+                if (meta_list != null) {
+                    for (int i = 0; i < meta_list.length; i++) {
+                        System.out.println(meta_list[i].getName() + " " + meta_list[i].getValue());
+                    }
+                }
+
+                //Thread.sleep(30000);
+
+                file_buff = client.download_file1(file_id);
+                if (file_buff != null) {
+                    System.out.println("file length:" + file_buff.length);
+                    System.out.println((new String(file_buff)));
+                }
+
+                master_file_id = file_id;
+                prefix_name = "-part1";
+                file_ext_name = "txt";
+                file_buff = "this is a slave buff.".getBytes(ClientGlobal.g_charset);
+                slave_file_id = client.upload_file1(master_file_id, prefix_name, file_buff, file_ext_name, meta_list);
+                if (slave_file_id != null) {
+                    System.err.println("slave file_id: " + slave_file_id);
+                    System.err.println(client.get_file_info1(slave_file_id));
+
+                    generated_slave_file_id = ProtoCommon.genSlaveFilename(master_file_id, prefix_name, file_ext_name);
+                    if (!generated_slave_file_id.equals(slave_file_id)) {
+                        System.err.println("generated slave file: " + generated_slave_file_id + "\n != returned slave file: " + slave_file_id);
+                    }
+                }
+
+                //Thread.sleep(10000);
+                if ((errno = client.delete_file1(file_id)) == 0) {
+                    System.err.println("Delete file success");
+                } else {
+                    System.err.println("Delete file fail, error no: " + errno);
+                }
+            }
+
+            if ((file_id = client.upload_file1(local_filename, null, meta_list)) != null) {
+                int ts;
+                String token;
+                String file_url;
+                InetSocketAddress inetSockAddr;
+
+                System.err.println("file_id: " + file_id);
+                System.err.println(client.get_file_info1(file_id));
+
+                inetSockAddr = trackerServer.getInetSocketAddress();
+                file_url = "http://" + inetSockAddr.getAddress().getHostAddress();
+                if (ClientGlobal.g_tracker_http_port != 80) {
+                    file_url += ":" + ClientGlobal.g_tracker_http_port;
+                }
+                file_url += "/" + file_id;
+                if (ClientGlobal.g_anti_steal_token) {
+                    ts = (int) (System.currentTimeMillis() / 1000);
+                    token = ProtoCommon.getToken(file_id, ts, ClientGlobal.g_secret_key);
+                    file_url += "?token=" + token + "&ts=" + ts;
+                }
+                System.err.println("file url: " + file_url);
+
+                errno = client.download_file1(file_id, 0, 100, "c:\\" + file_id.replaceAll("/", "_"));
+                if (errno == 0) {
+                    System.err.println("Download file success");
+                } else {
+                    System.err.println("Download file fail, error no: " + errno);
+                }
+
+                errno = client.download_file1(file_id, new DownloadFileWriter("c:\\" + file_id.replaceAll("/", "-")));
+                if (errno == 0) {
+                    System.err.println("Download file success");
+                } else {
+                    System.err.println("Download file fail, error no: " + errno);
+                }
+
+                master_file_id = file_id;
+                prefix_name = "-part2";
+                file_ext_name = null;
+                slave_file_id = client.upload_file1(master_file_id, prefix_name, local_filename, file_ext_name, meta_list);
+                if (slave_file_id != null) {
+                    System.err.println("slave file_id: " + slave_file_id);
+                    System.err.println(client.get_file_info1(slave_file_id));
+
+                    generated_slave_file_id = ProtoCommon.genSlaveFilename(master_file_id, prefix_name, file_ext_name);
+                    if (!generated_slave_file_id.equals(slave_file_id)) {
+                        System.err.println("generated slave file: " + generated_slave_file_id + "\n != returned slave file: " + slave_file_id);
+                    }
+                }
+            }
+
+            File f;
+            f = new File(local_filename);
+            int nPos = local_filename.lastIndexOf('.');
+            if (nPos > 0 && local_filename.length() - nPos <= ProtoCommon.FDFS_FILE_EXT_NAME_MAX_LEN + 1) {
+                file_ext_name = local_filename.substring(nPos + 1);
+            } else {
+                file_ext_name = null;
+            }
+
+            file_id = client.upload_file1(null, f.length(), new UploadLocalFileSender(local_filename), file_ext_name, meta_list);
+            if (file_id != null) {
+                System.out.println("file id: " + file_id);
+                System.out.println(client.get_file_info1(file_id));
+                master_file_id = file_id;
+                prefix_name = "-part3";
+                slave_file_id = client.upload_file1(master_file_id, prefix_name, f.length(), new UploadLocalFileSender(local_filename), file_ext_name, meta_list);
+                if (slave_file_id != null) {
+                    System.err.println("slave file_id: " + slave_file_id);
+                    generated_slave_file_id = ProtoCommon.genSlaveFilename(master_file_id, prefix_name, file_ext_name);
+                    if (!generated_slave_file_id.equals(slave_file_id)) {
+                        System.err.println("generated slave file: " + generated_slave_file_id + "\n != returned slave file: " + slave_file_id);
+                    }
+                }
+            } else {
+                System.err.println("Upload file fail, error no: " + errno);
+            }
+
+            storageServer = tracker.getFetchStorage1(trackerServer, file_id);
+            if (storageServer == null) {
+                System.out.println("getFetchStorage fail, errno code: " + tracker.getErrorCode());
+                return;
+            }
+
+
+            /* for test only */
+            System.out.println("active test to storage server: " + storageServer.getConnection().activeTest());
+
+            /* for test only */
+            System.out.println("active test to tracker server: " + trackerServer.getConnection().activeTest());
+        } catch (Exception ex) {
+            ex.printStackTrace();
         }
-
-        meta_list = new NameValuePair[4];
-        meta_list[0] = new NameValuePair("width", "1024");
-        meta_list[1] = new NameValuePair("heigth", "768");
-        meta_list[2] = new NameValuePair("bgcolor", "#000000");
-        meta_list[3] = new NameValuePair("title", "Untitle");
-
-        if ((errno = client.set_metadata1(file_id, meta_list, ProtoCommon.STORAGE_SET_METADATA_FLAG_MERGE)) == 0) {
-          System.err.println("set_metadata success");
-        } else {
-          System.err.println("set_metadata fail, error no: " + errno);
-        }
-
-        meta_list = client.get_metadata1(file_id);
-        if (meta_list != null) {
-          for (int i = 0; i < meta_list.length; i++) {
-            System.out.println(meta_list[i].getName() + " " + meta_list[i].getValue());
-          }
-        }
-
-        //Thread.sleep(30000);
-
-        file_buff = client.download_file1(file_id);
-        if (file_buff != null) {
-          System.out.println("file length:" + file_buff.length);
-          System.out.println((new String(file_buff)));
-        }
-
-        master_file_id = file_id;
-        prefix_name = "-part1";
-        file_ext_name = "txt";
-        file_buff = "this is a slave buff.".getBytes(ClientGlobal.g_charset);
-        slave_file_id = client.upload_file1(master_file_id, prefix_name, file_buff, file_ext_name, meta_list);
-        if (slave_file_id != null) {
-          System.err.println("slave file_id: " + slave_file_id);
-          System.err.println(client.get_file_info1(slave_file_id));
-
-          generated_slave_file_id = ProtoCommon.genSlaveFilename(master_file_id, prefix_name, file_ext_name);
-          if (!generated_slave_file_id.equals(slave_file_id)) {
-            System.err.println("generated slave file: " + generated_slave_file_id + "\n != returned slave file: " + slave_file_id);
-          }
-        }
-
-        //Thread.sleep(10000);
-        if ((errno = client.delete_file1(file_id)) == 0) {
-          System.err.println("Delete file success");
-        } else {
-          System.err.println("Delete file fail, error no: " + errno);
-        }
-      }
-
-      if ((file_id = client.upload_file1(local_filename, null, meta_list)) != null) {
-        int ts;
-        String token;
-        String file_url;
-        InetSocketAddress inetSockAddr;
-
-        System.err.println("file_id: " + file_id);
-        System.err.println(client.get_file_info1(file_id));
-
-        inetSockAddr = trackerServer.getInetSocketAddress();
-        file_url = "http://" + inetSockAddr.getAddress().getHostAddress();
-        if (ClientGlobal.g_tracker_http_port != 80) {
-          file_url += ":" + ClientGlobal.g_tracker_http_port;
-        }
-        file_url += "/" + file_id;
-        if (ClientGlobal.g_anti_steal_token) {
-          ts = (int) (System.currentTimeMillis() / 1000);
-          token = ProtoCommon.getToken(file_id, ts, ClientGlobal.g_secret_key);
-          file_url += "?token=" + token + "&ts=" + ts;
-        }
-        System.err.println("file url: " + file_url);
-
-        errno = client.download_file1(file_id, 0, 100, "c:\\" + file_id.replaceAll("/", "_"));
-        if (errno == 0) {
-          System.err.println("Download file success");
-        } else {
-          System.err.println("Download file fail, error no: " + errno);
-        }
-
-        errno = client.download_file1(file_id, new DownloadFileWriter("c:\\" + file_id.replaceAll("/", "-")));
-        if (errno == 0) {
-          System.err.println("Download file success");
-        } else {
-          System.err.println("Download file fail, error no: " + errno);
-        }
-
-        master_file_id = file_id;
-        prefix_name = "-part2";
-        file_ext_name = null;
-        slave_file_id = client.upload_file1(master_file_id, prefix_name, local_filename, file_ext_name, meta_list);
-        if (slave_file_id != null) {
-          System.err.println("slave file_id: " + slave_file_id);
-          System.err.println(client.get_file_info1(slave_file_id));
-
-          generated_slave_file_id = ProtoCommon.genSlaveFilename(master_file_id, prefix_name, file_ext_name);
-          if (!generated_slave_file_id.equals(slave_file_id)) {
-            System.err.println("generated slave file: " + generated_slave_file_id + "\n != returned slave file: " + slave_file_id);
-          }
-        }
-      }
-
-      File f;
-      f = new File(local_filename);
-      int nPos = local_filename.lastIndexOf('.');
-      if (nPos > 0 && local_filename.length() - nPos <= ProtoCommon.FDFS_FILE_EXT_NAME_MAX_LEN + 1) {
-        file_ext_name = local_filename.substring(nPos + 1);
-      } else {
-        file_ext_name = null;
-      }
-
-      file_id = client.upload_file1(null, f.length(), new UploadLocalFileSender(local_filename), file_ext_name, meta_list);
-      if (file_id != null) {
-        System.out.println("file id: " + file_id);
-        System.out.println(client.get_file_info1(file_id));
-        master_file_id = file_id;
-        prefix_name = "-part3";
-        slave_file_id = client.upload_file1(master_file_id, prefix_name, f.length(), new UploadLocalFileSender(local_filename), file_ext_name, meta_list);
-        if (slave_file_id != null) {
-          System.err.println("slave file_id: " + slave_file_id);
-          generated_slave_file_id = ProtoCommon.genSlaveFilename(master_file_id, prefix_name, file_ext_name);
-          if (!generated_slave_file_id.equals(slave_file_id)) {
-            System.err.println("generated slave file: " + generated_slave_file_id + "\n != returned slave file: " + slave_file_id);
-          }
-        }
-      } else {
-        System.err.println("Upload file fail, error no: " + errno);
-      }
-
-      storageServer = tracker.getFetchStorage1(trackerServer, file_id);
-      if (storageServer == null) {
-        System.out.println("getFetchStorage fail, errno code: " + tracker.getErrorCode());
-        return;
-      }
-
-  		/* for test only */
-      System.out.println("active test to storage server: " + ProtoCommon.activeTest(storageServer.getSocket()));
-      storageServer.close();
-
-  		/* for test only */
-      System.out.println("active test to tracker server: " + ProtoCommon.activeTest(trackerServer.getSocket()));
-
-      trackerServer.close();
-    } catch (Exception ex) {
-      ex.printStackTrace();
     }
-  }
 }

src/test/java/org/csource/fastdfs/TestLoad.java

@@ -8,8 +8,6 @@
 
 package org.csource.fastdfs;
 
-import org.csource.fastdfs.*;
-
 /**
  * load test class
  *
@@ -88,7 +86,7 @@ public class TestLoad {
 
     public Uploader() throws Exception {
       this.tracker = new TrackerClient();
-      this.trackerServer = tracker.getConnection();
+      this.trackerServer = tracker.getTrackerServer();
     }
 
     public int uploadFile() throws Exception {
@@ -129,7 +127,7 @@ public class TestLoad {
 
     public Downloader() throws Exception {
       this.tracker = new TrackerClient();
-      this.trackerServer = tracker.getConnection();
+      this.trackerServer = tracker.getTrackerServer();
       this.callback = new DownloadFileDiscard();
     }
 

src/test/resources/fdfs_client.conf

@@ -6,4 +6,4 @@ http.anti_steal_token = no
 http.secret_key = FastDFS1234567890
 
 tracker_server = 10.0.11.245:22122
-tracker_server = 10.0.11.246:22122
+tracker_server = 10.0.11.246:22122