Merge branch 'master' into develop

Author: tstack

NEWS.md

@@ -84,6 +84,11 @@ Features:
   - `⌘-X` to cut the current selection to the
     clipboard.
   - `⌘-Z` to undo the last change.
+* The multi-line prompt can now be resized with the
+  keyboard: `ALT-=` grows the prompt by one line and
+  `ALT--` shrinks it by one line.  This complements
+  the existing click-and-drag resize on the prompt's
+  status bar.
 * Additional readline-style key bindings in the
   prompt (issue #1676):
   - `ALT-f` / `ALT-b` move forward/backward by word.
@@ -107,6 +112,29 @@ Features:
 * Added `disfavors` to `external-editor` configuration
   to express file names that the editor is not interested
   in handling.
+* The `lnav_views.view_details` column is now populated
+  for every time-based view (log, histogram, spectro,
+  timeline, db) with a JSON `zoom-level` field reflecting
+  the current `:zoom-to` setting.
+* The `:zoom-to` command (and the `z`/`Z` hotkeys) now
+  affects only the currently focused view; previously,
+  zooming in either the histogram or the spectrogram
+  view would change both views' zoom level in lockstep.
+  Each view (log, histogram, spectro, timeline, db) now
+  has its own independent zoom level.
+* The `:zoom-to` command now accepts `+` and `-` as
+  shortcuts to step in or out by one level from the
+  current view's zoom (the same behavior as the `z`/`Z`
+  hotkeys).
+* SQL statements can now use `$zoom_level` to refer to
+  the current zoom level in the DB view.  Pressing
+  `z`/`Z` in the DB view will now rerun the last query
+  with the new zoom value.  The `stats.hist` PRQL
+  function now uses `$zoom_level` as the default value
+  for the `slice` parameter.
+* A `stats.timeseries` PRQL function has been added to
+  make it easier to perform an aggregation over buckets
+  of time.
 
 Breaking changes:
 * The `humanize_file_size()` SQLite function now

TESTS_ENVIRONMENT.in

