mariabackup : Fix enumerate_ibd_files() to include .isl

MariaDB · Sep 15, 2017 · bb7ab40 · bb7ab40
1 parent a8b3c60
commit bb7ab40
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 13 deletions.
diff --git a/extra/mariabackup/backup_copy.cc b/extra/mariabackup/backup_copy.cc
@@ -594,7 +594,6 @@ trim_dotslash(const char *path)
 /************************************************************************
 Check if string ends with given suffix.
 @return true if string ends with given suffix. */
-static
 bool
 ends_with(const char *str, const char *suffix)
 {

diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc
@@ -2771,14 +2771,12 @@ static dberr_t enumerate_ibd_files(process_single_tablespace_func_t callback)
 	ret = fil_file_readdir_next_file(&err, fil_path_to_mysql_datadir, dir,
 					 &dbinfo);
 	while (ret == 0) {
-		size_t len = strlen(dbinfo.name);
 
 		/* General tablespaces are always at the first level of the
 		data home dir */
-		if (dbinfo.type == OS_FILE_TYPE_FILE && len > 4) {
-			bool is_isl = !strcmp(dbinfo.name + len - 4, ".isl");
-			bool is_ibd = !is_isl
-				&& !strcmp(dbinfo.name + len - 4, ".ibd");
+		if (dbinfo.type == OS_FILE_TYPE_FILE) {
+			bool is_isl = ends_with(dbinfo.name, ".isl");
+			bool is_ibd = !is_isl && ends_with(dbinfo.name,".ibd");
 
 			if (is_isl || is_ibd) {
 				(*callback)(NULL, dbinfo.name, is_isl);
@@ -2794,7 +2792,7 @@ static dberr_t enumerate_ibd_files(process_single_tablespace_func_t callback)
 		/* We found a symlink or a directory; try opening it to see
 		if a symlink is a directory */
 
-		len = strlen(fil_path_to_mysql_datadir)
+		size_t len = strlen(fil_path_to_mysql_datadir)
 			+ strlen (dbinfo.name) + 2;
 		if (len > dbpath_len) {
 			dbpath_len = len;
@@ -2837,16 +2835,16 @@ static dberr_t enumerate_ibd_files(process_single_tablespace_func_t callback)
 				size_t len = strlen(fileinfo.name);
 
 				/* We found a symlink or a file */
-				if (len > 4
-				    && !strcmp(fileinfo.name + len - 4,
-					       ".ibd")) {
-					(*callback)(dbinfo.name, fileinfo.name, false);
+				if (len > 4) {
+					bool is_isl= false;
+					if (ends_with(fileinfo.name, ".ibd") || ((is_isl = ends_with(fileinfo.name, ".ibd"))))
+						(*callback)(dbinfo.name, fileinfo.name, is_isl);
 				}
 			}
 
 			if (0 != os_file_closedir(dbdir)) {
 				fprintf(stderr, "InnoDB: Warning: could not"
-				      " close database directory %s\n",
+				 " close database directory %s\n",
 					dbpath);
 
 				err = DB_ERROR;

diff --git a/extra/mariabackup/xtrabackup.h b/extra/mariabackup/xtrabackup.h
@@ -196,5 +196,5 @@ xb_get_copy_action(const char *dflt = "Copying");
 void mdl_lock_init();
 void mdl_lock_table(ulint space_id);
 void mdl_unlock_all();
-
+bool ends_with(const char *str, const char *suffix);
 #endif /* XB_XTRABACKUP_H */