fix bug in /api/search/lookup

Author: ytyou

src/core/query.cpp

@@ -1481,10 +1481,16 @@ QueryExecutor::http_get_api_search_lookup_handler(HttpRequest& request, HttpResp
             n += snprintf(resp_buff+n, size-n, "{\"tsuid\":\"%09X\",\"metric\":\"%s\",\"tags\":{",
                 ts->get_id(), metric);
 
-            for (auto tag = ts->get_tags(); tag != nullptr; tag = tag->next())
+            Tag *tags = ts->get_tags();
+            for (auto tag = tags; tag != nullptr; tag = tag->next())
                 n += snprintf(resp_buff+n, size-n, "\"%s\":\"%s\",", tag->m_key, tag->m_value);
 
-            if (ts->get_tags() != nullptr) n--;
+            if (tags != nullptr)
+            {
+                n--;
+                Tag::free_list(tags, false);
+            }
+
             n += snprintf(resp_buff+n, size-n, "}},");
         }
 

src/core/tsdb.cpp

@@ -681,10 +681,12 @@ Mapping::init_measurement(Measurement *mm, const char *measurement, char *tags,
     MetaFile::instance()->add_measurement(measurement, tags, fields);
 }
 
+// 'tsv' does NOT have to be empty when calling this function
 void
 Mapping::query_for_ts(Tag *tags, std::unordered_set<TimeSeries*>& tsv, const char *key, bool explicit_tags)
 {
     int tag_count = TagOwner::get_tag_count(tags, true);
+    auto original_size = tsv.size();
 
     if ((key != nullptr) && (tag_count == m_tag_count.load()))
     {
@@ -719,7 +721,7 @@ Mapping::query_for_ts(Tag *tags, std::unordered_set<TimeSeries*>& tsv, const cha
         }
     }
 
-    if (tsv.empty())
+    if (tsv.size() == original_size)
     {
         if (tags == nullptr)
         {
@@ -1584,7 +1586,7 @@ Tsdb::query_for_ts(Tag *tags, std::unordered_set<TimeSeries*>& tsv)
     get_all_mappings(mappings);
 
     for (auto mapping: mappings)
-        query_for_ts(mapping->get_metric(), tags, tsv, nullptr, false);
+        mapping->query_for_ts(tags, tsv, nullptr, false);
 }
 
 /* The 'key' should not include the special '_field' tag.