@@ -122,7 +122,7 @@ run_cap_test() {
 
     sed -ibak \
         -e "s;${prefix}/etc;{prefix}/etc;g" \
-        -e 's;run_at\\":\\".*\\";;' \
+        -e 's;run-at\\":\\".*\\";;' \
         -e "s;${LNAV_VERSION};{LNAV_VERSION};g" \
         -e "s;${test_dir};{test_dir};g" \
         -e "s;${builddir};{test_dir};g" \

docs/schemas/config-v1.schema.json

@@ -1405,17 +1405,18 @@
                 },
                 "color": {
                     "title": "/color",
-                    "description": "The foreground color value for this style. The value can be the name of an xterm color, the hexadecimal value, or a theme variable reference.",
+                    "description": "The foreground color value for this style. The value can be the name of an xterm color, the hexadecimal value, a theme variable reference, or 'semantic()' to derive the color from a hash of the matched text.",
                     "type": "string",
                     "examples": [
                         "#fff",
                         "Green",
-                        "$black"
+                        "$black",
+                        "semantic()"
                     ]
                 },
                 "background-color": {
                     "title": "/background-color",
-                    "description": "The background color value for this style. The value can be the name of an xterm color, the hexadecimal value, or a theme variable reference.",
+                    "description": "The background color value for this style. The value can be the name of an xterm color, the hexadecimal value, a theme variable reference, or 'semantic()' to derive the color from a hash of the matched text.",
                     "type": "string",
                     "examples": [
                         "#2d2a2e",

docs/schemas/format-v1.schema.json

@@ -975,17 +975,18 @@
                 },
                 "color": {
                     "title": "/color",
-                    "description": "The foreground color value for this style. The value can be the name of an xterm color, the hexadecimal value, or a theme variable reference.",
+                    "description": "The foreground color value for this style. The value can be the name of an xterm color, the hexadecimal value, a theme variable reference, or 'semantic()' to derive the color from a hash of the matched text.",
                     "type": "string",
                     "examples": [
                         "#fff",
                         "Green",
-                        "$black"
+                        "$black",
+                        "semantic()"
                     ]
                 },
                 "background-color": {
                     "title": "/background-color",
-                    "description": "The background color value for this style. The value can be the name of an xterm color, the hexadecimal value, or a theme variable reference.",
+                    "description": "The background color value for this style. The value can be the name of an xterm color, the hexadecimal value, a theme variable reference, or 'semantic()' to derive the color from a hash of the matched text.",
                     "type": "string",
                     "examples": [
                         "#2d2a2e",

docs/source/config.rst

@@ -143,6 +143,9 @@ the values from the :code:`styles/text` definition.
   picked based on the `CIEDE2000 <https://en.wikipedia.org/wiki/Color_difference#CIEDE2000>`_
   color difference algorithm.
 
+The special value :code:`semantic()` can also be used in place of a color.
+The displayed color is derived from a hash of the text to create a stable,
+distinguishable color.
 
 
 Example

docs/source/hotkeys.rst

@@ -464,6 +464,13 @@ editing:
       -
       - In search mode, search for the previous occurrence.  Otherwise,
         search history using current contents of the prompt
+    * - :kbd:`Alt` + :kbd:`=`
+      -
+      - In multi-line mode, grow the prompt by one line.  The prompt's
+        status bar can also be dragged with the mouse to resize.
+    * - :kbd:`Alt` + :kbd:`-`
+      -
+      - In multi-line mode, shrink the prompt by one line.
 
 Customizing
 -----------

docs/source/sqlext.rst

@@ -239,6 +239,10 @@ The following variables are available in SQL statements:
 
 * :code:`$LINES` - The number of lines in the terminal window.
 * :code:`$COLS` - The number of columns in the terminal window.
+* :code:`$zoom_level` - The current zoom level of the DB view as a
+  duration string (e.g. :code:`5m`, :code:`1h`).  Passing this
+  value to the `timeslice`_ function can be useful for easily
+  adjusting the time slice duration based on the zoom level.
 
 Environment
 -----------

docs/source/ui.rst

@@ -434,6 +434,16 @@ 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.
 
+Pressing :kbd:`z` / :kbd:`Shift` + :kbd:`z` (or running
+:code:`:zoom-to`) in the DB view changes the view's zoom level
+and re-runs the last query so that any references to the
+:code:`$zoom_level` SQL variable pick up the new value.  Passing this
+value to the :code:`timeslice()` function can be useful for easily
+adjusting the time slice duration based on the zoom level.
+This is useful with the :ref:`stats_hist` and :ref:`stats_timeseries`
+PRQL functions, whose default :code:`slice` parameter is
+:code:`$zoom_level`.
+
 If the query reads from log-backed tables (:code:`all_logs`,
 per-format tables like :code:`syslog_log`, :code:`all_opids`, etc.),
 the timing status also notes whether the results are based on
@@ -443,7 +453,8 @@ does not mention the log data freshness.
 
 The same query metadata is exposed via the :code:`view_details`
 column on the :code:`lnav_views` vtable as a JSON object containing
-:code:`query`, :code:`run_at`, and :code:`duration_us`.
+:code:`zoom-level`, :code:`query`, :code:`run-at`, and
+:code:`duration-us`.
 
 .. [#] lnav must be compiled in an environment with Rust/Cargo available
    for PRQL support.

src/all_logs_vtab.cc

@@ -190,6 +190,7 @@ all_logs_vtab::extract(logfile* lf,
         = to_owned(sub_values.lvv_src_file_value, values.lvv_allocator);
     values.lvv_src_line_value
         = to_owned(sub_values.lvv_src_line_value, values.lvv_allocator);
+    values.lvv_duration_value = sub_values.lvv_duration_value;
 }
 
 bool

src/base/humanize.cc

@@ -84,8 +84,10 @@ try_from(const string_fragment& sf)
             | ( [\-\+]? \d+ \. \d+ (?: [eE] [\-\+] \d+ )? )
               # file size: 4KiB, 2 MB, 100B, 500KBps
             | ( [\-\+]? \d+ (?:\.\d+)? \s* (?:[KMGTPE] i?)? [Bb] (?:ps)? )
-              # seconds with SI prefix: 1.2s, 1ms, 5us, 10ns
-            | ( [\-\+]? \d+ (?:\.\d+)? \s* [munpf]? ) s
+              # seconds: 1.2s, 1ms, 5us, 68 micros, 5 milliseconds
+            | ( [\-\+]? \d+ (?:\.\d+)? \s*
+                (?: milli | micro | nano | pico | femto | [munpf] )? )
+                s (?: ec (?:ond)? s? )?
               # duration h:m:s
             | ( \d{1,2} : \d{2} : \d{2} (?: \. \d{1,6} )? )
               # duration m:s
@@ -173,21 +175,39 @@ try_from(const string_fragment& sf)
 
         if (!unit_range.empty()) {
             size_t start = 0;
-            while (isspace(unit_range[start])) {
+            while (start < unit_range.size() && isspace(unit_range[start])) {
                 start += 1;
             }
-            switch (unit_range[start]) {
-                case 'f':
-                    retval /= 1000.0;
-                case 'p':
-                    retval /= 1000.0;
-                case 'n':
-                    retval /= 1000.0;
-                case 'u':
-                    retval /= 1000.0;
-                case 'm':
-                    retval /= 1000.0;
-                    break;
+            // The "micro" word form starts with 'm' but means /1e6, not
+            // /1e3 like the single-letter "m" SI prefix.  Match the word
+            // forms before falling through to the SI-letter switch.
+            auto starts_with = [&](std::string_view word) {
+                if (start + word.size() > unit_range.size()) {
+                    return false;
+                }
+                for (size_t i = 0; i < word.size(); ++i) {
+                    if (unit_range[start + i] != word[i]) {
+                        return false;
+                    }
+                }
+                return true;
+            };
+            if (starts_with("micro")) {
+                retval /= 1000000.0;
+            } else if (start < unit_range.size()) {
+                switch (unit_range[start]) {
+                    case 'f':
+                        retval /= 1000.0;
+                    case 'p':
+                        retval /= 1000.0;
+                    case 'n':
+                        retval /= 1000.0;
+                    case 'u':
+                        retval /= 1000.0;
+                    case 'm':
+                        retval /= 1000.0;
+                        break;
+                }
             }
         }