php ext support regenerate filename for appender file

HISTORY

@@ -1,5 +1,5 @@
 
-Version 6.02  2019-11-10
+Version 6.02  2019-11-11
  * get_file_info calculate CRC32 for appender file type
  * disk recovery download file to local temp file then rename it
    when the local file exists

client/storage_client.c

@@ -2397,9 +2397,6 @@ int storage_regenerate_appender_filename(ConnectionInfo *pTrackerServer,
 	pHeader = (TrackerHeader *)out_buff;
 	p = out_buff + sizeof(TrackerHeader);
 
-	snprintf(p, sizeof(out_buff) - sizeof(TrackerHeader),
-            "%s", group_name);
-    p += FDFS_GROUP_NAME_MAX_LEN;
 	memcpy(p, appender_filename, appender_filename_len);
 	p += appender_filename_len;
 

conf/storage.conf

@@ -107,6 +107,7 @@ store_path_count=1
 
 # store_path#, based 0, if store_path0 not exists, it's value is base_path
 # the paths must be exist
+# NOTE: the store paths' order is very important, don't mess up.
 store_path0=/home/yuqing/fastdfs
 #store_path1=/home/yuqing/fastdfs2
 

php_client/fastdfs_client.c

@@ -169,6 +169,8 @@ const zend_fcall_info empty_fcall_info = { 0, NULL, NULL, NULL, NULL, 0, NULL, N
 		ZEND_FE(fastdfs_storage_file_exist1, NULL)
 		ZEND_FE(fastdfs_gen_slave_filename, NULL)
 		ZEND_FE(fastdfs_send_data, NULL)
+		ZEND_FE(fastdfs_storage_regenerate_appender_filename, NULL)
+		ZEND_FE(fastdfs_storage_regenerate_appender_filename1, NULL)
 		{NULL, NULL, NULL}  /* Must be the last line */
 	};
 
@@ -4047,6 +4049,195 @@ static void php_fdfs_storage_modify_file_impl( \
 	}
 }
 
