[breadcrumb] add thread ID to breadcrumb bar

Author: tstack

NEWS.md

@@ -193,6 +193,8 @@ Interface changes:
   of time in the gap.
 * The SPECTRO view now shows the year in timestamps
   and uses additional colors to show the value range.
+* The breadcrumb bar in the LOG view now includes the
+  current thread, if defined.
 * If there are background tasks, like the processing done
   by `:add-source-path`, a panel with progress bars for
   each operation will be shown just above the bottom

src/all_logs_vtab.cc

@@ -57,17 +57,12 @@ all_logs_vtab::all_logs_vtab()
       alv_src_meta(intern_string::lookup("log_msg_src"),
                    value_kind_t::VALUE_JSON,
                    logline_value_meta::table_column{3}),
-      alv_thread_meta(intern_string::lookup("log_thread_id"),
-                      value_kind_t::VALUE_TEXT,
-                      logline_value_meta::table_column{4}),
       alv_stacktrace_meta(intern_string::lookup("log_stack_trace"),
                           value_kind_t::VALUE_TEXT,
-                          logline_value_meta::table_column{5})
+                          logline_value_meta::table_column{4})
 {
     this->alv_msg_meta.lvm_identifier = true;
     this->alv_schema_meta.lvm_identifier = true;
-    this->alv_thread_meta.lvm_identifier = true;
-    this->alv_thread_meta.lvm_foreign_key = true;
 }
 
 void
@@ -92,11 +87,6 @@ all_logs_vtab::get_columns(std::vector<vtab_column>& cols) const
                       "",
                       false,
                       "The source code that generated this message");
-    cols.emplace_back(this->alv_thread_meta.lvm_name.get(),
-                      SQLITE3_TEXT,
-                      "",
-                      false,
-                      "The ID of the thread that generated this message");
     cols.emplace_back(this->alv_stacktrace_meta.lvm_name.get(),
                       SQLITE3_TEXT,
                       "",
@@ -157,9 +147,8 @@ all_logs_vtab::extract(logfile* lf,
             h.update(find_res->pattern.c_str());
         }
         auto line_iter = lf->begin() + line_number;
-        if (!line_iter->has_schema()) {
-            line_iter->set_schema(h.to_array());
-        }
+        line_iter->merge_bloom_bits(h.to_bloom_bits());
+        line_iter->set_schema_computed(true);
         values.lvv_values.emplace_back(this->alv_msg_meta,
                                        (std::string) find_res->pattern);
         values.lvv_values.emplace_back(this->alv_schema_meta, h.to_string());
@@ -195,12 +184,7 @@ all_logs_vtab::extract(logfile* lf,
             this->alv_values_meta,
             json_string(gen).to_string_fragment().to_string());
     }
-    if (sub_values.lvv_thread_id_value) {
-        values.lvv_values.emplace_back(this->alv_thread_meta,
-                                       sub_values.lvv_thread_id_value.value());
-    } else {
-        values.lvv_values.emplace_back(this->alv_thread_meta);
-    }
+    values.lvv_thread_id_value = std::move(sub_values.lvv_thread_id_value);
     values.lvv_opid_value = std::move(sub_values.lvv_opid_value);
     values.lvv_opid_provenance = sub_values.lvv_opid_provenance;
 }

src/all_logs_vtab.hh

@@ -60,7 +60,6 @@ private:
     logline_value_meta alv_schema_meta;
     logline_value_meta alv_values_meta;
     logline_value_meta alv_src_meta;
-    logline_value_meta alv_thread_meta;
     logline_value_meta alv_stacktrace_meta;
 };
 

src/base/intern_string.cc

@@ -349,6 +349,27 @@ string_fragment::to_string_with_case_style(case_style style) const
     return retval;
 }
 
