database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Use Env function to operate directory (#1980)

Browse Source 
Now Env has unify all environment operation, such as file operation.
However some of our old functions don't leverage it. This change unify
FileUtils::scan_dir to use Env's function.
This commit is contained in:
ZHAO Chun
2019-10-15 09:25:12 +08:00
committed by GitHub
parent 4391152168
commit f130bd3e7b
15 changed files with 164 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
be/src/runtime/user_function_cache.cpp
View File

@ -24,6 +24,7 @@
#include <boost/algorithm/string/predicate.hpp> // boost::algorithm::ends_with
#include <boost/algorithm/string/classification.hpp> // boost::is_any_of
#include "env/env.h"
#include "http/http_client.h"
#include "util/dynamic_util.h"
#include "util/file_utils.h"
@ -155,17 +156,21 @@ Status UserFunctionCache::_load_cached_lib() {
// create library directory if not exist
RETURN_IF_ERROR(FileUtils::create_dir(_lib_dir));
auto scan_cb = [this] (const std::string& dir, const std::string& file) {
auto st = _load_entry_from_lib(dir, file);
if (!st.ok()) {
LOG(WARNING) << "load a library failed, dir=" << dir << ", file=" << file;
}
return true;
};
for (int i = 0; i < kLibShardNum; ++i) {
std::string sub_dir = _lib_dir + "/" + std::to_string(i);
RETURN_IF_ERROR(FileUtils::create_dir(sub_dir));
RETURN_IF_ERROR(FileUtils::scan_dir(sub_dir, scan_cb));
auto scan_cb = [this, &sub_dir] (const char* file) {
if (is_dot_or_dotdot(file)) {
return true;
}
auto st = _load_entry_from_lib(sub_dir, file);
if (!st.ok()) {
LOG(WARNING) << "load a library failed, dir=" << sub_dir << ", file=" << file;
}
return true;
};
RETURN_IF_ERROR(Env::Default()->iterate_dir(sub_dir, scan_cb));
}
return Status::OK();
}