diff --git a/src/main/java/org/csource/fastdfs/StorageClient.java b/src/main/java/org/csource/fastdfs/StorageClient.java
index 5f0d61e..ef0b356 100644
--- a/src/main/java/org/csource/fastdfs/StorageClient.java
+++ b/src/main/java/org/csource/fastdfs/StorageClient.java
@@ -73,15 +73,18 @@ public class StorageClient {
* upload file to storage server (by file name)
*
* @param local_filename local filename to upload
- * @param file_ext_name file ext name, do not include dot(.), null to extract ext name from the local filename
+ * @param file_ext_name file ext name, do not include dot(.), null to extract
+ * ext name from the local filename
* @param meta_list meta info array
* @return 2 elements string array if success:
- * - results[0]: the group name to store the file
- * - results[1]: the new created filename
- * return null if fail
+ *
+ * - results[0]: the group name to store the file
+ * - results[1]: the new created filename
+ *
+ * return null if fail
*/
public String[] upload_file(String local_filename, String file_ext_name,
- NameValuePair[] meta_list) throws IOException, MyException {
+ NameValuePair[] meta_list) throws IOException, MyException {
final String group_name = null;
return this.upload_file(group_name, local_filename, file_ext_name, meta_list);
}
@@ -91,15 +94,18 @@ public class StorageClient {
*
* @param group_name the group name to upload file to, can be empty
* @param local_filename local filename to upload
- * @param file_ext_name file ext name, do not include dot(.), null to extract ext name from the local filename
+ * @param file_ext_name file ext name, do not include dot(.), null to extract
+ * ext name from the local filename
* @param meta_list meta info array
* @return 2 elements string array if success:
- * - results[0]: the group name to store the file
- * - results[1]: the new created filename
- * return null if fail
+ *
+ * - results[0]: the group name to store the file
+ * - results[1]: the new created filename
+ *
+ * return null if fail
*/
protected String[] upload_file(String group_name, String local_filename, String file_ext_name,
- NameValuePair[] meta_list) throws IOException, MyException {
+ NameValuePair[] meta_list) throws IOException, MyException {
final byte cmd = ProtoCommon.STORAGE_PROTO_CMD_UPLOAD_FILE;
return this.upload_file(cmd, group_name, local_filename, file_ext_name, meta_list);
}
@@ -110,15 +116,18 @@ public class StorageClient {
* @param cmd the command
* @param group_name the group name to upload file to, can be empty
* @param local_filename local filename to upload
- * @param file_ext_name file ext name, do not include dot(.), null to extract ext name from the local filename
+ * @param file_ext_name file ext name, do not include dot(.), null to extract
+ * ext name from the local filename
* @param meta_list meta info array
* @return 2 elements string array if success:
- * - results[0]: the group name to store the file
- * - results[1]: the new created filename
- * return null if fail
+ *
+ * - results[0]: the group name to store the file
+ * - results[1]: the new created filename
+ *
+ * return null if fail
*/
protected String[] upload_file(byte cmd, String group_name, String local_filename, String file_ext_name,
- NameValuePair[] meta_list) throws IOException, MyException {
+ NameValuePair[] meta_list) throws IOException, MyException {
File f = new File(local_filename);
FileInputStream fis = new FileInputStream(f);
@@ -146,12 +155,14 @@ public class StorageClient {
* @param file_ext_name file ext name, do not include dot(.)
* @param meta_list meta info array
* @return 2 elements string array if success:
- * - results[0]: the group name to store the file
- * - results[1]: the new created filename
- * return null if fail
+ *
+ * - results[0]: the group name to store the file
+ * - results[1]: the new created filename
+ *
+ * return null if fail
*/
public String[] upload_file(byte[] file_buff, int offset, int length, String file_ext_name,
- NameValuePair[] meta_list) throws IOException, MyException {
+ NameValuePair[] meta_list) throws IOException, MyException {
final String group_name = null;
return this.upload_file(group_name, file_buff, offset, length, file_ext_name, meta_list);
}
@@ -166,12 +177,14 @@ public class StorageClient {
* @param file_ext_name file ext name, do not include dot(.)
* @param meta_list meta info array
* @return 2 elements string array if success:
- * - results[0]: the group name to store the file
- * - results[1]: the new created filename
- * return null if fail
+ *
+ * - results[0]: the group name to store the file
+ * - results[1]: the new created filename
+ *
+ * return null if fail
*/
public String[] upload_file(String group_name, byte[] file_buff, int offset, int length,
- String file_ext_name, NameValuePair[] meta_list) throws IOException, MyException {
+ String file_ext_name, NameValuePair[] meta_list) throws IOException, MyException {
return this.do_upload_file(ProtoCommon.STORAGE_PROTO_CMD_UPLOAD_FILE, group_name, null, null, file_ext_name,
length, new UploadBuff(file_buff, offset, length), meta_list);
}
@@ -183,12 +196,14 @@ public class StorageClient {
* @param file_ext_name file ext name, do not include dot(.)
* @param meta_list meta info array
* @return 2 elements string array if success:
- * - results[0]: the group name to store the file
- * - results[1]: the new created filename
- * return null if fail
+ *
+ * - results[0]: the group name to store the file
+ * - results[1]: the new created filename
+ *
+ * return null if fail
*/
public String[] upload_file(byte[] file_buff, String file_ext_name,
- NameValuePair[] meta_list) throws IOException, MyException {
+ NameValuePair[] meta_list) throws IOException, MyException {
final String group_name = null;
return this.upload_file(group_name, file_buff, 0, file_buff.length, file_ext_name, meta_list);
}
@@ -201,12 +216,14 @@ public class StorageClient {
* @param file_ext_name file ext name, do not include dot(.)
* @param meta_list meta info array
* @return 2 elements string array if success:
- * - results[0]: the group name to store the file
- * - results[1]: the new created filename
- * return null if fail
+ *
+ * - results[0]: the group name to store the file
+ * - results[1]: the new created filename
+ *
+ * return null if fail
*/
public String[] upload_file(String group_name, byte[] file_buff,
- String file_ext_name, NameValuePair[] meta_list) throws IOException, MyException {
+ String file_ext_name, NameValuePair[] meta_list) throws IOException, MyException {
return this.do_upload_file(ProtoCommon.STORAGE_PROTO_CMD_UPLOAD_FILE, group_name, null, null, file_ext_name,
file_buff.length, new UploadBuff(file_buff, 0, file_buff.length), meta_list);
}
@@ -220,12 +237,14 @@ public class StorageClient {
* @param file_ext_name file ext name, do not include dot(.)
* @param meta_list meta info array
* @return 2 elements string array if success:
- * - results[0]: the group name to store the file
- * - results[1]: the new created filename
- * return null if fail
+ *
+ * - results[0]: the group name to store the file
+ * - results[1]: the new created filename
+ *
+ * return null if fail
*/
public String[] upload_file(String group_name, long file_size, UploadCallback callback,
- String file_ext_name, NameValuePair[] meta_list) throws IOException, MyException {
+ String file_ext_name, NameValuePair[] meta_list) throws IOException, MyException {
final String master_filename = null;
final String prefix_name = null;
@@ -240,15 +259,18 @@ public class StorageClient {
* @param master_filename the master file name to generate the slave file
* @param prefix_name the prefix name to generate the slave file
* @param local_filename local filename to upload
- * @param file_ext_name file ext name, do not include dot(.), null to extract ext name from the local filename
+ * @param file_ext_name file ext name, do not include dot(.), null to extract
+ * ext name from the local filename
* @param meta_list meta info array
* @return 2 elements string array if success:
- * - results[0]: the group name to store the file
- * - results[1]: the new created filename
- * return null if fail
+ *
+ * - results[0]: the group name to store the file
+ * - results[1]: the new created filename
+ *
+ * return null if fail
*/
public String[] upload_file(String group_name, String master_filename, String prefix_name,
- String local_filename, String file_ext_name, NameValuePair[] meta_list) throws IOException, MyException {
+ String local_filename, String file_ext_name, NameValuePair[] meta_list) throws IOException, MyException {
if ((group_name == null || group_name.length() == 0) ||
(master_filename == null || master_filename.length() == 0) ||
(prefix_name == null)) {
@@ -266,8 +288,8 @@ public class StorageClient {
}
try {
- return this.do_upload_file(ProtoCommon.STORAGE_PROTO_CMD_UPLOAD_SLAVE_FILE, group_name, master_filename, prefix_name,
- file_ext_name, f.length(), new UploadStream(fis, f.length()), meta_list);
+ return this.do_upload_file(ProtoCommon.STORAGE_PROTO_CMD_UPLOAD_SLAVE_FILE, group_name, master_filename,
+ prefix_name, file_ext_name, f.length(), new UploadStream(fis, f.length()), meta_list);
} finally {
fis.close();
}
@@ -283,20 +305,23 @@ public class StorageClient {
* @param file_ext_name file ext name, do not include dot(.)
* @param meta_list meta info array
* @return 2 elements string array if success:
- * - results[0]: the group name to store the file
- * - results[1]: the new created filename
- * return null if fail
+ *
+ * - results[0]: the group name to store the file
+ * - results[1]: the new created filename
+ *
+ * return null if fail
*/
public String[] upload_file(String group_name, String master_filename, String prefix_name,
- byte[] file_buff, String file_ext_name, NameValuePair[] meta_list) throws IOException, MyException {
+ byte[] file_buff, String file_ext_name, NameValuePair[] meta_list) throws IOException, MyException {
if ((group_name == null || group_name.length() == 0) ||
(master_filename == null || master_filename.length() == 0) ||
(prefix_name == null)) {
throw new MyException("invalid arguement");
}
- return this.do_upload_file(ProtoCommon.STORAGE_PROTO_CMD_UPLOAD_SLAVE_FILE, group_name, master_filename, prefix_name,
- file_ext_name, file_buff.length, new UploadBuff(file_buff, 0, file_buff.length), meta_list);
+ return this.do_upload_file(ProtoCommon.STORAGE_PROTO_CMD_UPLOAD_SLAVE_FILE, group_name, master_filename,
+ prefix_name, file_ext_name, file_buff.length, new UploadBuff(file_buff, 0, file_buff.length),
+ meta_list);
}
/**
@@ -311,21 +336,23 @@ public class StorageClient {
* @param file_ext_name file ext name, do not include dot(.)
* @param meta_list meta info array
* @return 2 elements string array if success:
- * - results[0]: the group name to store the file
- * - results[1]: the new created filename
- * return null if fail
+ *
+ * - results[0]: the group name to store the file
+ * - results[1]: the new created filename
+ *
+ * return null if fail
*/
public String[] upload_file(String group_name, String master_filename, String prefix_name,
- byte[] file_buff, int offset, int length, String file_ext_name,
- NameValuePair[] meta_list) throws IOException, MyException {
+ byte[] file_buff, int offset, int length, String file_ext_name,
+ NameValuePair[] meta_list) throws IOException, MyException {
if ((group_name == null || group_name.length() == 0) ||
(master_filename == null || master_filename.length() == 0) ||
(prefix_name == null)) {
throw new MyException("invalid arguement");
}
- return this.do_upload_file(ProtoCommon.STORAGE_PROTO_CMD_UPLOAD_SLAVE_FILE, group_name, master_filename, prefix_name,
- file_ext_name, length, new UploadBuff(file_buff, offset, length), meta_list);
+ return this.do_upload_file(ProtoCommon.STORAGE_PROTO_CMD_UPLOAD_SLAVE_FILE, group_name, master_filename,
+ prefix_name, file_ext_name, length, new UploadBuff(file_buff, offset, length), meta_list);
}
/**
@@ -339,30 +366,35 @@ public class StorageClient {
* @param file_ext_name file ext name, do not include dot(.)
* @param meta_list meta info array
* @return 2 elements string array if success:
- * - results[0]: the group name to store the file
- * - results[1]: the new created filename
- * return null if fail
+ *
+ * - results[0]: the group name to store the file
+ * - results[1]: the new created filename
+ *
+ * return null if fail
*/
public String[] upload_file(String group_name, String master_filename,
- String prefix_name, long file_size, UploadCallback callback,
- String file_ext_name, NameValuePair[] meta_list) throws IOException, MyException {
- return this.do_upload_file(ProtoCommon.STORAGE_PROTO_CMD_UPLOAD_SLAVE_FILE, group_name, master_filename, prefix_name,
- file_ext_name, file_size, callback, meta_list);
+ String prefix_name, long file_size, UploadCallback callback,
+ String file_ext_name, NameValuePair[] meta_list) throws IOException, MyException {
+ return this.do_upload_file(ProtoCommon.STORAGE_PROTO_CMD_UPLOAD_SLAVE_FILE, group_name, master_filename,
+ prefix_name, file_ext_name, file_size, callback, meta_list);
}
/**
* upload appender file to storage server (by file name)
*
* @param local_filename local filename to upload
- * @param file_ext_name file ext name, do not include dot(.), null to extract ext name from the local filename
+ * @param file_ext_name file ext name, do not include dot(.), null to extract
+ * ext name from the local filename
* @param meta_list meta info array
* @return 2 elements string array if success:
- * - results[0]: the group name to store the file
- * - results[1]: the new created filename
- * return null if fail
+ *
+ * - results[0]: the group name to store the file
+ * - results[1]: the new created filename
+ *
+ * return null if fail
*/
public String[] upload_appender_file(String local_filename, String file_ext_name,
- NameValuePair[] meta_list) throws IOException, MyException {
+ NameValuePair[] meta_list) throws IOException, MyException {
final String group_name = null;
return this.upload_appender_file(group_name, local_filename, file_ext_name, meta_list);
}
@@ -372,15 +404,18 @@ public class StorageClient {
*
* @param group_name the group name to upload file to, can be empty
* @param local_filename local filename to upload
- * @param file_ext_name file ext name, do not include dot(.), null to extract ext name from the local filename
+ * @param file_ext_name file ext name, do not include dot(.), null to extract
+ * ext name from the local filename
* @param meta_list meta info array
* @return 2 elements string array if success:
- * - results[0]: the group name to store the file
- * - results[1]: the new created filename
- * return null if fail
+ *
+ * - results[0]: the group name to store the file
+ * - results[1]: the new created filename
+ *
+ * return null if fail
*/
protected String[] upload_appender_file(String group_name, String local_filename, String file_ext_name,
- NameValuePair[] meta_list) throws IOException, MyException {
+ NameValuePair[] meta_list) throws IOException, MyException {
final byte cmd = ProtoCommon.STORAGE_PROTO_CMD_UPLOAD_APPENDER_FILE;
return this.upload_file(cmd, group_name, local_filename, file_ext_name, meta_list);
}
@@ -394,12 +429,14 @@ public class StorageClient {
* @param file_ext_name file ext name, do not include dot(.)
* @param meta_list meta info array
* @return 2 elements string array if success:
- * - results[0]: the group name to store the file
- * - results[1]: the new created filename
- * return null if fail
+ *
+ * - results[0]: the group name to store the file
+ * - results[1]: the new created filename
+ *
+ * return null if fail
*/
public String[] upload_appender_file(byte[] file_buff, int offset, int length, String file_ext_name,
- NameValuePair[] meta_list) throws IOException, MyException {
+ NameValuePair[] meta_list) throws IOException, MyException {
final String group_name = null;
return this.upload_appender_file(group_name, file_buff, offset, length, file_ext_name, meta_list);
}
@@ -414,14 +451,16 @@ public class StorageClient {
* @param file_ext_name file ext name, do not include dot(.)
* @param meta_list meta info array
* @return 2 elements string array if success:
- * - results[0]: the group name to store the file
- * - results[1]: the new created filename
- * return null if fail
+ *
+ * - results[0]: the group name to store the file
+ * - results[1]: the new created filename
+ *
+ * return null if fail
*/
public String[] upload_appender_file(String group_name, byte[] file_buff, int offset, int length,
- String file_ext_name, NameValuePair[] meta_list) throws IOException, MyException {
- return this.do_upload_file(ProtoCommon.STORAGE_PROTO_CMD_UPLOAD_APPENDER_FILE, group_name, null, null, file_ext_name,
- length, new UploadBuff(file_buff, offset, length), meta_list);
+ String file_ext_name, NameValuePair[] meta_list) throws IOException, MyException {
+ return this.do_upload_file(ProtoCommon.STORAGE_PROTO_CMD_UPLOAD_APPENDER_FILE, group_name, null, null,
+ file_ext_name, length, new UploadBuff(file_buff, offset, length), meta_list);
}
/**
@@ -431,12 +470,14 @@ public class StorageClient {
* @param file_ext_name file ext name, do not include dot(.)
* @param meta_list meta info array
* @return 2 elements string array if success:
- * - results[0]: the group name to store the file
- * - results[1]: the new created filename
- * return null if fail
+ *
+ * - results[0]: the group name to store the file
+ * - results[1]: the new created filename
+ *
+ * return null if fail
*/
public String[] upload_appender_file(byte[] file_buff, String file_ext_name,
- NameValuePair[] meta_list) throws IOException, MyException {
+ NameValuePair[] meta_list) throws IOException, MyException {
final String group_name = null;
return this.upload_appender_file(group_name, file_buff, 0, file_buff.length, file_ext_name, meta_list);
}
@@ -449,14 +490,16 @@ public class StorageClient {
* @param file_ext_name file ext name, do not include dot(.)
* @param meta_list meta info array
* @return 2 elements string array if success:
- * - results[0]: the group name to store the file
- * - results[1]: the new created filename
- * return null if fail
+ *
+ * - results[0]: the group name to store the file
+ * - results[1]: the new created filename
+ *
+ * return null if fail
*/
public String[] upload_appender_file(String group_name, byte[] file_buff,
- String file_ext_name, NameValuePair[] meta_list) throws IOException, MyException {
- return this.do_upload_file(ProtoCommon.STORAGE_PROTO_CMD_UPLOAD_APPENDER_FILE, group_name, null, null, file_ext_name,
- file_buff.length, new UploadBuff(file_buff, 0, file_buff.length), meta_list);
+ String file_ext_name, NameValuePair[] meta_list) throws IOException, MyException {
+ return this.do_upload_file(ProtoCommon.STORAGE_PROTO_CMD_UPLOAD_APPENDER_FILE, group_name, null, null,
+ file_ext_name, file_buff.length, new UploadBuff(file_buff, 0, file_buff.length), meta_list);
}
/**
@@ -468,16 +511,19 @@ public class StorageClient {
* @param file_ext_name file ext name, do not include dot(.)
* @param meta_list meta info array
* @return 2 elements string array if success:
- * - results[0]: the group name to store the file
- * - results[1]: the new created filename
- * return null if fail
+ *
+ * - results[0]: the group name to store the file
+ * - results[1]: the new created filename
+ *
+ * return null if fail
*/
public String[] upload_appender_file(String group_name, long file_size, UploadCallback callback,
- String file_ext_name, NameValuePair[] meta_list) throws IOException, MyException {
+ String file_ext_name, NameValuePair[] meta_list) throws IOException, MyException {
final String master_filename = null;
final String prefix_name = null;
- return this.do_upload_file(ProtoCommon.STORAGE_PROTO_CMD_UPLOAD_APPENDER_FILE, group_name, master_filename, prefix_name,
+ return this.do_upload_file(ProtoCommon.STORAGE_PROTO_CMD_UPLOAD_APPENDER_FILE, group_name, master_filename,
+ prefix_name,
file_ext_name, file_size, callback, meta_list);
}
@@ -489,7 +535,8 @@ public class StorageClient {
* @param local_filename local filename to append
* @return 0 for success, != 0 for error (error no)
*/
- public int append_file(String group_name, String appender_filename, String local_filename) throws IOException, MyException {
+ public int append_file(String group_name, String appender_filename, String local_filename)
+ throws IOException, MyException {
File f = new File(local_filename);
FileInputStream fis = new FileInputStream(f);
@@ -508,8 +555,10 @@ public class StorageClient {
* @param file_buff file content/buff
* @return 0 for success, != 0 for error (error no)
*/
- public int append_file(String group_name, String appender_filename, byte[] file_buff) throws IOException, MyException {
- return this.do_append_file(group_name, appender_filename, file_buff.length, new UploadBuff(file_buff, 0, file_buff.length));
+ public int append_file(String group_name, String appender_filename, byte[] file_buff)
+ throws IOException, MyException {
+ return this.do_append_file(group_name, appender_filename, file_buff.length,
+ new UploadBuff(file_buff, 0, file_buff.length));
}
/**
@@ -523,7 +572,7 @@ public class StorageClient {
* @return 0 for success, != 0 for error (error no)
*/
public int append_file(String group_name, String appender_filename,
- byte[] file_buff, int offset, int length) throws IOException, MyException {
+ byte[] file_buff, int offset, int length) throws IOException, MyException {
return this.do_append_file(group_name, appender_filename, length, new UploadBuff(file_buff, offset, length));
}
@@ -537,7 +586,7 @@ public class StorageClient {
* @return 0 for success, != 0 for error (error no)
*/
public int append_file(String group_name, String appender_filename,
- long file_size, UploadCallback callback) throws IOException, MyException {
+ long file_size, UploadCallback callback) throws IOException, MyException {
return this.do_append_file(group_name, appender_filename, file_size, callback);
}
@@ -551,7 +600,7 @@ public class StorageClient {
* @return 0 for success, != 0 for error (error no)
*/
public int modify_file(String group_name, String appender_filename,
- long file_offset, String local_filename) throws IOException, MyException {
+ long file_offset, String local_filename) throws IOException, MyException {
File f = new File(local_filename);
FileInputStream fis = new FileInputStream(f);
@@ -573,7 +622,7 @@ public class StorageClient {
* @return 0 for success, != 0 for error (error no)
*/
public int modify_file(String group_name, String appender_filename,
- long file_offset, byte[] file_buff) throws IOException, MyException {
+ long file_offset, byte[] file_buff) throws IOException, MyException {
return this.do_modify_file(group_name, appender_filename, file_offset,
file_buff.length, new UploadBuff(file_buff, 0, file_buff.length));
}
@@ -590,7 +639,7 @@ public class StorageClient {
* @return 0 for success, != 0 for error (error no)
*/
public int modify_file(String group_name, String appender_filename,
- long file_offset, byte[] file_buff, int buffer_offset, int buffer_length) throws IOException, MyException {
+ long file_offset, byte[] file_buff, int buffer_offset, int buffer_length) throws IOException, MyException {
return this.do_modify_file(group_name, appender_filename, file_offset,
buffer_length, new UploadBuff(file_buff, buffer_offset, buffer_length));
}
@@ -606,7 +655,7 @@ public class StorageClient {
* @return 0 for success, != 0 for error (error no)
*/
public int modify_file(String group_name, String appender_filename,
- long file_offset, long modify_size, UploadCallback callback) throws IOException, MyException {
+ long file_offset, long modify_size, UploadCallback callback) throws IOException, MyException {
return this.do_modify_file(group_name, appender_filename, file_offset,
modify_size, callback);
}
@@ -617,11 +666,14 @@ public class StorageClient {
* @param group_name the group name of appender file
* @param appender_filename the appender filename
* @return 2 elements string array if success:
- * - results[0]: the group name to store the file
- * - results[1]: the new created filename
- * return null if fail
+ *
+ * - results[0]: the group name to store the file
+ * - results[1]: the new created filename
+ *
+ * return null if fail
*/
- public String[] regenerate_appender_filename(String group_name, String appender_filename) throws IOException, MyException {
+ public String[] regenerate_appender_filename(String group_name, String appender_filename)
+ throws IOException, MyException {
byte[] header;
boolean bNewStorageServer;
Connection connection = null;
@@ -700,13 +752,15 @@ public class StorageClient {
* @param callback the write data callback object
* @param meta_list meta info array
* @return 2 elements string array if success:
- * - results[0]: the group name to store the file
- * - results[1]: the new created filename
- * return null if fail
+ *
+ * - results[0]: the group name to store the file
+ * - results[1]: the new created filename
+ *
+ * return null if fail
*/
protected String[] do_upload_file(byte cmd, String group_name, String master_filename,
- String prefix_name, String file_ext_name, long file_size, UploadCallback callback,
- NameValuePair[] meta_list) throws IOException, MyException {
+ String prefix_name, String file_ext_name, long file_size, UploadCallback callback,
+ NameValuePair[] meta_list) throws IOException, MyException {
byte[] header;
byte[] ext_name_bs;
String new_group_name;
@@ -746,8 +800,8 @@ public class StorageClient {
masterFilenameBytes = master_filename.getBytes(ClientGlobal.g_charset);
sizeBytes = new byte[2 * ProtoCommon.FDFS_PROTO_PKG_LEN_SIZE];
- body_len = sizeBytes.length + ProtoCommon.FDFS_FILE_PREFIX_MAX_LEN + ProtoCommon.FDFS_FILE_EXT_NAME_MAX_LEN
- + masterFilenameBytes.length + file_size;
+ body_len = sizeBytes.length + ProtoCommon.FDFS_FILE_PREFIX_MAX_LEN
+ + ProtoCommon.FDFS_FILE_EXT_NAME_MAX_LEN + masterFilenameBytes.length + file_size;
hexLenBytes = ProtoCommon.long2buff(master_filename.length());
System.arraycopy(hexLenBytes, 0, sizeBytes, 0, hexLenBytes.length);
@@ -861,7 +915,7 @@ public class StorageClient {
* @return return true for success, false for fail
*/
protected int do_append_file(String group_name, String appender_filename,
- long file_size, UploadCallback callback) throws IOException, MyException {
+ long file_size, UploadCallback callback) throws IOException, MyException {
byte[] header;
boolean bNewStorageServer;
Connection connection = null;
@@ -954,7 +1008,7 @@ public class StorageClient {
* @return return true for success, false for fail
*/
protected int do_modify_file(String group_name, String appender_filename,
- long file_offset, long modify_size, UploadCallback callback) throws IOException, MyException {
+ long file_offset, long modify_size, UploadCallback callback) throws IOException, MyException {
byte[] header;
boolean bNewStorageServer;
Connection connection = null;
@@ -1080,7 +1134,7 @@ public class StorageClient {
* @return 0 for success, none zero for fail (error code)
*/
public int truncate_file(String group_name, String appender_filename,
- long truncated_file_size) throws IOException, MyException {
+ long truncated_file_size) throws IOException, MyException {
byte[] header;
boolean bNewStorageServer;
Connection connection = null;
@@ -1163,7 +1217,8 @@ public class StorageClient {
* @param download_bytes download bytes, 0 for remain bytes from offset
* @return file content/buff, return null if fail
*/
- public byte[] download_file(String group_name, String remote_filename, long file_offset, long download_bytes) throws IOException, MyException {
+ public byte[] download_file(String group_name, String remote_filename, long file_offset, long download_bytes)
+ throws IOException, MyException {
boolean bNewStorageServer = this.newReadableStorageConnection(group_name, remote_filename);
Connection connection = this.storageServer.getConnection();
@@ -1203,7 +1258,7 @@ public class StorageClient {
* @return 0 success, return none zero errno if fail
*/
public int download_file(String group_name, String remote_filename,
- String local_filename) throws IOException, MyException {
+ String local_filename) throws IOException, MyException {
final long file_offset = 0;
final long download_bytes = 0;
return this.download_file(group_name, remote_filename,
@@ -1221,8 +1276,8 @@ public class StorageClient {
* @return 0 success, return none zero errno if fail
*/
public int download_file(String group_name, String remote_filename,
- long file_offset, long download_bytes,
- String local_filename) throws IOException, MyException {
+ long file_offset, long download_bytes,
+ String local_filename) throws IOException, MyException {
boolean bNewStorageServer = this.newReadableStorageConnection(group_name, remote_filename);
Connection connection = this.storageServer.getConnection();
try {
@@ -1243,17 +1298,18 @@ public class StorageClient {
long remainBytes = header.body_len;
int bytes;
- //System.out.println("expect_body_len=" + header.body_len);
+ // System.out.println("expect_body_len=" + header.body_len);
while (remainBytes > 0) {
if ((bytes = in.read(buff, 0, remainBytes > buff.length ? buff.length : (int) remainBytes)) < 0) {
- throw new IOException("recv package size " + (header.body_len - remainBytes) + " != " + header.body_len);
+ throw new IOException(
+ "recv package size " + (header.body_len - remainBytes) + " != " + header.body_len);
}
out.write(buff, 0, bytes);
remainBytes -= bytes;
- //System.out.println("totalBytes=" + (header.body_len - remainBytes));
+ // System.out.println("totalBytes=" + (header.body_len - remainBytes));
}
return 0;
@@ -1292,7 +1348,7 @@ public class StorageClient {
* @return 0 success, return none zero errno if fail
*/
public int download_file(String group_name, String remote_filename,
- DownloadCallback callback) throws IOException, MyException {
+ DownloadCallback callback) throws IOException, MyException {
final long file_offset = 0;
final long download_bytes = 0;
return this.download_file(group_name, remote_filename,
@@ -1310,8 +1366,8 @@ public class StorageClient {
* @return 0 success, return none zero errno if fail
*/
public int download_file(String group_name, String remote_filename,
- long file_offset, long download_bytes,
- DownloadCallback callback) throws IOException, MyException {
+ long file_offset, long download_bytes,
+ DownloadCallback callback) throws IOException, MyException {
int result;
boolean bNewStorageServer = this.newReadableStorageConnection(group_name, remote_filename);
Connection connection = this.storageServer.getConnection();
@@ -1331,7 +1387,7 @@ public class StorageClient {
long remainBytes = header.body_len;
int bytes;
- //System.out.println("expect_body_len=" + header.body_len);
+ // System.out.println("expect_body_len=" + header.body_len);
while (remainBytes > 0) {
if ((bytes = in.read(buff, 0, remainBytes > buff.length ? buff.length : (int) remainBytes)) < 0) {
@@ -1344,7 +1400,7 @@ public class StorageClient {
}
remainBytes -= bytes;
- //System.out.println("totalBytes=" + (header.body_len - remainBytes));
+ // System.out.println("totalBytes=" + (header.body_len - remainBytes));
}
return 0;
@@ -1406,14 +1462,18 @@ public class StorageClient {
* @param remote_filename filename on storage server
* @param meta_list meta item array
* @param op_flag flag, can be one of following values:
- * - ProtoCommon.STORAGE_SET_METADATA_FLAG_OVERWRITE: overwrite all old
- * metadata items
- * - ProtoCommon.STORAGE_SET_METADATA_FLAG_MERGE: merge, insert when
- * the metadata item not exist, otherwise update it
+ *
+ * - ProtoCommon.STORAGE_SET_METADATA_FLAG_OVERWRITE:
+ * overwrite all old
+ * metadata items
+ * - ProtoCommon.STORAGE_SET_METADATA_FLAG_MERGE:
+ * merge, insert when
+ * the metadata item not exist, otherwise update it
+ *
* @return 0 for success, !=0 fail (error code)
*/
public int set_metadata(String group_name, String remote_filename,
- NameValuePair[] meta_list, byte op_flag) throws IOException, MyException {
+ NameValuePair[] meta_list, byte op_flag) throws IOException, MyException {
boolean bNewStorageServer = this.newUpdatableStorageConnection(group_name, remote_filename);
Connection connection = this.storageServer.getConnection();
try {
@@ -1454,7 +1514,7 @@ public class StorageClient {
header = ProtoCommon.packHeader(ProtoCommon.STORAGE_PROTO_CMD_SET_METADATA,
2 * ProtoCommon.FDFS_PROTO_PKG_LEN_SIZE + 1 + groupBytes.length
- + filenameBytes.length + meta_buff.length, (byte) 0);
+ + filenameBytes.length + meta_buff.length, (byte) 0);
OutputStream out = connection.getOutputStream();
byte[] wholePkg = new byte[header.length + sizeBytes.length + 1 + groupBytes.length + filenameBytes.length];
System.arraycopy(header, 0, wholePkg, 0, header.length);
@@ -1516,7 +1576,7 @@ public class StorageClient {
}
if (file_type == FileInfo.FILE_TYPE_SLAVE ||
- file_type == FileInfo.FILE_TYPE_APPENDER) { //slave file or appender file
+ file_type == FileInfo.FILE_TYPE_APPENDER) { // slave file or appender file
FileInfo fi = this.query_file_info(group_name, remote_filename);
if (fi == null) {
return null;
@@ -1528,7 +1588,7 @@ public class StorageClient {
int create_timestamp = ProtoCommon.buff2int(buff, 4);
if ((file_size >> 63) != 0) {
- file_size &= 0xFFFFFFFFL; //low 32 bits is file size
+ file_size &= 0xFFFFFFFFL; // low 32 bits is file size
}
int crc32 = ProtoCommon.buff2int(buff, 4 * 4);
@@ -1618,7 +1678,7 @@ public class StorageClient {
TrackerClient tracker = new TrackerClient();
this.storageServer = tracker.getStoreStorage(this.trackerServer, group_name);
if (this.storageServer == null) {
- throw new MyException("getStoreStorage fail, errno code: " + tracker.getErrorCode());
+ throw new MyException("getStoreStorage fail, error code: " + tracker.getErrorCode());
}
return true;
}
@@ -1631,7 +1691,8 @@ public class StorageClient {
* @param remote_filename filename on storage server
* @return true if create a new connection
*/
- protected boolean newReadableStorageConnection(String group_name, String remote_filename) throws IOException, MyException {
+ protected boolean newReadableStorageConnection(String group_name, String remote_filename)
+ throws IOException, MyException {
if (this.storageServer != null) {
return false;
} else {
@@ -1651,7 +1712,8 @@ public class StorageClient {
* @param remote_filename filename on storage server
* @return true if create a new connection
*/
- protected boolean newUpdatableStorageConnection(String group_name, String remote_filename) throws IOException, MyException {
+ protected boolean newUpdatableStorageConnection(String group_name, String remote_filename)
+ throws IOException, MyException {
if (this.storageServer != null) {
return false;
} else {
@@ -1671,7 +1733,8 @@ public class StorageClient {
* @param group_name the group name of storage server
* @param remote_filename filename on storage server
*/
- protected void send_package(byte cmd, String group_name, String remote_filename, Connection connection) throws IOException {
+ protected void send_package(byte cmd, String group_name, String remote_filename, Connection connection)
+ throws IOException {
byte[] header;
byte[] groupBytes;
byte[] filenameBytes;
@@ -1792,7 +1855,8 @@ public class StorageClient {
}
/**
- * send file content callback function, be called only once when the file uploaded
+ * send file content callback function, be called only once when the file
+ * uploaded
*
* @param out output stream for writing file content
* @return 0 success, return none zero(errno) if fail