Merge branch 'master' into develop

tstack · tstack · commit cd2cc48934ed · 2026-04-22T22:58:36.000-07:00
diff --git a/NEWS.md b/NEWS.md
@@ -54,6 +54,11 @@ Features:
 ## lnav v0.14.1
 
 Features:
+* Added the `:reload-view` command, bound to `F5`, that
+  re-runs the operation that populated the current view.
+  In the DB view, this re-executes the last SQL query; in
+  the TIMELINE view, it rebuilds the index.  Views that
+  don't have a meaningful reload report an error.
 * The DB view now shows a status bar above the bottom
   status bar with the SQL query that populated the view,
   the relative time when it was run, and how long it took.
diff --git a/docs/source/hotkeys.rst b/docs/source/hotkeys.rst
@@ -317,6 +317,9 @@ Display
      - Close the current text file or log file.
    * - :kbd:`F2`
      - Toggle mouse support.
+   * - :kbd:`F5`
+     - Reload the current view.  Re-runs the SQL query for the DB view
+       or rebuilds the index for the TIMELINE view.
 
 Session
 -------
diff --git a/docs/source/ui.rst b/docs/source/ui.rst
@@ -430,8 +430,9 @@ PRQL [#]_ statement.
 Press :kbd:`v` to switch to the database result view.
 
 A status bar above the bottom status bar shows the query that populated
-the view, how long ago it ran, and how long it took.  Clicking
-the reload icon (↻) at the left of the bar re-runs the query.
+the view, how long ago it ran, and how long it took.  Clicking the reload
+icon (↻) at the left of the bar — or pressing :kbd:`F5` — re-runs the
+query via the :code:`:reload-view` command.
 
 If the query reads from log-backed tables (:code:`all_logs`,
 per-format tables like :code:`syslog_log`, :code:`all_opids`, etc.),
@@ -486,6 +487,10 @@ The timeline view [#]_ visualizes operations, log files, threads, tags, and
 partitions over time. The items are ordered top-to-bottom by their start time.
 So, scrolling down will move forward in time.
 
+The timeline index is not refreshed automatically as new log data arrives.
+Press :kbd:`F5` (or run :code:`:reload-view`) to rebuild the index with the
+latest data.
+
 An operation is identified by an ID that can come from multiple sources:
 
 * If the ID is in the log message, the log format can set the
diff --git a/src/command_executor.cc b/src/command_executor.cc
@@ -211,7 +211,6 @@ bind_sql_parameters(exec_context& ec, sqlite3_stmt* stmt)
     std::map<std::string, scoped_value_t> retval;
     auto param_count = sqlite3_bind_parameter_count(stmt);
     for (int lpc = 0; lpc < param_count; lpc++) {
-        std::map<std::string, std::string>::iterator ov_iter;
         const auto* name = sqlite3_bind_parameter_name(stmt, lpc + 1);
         if (name == nullptr) {
             auto um
@@ -479,6 +478,17 @@ execute_sql(exec_context& ec, const std::string& sql, std::string& alt_msg)
             if (!ec.ec_label_source_stack.empty()) {
                 auto& dls = *ec.ec_label_source_stack.back();
                 dls.dls_user_query = sql;
+                if (!ec.ec_source.empty()) {
+                    dls.dls_user_query_src_loc
+                        = ec.ec_source.back().s_location;
+                } else {
+                    dls.dls_user_query_src_loc = std::nullopt;
+                }
+                if (!ec.ec_local_vars.empty()) {
+                    dls.dls_user_query_vars = ec.ec_local_vars.top();
+                } else {
+                    dls.dls_user_query_vars.clear();
+                }
                 dls.dls_query_start = std::chrono::system_clock::now();
                 auto* vtab_mgr = injector::get<log_vtab_manager*>();
                 dls.dls_query_touches_log_data
diff --git a/src/db_status_source.cc b/src/db_status_source.cc
@@ -31,15 +31,15 @@
 
 #include "base/attr_line.hh"
 #include "base/humanize.time.hh"
+#include "base/injector.hh"
 #include "base/intern_string.hh"
 #include "base/string_attr_type.hh"
 #include "base/time_util.hh"
 #include "command_executor.hh"
 #include "db_sub_source.hh"
 #include "fmt/format.h"
-#include "lnav.hh"
+#include "logfile_sub_source.hh"
 #include "readline_highlighters.hh"
-#include "sql.formatter.hh"
 
 using namespace lnav::roles::literals;
 
@@ -53,22 +53,6 @@ db_status_source::db_status_source()
         role_t::VCR_STATUS_STITCH_TITLE_TO_NORMAL,
         role_t::VCR_STATUS_STITCH_NORMAL_TO_TITLE);
     this->dss_fields[DSF_RELOAD].set_width(3);
-    this->dss_fields[DSF_RELOAD].on_click = [](status_field&) {
-        auto query = lnav_data.ld_db_row_source.dls_user_query;
-        if (query.empty()) {
-            return;
-        }
-        std::string alt_msg;
-        auto& ec = lnav_data.ld_exec_context;
-        auto src_guard = ec.enter_source(intern_string::lookup("db-reload"),
-                                         1,
-                                         fmt::format(FMT_STRING(";{}"), query));
-        auto result = execute_sql(ec, query, alt_msg);
-        if (result.isErr()) {
-            auto um = result.unwrapErr();
-            ec.ec_msg_callback_stack.back()(um);
-        }
-    };
     this->dss_fields[DSF_QUERY].set_share(3);
     this->dss_fields[DSF_TIMING].right_justify(true);
     this->dss_fields[DSF_TIMING].set_width(80);
@@ -77,7 +61,8 @@ db_status_source::db_status_source()
 bool
 db_status_source::update_from_db_source()
 {
-    const auto& dls = lnav_data.ld_db_row_source;
+    static const auto& dls = injector::get<db_label_source&>();
+    static auto& lss = injector::get<logfile_sub_source&>();
     auto changed = false;
 
     if (dls.dls_user_query.empty()) {
@@ -111,11 +96,9 @@ db_status_source::update_from_db_source()
                            .to_string();
             timing_al.append("ran ").append(lnav::roles::time_ago(ago));
             if (dls.dls_query_touches_log_data) {
-                auto& lss = lnav_data.ld_log_source;
                 bool is_stale
                     = lss.lss_index_generation != dls.dls_log_gen_at_query
-                    || lss.text_line_count()
-                        != dls.dls_log_line_count_at_query;
+                    || lss.text_line_count() != dls.dls_log_line_count_at_query;
                 timing_al.append(" on ").append(
                     is_stale ? lnav::roles::warning("old log data")
                              : lnav::roles::ok("current log data"));
diff --git a/src/db_sub_source.cc b/src/db_sub_source.cc
@@ -34,15 +34,18 @@
 
 #include "base/ansi_scrubber.hh"
 #include "base/date_time_scanner.hh"
+#include "base/func_util.hh"
 #include "base/humanize.hh"
 #include "base/itertools.enumerate.hh"
 #include "base/itertools.hh"
 #include "base/map_util.hh"
 #include "base/math_util.hh"
 #include "base/time_util.hh"
 #include "base/types.hh"
+#include "command_executor.hh"
 #include "config.h"
 #include "hist_source_T.hh"
+#include "lnav_util.hh"
 #include "log_level.hh"
 #include "scn/scan.h"
 #include "yajlpp/json_ptr.hh"
@@ -663,6 +666,8 @@ db_label_source::clear()
 {
     this->dls_generation += 1;
     this->dls_user_query.clear();
+    this->dls_user_query_src_loc = std::nullopt;
+    this->dls_user_query_vars.clear();
     this->dls_query_start = std::nullopt;
     this->dls_query_end = std::nullopt;
     this->dls_query_touches_log_data = false;
@@ -850,6 +855,30 @@ db_label_source::text_row_details(const textview_curses& tc)
     return std::nullopt;
 }
 
+Result<std::string, lnav::console::user_message>
+db_label_source::text_reload_data(exec_context& ec)
+{
+    if (this->dls_user_query.empty()) {
+        return ec.make_error("no previous query to re-run");
+    }
+
+    auto prev_query = this->dls_user_query;
+    auto prev_loc = this->dls_user_query_src_loc.value_or(INTERNAL_SRC_LOC);
+    auto prev_vars = this->dls_user_query_vars;
+    std::string alt_msg;
+
+    auto src_guard = ec.enter_source(
+        prev_loc, fmt::format(FMT_STRING(";{}"), prev_query));
+    auto db_guard = ec.enter_db_source(this);
+    auto cb_guard = ec.push_callback(sql_callback);
+
+    ec.ec_local_vars.emplace(std::move(prev_vars));
+    auto vars_guard
+        = finally([&ec]() { ec.ec_local_vars.pop(); });
+
+    return execute_sql(ec, prev_query, alt_msg);
+}
+
 std::optional<std::string>
 db_label_source::text_view_details() const
 {
diff --git a/src/db_sub_source.hh b/src/db_sub_source.hh
@@ -41,6 +41,7 @@
 
 #include "ArenaAlloc/arenaalloc.h"
 #include "base/cell_container.hh"
+#include "base/file_range.hh"
 #include "base/lnav.resolver.hh"
 #include "base/sparse_cursor_container.hh"
 #include "digestible/digestible.h"
@@ -118,6 +119,9 @@ public:
 
     std::optional<std::string> text_view_details() const override;
 
+    Result<std::string, lnav::console::user_message> text_reload_data(
+        exec_context& ec) override;
+
     std::string get_cell_as_string(vis_line_t row, size_t col);
     std::optional<int64_t> get_cell_as_int64(vis_line_t row, size_t col) const;
     std::optional<double> get_cell_as_double(vis_line_t row, size_t col) const;
@@ -182,6 +186,8 @@ public:
 
     uint32_t dls_generation{0};
     std::string dls_user_query;
+    std::optional<source_location> dls_user_query_src_loc;
+    std::map<std::string, scoped_value_t> dls_user_query_vars;
     std::optional<std::chrono::system_clock::time_point> dls_query_start;
     std::optional<std::chrono::system_clock::time_point> dls_query_end;
     bool dls_query_touches_log_data{false};
diff --git a/src/internals/cmd-ref.rst b/src/internals/cmd-ref.rst
@@ -1449,6 +1449,19 @@
 ----
 
 
+.. _reload_view:
+
+:reload-view
+^^^^^^^^^^^^
+
+  Re-run the operation that populated the current view
+
+  **See Also**
+    
+
+----
+
+
 .. _reset_config:
 
 :reset-config *option*
diff --git a/src/keymaps/default-keymap.json b/src/keymaps/default-keymap.json
@@ -23,6 +23,9 @@
                 "f1": {
                     "command": ":help"
                 },
+                "f5": {
+                    "command": ":reload-view"
+                },
                 "f7": {
                     "command": "|lnav-moveto-breakpoint prev"
                 },
diff --git a/src/lnav.cc b/src/lnav.cc
@@ -239,6 +239,9 @@ static auto bound_lnav_flags
 static auto bound_lnav_exec_context
     = injector::bind<exec_context>::to_instance(&lnav_data.ld_exec_context);
 
+static auto bound_db_row_source
+    = injector::bind<db_label_source>::to_instance(&lnav_data.ld_db_row_source);
+
 static auto bound_log_source
     = injector::bind<logfile_sub_source>::to_instance(&lnav_data.ld_log_source);
 
@@ -1766,6 +1769,17 @@ VALUES ('org.lnav.mouse-support', -1, DATETIME('now', '+1 minute'),
 
         execute_command(lnav_data.ld_exec_context, cmd);
     };
+    lnav_data.ld_db_status_source
+        .statusview_value_for_field(db_status_source::DSF_RELOAD)
+        .on_click = [](status_field&) {
+        auto& ec = lnav_data.ld_exec_context;
+        auto prov_guard = ec.with_provenance(exec_context::mouse_input{});
+        auto res = ec.execute(INTERNAL_SRC_LOC, ":reload-view");
+        if (res.isErr()) {
+            auto um = res.unwrapErr();
+            ec.ec_msg_callback_stack.back()(um);
+        }
+    };
 
     lnav_data.ld_status[LNS_TOP].set_title("top");
     lnav_data.ld_status[LNS_TOP].set_y(0);
diff --git a/src/lnav_commands.cc b/src/lnav_commands.cc
@@ -1064,6 +1064,31 @@ com_relative_goto(exec_context& ec,
     return Ok(retval);
 }
 
+static Result<std::string, lnav::console::user_message>
+com_reload_view(exec_context& ec,
+                std::string cmdline,
+                std::vector<std::string>& args)
+{
+    if (args.empty()) {
+        return Ok(std::string());
+    }
+
+    auto top_tc = lnav_data.ld_view_stack.top();
+    if (!top_tc) {
+        return ec.make_error("no view to reload");
+    }
+    auto* tss = top_tc.value()->get_sub_source();
+    if (tss == nullptr) {
+        return ec.make_error("no view to reload");
+    }
+
+    if (ec.ec_dry_run) {
+        return Ok(std::string());
+    }
+
+    return tss->text_reload_data(ec);
+}
+
 static Result<std::string, lnav::console::user_message>
 com_mark_expr(exec_context& ec,
               std::string cmdline,
@@ -3321,6 +3346,14 @@ readline_context::command_t STD_COMMANDS[] = {
                  {"To go to the Screenshots section", "#screenshots"}})
             .with_tags({"navigation"}),
     },
+    {
+        "reload-view",
+        com_reload_view,
+        help_text(":reload-view")
+            .with_summary(
+                "Re-run the operation that populated the current view")
+            .with_tags({"views"}),
+    },
     {
         "relative-goto",
         com_relative_goto,
diff --git a/src/textview_curses.cc b/src/textview_curses.cc
@@ -38,6 +38,7 @@
 #include "base/injector.hh"
 #include "base/lnav_log.hh"
 #include "base/time_util.hh"
+#include "command_executor.hh"
 #include "config.h"
 #include "data_scanner.hh"
 #include "fmt/format.h"
@@ -1323,6 +1324,12 @@ text_sub_source::clear_preview()
     this->tss_preview_min_log_level = std::nullopt;
 }
 
+Result<std::string, lnav::console::user_message>
+text_sub_source::text_reload_data(exec_context& ec)
+{
+    return ec.make_error("this view cannot be reloaded");
+}
+
 void
 text_sub_source::add_commands_for_session(
     const std::function<void(const std::string&)>& receiver)
diff --git a/src/textview_curses.hh b/src/textview_curses.hh
@@ -39,7 +39,9 @@
 
 #include "base/enum_util.hh"
 #include "base/func_util.hh"
+#include "base/lnav.console.hh"
 #include "base/lnav_log.hh"
+#include "base/result.h"
 #include "base/text_format_enum.hh"
 #include "bookmarks.hh"
 #include "breadcrumb.hh"
@@ -55,6 +57,7 @@
 #include "vis_line.hh"
 
 class textview_curses;
+struct exec_context;
 
 using vis_bookmarks_t = bookmarks<vis_line_t>;
 using vis_bookmarks = bookmarks<vis_line_t>::type;
@@ -599,6 +602,13 @@ public:
         return std::nullopt;
     }
 
+    // Re-run whatever operation populated this view.  Default behavior
+    // is to report that the view cannot be reloaded; views like the DB
+    // view and the TIMELINE view override this to re-execute the last
+    // SQL query or rebuild the timeline index, respectively.
+    virtual Result<std::string, lnav::console::user_message>
+    text_reload_data(exec_context& ec);
+
     [[nodiscard]] log_level_t get_min_log_level() const
     {
         return this->tss_min_log_level;
diff --git a/src/timeline_source.cc b/src/timeline_source.cc
@@ -930,6 +930,20 @@ timeline_source::text_size_for_line(textview_curses& tc,
     return this->ts_total_width;
 }
 
+Result<std::string, lnav::console::user_message>
+timeline_source::text_reload_data(exec_context& ec)
+{
+    if (!this->rebuild_indexes()) {
+        return ec.make_error("timeline rebuild was interrupted");
+    }
+    this->apply_pending_bookmarks();
+    if (this->tss_view != nullptr) {
+        this->tss_view->reload_data();
+        this->tss_view->redo_search();
+    }
+    return Ok(std::string());
+}
+
 bool
 timeline_source::rebuild_indexes()
 {
diff --git a/src/timeline_source.hh b/src/timeline_source.hh
diff --git a/test/expected/test_cli.sh_0b3639753916f71254e8c9cce4ebb8bfd9978d3e.out b/test/expected/test_cli.sh_0b3639753916f71254e8c9cce4ebb8bfd9978d3e.out
diff --git a/test/expected/test_cli.sh_cc06341dd560f927512e92c7c0985ed8b25827ae.out b/test/expected/test_cli.sh_cc06341dd560f927512e92c7c0985ed8b25827ae.out
diff --git a/test/expected/test_cmds.sh_b6a3bb78e9d60e5e1f5ce5b18e40d2f1662707ab.out b/test/expected/test_cmds.sh_b6a3bb78e9d60e5e1f5ce5b18e40d2f1662707ab.out