+/*
+boolean fastdfs_storage_regenerate_appender_filename(string group_name,
+    string appender_filename, [array tracker_server, array storage_server])
+return assoc array for success, false for error
+*/
+static void php_fdfs_storage_regenerate_appender_filename_impl(
+		INTERNAL_FUNCTION_PARAMETERS, FDFSPhpContext *pContext,
+		const bool bFileId)
+{
+	int result;
+	int argc;
+	char *appender_filename;
+	zval *tracker_obj;
+	zval *storage_obj;
+	char *group_name;
+	HashTable *tracker_hash;
+	HashTable *storage_hash;
+	ConnectionInfo tracker_server;
+	ConnectionInfo storage_server;
+	ConnectionInfo *pTrackerServer;
+	ConnectionInfo *pStorageServer;
+    char new_group_name[FDFS_GROUP_NAME_MAX_LEN + 1];
+    char new_remote_filename[128];
+	char new_file_id[FDFS_GROUP_NAME_MAX_LEN + 128];
+	zend_size_t group_name_len;
+	zend_size_t appender_filename_len;
+	int saved_tracker_sock;
+	int saved_storage_sock;
+	int min_param_count;
+	int max_param_count;
+
+	if (bFileId)
+	{
+		min_param_count = 1;
+		max_param_count = 3;
+	}
+	else
+	{
+		min_param_count = 2;
+		max_param_count = 4;
+	}
+
+    argc = ZEND_NUM_ARGS();
+	if (argc < min_param_count || argc > max_param_count)
+	{
+		logError("file: "__FILE__", line: %d, " \
+			"storage_modify_file parameters " \
+			"count: %d < %d or > %d", __LINE__, argc, \
+			min_param_count, max_param_count);
+		pContext->err_no = EINVAL;
+		RETURN_BOOL(false);
+	}
+
+	tracker_obj = NULL;
+	storage_obj = NULL;
+	if (bFileId)
+	{
+		char *pSeperator;
+		char *appender_file_id;
+		zend_size_t appender_file_id_len;
+
+		result = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
+			"s|aa", &appender_file_id, &appender_file_id_len,
+			&tracker_obj, &storage_obj);
+		if (result == FAILURE)
+		{
+			logError("file: "__FILE__", line: %d, " \
+				"zend_parse_parameters fail!", __LINE__);
+			pContext->err_no = EINVAL;
+			RETURN_BOOL(false);
+		}
+
+		snprintf(new_file_id, sizeof(new_file_id), "%s", appender_file_id);
+		pSeperator = strchr(new_file_id, FDFS_FILE_ID_SEPERATOR);
+		if (pSeperator == NULL)
+		{
+			logError("file: "__FILE__", line: %d, "
+				"appender_file_id is invalid, "
+				"appender_file_id=%s",
+				__LINE__, appender_file_id);
+			pContext->err_no = EINVAL;
+			RETURN_BOOL(false);
+		}
+
+		*pSeperator = '\0';
+		group_name = new_file_id;
+		appender_filename =  pSeperator + 1;
+	}
+	else
+	{
+		result = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
+			"ss|aa", &group_name, &group_name_len,
+			&appender_filename, &appender_filename_len,
+			&tracker_obj, &storage_obj);
+		if (result == FAILURE)
+		{
+			logError("file: "__FILE__", line: %d, "
+				"zend_parse_parameters fail!", __LINE__);
+			pContext->err_no = EINVAL;
+			RETURN_BOOL(false);
+		}
+	}
+
+	if (tracker_obj == NULL)
+	{
+		pTrackerServer = tracker_get_connection_no_pool( \
+					pContext->pTrackerGroup);
+		if (pTrackerServer == NULL)
+		{
+			pContext->err_no = ENOENT;
+			RETURN_BOOL(false);
+		}
+		saved_tracker_sock = -1;
+		tracker_hash = NULL;
+	}
+	else
+	{
+		pTrackerServer = &tracker_server;
+		tracker_hash = Z_ARRVAL_P(tracker_obj);
+		if ((result=php_fdfs_get_server_from_hash(tracker_hash, \
+				pTrackerServer)) != 0)
+		{
+			pContext->err_no = result;
+			RETURN_BOOL(false);
+		}
+		saved_tracker_sock = pTrackerServer->sock;
+	}
+
+	if (storage_obj == NULL)
+	{
+		pStorageServer = NULL;
+		storage_hash = NULL;
+		saved_storage_sock = -1;
+	}
+	else
+	{
+		pStorageServer = &storage_server;
+		storage_hash = Z_ARRVAL_P(storage_obj);
+		if ((result=php_fdfs_get_server_from_hash(storage_hash, \
+				pStorageServer)) != 0)
+		{
+			pContext->err_no = result;
+			RETURN_BOOL(false);
+		}
+
+		saved_storage_sock = pStorageServer->sock;
+	}
+
+    pContext->err_no = storage_regenerate_appender_filename(pTrackerServer,
+		pStorageServer, group_name, appender_filename,
+        new_group_name, new_remote_filename);
+
+	if (tracker_hash != NULL && pTrackerServer->sock != \
+		saved_tracker_sock)
+	{
+		CLEAR_HASH_SOCK_FIELD(tracker_hash)
+	}
+	if (pStorageServer != NULL && pStorageServer->sock != \
+		saved_storage_sock)
+	{
+		CLEAR_HASH_SOCK_FIELD(storage_hash)
+	}
+
+    if (pContext->err_no != 0)
+    {
+        RETURN_BOOL(false);
+    }
+	if (bFileId)
+	{
+		char file_id[FDFS_GROUP_NAME_MAX_LEN + 128];
+		int file_id_len;
+
+		file_id_len = sprintf(file_id, "%s%c%s", new_group_name,
+				FDFS_FILE_ID_SEPERATOR, new_remote_filename);
+		ZEND_RETURN_STRINGL(file_id, file_id_len, 1);
+	}
+	else
+	{
+		array_init(return_value);
+
+		zend_add_assoc_stringl_ex(return_value, "group_name",
+			sizeof("group_name"), new_group_name,
+			strlen(new_group_name), 1);
+		zend_add_assoc_stringl_ex(return_value, "filename",
+			sizeof("filename"), new_remote_filename,
+			strlen(new_remote_filename), 1);
+	}
+}
+
 static void php_fdfs_storage_set_metadata_impl(INTERNAL_FUNCTION_PARAMETERS, \
 		FDFSPhpContext *pContext, const bool bFileId)
 {
@@ -4271,7 +4462,7 @@ static void php_fdfs_http_gen_token_impl(INTERNAL_FUNCTION_PARAMETERS, \
 	if (argc != 2)
 	{
 		logError("file: "__FILE__", line: %d, " \
-			"storage_upload_file parameters " \
+			"fdfs_http_gen_token parameters " \
 			"count: %d != 2", __LINE__, argc);
 		pContext->err_no = EINVAL;
 		RETURN_BOOL(false);
@@ -4359,7 +4550,7 @@ static void php_fdfs_get_file_info_impl(INTERNAL_FUNCTION_PARAMETERS, \
 	if (argc != param_count)
 	{
 		logError("file: "__FILE__", line: %d, " \
-			"storage_upload_file parameters " \
+			"fdfs_get_file_info parameters " \
 			"count: %d != %d", __LINE__, argc, param_count);
 		pContext->err_no = EINVAL;
 		RETURN_BOOL(false);
@@ -4416,16 +4607,20 @@ static void php_fdfs_get_file_info_impl(INTERNAL_FUNCTION_PARAMETERS, \
 	}
 
 	array_init(return_value);
-	zend_add_assoc_long_ex(return_value, "source_id", \
+	zend_add_assoc_bool_ex(return_value, "get_from_server",
+		sizeof("get_from_server"), file_info.get_from_server);
+	zend_add_assoc_long_ex(return_value, "file_type",
+		sizeof("file_type"), file_info.file_type);
+	zend_add_assoc_long_ex(return_value, "source_id",
 		sizeof("source_id"), file_info.source_id);
-	zend_add_assoc_long_ex(return_value, "create_timestamp", \
+	zend_add_assoc_long_ex(return_value, "create_timestamp",
 		sizeof("create_timestamp"), file_info.create_timestamp);
-	zend_add_assoc_long_ex(return_value, "file_size", \
+	zend_add_assoc_long_ex(return_value, "file_size",
 		sizeof("file_size"), (long)file_info.file_size);
-	zend_add_assoc_stringl_ex(return_value, "source_ip_addr", \
+	zend_add_assoc_stringl_ex(return_value, "source_ip_addr",
-		sizeof("source_ip_addr"), file_info.source_ip_addr, \
+		sizeof("source_ip_addr"), file_info.source_ip_addr,
 		strlen(file_info.source_ip_addr), 1);
-	zend_add_assoc_long_ex(return_value, "crc32", \
+	zend_add_assoc_long_ex(return_value, "crc32",
 		sizeof("crc32"), file_info.crc32);
 }
 
@@ -4453,7 +4648,7 @@ static void php_fdfs_gen_slave_filename_impl(INTERNAL_FUNCTION_PARAMETERS, \
 	if (argc != 2 && argc != 3)
 	{
 		logError("file: "__FILE__", line: %d, " \
-			"storage_upload_file parameters " \
+			"fdfs_gen_slave_filename parameters " \
 			"count: %d != 2 or 3", __LINE__, argc);
 		pContext->err_no = EINVAL;
 		RETURN_BOOL(false);
@@ -4940,7 +5135,7 @@ ZEND_FUNCTION(fastdfs_storage_modify_by_callback)
 
 /*
 boolean fastdfs_storage_modify_by_callback1(array callback_array, 
-	long file_offset, string group_name, string appender_filename
+	long file_offset, string appender_file_id,
 	[, array tracker_server, array storage_server])
 return true for success, false for error
 */
@@ -4950,6 +5145,28 @@ ZEND_FUNCTION(fastdfs_storage_modify_by_callback1)
 		&php_context, FDFS_UPLOAD_BY_CALLBACK, true);
 }
 
+/*
+boolean fastdfs_storage_regenerate_appender_filename(string group_name,
+    string appender_filename, [array tracker_server, array storage_server])
+return assoc array for success, false for error
+*/
+ZEND_FUNCTION(fastdfs_storage_regenerate_appender_filename)
+{
+	php_fdfs_storage_regenerate_appender_filename_impl(
+            INTERNAL_FUNCTION_PARAM_PASSTHRU, &php_context, false);
+}
+
+/*
+boolean fastdfs_storage_regenerate_appender_filename1(
+    string appender_file_id, [array tracker_server, array storage_server])
+return regenerated file id for success, false for error
+*/
+ZEND_FUNCTION(fastdfs_storage_regenerate_appender_filename1)
+{
+	php_fdfs_storage_regenerate_appender_filename_impl(
+            INTERNAL_FUNCTION_PARAM_PASSTHRU, &php_context, true);
+}
+
 /*
 array fastdfs_storage_upload_appender_by_filename(string local_filename, 
 	[string file_ext_name, string meta_list, string group_name, 
@@ -5962,6 +6179,36 @@ PHP_METHOD(FastDFS, storage_modify_by_callback1)
 		&(i_obj->context), FDFS_UPLOAD_BY_CALLBACK, true);
 }
 
+/*
+boolean fastdfs_storage_regenerate_appender_filename(string group_name,
+    string appender_filename, [array tracker_server, array storage_server])
+return assoc array for success, false for error
+*/
+PHP_METHOD(FastDFS, storage_regenerate_appender_filename)
+{
+	zval *object = getThis();
+	php_fdfs_t *i_obj;
+
+	i_obj = (php_fdfs_t *) fdfs_get_object(object);
+	php_fdfs_storage_regenerate_appender_filename_impl(
+            INTERNAL_FUNCTION_PARAM_PASSTHRU, &(i_obj->context), false);
+}
+
+/*
+boolean fastdfs_storage_regenerate_appender_filename1(
+    string appender_file_id, [array tracker_server, array storage_server])
+return regenerated file id for success, false for error
+*/
+PHP_METHOD(FastDFS, storage_regenerate_appender_filename1)
+{
+	zval *object = getThis();
+	php_fdfs_t *i_obj;
+
+	i_obj = (php_fdfs_t *) fdfs_get_object(object);
+	php_fdfs_storage_regenerate_appender_filename_impl(
+            INTERNAL_FUNCTION_PARAM_PASSTHRU, &(i_obj->context), true);
+}
+
 /*
 array FastDFS::storage_upload_appender_by_filename(string local_filename, 
 	[string file_ext_name, string meta_list, string group_name, 
@@ -6758,6 +7005,19 @@ ZEND_ARG_INFO(0, tracker_server)
 ZEND_ARG_INFO(0, storage_server)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_INFO_EX(arginfo_storage_regenerate_appender_filename, 0, 0, 2)
+ZEND_ARG_INFO(0, group_name)
+ZEND_ARG_INFO(0, appender_filename)
+ZEND_ARG_INFO(0, tracker_server)
+ZEND_ARG_INFO(0, storage_server)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_storage_regenerate_appender_filename1, 0, 0, 1)
+ZEND_ARG_INFO(0, appender_file_id)
+ZEND_ARG_INFO(0, tracker_server)
+ZEND_ARG_INFO(0, storage_server)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_INFO_EX(arginfo_storage_upload_appender_by_filename, 0, 0, 1)
 ZEND_ARG_INFO(0, local_filename)
 ZEND_ARG_INFO(0, file_ext_name)
@@ -7073,6 +7333,8 @@ static zend_function_entry fdfs_class_methods[] = {
     FDFS_ME(storage_modify_by_filebuff1, arginfo_storage_modify_by_filebuff1)
     FDFS_ME(storage_modify_by_callback,  arginfo_storage_modify_by_callback)
     FDFS_ME(storage_modify_by_callback1,  arginfo_storage_modify_by_callback1)
+    FDFS_ME(storage_regenerate_appender_filename,  arginfo_storage_regenerate_appender_filename)
+    FDFS_ME(storage_regenerate_appender_filename1,  arginfo_storage_regenerate_appender_filename1)
     FDFS_ME(storage_upload_appender_by_filename,  arginfo_storage_upload_appender_by_filename)
     FDFS_ME(storage_upload_appender_by_filename1, arginfo_storage_upload_appender_by_filename1)
     FDFS_ME(storage_upload_appender_by_filebuff,  arginfo_storage_upload_appender_by_filebuff)
@@ -7539,6 +7801,13 @@ PHP_MINIT_FUNCTION(fastdfs_client)
 	REGISTER_LONG_CONSTANT("FDFS_STORAGE_STATUS_NONE", \
 		FDFS_STORAGE_STATUS_NONE, CONST_CS | CONST_PERSISTENT);
 
+	REGISTER_LONG_CONSTANT("FDFS_FILE_TYPE_NORMAL",
+		FDFS_FILE_TYPE_NORMAL, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("FDFS_FILE_TYPE_SLAVE",
+		FDFS_FILE_TYPE_SLAVE, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("FDFS_FILE_TYPE_APPENDER",
+		FDFS_FILE_TYPE_APPENDER, CONST_CS | CONST_PERSISTENT);
+
 	return SUCCESS;
 }
 

php_client/fastdfs_client.h

@@ -88,6 +88,8 @@ ZEND_FUNCTION(fastdfs_storage_modify_by_callback);
 ZEND_FUNCTION(fastdfs_storage_modify_by_callback1);
 ZEND_FUNCTION(fastdfs_storage_truncate_file);
 ZEND_FUNCTION(fastdfs_storage_truncate_file1);
+ZEND_FUNCTION(fastdfs_storage_regenerate_appender_filename);
+ZEND_FUNCTION(fastdfs_storage_regenerate_appender_filename1);
 
 PHP_FASTDFS_API zend_class_entry *php_fdfs_get_ce(void);
 PHP_FASTDFS_API zend_class_entry *php_fdfs_get_exception(void);

storage/storage_service.c

@@ -4920,8 +4920,7 @@ static void calc_crc32_done_callback_for_regenerate(
 }
 
 /**
-FDFS_GROUP_NAME_MAX_LEN: group name
+body length: appender filename
-body length - FDFS_GROUP_NAME_MAX_LEN: appender filename
 **/
 static int storage_server_regenerate_appender_filename(struct fast_task_info *pTask)
 {
@@ -4929,7 +4928,6 @@ static int storage_server_regenerate_appender_filename(struct fast_task_info *pT
 	StorageFileContext *pFileContext;
     FDFSTrunkFullInfo *pTrunkInfo;
 	char *p;
-	char group_name[FDFS_GROUP_NAME_MAX_LEN + 1];
 	char appender_filename[128];
 	char true_filename[128];
 	struct stat stat_buf;
@@ -4942,9 +4940,8 @@ static int storage_server_regenerate_appender_filename(struct fast_task_info *pT
 	pFileContext =  &(pClientInfo->file_context);
 
 	nInPackLen = pClientInfo->total_length - sizeof(TrackerHeader);
-    appender_filename_len = nInPackLen - FDFS_GROUP_NAME_MAX_LEN;
+    appender_filename_len = nInPackLen;
-	if ((nInPackLen < FDFS_GROUP_NAME_MAX_LEN +
+	if ((nInPackLen < FDFS_LOGIC_FILE_PATH_LEN + FDFS_FILENAME_BASE64_LENGTH +
-            FDFS_LOGIC_FILE_PATH_LEN + FDFS_FILENAME_BASE64_LENGTH +
             FDFS_FILE_EXT_NAME_MAX_LEN + 1)
 		|| (appender_filename_len >= sizeof(appender_filename)))
 	{
@@ -4955,19 +4952,6 @@ static int storage_server_regenerate_appender_filename(struct fast_task_info *pT
 	}
 
 	p = pTask->data + sizeof(TrackerHeader);
-	memcpy(group_name, p, FDFS_GROUP_NAME_MAX_LEN);
-	*(group_name + FDFS_GROUP_NAME_MAX_LEN) = '\0';
-	if (strcmp(group_name, g_group_name) != 0)
-	{
-		logError("file: "__FILE__", line: %d, "
-			"client ip:%s, group_name: %s "
-			"not correct, should be: %s",
-			__LINE__, pTask->client_ip,
-			group_name, g_group_name);
-		return EINVAL;
-	}
-
-    p += FDFS_GROUP_NAME_MAX_LEN;
 	memcpy(appender_filename, p, appender_filename_len);
 	*(appender_filename + appender_filename_len) = '\0';