From 6fb8fe206bed90cc8a4dd2c82205acd8da3b755a Mon Sep 17 00:00:00 2001
From: YuQing <384681@qq.com>
Date: Tue, 12 Nov 2019 10:25:53 +0800
Subject: [PATCH] modify php test for regenerate_appender_filename

---
 client/fdfs_file_info.c               |  2 +-
 php_client/fastdfs_appender_test.php  | 33 ++++++++++++++++++++++++---
 php_client/fastdfs_appender_test1.php | 28 ++++++++++++++++++++---
 3 files changed, 56 insertions(+), 7 deletions(-)

diff --git a/client/fdfs_file_info.c b/client/fdfs_file_info.c
index 050a6c2..cb06e7f 100644
--- a/client/fdfs_file_info.c
+++ b/client/fdfs_file_info.c
@@ -79,7 +79,7 @@ int main(int argc, char *argv[])
 			szDatetime, sizeof(szDatetime)));
 		printf("file size: %"PRId64"\n", \
 			file_info.file_size);
-		printf("file crc32: %u (0x%08X)\n", \
+		printf("file crc32: %d (0x%08X)\n", \
 			file_info.crc32, file_info.crc32);
 	}
 
diff --git a/php_client/fastdfs_appender_test.php b/php_client/fastdfs_appender_test.php
index 00653b4..d6af08b 100644
--- a/php_client/fastdfs_appender_test.php
+++ b/php_client/fastdfs_appender_test.php
@@ -30,7 +30,6 @@
 	echo "fastdfs_storage_modify_by_filename fail, errno: " . fastdfs_get_last_error_no() . ", error info: " . fastdfs_get_last_error_info() . "\n";
 	exit;
  }
-
  var_dump(fastdfs_get_file_info($group_name, $appender_filename));
 
  if (!fastdfs_storage_truncate_file($group_name, $appender_filename, 0))
@@ -38,9 +37,23 @@
 	echo "fastdfs_storage_truncate_file fail, errno: " . fastdfs_get_last_error_no() . ", error info: " . fastdfs_get_last_error_info() . "\n";
 	exit;
  }
-
  var_dump(fastdfs_get_file_info($group_name, $appender_filename));
 
+ $new_file_info = fastdfs_storage_regenerate_appender_filename($group_name, $appender_filename);
+ if (!$new_file_info)
+ {
+	echo "fastdfs_storage_regenerate_appender_filename fail, errno: " . fastdfs_get_last_error_no() . ", error info: " . fastdfs_get_last_error_info() . "\n";
+	exit;
+ }
+
+ $group_name = $new_file_info['group_name'];
+ $appender_filename = $new_file_info['filename'];
+ echo "regenerated file id: $group_name/$appender_filename\n";
+ var_dump(fastdfs_get_file_info($group_name, $appender_filename));
+
+ $result = fastdfs_storage_delete_file($group_name, $appender_filename);
+ echo "delete file $group_name/$appender_filename return: $result\n";
+
  echo "function test done\n\n";
 
  $fdfs = new FastDFS();
@@ -81,8 +94,22 @@
 	echo "$fdfs->storage_truncate_file fail, errno: " . $fdfs->get_last_error_no() . ", error info: " . $fdfs->get_last_error_info() . "\n";
 	exit;
  }
-
  var_dump($fdfs->get_file_info($group_name, $appender_filename));
 
+ $new_file_info = $fdfs->storage_regenerate_appender_filename($group_name, $appender_filename);
+ if (!$new_file_info)
+ {
+	echo "$fdfs->storage_regenerate_appender_filename fail, errno: " . $fdfs->get_last_error_no() . ", error info: " . $fdfs->get_last_error_info() . "\n";
+	exit;
+ }
+
+ $group_name = $new_file_info['group_name'];
+ $appender_filename = $new_file_info['filename'];
+ echo "regenerated file id: $group_name/$appender_filename\n";
+ var_dump($fdfs->get_file_info($group_name, $appender_filename));
+
+ $result = $fdfs->storage_delete_file($group_name, $appender_filename);
+ echo "delete file $group_name/$appender_filename return: $result\n";
+
  echo 'tracker_close_all_connections result: ' . $fdfs->tracker_close_all_connections() . "\n";
 ?>
diff --git a/php_client/fastdfs_appender_test1.php b/php_client/fastdfs_appender_test1.php
index 107180b..9ec4368 100644
--- a/php_client/fastdfs_appender_test1.php
+++ b/php_client/fastdfs_appender_test1.php
@@ -25,7 +25,6 @@
 	echo "fastdfs_storage_modify_by_filename1 fail, errno: " . fastdfs_get_last_error_no() . ", error info: " . fastdfs_get_last_error_info() . "\n";
 	exit;
  }
-
  var_dump(fastdfs_get_file_info1($appender_file_id));
 
  if (!fastdfs_storage_truncate_file1($appender_file_id, 0))
@@ -33,8 +32,20 @@
 	echo "fastdfs_storage_truncate_file1 fail, errno: " . fastdfs_get_last_error_no() . ", error info: " . fastdfs_get_last_error_info() . "\n";
 	exit;
  }
-
  var_dump(fastdfs_get_file_info1($appender_file_id));
+
+ $new_file_id = fastdfs_storage_regenerate_appender_filename1($appender_file_id);
+ if (!$new_file_id)
+ {
+	echo "fastdfs_storage_regenerate_appender_filename1 fail, errno: " . fastdfs_get_last_error_no() . ", error info: " . fastdfs_get_last_error_info() . "\n";
+	exit;
+ }
+ $appender_file_id = $new_file_id;
+ var_dump(fastdfs_get_file_info1($appender_file_id));
+
+ $result = fastdfs_storage_delete_file1($appender_file_id);
+ echo "delete file $appender_file_id return: $result\n";
+
  echo "function test done\n\n";
 
  $fdfs = new FastDFS();
@@ -69,8 +80,19 @@
 	echo "\$fdfs->torage_truncate_file1 torage_modify_by_filename1 fail, errno: " . $fdfs->get_last_error_no() . ", error info: " . $fdfs->get_last_error_info() . "\n";
 	exit;
  }
-
  var_dump($fdfs->get_file_info1($appender_file_id));
 
+ $new_file_id = $fdfs->storage_regenerate_appender_filename1($appender_file_id);
+ if (!$new_file_id)
+ {
+	echo "$fdfs->storage_regenerate_appender_filename1 fail, errno: " . $fdfs->get_last_error_no() . ", error info: " . $fdfs->get_last_error_info() . "\n";
+	exit;
+ }
+ $appender_file_id = $new_file_id;
+ var_dump($fdfs->get_file_info1($appender_file_id));
+
+ $result = $fdfs->storage_delete_file1($appender_file_id);
+ echo "delete file $appender_file_id return: $result\n";
+
  echo 'tracker_close_all_connections result: ' . $fdfs->tracker_close_all_connections() . "\n";
 ?>