Add completed param to Match

Author: carlopi

src/s3fs.cpp

@@ -1092,19 +1092,20 @@ void S3FileSystem::Write(FileHandle &handle, void *buffer, int64_t nr_bytes, idx
 }
 
 static bool Match(vector<string>::const_iterator key, vector<string>::const_iterator key_end,
-                  vector<string>::const_iterator pattern, vector<string>::const_iterator pattern_end) {
+                  vector<string>::const_iterator pattern, vector<string>::const_iterator pattern_end, bool completed) {
 
-	while (key != key_end && pattern != pattern_end) {
-		if (*key == "**") {
+		if (key == key_end && !completed) {
 			return true;
 		}
+
+	while (key != key_end && pattern != pattern_end) {
 		if (*pattern == "**") {
 			if (std::next(pattern) == pattern_end) {
 				return true;
 			}
 			pattern ++;
 			while (key != key_end) {
-				if (Match(key, key_end, pattern, pattern_end)) {
+				if (Match(key, key_end, pattern, pattern_end, completed)) {
 					return true;
 				}
 				key++;
@@ -1117,7 +1118,7 @@ static bool Match(vector<string>::const_iterator key, vector<string>::const_iter
 		key++;
 		pattern++;
 	}
-	if (*pattern == "**") {
+	if (*pattern == "**" && !completed) {
 		while (*pattern == "**") pattern++;
 		if (pattern == pattern_end) {
 			return true;
@@ -1197,8 +1198,7 @@ bool S3GlobResult::ExpandNextPath() const {
                vector<string> pattern_splits = StringUtil::Split(parsed_s3_url.key, "/");
                vector<string> key_splits = StringUtil::Split(current_common_prefix, "/");
                //pattern_splits.resize(key_splits.size());
-		key_splits.push_back("**");
-               const bool is_match = Match(key_splits.begin(), key_splits.end(), pattern_splits.begin(), pattern_splits.end());
+               const bool is_match = Match(key_splits.begin(), key_splits.end(), pattern_splits.begin(), pattern_splits.end(), false);
 		std::cout << current_common_prefix << "\t" << parsed_s3_url.key << "\t" << (is_match ? "MATCH" : "no" )<< "\n";
                if (is_match) {
                        auto prefix_res = AWSListObjectV2::Request(prefix_path, *http_params, s3_auth_params,
@@ -1250,7 +1250,7 @@ bool S3GlobResult::ExpandNextPath() const {
 	for (auto &s3_key : s3_keys) {
 
 		vector<string> key_splits = StringUtil::Split(s3_key.path, "/");
-		bool is_match = Match(key_splits.begin(), key_splits.end(), pattern_splits.begin(), pattern_splits.end());
+		bool is_match = Match(key_splits.begin(), key_splits.end(), pattern_splits.begin(), pattern_splits.end(), true);
 
 		if (is_match) {
 			auto result_full_url = parsed_s3_url.prefix + parsed_s3_url.bucket + "/" + s3_key.path;