[attr_line] optimize split_lines

Author: tstack

src/base/attr_line.cc

@@ -36,6 +36,7 @@
 #include "ansi_scrubber.hh"
 #include "auto_mem.hh"
 #include "config.h"
+#include "intervaltree/IntervalTree.h"
 #include "lnav_log.hh"
 #include "pcrepp/pcre2pp.hh"
 
@@ -399,13 +400,43 @@ attr_line_t::subline(size_t start, size_t len) const
 void
 attr_line_t::split_lines(std::vector<attr_line_t>& lines) const
 {
+    using line_type_t = interval_tree::Interval<size_t, attr_line_t>;
+    using lines_tree_t = interval_tree::IntervalTree<size_t, attr_line_t>;
+
+    auto eols = std::vector<line_type_t>{};
     size_t pos = 0, next_line;
 
     while ((next_line = this->al_string.find('\n', pos)) != std::string::npos) {
-        lines.emplace_back(this->subline(pos, next_line - pos));
+        eols.emplace_back(
+            pos,
+            next_line > pos ? next_line - 1 : next_line,
+            attr_line_t{this->al_string.substr(pos, next_line - pos)});
         pos = next_line + 1;
     }
-    lines.emplace_back(this->subline(pos));
+    if (pos < this->al_string.length()) {
+        eols.emplace_back(pos,
+                          this->al_string.length() - 1,
+                          attr_line_t{this->al_string.substr(pos)});
+    }
+    auto lines_tree = lines_tree_t{std::move(eols)};
+    for (const auto& sa : this->al_attrs) {
+        if (sa.sa_range.empty()) {
+            continue;
+        }
+        auto range_end = sa.sa_range.end_for_string(this->al_string) - 1;
+        lines_tree.visit_overlapping(
+            sa.sa_range.lr_start, range_end, [&sa](const auto& cinterval) {
+                auto& interval = const_cast<line_type_t&>(cinterval);
+                auto lr = line_range(interval.start, interval.stop + 1);
+                auto ilr = lr.intersection(sa.sa_range).shift(0, -lr.lr_start);
+                interval.value.al_attrs.emplace_back(
+                    ilr, std::make_pair(sa.sa_type, sa.sa_value));
+            });
+    }
+    lines_tree.visit_all([&lines](auto& cinterval) {
+        auto& interval = const_cast<line_type_t&>(cinterval);
+        lines.emplace_back(std::move(interval.value));
+    });
 }
 
 attr_line_t&

src/command_executor.cc

@@ -65,8 +65,10 @@ using namespace lnav::roles::literals;
 
 exec_context INIT_EXEC_CONTEXT;
 
+static sig_atomic_t sql_counter = 0;
+
 int
-sql_progress(const struct log_cursor& lc)
+sql_progress(const log_cursor& lc)
 {
     ssize_t total = lnav_data.ld_log_source.text_line_count();
     off_t off = lc.lc_curr_line;
@@ -83,8 +85,6 @@ sql_progress(const struct log_cursor& lc)
         return 1;
     }
 
