=== renamed file 'storage/ndb/src/mgmsrv/DirIterator.hpp' => 'storage/ndb/include/util/DirIterator.hpp' --- storage/ndb/src/mgmsrv/DirIterator.hpp 2008-10-24 12:41:10 +0000 +++ storage/ndb/include/util/DirIterator.hpp 2009-07-03 12:08:54 +0000 @@ -16,14 +16,57 @@ #ifndef DirIterator_HPP #define DirIterator_HPP +#include +#include +#include + class DirIterator { class DirIteratorImpl& m_impl; + DirIterator(const DirIterator&); // not impl + DirIterator& operator=(const DirIterator&); // not impl public: + + struct Entry { + enum { UNKNOWN=1, ISFILE=2, ISDIR=4 } type; + const char* name; + Entry() : + type(UNKNOWN), name(0) {}; + }; DirIterator(); ~DirIterator(); - int open(const char* path); - const char* next_file(void); + // 0: success, + enum { OK = 0, NOTADIR = 1 }; + int open(const char *path); + int close(); + const char* path(); + const char* next_entry(Entry &); + + // 0 - no more files, char* otherwise + const char* next_file() { + const char*s; + Entry entry; + do { + s = next_entry(entry); + } while (s && entry.type != Entry::ISFILE); + return s; + } }; + +/* + Remove a directory and all it's subdirecrories +*/ +int ndb_remove_dir_recursive(const char* name); + +/* + Remove all entries in directory +*/ +int ndb_remove_dir_contents(const char* name); + +/* + a convenience function: tries unlink, then rmdir +*/ +int ndb_remove_entry(const char* name); + #endif === modified file 'storage/ndb/src/common/util/CMakeLists.txt' --- storage/ndb/src/common/util/CMakeLists.txt 2009-06-02 14:00:06 +0000 +++ storage/ndb/src/common/util/CMakeLists.txt 2009-07-01 18:34:07 +0000 @@ -54,6 +54,7 @@ basestring_vsnprintf.c Bitmask.cpp ndbinfo.c + DirIterator.cpp ) TARGET_LINK_LIBRARIES(ndbgeneral zlib) @@ -67,3 +68,8 @@ PROPERTIES COMPILE_FLAGS "-DTEST_BITMASK") TARGET_LINK_LIBRARIES(Bitmask-t ndbgeneral) +ADD_EXECUTABLE(DirIterator-t DirIterator.cpp) +SET_TARGET_PROPERTIES(DirIterator-t + PROPERTIES COMPILE_FLAGS "-DTAP_TEST") +TARGET_LINK_LIBRARIES(DirIterator-t ndbgeneral mysys wsock32) + === renamed file 'storage/ndb/src/mgmsrv/DirIterator.cpp' => 'storage/ndb/src/common/util/DirIterator.cpp' --- storage/ndb/src/mgmsrv/DirIterator.cpp 2008-11-06 17:17:12 +0000 +++ storage/ndb/src/common/util/DirIterator.cpp 2009-07-03 12:46:59 +0000 @@ -15,8 +15,18 @@ #include "DirIterator.hpp" #include - -#ifndef __WIN__ +#include +#include + +#define require(x) do {\ + long x_,e=errno=0;x_=(x);e=errno;if(!x_) {\ + fprintf(stderr,"required %s, got %ld\n%s:%d\n",#x,x_,__FILE__,__LINE__);\ + errno=e;\ + perror("perror: ");\ + assert(0); exit(1); }\ +} while(0) + +#ifndef _WIN32 #include @@ -26,26 +36,41 @@ class DirIteratorImpl { DIR* m_dirp; - const char *m_path; + BaseString m_path; - bool is_regular_file(struct dirent* dp) const { + bool to_entry(DirIterator::Entry &entry, struct dirent* dp) const { + entry.type = DirIterator::Entry::UNKNOWN; #ifdef _DIRENT_HAVE_D_TYPE /* Using dirent's d_type field to determine if it's a regular file */ - if(dp->d_type != DT_UNKNOWN) - return (dp->d_type == DT_REG); + switch (dp->d_type){ + case DT_REG: + entry.type = DirIterator::Entry::ISFILE; + return true; + case DT_DIR: + entry.type = DirIterator::Entry::ISDIR; + return true; + } // Fallback to use 'stat' #endif /* Using stat to read more info about the file */ BaseString fullpath; - fullpath.assfmt("%s/%s", m_path, dp->d_name); + fullpath.assfmt("%s/%s", m_path.c_str(), dp->d_name); struct stat buf; if (stat(fullpath.c_str(), &buf)) - return false; // 'stat' failed + return false; - return S_ISREG(buf.st_mode); + if (S_ISREG(buf.st_mode)) { + entry.type = DirIterator::Entry::ISFILE; + return true; + } + if (S_ISDIR(buf.st_mode)) { + entry.type = DirIterator::Entry::ISDIR; + return true; + } + return false; } @@ -54,7 +79,7 @@ m_dirp(NULL) {}; ~DirIteratorImpl() { - closedir(m_dirp); + close(); } int open(const char* path){ @@ -65,41 +90,92 @@ return 0; } - const char* next_file(void){ + const char* next_entry(DirIterator::Entry &entry){ struct dirent* dp; - while ((dp = readdir(m_dirp)) != NULL && - !is_regular_file(dp)) - ; - return dp ? dp->d_name : NULL; - } + const char *s; + while ((dp = readdir(m_dirp)) != NULL) { + s = dp->d_name; + if(!strcmp(s,".") || !strcmp(s,"..")) + continue; + to_entry(entry, dp); + return s; + } + return 0; + } + + const char* next_file(DirIterator::Entry &entry){ + while(next_entry(entry)) + if(entry.type==DirIterator::Entry::ISFILE); + return entry.name; + return 0; + } + + int close() { + if(m_dirp) + closedir(m_dirp); + m_dirp = 0; + } + + const char *path() { + return m_path.c_str(); + } + }; #else #include +#include class DirIteratorImpl { - bool m_first; + bool m_first, m_end; WIN32_FIND_DATA m_find_data; HANDLE m_find_handle; - - bool is_dir(const WIN32_FIND_DATA find_data) const { - return (find_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY); + intptr_t m_handle; + BaseString m_path; + + bool to_entry(DirIterator::Entry &e, const WIN32_FIND_DATA find_data) const { + DWORD atts = find_data.dwFileAttributes; + e.name = m_find_data.cFileName; + e.type = DirIterator::Entry::UNKNOWN; + if (atts & FILE_ATTRIBUTE_DIRECTORY) + e.type = DirIterator::Entry::ISDIR; + if ((atts & FILE_ATTRIBUTE_NORMAL) || (atts & FILE_ATTRIBUTE_TEMPORARY)) + e.type = DirIterator::Entry::ISFILE; + return true; + } + + BaseString normalize_path(const char *path) + { BaseString rv = path; + int len = rv.length(); + if (rv.c_str()[len-1] == DIR_SEPARATOR[0]) + rv.substr(0,len-1); + return rv; } public: DirIteratorImpl(): + m_path(), m_first(true), + m_end(false), m_find_handle(INVALID_HANDLE_VALUE) {}; ~DirIteratorImpl() { - FindClose(m_find_handle); + close(); + } + + int close() { + if(m_find_handle != INVALID_HANDLE_VALUE) + if(!FindClose(m_find_handle)) + return -1; + return 0; } int open(const char* path){ - BaseString path_buf; - path_buf.assfmt("%s\\*", path); - m_find_handle = FindFirstFile(path_buf.c_str(), &m_find_data); + m_path = normalize_path(path); + BaseString pattern; + pattern.assfmt("%s\\*", m_path); + m_find_handle = FindFirstFile(pattern.c_str(), &m_find_data); if(m_find_handle == INVALID_HANDLE_VALUE) { if (GetLastError() == ERROR_FILE_NOT_FOUND) @@ -110,22 +186,30 @@ return 0; } - const char* next_file(void){ - while(m_first || FindNextFile(m_find_handle, &m_find_data)) + const char* next_entry(DirIterator::Entry &entry){ + const char *s; + while(m_first || FindNextFile(m_find_handle, &m_find_data)) { - m_first= false; - - if (!is_dir(m_find_data)) - return m_find_data.cFileName; + s = m_find_data.cFileName; + m_first = false; + if(!strcmp(s,".") || !strcmp(s,"..")) + continue; + bool result = to_entry(entry,m_find_data); + if (!result) + return 0; + return s; } return NULL; } + const char* path() { + return m_path.c_str(); + } + }; #endif - DirIterator::DirIterator() : m_impl(*new DirIteratorImpl()) { @@ -142,8 +226,149 @@ return m_impl.open(path); } -const char* DirIterator::next_file(void) -{ - return m_impl.next_file(); -} - +int DirIterator::close() +{ + return m_impl.close(); +} + +const char *DirIterator::path() +{ + return m_impl.path(); +} + +const char* DirIterator::next_entry(Entry &entry) +{ + return m_impl.next_entry(entry); +} + +#ifdef _WIN32 +static inline int unlink(const char *s) +{ + return _unlink(s); +} +static inline int rmdir(const char *s) +{ + return _rmdir(s); +} +#endif + +int ndb_remove_dir_contents(const char* name) +{ + DirIterator di; + DirIterator::Entry entry; + int rv; + require(!(rv = di.open(name))); + int has_entries = (long)di.next_entry(entry); + if (!has_entries) + return 0; + di.close(); + require(!di.open(name)); + while ((name = di.next_entry(entry))) + { BaseString bs; + bs.assfmt("%s%s%s", di.path(), DIR_SEPARATOR, entry.name); + if (entry.type == DirIterator::Entry::ISDIR) + { if(ndb_remove_entry(bs.c_str())) + return ndb_remove_dir_recursive(bs.c_str()); + } else + if (ndb_remove_entry(bs.c_str())) + return 1; + } + return 0; +} +int ndb_remove_entry(const char* name) +{ + if(!unlink(name) || !rmdir(name)) + return 0; + return -1; +} + +int ndb_remove_dir_recursive(const char* dir) { + struct stat statbuf; + if(stat(dir,&statbuf)==-1 && errno==ENOENT) + return DirIterator::NOTADIR; + Vector bss; + bss.push(dir,0); + for (;bss.size();) { + DirIterator di; + DirIterator::Entry entry; + const char *name; + int has_entries; + int rv; + require(!(rv = di.open(bss[0].c_str()))); + has_entries = (long)di.next_entry(entry); + if (!has_entries) { + require(!rmdir(di.path())); + bss.erase(0); //pop + di.close(); + continue; + } + di.close(); + require(!di.open(bss[0].c_str())); + while ((name = di.next_entry(entry))) { + BaseString bs; + bs.assfmt("%s%s%s", di.path(), DIR_SEPARATOR, name); + if (entry.type==DirIterator::Entry::ISDIR) { + // a link can appear as a dir, so try to delete link first + if(unlink(bs.c_str())) + bss.push(bs,0); + } else { + require(!unlink(bs.c_str())); + } + } + } + return 0; +} + +#ifdef TAP_TEST +#ifndef _WIN32 +#include +#endif +#include + +inline int mkdirectory(const char *path) { +#ifdef _WIN32 + return mkdir(path); +#else + return mkdir(path,0777); +#endif +} + +#define TMP "tmp_dir_iterator" +int build_tree() +{ + OK(!mkdirectory(TMP)); + fclose(fopen(TMP DIR_SEPARATOR "a","w")); + OK(!mkdirectory(TMP DIR_SEPARATOR "d")); + OK(!mkdirectory(TMP DIR_SEPARATOR "e")); + fclose(fopen(TMP DIR_SEPARATOR "d" DIR_SEPARATOR "a","w")); + fclose(fopen(TMP DIR_SEPARATOR "d" DIR_SEPARATOR "b","w")); + fclose(fopen(TMP DIR_SEPARATOR "d" DIR_SEPARATOR "c","w")); + fclose(fopen(TMP DIR_SEPARATOR "d" DIR_SEPARATOR "c.x","w")); +#ifndef _WIN32 + OK(!symlink("/etc",TMP "/d/symlink")); +#endif + return 0; +} +int check_gone(const char *file) +{ + struct stat statbuf; + OK(stat(file,&statbuf)==-1 && errno==ENOENT); + return 0; +} +TAPTEST(DirIterator) +{ + struct stat statbuf; + ndb_remove_dir_recursive(TMP); + check_gone(TMP); + build_tree(); + OK(!ndb_remove_dir_recursive(TMP)); + OK(stat(TMP,&statbuf)==-1 && errno==ENOENT); + check_gone(TMP); + build_tree(); + OK(!ndb_remove_dir_contents(TMP)); + OK(!mkdirectory(TMP DIR_SEPARATOR "a")); + ndb_remove_dir_contents(TMP); + OK(!rmdir(TMP)); + return 1; +} +#endif === modified file 'storage/ndb/src/common/util/Makefile.am' --- storage/ndb/src/common/util/Makefile.am 2009-06-03 16:04:23 +0000 +++ storage/ndb/src/common/util/Makefile.am 2009-07-01 18:33:56 +0000 @@ -29,14 +29,20 @@ ConfigValues.cpp ndb_init.cpp basestring_vsnprintf.c \ Bitmask.cpp \ ndb_rand.c \ - ndbinfo.c + ndbinfo.c DirIterator.cpp INCLUDES_LOC = @ZLIB_INCLUDES@ libndbazio_la_SOURCES = azio.c libndbazio_la_LIBADD = @ZLIB_LIBS@ -noinst_PROGRAMS = BaseString-t HashMap-t Bitmask-t +noinst_PROGRAMS = BaseString-t HashMap-t Bitmask-t DirIterator-t + +DirIterator_t_SOURCES = DirIterator.cpp +DirIterator_t_CXXFLAGS = -DTAP_TEST +DirIterator_t_LDADD = \ + libgeneral.la \ + $(top_builddir)/mysys/libmysyslt.la BaseString_t_SOURCES = BaseString.cpp BaseString_t_CXXFLAGS = -DTEST_BASE_STRING === modified file 'storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp' --- storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp 2009-05-27 15:21:45 +0000 +++ storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp 2009-07-03 14:40:14 +0000 @@ -22,6 +22,9 @@ #include #include "AsyncIoThread.hpp" #include "Filename.hpp" +#include +#include +#include class AsyncFile { @@ -69,7 +72,7 @@ virtual void syncReq(Request *request)=0; virtual void removeReq(Request *request)=0; virtual void appendReq(Request *request)=0; - virtual void rmrfReq(Request *request, const char * path, bool removePath)=0; + virtual void rmrfReq(Request *request, const char * path, bool removePath); virtual void createDirectories()=0; /** @@ -110,6 +113,31 @@ SimulatedBlock& m_fs; }; +inline +void +AsyncFile::rmrfReq(Request *request, const char * path, bool removePath) +{ + struct stat statbuf; + if (stat(path,&statbuf)==-1 && errno==ENOENT) + return; + if (!request->par.rmrf.directory) + { + // Remove file + if(ndb_remove_entry(path)) + request->error = errno; + return; + } + if (removePath) + { + if(ndb_remove_dir_recursive(path)) + request->error = errno; + } + else + if (ndb_remove_dir_contents(path)) + request->error = errno; + return; +} + inline void AsyncFile::set_buffer(Ptr ptr, Uint32 cnt) === modified file 'storage/ndb/src/kernel/blocks/ndbfs/PosixAsyncFile.cpp' --- storage/ndb/src/kernel/blocks/ndbfs/PosixAsyncFile.cpp 2009-05-27 15:21:45 +0000 +++ storage/ndb/src/kernel/blocks/ndbfs/PosixAsyncFile.cpp 2009-07-03 14:12:35 +0000 @@ -764,64 +764,6 @@ } } -void -PosixAsyncFile::rmrfReq(Request *request, const char * src, bool removePath) -{ - if(!request->par.rmrf.directory) - { - // Remove file - if(unlink(src) != 0 && errno != ENOENT) - request->error = errno; - return; - } - - char path[PATH_MAX]; - strcpy(path, src); - strcat(path, "/"); - - DIR* dirp; - struct dirent * dp; -loop: - dirp = opendir(path); - if(dirp == 0) - { - if(errno != ENOENT) - request->error = errno; - return; - } - - while ((dp = readdir(dirp)) != NULL) - { - if ((strcmp(".", dp->d_name) != 0) && (strcmp("..", dp->d_name) != 0)) - { - int len = strlen(path); - strcat(path, dp->d_name); - if (remove(path) == 0) - { - path[len] = 0; - continue; - } - - closedir(dirp); - strcat(path, "/"); - goto loop; - } - } - closedir(dirp); - path[strlen(path)-1] = 0; // remove / - if (strcmp(src, path) != 0) - { - char * t = strrchr(path, '/'); - t[1] = 0; - goto loop; - } - - if(removePath && rmdir(src) != 0) - { - request->error = errno; - } -} - PosixAsyncFile::~PosixAsyncFile() { if (azfBufferUnaligned) === modified file 'storage/ndb/src/kernel/blocks/ndbfs/PosixAsyncFile.hpp' --- storage/ndb/src/kernel/blocks/ndbfs/PosixAsyncFile.hpp 2009-05-27 15:21:45 +0000 +++ storage/ndb/src/kernel/blocks/ndbfs/PosixAsyncFile.hpp 2009-07-03 14:12:36 +0000 @@ -55,7 +55,6 @@ virtual void syncReq(Request *request); virtual void removeReq(Request *request); virtual void appendReq(Request *request); - virtual void rmrfReq(Request *request, const char * path, bool removePath); virtual int readBuffer(Request*, char * buf, size_t size, off_t offset); virtual int writeBuffer(const char * buf, size_t size, off_t offset); === modified file 'storage/ndb/src/kernel/blocks/ndbfs/Win32AsyncFile.cpp' --- storage/ndb/src/kernel/blocks/ndbfs/Win32AsyncFile.cpp 2009-05-28 18:54:28 +0000 +++ storage/ndb/src/kernel/blocks/ndbfs/Win32AsyncFile.cpp 2009-07-03 14:11:04 +0000 @@ -366,68 +366,6 @@ } } -void -Win32AsyncFile::rmrfReq(Request * request, const char * src, bool removePath){ - if (!request->par.rmrf.directory) - { - // Remove file - if (!DeleteFile(src)) - { - DWORD dwError = GetLastError(); - if (dwError != ERROR_FILE_NOT_FOUND) - request->error = dwError; - } - return; - } - - char path[PATH_MAX]; - strcpy(path, src); - strcat(path, "\\*"); - - WIN32_FIND_DATA ffd; - HANDLE hFindFile; -loop: - hFindFile = FindFirstFile(path, &ffd); - if (INVALID_HANDLE_VALUE == hFindFile) - { - DWORD dwError = GetLastError(); - if (dwError != ERROR_PATH_NOT_FOUND) - request->error = dwError; - return; - } - path[strlen(path) - 1] = 0; // remove '*' - - do { - if (0 != strcmp(".", ffd.cFileName) && 0 != strcmp("..", ffd.cFileName)) - { - int len = strlen(path); - strcat(path, ffd.cFileName); - if(DeleteFile(path)) - { - path[len] = 0; - continue; - }//if - - FindClose(hFindFile); - strcat(path, "\\*"); - goto loop; - } - } while(FindNextFile(hFindFile, &ffd)); - - FindClose(hFindFile); - path[strlen(path)-1] = 0; // remove '\' - if (strcmp(src, path) != 0) - { - char * t = strrchr(path, '\\'); - t[1] = '*'; - t[2] = 0; - goto loop; - } - - if(removePath && !RemoveDirectory(src)) - request->error = GetLastError(); -} - void Win32AsyncFile::createDirectories() { char* tmp; === modified file 'storage/ndb/src/kernel/blocks/ndbfs/Win32AsyncFile.hpp' --- storage/ndb/src/kernel/blocks/ndbfs/Win32AsyncFile.hpp 2009-05-27 15:21:45 +0000 +++ storage/ndb/src/kernel/blocks/ndbfs/Win32AsyncFile.hpp 2009-07-03 14:12:35 +0000 @@ -42,7 +42,6 @@ virtual void syncReq(Request *request); virtual void removeReq(Request *request); virtual void appendReq(Request *request); - virtual void rmrfReq(Request *request, const char * path, bool removePath); virtual int readBuffer(Request*, char * buf, size_t size, off_t offset); virtual int writeBuffer(const char * buf, size_t size, off_t offset); === modified file 'storage/ndb/src/mgmsrv/CMakeLists.txt' --- storage/ndb/src/mgmsrv/CMakeLists.txt 2008-10-24 12:41:10 +0000 +++ storage/ndb/src/mgmsrv/CMakeLists.txt 2009-06-26 12:03:41 +0000 @@ -41,6 +41,5 @@ MgmtSrvr.cpp main.cpp Services.cpp - ConfigManager.cpp - DirIterator.cpp) + ConfigManager.cpp) TARGET_LINK_LIBRARIES(ndb_mgmd ndbconf) === modified file 'storage/ndb/src/mgmsrv/ConfigManager.cpp' --- storage/ndb/src/mgmsrv/ConfigManager.cpp 2009-06-10 10:16:30 +0000 +++ storage/ndb/src/mgmsrv/ConfigManager.cpp 2009-07-02 17:52:16 +0000 @@ -16,7 +16,7 @@ #include "ConfigManager.hpp" #include "MgmtSrvr.hpp" -#include "DirIterator.hpp" +#include #include #include === modified file 'storage/ndb/src/mgmsrv/Makefile.am' --- storage/ndb/src/mgmsrv/Makefile.am 2009-05-27 15:21:45 +0000 +++ storage/ndb/src/mgmsrv/Makefile.am 2009-06-26 11:35:24 +0000 @@ -31,8 +31,7 @@ InitConfigFileParser.cpp \ Config.cpp \ mgm_ndbinfo.cpp \ - ConfigManager.cpp \ - DirIterator.cpp + ConfigManager.cpp noinst_PROGRAMS = testConfig