Skip to content

Commit cd8c3ab

Browse files
committed
Decode path
1 parent 1c08038 commit cd8c3ab

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

src/s3fs.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
#include "create_secret_functions.hpp"
2323

24+
#include <iostream>
2425
#include <iostream>
2526
#include <thread>
2627
#ifdef EMSCRIPTEN
@@ -1215,7 +1216,6 @@ static bool Match(vector<string>::const_iterator key, vector<string>::const_iter
12151216
return false;
12161217
}
12171218
if (!Glob(key->data(), key->length(), pattern->data(), pattern->length())) {
1218-
//std::cout << *key << "\t" << *pattern << " are different\n";
12191219
return false;
12201220
}
12211221
key++;
@@ -1299,14 +1299,15 @@ bool S3GlobResult::ExpandNextPath() const {
12991299
vector<string> key_splits = StringUtil::Split(current_common_prefix, "/");
13001300
//pattern_splits.resize(key_splits.size());
13011301
const bool is_match = Match(key_splits.begin(), key_splits.end(), pattern_splits.begin(), pattern_splits.end(), false);
1302-
//std::cout << current_common_prefix << "\t" << parsed_s3_url.key << "\t" << (is_match ? "MATCH" : "no" )<< "\n";
13031302
if (is_match) {
1303+
prefix_path = S3FileSystem::UrlDecode(prefix_path);
13041304
auto prefix_res = AWSListObjectV2::Request(prefix_path, *http_params, s3_auth_params,
13051305
common_prefix_continuation_token, true);
13061306

13071307
AWSListObjectV2::ParseFileList(prefix_res, s3_keys);
13081308
auto more_prefixes = AWSListObjectV2::ParseCommonPrefix(prefix_res);
13091309
common_prefixes.insert(common_prefixes.end(), more_prefixes.begin(), more_prefixes.end());
1310+
13101311
common_prefix_continuation_token = AWSListObjectV2::ParseContinuationToken(prefix_res);
13111312
}
13121313

0 commit comments

Comments
 (0)