-    static sig_atomic_t sql_counter = 0;
-
     if (ui_periodic_timer::singleton().time_to_update(sql_counter)) {
         lnav_data.ld_bottom_source.update_loading(off, total);
         lnav_data.ld_status_refresher();
@@ -96,6 +96,12 @@ sql_progress(const struct log_cursor& lc)
 void
 sql_progress_finished()
 {
+    if (sql_counter == 0) {
+        return;
+    }
+
+    sql_counter = 0;
+
     if (lnav_data.ld_window == nullptr) {
         return;
     }
@@ -265,9 +271,9 @@ execute_search(const std::string& search_cmd)
 Result<std::string, lnav::console::user_message>
 execute_sql(exec_context& ec, const std::string& sql, std::string& alt_msg)
 {
-    db_label_source& dls = *(ec.ec_label_source_stack.back());
+    auto& dls = *(ec.ec_label_source_stack.back());
     auto_mem<sqlite3_stmt> stmt(sqlite3_finalize);
-    struct timeval start_tv, end_tv;
+    timeval start_tv, end_tv;
     std::string stmt_str = trim(sql);
     std::string retval;
     int retcode = SQLITE_OK;
@@ -516,7 +522,7 @@ execute_sql(exec_context& ec, const std::string& sql, std::string& alt_msg)
             } else {
                 int row_count = dls.dls_rows.size();
                 char row_count_buf[128];
-                struct timeval diff_tv;
+                timeval diff_tv;
 
                 timersub(&end_tv, &start_tv, &diff_tv);
                 snprintf(row_count_buf,

src/internals/sql-ref.rst

@@ -1317,7 +1317,6 @@ fstat(*pattern*)
        reason: No such file or directory
        --> fstat:1
        | SELECT ifnull(data, raise_error('cannot read: ' || st_name, error)) FROM fstat('/non-existent')
-      
 
 
 ----
@@ -3290,7 +3289,6 @@ raise_error(*msg*, *\[reason\]*)
        reason: because
        --> raise_error:1
        | SELECT ifnull($val, raise_error('please set $val', 'because'))
-      
 
 
 ----

src/lnav.cc

@@ -1216,6 +1216,7 @@ VALUES ('org.lnav.mouse-support', -1, DATETIME('now', '+1 minute'),
         auto _ign_signal = finally([] {
             signal(SIGWINCH, SIG_IGN);
             lnav_data.ld_winched = false;
+            lnav_data.ld_window = nullptr;
         });
 
         auto_fd errpipe[2];
@@ -1226,8 +1227,7 @@ VALUES ('org.lnav.mouse-support', -1, DATETIME('now', '+1 minute'),
         auto pipe_err_handle
             = log_pipe_err(errpipe[0].release(), errpipe[1].release());
 
-        notcurses_options nco;
-        memset(&nco, 0, sizeof(nco));
+        notcurses_options nco = {};
         nco.flags |= NCOPTION_SUPPRESS_BANNERS | NCOPTION_NO_WINCH_SIGHANDLER;
         nco.loglevel = NCLOGLEVEL_PANIC;
         auto create_screen_res = screen_curses::create(nco);
@@ -3005,6 +3005,9 @@ SELECT tbl_name FROM sqlite_master WHERE sql LIKE 'CREATE VIRTUAL TABLE%'
         .set_sub_source(&lnav_data.ld_hist_source2);
     lnav_data.ld_views[LNV_DB].set_sub_source(&lnav_data.ld_db_row_source);
     lnav_data.ld_db_overlay.dos_labels = &lnav_data.ld_db_row_source;
+    lnav_data.ld_db_example_row_source.dls_max_column_width = 15;
+    lnav_data.ld_db_example_overlay.dos_labels
+        = &lnav_data.ld_db_example_row_source;
     lnav_data.ld_db_preview_overlay_source[0].dos_labels
         = &lnav_data.ld_db_preview_source[0];
     lnav_data.ld_db_preview_overlay_source[1].dos_labels

src/lnav.hh

@@ -234,6 +234,8 @@ struct lnav_data_t {
 
     db_label_source ld_db_row_source;
     db_overlay_source ld_db_overlay;
+    db_label_source ld_db_example_row_source;
+    db_overlay_source ld_db_example_overlay;
     db_label_source ld_db_preview_source[2];
     db_overlay_source ld_db_preview_overlay_source[2];
     std::vector<std::string> ld_db_key_names;

src/md2attr_line.cc

@@ -289,6 +289,9 @@ md2attr_line::leave_block(const md4cpp::event_handler::block& bl)
                     new_block_text.append(line).append("\n");
                 }
             }
+            if (!cmd_block.empty()) {
+                new_block_text.append(cmd_block);
+            }
             block_text = new_block_text.move();
         }
 

src/statusview_curses.hh

@@ -186,7 +186,6 @@ private:
     status_data_source* sc_source{nullptr};
     ncplane* sc_window{nullptr};
     bool sc_enabled{true};
-    role_t sc_default_role{role_t::VCR_STATUS};
 
     struct displayed_field {
         displayed_field(line_range lr, size_t field_index)

src/view_helpers.cc

@@ -1009,8 +1009,8 @@ execute_example(std::unordered_map<std::string, attr_line_t>& res_map,
         return;
     }
 
-    auto& dls = lnav_data.ld_db_row_source;
-    auto& dos = lnav_data.ld_db_overlay;
+    auto& dls = lnav_data.ld_db_example_row_source;
+    auto& dos = lnav_data.ld_db_example_overlay;
     auto& db_tc = lnav_data.ld_views[LNV_DB];
 
     for (const auto& [index, ex] : lnav::itertools::enumerate(ht.ht_example, 1)) {
@@ -1128,11 +1128,7 @@ eval_example(const help_text& ht, const help_example& ex)
 
         switch (ht.ht_context) {
             default: {
-                auto& dls = lnav_data.ld_db_row_source;
-                auto old_width = dls.dls_max_column_width;
-                dls.dls_max_column_width = 15;
                 execute_example(*res_map, ht);
-                dls.dls_max_column_width = old_width;
                 break;
             }
         }

test/expected/test_config.sh_a0907769aba112d628e7ebe39c4ec252e5e0bc69.err

@@ -42,7 +42,6 @@
  | parse error: object key and value must be separated by a colon (':')
  |                "ui": "theme",     "abc",     "def": "" }            
  |                      (right here) ------^                           
- |                                                                     
 ⚠ warning: unexpected value for property “/ui”
  --> {test_dir}/bad-config2/formats/invalid-config/config.truncated.json:2
  |     "ui": "theme"                       

test/expected/test_format_loader.sh_5992e2695b7e6cf1f3520dbb87af8fc2b8f27088.err

@@ -158,7 +158,6 @@
          semi       = “^(?<timestamp>\d+); (?<body>\w+)$”
          std        = “^(?<timestamp>\d+): (?<pid>\w+) (?<body>.*)$”
          with-level = “^(?<timestamp>\d+)\| (?<level>\w+) (?<body>\w+)$”
-         
 ⚠ warning: invalid pattern: “/bad_sample_log/regex/semi”
    reason: pattern does not match any samples
  --> {test_dir}/bad-config/formats/invalid-sample/format.json:10