+uint64_t
+string_fragment::bloom_bits() const
+{
+    auto a = XXH3_64bits(this->data(), this->length());
+    auto b = a >> 8;
+    if ((b & 0x3f) == (a & 0x3f)) {
+        b = b >> 8;
+    }
+    auto c = b >> 8;
+    if ((c & 0x3f) == (a & 0x3f) || (c & 0x3f) == (b & 0x3f)) {
+        c = c >> 8;
+    }
+
+    uint64_t retval = 0;
+    retval |= 1ULL << (a % 56);
+    retval |= 1ULL << (b % 56);
+    retval |= 1ULL << (c % 56);
+
+    return retval;
+}
+
 std::string
 string_fragment::to_unquoted_string() const
 {
@@ -540,7 +561,7 @@ string_fragment::byte_to_column_index(const size_t byte_index) const
                     do {
                         curr_col += 1;
                     } while (curr_col % 8);
-                break;
+                    break;
                 default: {
                     auto wcw_res = uc_width(read_res.unwrap(), "UTF-8");
                     if (wcw_res < 0) {

src/base/intern_string.hh

@@ -745,6 +745,8 @@ struct string_fragment {
         return hash_str(this->data(), this->length());
     }
 
+    uint64_t bloom_bits() const;
+
     const char* sf_string;
     int32_t sf_begin;
     int32_t sf_end;

src/base/log_level_enum.hh

@@ -51,15 +51,6 @@ enum log_level_t : int {
     LEVEL_INVALID,
 
     LEVEL__MAX,
-
-    LEVEL_IGNORE = 0x10, /*< Ignore */
-    LEVEL_TIME_SKEW = 0x20, /*< Received after timestamp. */
-    LEVEL_MARK = 0x40, /*< Bookmarked line. */
-    LEVEL_CONTINUED = 0x80, /*< Continuation of multiline entry. */
-
-    /** Mask of flags for the level field. */
-    LEVEL__FLAGS
-        = (LEVEL_IGNORE | LEVEL_TIME_SKEW | LEVEL_MARK | LEVEL_CONTINUED)
 };
 
 #endif

src/breadcrumb_curses.cc

@@ -176,12 +176,8 @@ breadcrumb_curses::reload_data()
         }
     }
 
-    auto matches = attr_line_t()
-                       .join(this->bc_similar_values
-                                 | lnav::itertools::map(
-                                     &breadcrumb::possibility::p_display_value),
-                             "\n")
-                       .move();
+    auto matches = this->bc_similar_values
+        | lnav::itertools::map(&breadcrumb::possibility::p_display_value);
     this->bc_match_source.replace_with(matches);
     auto width = this->bc_possible_values
         | lnav::itertools::fold(

src/hasher.hh

@@ -87,6 +87,18 @@ public:
         return retval;
     }
 
+    uint64_t to_bloom_bits() const
+    {
+        uint64_t h1;
+        uint64_t h2;
+        uint64_t retval = 0;
+
+        this->h_context.Final(&h1, &h2);
+        retval |= 1UL << (h1 % 56);
+        retval |= 1UL << (h2 % 56);
+        return retval;
+    }
+
     void to_string(auto_buffer& buf) const
     {
         auto bits = this->to_array();

src/hotkeys.cc

@@ -657,7 +657,10 @@ DELETE FROM lnav_user_notifications WHERE id = 'org.lnav.mouse-support'
                             .to_attr_line());
                 } else {
                     const auto& start_line = start_win_iter->get_logline();
-                    unsigned int opid_hash = start_line.get_opid();
+                    auto lvv = start_win_iter->get_values();
+                    auto opid_bloom
+                        = string_fragment::from_str(opid_opt.value())
+                              .bloom_bits();
                     auto next_win
                         = lss->window_to_end(start_win_iter->get_vis_line());
                     auto next_win_iter = next_win->begin();
@@ -676,7 +679,7 @@ DELETE FROM lnav_user_notifications WHERE id = 'org.lnav.mouse-support'
                             --next_win_iter;
                         }
                         const auto& next_line = next_win_iter->get_logline();
-                        if (!next_line.match_opid_hash(opid_hash)) {
+                        if (!next_line.match_bloom_bits(opid_bloom)) {
                             continue;
                         }
                         const auto& next_opid_opt

src/itertools.similar.hh

@@ -32,6 +32,7 @@
 
 #include <queue>
 #include <string>
+#include <vector>
 
 #include "base/fts_fuzzy_match.hh"
 #include "base/itertools.hh"
@@ -79,6 +80,7 @@ std::vector<typename T::value_type>
 operator|(const T& in, const lnav::itertools::details::similar_to<F>& st)
 {
     using score_pair = std::pair<int, typename T::value_type>;
+    constexpr size_t MAX_ELEMENTS = 512;
 
     struct score_cmp {
         bool operator()(const score_pair& lhs, const score_pair& rhs)
@@ -90,7 +92,13 @@ operator|(const T& in, const lnav::itertools::details::similar_to<F>& st)
     std::vector<std::remove_const_t<typename T::value_type>> retval;
 
     if (st.st_pattern.empty()) {
-        retval.insert(retval.begin(), in.begin(), in.end());
+        retval.reserve(std::min(MAX_ELEMENTS, in.size()));
+        for (const auto& elem : in) {
+            if (retval.size() >= MAX_ELEMENTS) {
+                break;
+            }
+            retval.emplace_back(elem);
+        }
         return retval;
     }