diff --git a/NEWS.md b/NEWS.md index d1fe9d26..37838b2c 100644 --- a/NEWS.md +++ b/NEWS.md @@ -10,6 +10,12 @@ Features: * Added `humanize_id` SQL function that colorizes a string using ANSI escape codes. +Interface changes: +* The bar charts in the DB view have now been moved to their + individual columns instead of occupying the whole width of + the view. The result is much cleaner, so the charts are + now enabled by default again. + Bug Fixes: * With the recent xz backdoor shenanigans, it seems like a good time to add some checks for data being hidden by escape codes: diff --git a/docs/source/query-results.png b/docs/source/query-results.png index 14ae5b8d..8343d717 100644 Binary files a/docs/source/query-results.png and b/docs/source/query-results.png differ diff --git a/docs/source/sqlext.rst b/docs/source/sqlext.rst index f452f5f8..3b0ee75c 100644 --- a/docs/source/sqlext.rst +++ b/docs/source/sqlext.rst @@ -47,6 +47,14 @@ and maximum number of bytes returned by the server, grouped by IP address: ;SELECT c_ip, avg(sc_bytes), max(sc_bytes) FROM access_log GROUP BY c_ip +.. note:: + + For reference, the PRQL query would look like this: + + .. code-block:: elm + + from access_log | stats.by c_ip {average sc_bytes, max sc_bytes} + After pressing :kbd:`Enter`, SQLite will execute the query using **lnav**'s virtual table implementation to extract the data directly from the log files. Once the query has finished, the main window will switch to the DB view to diff --git a/src/command_executor.cc b/src/command_executor.cc index cf152535..80902066 100644 --- a/src/command_executor.cc +++ b/src/command_executor.cc @@ -942,7 +942,6 @@ sql_callback(exec_context& ec, sqlite3_stmt* stmt) return 0; } - auto& chart = dls.dls_chart; auto& vc = view_colors::singleton(); int ncols = sqlite3_column_count(stmt); int row_number; @@ -964,16 +963,17 @@ sql_callback(exec_context& ec, sqlite3_stmt* stmt) dls.push_header(colname, type, graphable); if (graphable) { + auto& hm = dls.dls_headers.back(); auto name_for_ident_attrs = colname; auto attrs = vc.attrs_for_ident(name_for_ident_attrs); for (size_t attempt = 0; - chart.attrs_in_use(attrs) && attempt < 3; + hm.hm_chart.attrs_in_use(attrs) && attempt < 3; attempt++) { name_for_ident_attrs += " "; attrs = vc.attrs_for_ident(name_for_ident_attrs); } - chart.with_attrs_for_ident(colname, attrs); + hm.hm_chart.with_attrs_for_ident(colname, attrs); dls.dls_headers.back().hm_title_attrs = attrs; } } diff --git a/src/db_sub_source.cc b/src/db_sub_source.cc index 130fddb2..1f6408a0 100644 --- a/src/db_sub_source.cc +++ b/src/db_sub_source.cc @@ -116,17 +116,22 @@ db_label_source::text_attrs_for_line(textview_curses& tc, for (const auto& attr : sa) { require_ge(attr.sa_range.lr_start, 0); } - int left = 0; + int cell_start = 0; for (size_t lpc = 0; lpc < this->dls_headers.size(); lpc++) { auto row_view = scn::string_view{this->dls_rows[row][lpc]}; const auto& hm = this->dls_headers[lpc]; + int left = cell_start; if (hm.hm_graphable) { auto num_scan_res = scn::scan_value(row_view); if (num_scan_res) { - this->dls_chart.chart_attrs_for_value( - tc, left, hm.hm_name, num_scan_res.value(), sa); + hm.hm_chart.chart_attrs_for_value(tc, + left, + this->dls_cell_width[lpc], + hm.hm_name, + num_scan_res.value(), + sa); for (const auto& attr : sa) { require_ge(attr.sa_range.lr_start, 0); @@ -151,9 +156,10 @@ db_label_source::text_attrs_for_line(textview_curses& tc, = scn::scan_value(jpw_value.wt_value); if (num_scan_res) { - this->dls_chart.chart_attrs_for_value( + hm.hm_chart.chart_attrs_for_value( tc, left, + this->dls_cell_width[lpc], jpw_value.wt_ptr, num_scan_res.value(), sa); @@ -164,6 +170,7 @@ db_label_source::text_attrs_for_line(textview_curses& tc, } } } + cell_start += this->dls_cell_width[lpc] + 1; } for (const auto& attr : sa) { @@ -187,6 +194,7 @@ db_label_source::push_header(const std::string& colstr, if (colstr == "log_time" || colstr == "min(log_time)") { this->dls_time_column_index = this->dls_headers.size() - 1; } + hm.hm_chart.with_show_state(stacked_bar_chart_base::show_all{}); } void @@ -247,9 +255,9 @@ db_label_source::push_column(const scoped_value_t& sv) && this->dls_headers[index].hm_graphable) { if (sv.is()) { - this->dls_chart.add_value(hm.hm_name, sv.get()); + hm.hm_chart.add_value(hm.hm_name, sv.get()); } else { - this->dls_chart.add_value(hm.hm_name, sv.get()); + hm.hm_chart.add_value(hm.hm_name, sv.get()); } } else if (col_sf.length() > 2 && ((col_sf.startswith("{") && col_sf.endswith("}")) @@ -267,9 +275,9 @@ db_label_source::push_column(const scoped_value_t& sv) auto num_scan_res = scn::scan_value(jpw_value.wt_value); if (num_scan_res) { - this->dls_chart.add_value(jpw_value.wt_ptr, - num_scan_res.value()); - this->dls_chart.with_attrs_for_ident( + hm.hm_chart.add_value(jpw_value.wt_ptr, + num_scan_res.value()); + hm.hm_chart.with_attrs_for_ident( jpw_value.wt_ptr, vc.attrs_for_ident(jpw_value.wt_ptr)); } } @@ -280,7 +288,6 @@ db_label_source::push_column(const scoped_value_t& sv) void db_label_source::clear() { - this->dls_chart.clear(); this->dls_headers.clear(); this->dls_rows.clear(); this->dls_time_column.clear(); @@ -375,7 +382,7 @@ db_overlay_source::list_value_for_overlay(const listview_curses& lv, value_out.emplace_back(" " + jpw_value.wt_ptr + " = " + jpw_value.wt_value); - string_attrs_t& sa = value_out.back().get_attrs(); + auto& sa = value_out.back().get_attrs(); struct line_range lr(1, 2); sa.emplace_back(lr, VC_GRAPHIC.value(ACS_LTEE)); @@ -413,8 +420,12 @@ db_overlay_source::list_value_for_overlay(const listview_curses& lv, auto& sa = value_out[curr_line].get_attrs(); int left = 3; - chart.chart_attrs_for_value( - lv, left, iter->wt_ptr, num_scan_res.value(), sa); + chart.chart_attrs_for_value(lv, + left, + width, + iter->wt_ptr, + num_scan_res.value(), + sa); } } } diff --git a/src/db_sub_source.hh b/src/db_sub_source.hh index 47a9e5c0..646fa60c 100644 --- a/src/db_sub_source.hh +++ b/src/db_sub_source.hh @@ -105,10 +105,10 @@ public: bool hm_graphable{false}; size_t hm_column_size{0}; text_attrs hm_title_attrs; + stacked_bar_chart hm_chart; }; size_t dls_max_column_width{120}; - stacked_bar_chart dls_chart; std::vector dls_headers; std::vector> dls_rows; std::vector dls_time_column; diff --git a/src/hist_source.cc b/src/hist_source.cc index 7cd73726..422c1d2d 100644 --- a/src/hist_source.cc +++ b/src/hist_source.cc @@ -92,12 +92,15 @@ hist_source2::text_attrs_for_line(textview_curses& tc, int row, string_attrs_t& value_out) { - bucket_t& bucket = this->find_bucket(row); + auto& bucket = this->find_bucket(row); + auto dim = tc.get_dimensions(); + auto width = dim.second; int left = 0; for (int lpc = 0; lpc < HT__MAX; lpc++) { this->hs_chart.chart_attrs_for_value(tc, left, + width, (const hist_type_t) lpc, bucket.b_values[lpc].hv_value, value_out); diff --git a/src/hist_source.hh b/src/hist_source.hh index 0a411024..f3704ab3 100644 --- a/src/hist_source.hh +++ b/src/hist_source.hh @@ -175,6 +175,7 @@ public: void chart_attrs_for_value(const listview_curses& lc, int& left, + unsigned long width, const T& ident, double value, string_attrs_t& value_out) const @@ -184,10 +185,9 @@ public: require(ident_iter != this->sbc_ident_lookup.end()); size_t ident_index = ident_iter->second; - unsigned long width, avail_width; + unsigned long avail_width; bucket_stats_t overall_stats; struct line_range lr; - vis_line_t height; lr.lr_unit = line_range::unit::codepoint; @@ -200,8 +200,6 @@ public: return; } - lc.get_dimensions(height, width); - for (size_t lpc = 0; lpc < this->sbc_idents.size(); lpc++) { if (this->sbc_show_state.template is() || lpc == (size_t) ident_to_show) @@ -212,7 +210,9 @@ public: } if (this->sbc_show_state.template is()) { - if (width < this->sbc_idents.size()) { + if (this->sbc_idents.size() == 1) { + avail_width = width; + } else if (width < this->sbc_idents.size()) { avail_width = 0; } else { avail_width = width - this->sbc_idents.size(); diff --git a/src/hotkeys.cc b/src/hotkeys.cc index 4a7af434..66b93288 100644 --- a/src/hotkeys.cc +++ b/src/hotkeys.cc @@ -846,28 +846,6 @@ handle_paging_key(int ch) case '\t': case KEY_BTAB: if (tc == &lnav_data.ld_views[LNV_DB]) { - auto& chart = lnav_data.ld_db_row_source.dls_chart; - const auto& state = chart.show_next_ident( - ch == '\t' ? stacked_bar_chart_base::direction::forward - : stacked_bar_chart_base::direction::backward); - - state.match( - [&](stacked_bar_chart_base::show_none) { - lnav_data.ld_rl_view->set_value("Graphing no values"); - }, - [&](stacked_bar_chart_base::show_all) { - lnav_data.ld_rl_view->set_value("Graphing all values"); - }, - [&](stacked_bar_chart_base::show_one) { - std::string colname; - - chart.get_ident_to_show(colname); - lnav_data.ld_rl_view->set_value( - "Graphing column " ANSI_BOLD_START + colname - + ANSI_NORM); - }); - - tc->reload_data(); } else if (tc == &lnav_data.ld_views[LNV_SPECTRO]) { lnav_data.ld_mode = ln_mode_t::SPECTRO_DETAILS; } else if (tc_tss != nullptr && tc_tss->tss_supports_filtering) { diff --git a/src/lnav.cc b/src/lnav.cc index d7e7315a..7ee88ab8 100644 --- a/src/lnav.cc +++ b/src/lnav.cc @@ -194,23 +194,13 @@ const std::vector lnav_zoom_strings = { }; static const std::vector DEFAULT_DB_KEY_NAMES = { - "capture_count", - "capture_index", - "device", - "id", - "inode", - "key", - "match_index", - "parent", - "range_start", - "range_stop", - "rowid", - "st_dev", - "st_gid", - "st_ino", - "st_mode", - "st_rdev", - "st_uid", + "$id", "capture_count", "capture_index", + "device", "enabled", "filter_id", + "id", "inode", "key", + "match_index", "parent", "range_start", + "range_stop", "rowid", "st_dev", + "st_gid", "st_ino", "st_mode", + "st_rdev", "st_uid", }; static auto bound_pollable_supervisor diff --git a/src/log_vtab_impl.cc b/src/log_vtab_impl.cc index 92675336..0f905fc0 100644 --- a/src/log_vtab_impl.cc +++ b/src/log_vtab_impl.cc @@ -215,6 +215,7 @@ log_vtab_impl::get_foreign_keys(std::vector& keys_inout) const keys_inout.emplace_back("log_mark"); keys_inout.emplace_back("log_time_msecs"); keys_inout.emplace_back("log_top_line()"); + keys_inout.emplace_back("log_msg_line()"); } void diff --git a/src/prql/stats.prql b/src/prql/stats.prql index f96f66c7..a78c05ba 100644 --- a/src/prql/stats.prql +++ b/src/prql/stats.prql @@ -21,7 +21,7 @@ let by = func column values rel -> ( let hist = func column slice:'5m' rel -> ( rel group { tslice = (time.slice log_time_msecs slice), column } ( - aggregate { total = count(this) } + aggregate { total = count this } ) group { tslice } ( aggregate { v = json.group_object column total } diff --git a/src/spectro_impls.cc b/src/spectro_impls.cc index d5513ed5..7ad78e41 100644 --- a/src/spectro_impls.cc +++ b/src/spectro_impls.cc @@ -345,7 +345,6 @@ db_spectro_value_source::update_stats() this->dsvs_stats.clear(); auto& dls = lnav_data.ld_db_row_source; - auto& chart = dls.dls_chart; this->dsvs_column_index = dls.column_name_to_index(this->dsvs_colname); @@ -438,12 +437,20 @@ db_spectro_value_source::update_stats() return; } - auto bs = chart.get_stats_for(this->dsvs_colname); - this->dsvs_begin_time = dls.dls_time_column.front().tv_sec; this->dsvs_end_time = dls.dls_time_column.back().tv_sec; - this->dsvs_stats.lvs_min_value = bs.bs_min_value; - this->dsvs_stats.lvs_max_value = bs.bs_max_value; + + auto find_res + = dls.dls_headers | lnav::itertools::find_if([this](const auto& elem) { + return elem.hm_name == this->dsvs_colname; + }); + if (find_res) { + auto hm = find_res.value(); + auto& bs = hm->hm_chart.get_stats_for(this->dsvs_colname); + this->dsvs_stats.lvs_min_value = bs.bs_min_value; + this->dsvs_stats.lvs_max_value = bs.bs_max_value; + } + this->dsvs_stats.lvs_count = dls.dls_rows.size(); } diff --git a/test/expected/test_cli.sh_f2e41555f1a5f40f54ce241207af602ed1503a2b.out b/test/expected/test_cli.sh_f2e41555f1a5f40f54ce241207af602ed1503a2b.out index 3423f793..aea936f0 100644 --- a/test/expected/test_cli.sh_f2e41555f1a5f40f54ce241207af602ed1503a2b.out +++ b/test/expected/test_cli.sh_f2e41555f1a5f40f54ce241207af602ed1503a2b.out @@ -1,2 +1,2 @@ filepath lines  -stdin 4 +stdin  4 diff --git a/test/expected/test_prql.sh_06900fac5c2e854b1208320b753fcd43d4ba63a3.out b/test/expected/test_prql.sh_06900fac5c2e854b1208320b753fcd43d4ba63a3.out index e73b0173..2d7b252b 100644 --- a/test/expected/test_prql.sh_06900fac5c2e854b1208320b753fcd43d4ba63a3.out +++ b/test/expected/test_prql.sh_06900fac5c2e854b1208320b753fcd43d4ba63a3.out @@ -1,2 +1,2 @@ log_line  log_time log_level  c_ip cs_method cs_referer cs_uri_query  cs_uri_stem cs_user_agent cs_username cs_version sc_bytes sc_status cs_host log_part log_idle_msecs log_mark log_comment log_tags log_annotations log_filters  - 0 2009-07-20 22:59:26.000 info 192.168.202.254 GET - /vmw/cgi/tramp gPXE/0.9.7 - HTTP/1.0  134 200  0 0 + 0 2009-07-20 22:59:26.000 info 192.168.202.254 GET - /vmw/cgi/tramp gPXE/0.9.7 - HTTP/1.0  134 200  0 0 diff --git a/test/expected/test_sql.sh_13429aed81d7edfd47b57e9cdb8a25c43aff35c4.out b/test/expected/test_sql.sh_13429aed81d7edfd47b57e9cdb8a25c43aff35c4.out index 34edebe0..0a1cfc97 100644 --- a/test/expected/test_sql.sh_13429aed81d7edfd47b57e9cdb8a25c43aff35c4.out +++ b/test/expected/test_sql.sh_13429aed81d7edfd47b57e9cdb8a25c43aff35c4.out @@ -1,2 +1,2 @@ log_line  log_time log_level  c_ip cs_bytes cs_method cs_uri_query  cs_uri_stem cs_username cs_vars cs_version s_app s_core s_pid s_req s_runtime s_switches s_worker_reqs sc_bytes sc_header_bytes sc_headers sc_status log_part log_idle_msecs log_mark log_comment log_tags log_annotations log_filters  - 0 2016-03-13 22:49:12.000 info 127.0.0.1  696 POST /update_metrics  38 HTTP/1.1 0 3 88185 1  0.129  1 1  47  378  9 200  0 0 + 0 2016-03-13 22:49:12.000 info 127.0.0.1  696 POST /update_metrics  38 HTTP/1.1 0 3 88185 1  0.129  1 1  47  378  9 200  0 0 diff --git a/test/expected/test_sql.sh_1cbb81cfe40ee16332c5c775a74d06b945aa65c2.out b/test/expected/test_sql.sh_1cbb81cfe40ee16332c5c775a74d06b945aa65c2.out index 469fe5f9..8b7eb8fc 100644 --- a/test/expected/test_sql.sh_1cbb81cfe40ee16332c5c775a74d06b945aa65c2.out +++ b/test/expected/test_sql.sh_1cbb81cfe40ee16332c5c775a74d06b945aa65c2.out @@ -1,3 +1,3 @@ id first_name last_name age  - 0 Phil Myman 30 - 1 Lem Hewitt 35 + 0 Phil Myman  30 + 1 Lem Hewitt  35 diff --git a/test/expected/test_sql.sh_2c60ed41369d667d1e2a563d54f8edf84682e526.out b/test/expected/test_sql.sh_2c60ed41369d667d1e2a563d54f8edf84682e526.out index 37bf9b99..019e044b 100644 --- a/test/expected/test_sql.sh_2c60ed41369d667d1e2a563d54f8edf84682e526.out +++ b/test/expected/test_sql.sh_2c60ed41369d667d1e2a563d54f8edf84682e526.out @@ -1,2 +1,2 @@ -log_top_line() log_msg_line()  +log_top_line() log_msg_line()  1 0 diff --git a/test/expected/test_sql.sh_2f15b8a38673ac4db45dc6ed2eafe609c332575b.out b/test/expected/test_sql.sh_2f15b8a38673ac4db45dc6ed2eafe609c332575b.out index 469fe5f9..8b7eb8fc 100644 --- a/test/expected/test_sql.sh_2f15b8a38673ac4db45dc6ed2eafe609c332575b.out +++ b/test/expected/test_sql.sh_2f15b8a38673ac4db45dc6ed2eafe609c332575b.out @@ -1,3 +1,3 @@ id first_name last_name age  - 0 Phil Myman 30 - 1 Lem Hewitt 35 + 0 Phil Myman  30 + 1 Lem Hewitt  35 diff --git a/test/expected/test_sql.sh_7593b39f4be6fd2124ec7cf10835ee015d475b16.out b/test/expected/test_sql.sh_7593b39f4be6fd2124ec7cf10835ee015d475b16.out index 5fc0c052..543f4fda 100644 --- a/test/expected/test_sql.sh_7593b39f4be6fd2124ec7cf10835ee015d475b16.out +++ b/test/expected/test_sql.sh_7593b39f4be6fd2124ec7cf10835ee015d475b16.out @@ -1,2 +1,2 @@ -log_top_line() log_msg_line()  +log_top_line() log_msg_line()  2 2 diff --git a/test/expected/test_sql.sh_bad03a996c0750733ab99c592b9011851f521a69.out b/test/expected/test_sql.sh_bad03a996c0750733ab99c592b9011851f521a69.out index 8998948b..d876b93a 100644 --- a/test/expected/test_sql.sh_bad03a996c0750733ab99c592b9011851f521a69.out +++ b/test/expected/test_sql.sh_bad03a996c0750733ab99c592b9011851f521a69.out @@ -1,5 +1,5 @@ match_index  content  case match_index when 2 then replicate('abc', 1000) else '' end  - 0 {"col_0":10} - 1 {"col_0":50} - 2 {"col_0":50} abcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabc⋯bcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabc  - 3 {"col_0":50}   + 0 {"col_0":10} + 1 {"col_0":50} + 2 {"col_0":50} abcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabc⋯bcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabc  + 3 {"col_0":50}   diff --git a/test/expected/test_sql.sh_d4d540f0ef7e34b693fc72078d1cf2e069f86d81.out b/test/expected/test_sql.sh_d4d540f0ef7e34b693fc72078d1cf2e069f86d81.out index f141a008..7dcfcea8 100644 --- a/test/expected/test_sql.sh_d4d540f0ef7e34b693fc72078d1cf2e069f86d81.out +++ b/test/expected/test_sql.sh_d4d540f0ef7e34b693fc72078d1cf2e069f86d81.out @@ -1,4 +1,4 @@ total log_line  log_time duration log_formats  log_msg_format  - 2 0 2007-04-28 06:53:55.000 syslog_log New relevant interface # for # - 2 1 2007-04-28 06:53:55.000 syslog_log Joining # multicast group on interface # with address # - 2  2 2007-04-28 06:53:55.000   syslog_log  Registering new address record for # on #  + 2 0 2007-04-28 06:53:55.000 syslog_log New relevant interface # for # + 2 1 2007-04-28 06:53:55.000 syslog_log Joining # multicast group on interface # with address # + 2  2 2007-04-28 06:53:55.000   syslog_log  Registering new address record for # on #  diff --git a/test/expected/test_sql_indexes.sh_1614ebb5e2e83bab11023354dea8a0885ddf64b4.out b/test/expected/test_sql_indexes.sh_1614ebb5e2e83bab11023354dea8a0885ddf64b4.out index 3679b99c..5930ab0d 100644 --- a/test/expected/test_sql_indexes.sh_1614ebb5e2e83bab11023354dea8a0885ddf64b4.out +++ b/test/expected/test_sql_indexes.sh_1614ebb5e2e83bab11023354dea8a0885ddf64b4.out @@ -1,3 +1,3 @@ log_line  log_time log_level log_msg_format log_msg_values log_part log_idle_msecs log_mark log_comment log_tags log_annotations log_filters  - 1 2009-07-20 22:59:29.000 error null  3000 0 - 3 2013-02-15 06:00:31.000 error null  112777262000 0 + 1 2009-07-20 22:59:29.000 error null   3000 0 + 3 2013-02-15 06:00:31.000 error null  112777262000 0 diff --git a/test/expected/test_sql_indexes.sh_2b4945247332d01b08e6f17340f7d17f3b3649b8.out b/test/expected/test_sql_indexes.sh_2b4945247332d01b08e6f17340f7d17f3b3649b8.out index 941b16a3..174a27eb 100644 --- a/test/expected/test_sql_indexes.sh_2b4945247332d01b08e6f17340f7d17f3b3649b8.out +++ b/test/expected/test_sql_indexes.sh_2b4945247332d01b08e6f17340f7d17f3b3649b8.out @@ -1,5 +1,5 @@ log_line  log_time log_level log_msg_format log_msg_values log_part log_idle_msecs log_mark log_comment log_tags log_annotations log_filters  0 2009-07-20 22:59:26.000 info null  0 0 - 1 2009-07-20 22:59:29.000 error null  3000 0 + 1 2009-07-20 22:59:29.000 error null   3000 0  2 2009-07-20 22:59:29.000 info    null   <NULL>  0  0  <NULL>  <NULL>  <NULL>  <NULL>  - 3 2013-02-15 06:00:31.000 error    null   <NULL>  112777262000  0  <NULL>  <NULL>  <NULL>  <NULL>  + 3 2013-02-15 06:00:31.000 error    null   <NULL>  112777262000  0  <NULL>  <NULL>  <NULL>  <NULL>  diff --git a/test/expected/test_sql_indexes.sh_541a8e35f34a206e340a3880128b6ce137847872.out b/test/expected/test_sql_indexes.sh_541a8e35f34a206e340a3880128b6ce137847872.out index c6c8524c..0ffbbc69 100644 --- a/test/expected/test_sql_indexes.sh_541a8e35f34a206e340a3880128b6ce137847872.out +++ b/test/expected/test_sql_indexes.sh_541a8e35f34a206e340a3880128b6ce137847872.out @@ -1,5 +1,5 @@ log_line  log_time log_level  c_ip cs_method cs_referer cs_uri_query  cs_uri_stem cs_user_agent cs_username cs_version sc_bytes sc_status cs_host log_part log_idle_msecs log_mark log_comment log_tags log_annotations log_filters  log_unique_path  - 0 2009-07-20 22:59:26.000 info 192.168.202.254 GET - /vmw/cgi/tramp gPXE/0.9.7 - HTTP/1.0  134 200  0 0 logfile_access_log.0 - 1 2009-07-20 22:59:29.000 error 192.168.202.254 GET - /vmw/vSphere/default/vmkboot.gz gPXE/0.9.7 - HTTP/1.0  46210 404  3000 0 logfile_access_log.0 - 2 2009-07-20 22:59:29.000 info  192.168.202.254 GET  -   <NULL> /vmw/vSphere/default/vmkernel.gz gPXE/0.9.7  -  HTTP/1.0   78929  200  <NULL>  <NULL>  0  0  <NULL>  <NULL>  <NULL>  <NULL> logfile_access_log.0  - 3 2013-02-15 06:00:31.000 error  10.112.81.15  <NULL>  -   <NULL> <NULL>  -  -  <NULL>   0  400  <NULL>  <NULL>  112777262000  0  <NULL>  <NULL>  <NULL>  <NULL> logfile_access_log.1  + 0 2009-07-20 22:59:26.000 info 192.168.202.254 GET - /vmw/cgi/tramp gPXE/0.9.7 - HTTP/1.0   134 200  0 0 logfile_access_log.0 + 1 2009-07-20 22:59:29.000 error 192.168.202.254 GET - /vmw/vSphere/default/vmkboot.gz gPXE/0.9.7 - HTTP/1.0  46210 404   3000 0 logfile_access_log.0 + 2 2009-07-20 22:59:29.000 info  192.168.202.254 GET  -   <NULL> /vmw/vSphere/default/vmkernel.gz gPXE/0.9.7  -  HTTP/1.0   78929  200  <NULL>  <NULL>  0  0  <NULL>  <NULL>  <NULL>  <NULL> logfile_access_log.0  + 3 2013-02-15 06:00:31.000 error  10.112.81.15  <NULL>  -   <NULL> <NULL>  -  -  <NULL>   0  400  <NULL>  <NULL>  112777262000  0  <NULL>  <NULL>  <NULL>  <NULL> logfile_access_log.1  diff --git a/test/expected/test_sql_indexes.sh_59a1497c13a5e09bc8f95ef02552b2835ebea6e5.out b/test/expected/test_sql_indexes.sh_59a1497c13a5e09bc8f95ef02552b2835ebea6e5.out index 614309fe..d6cee015 100644 --- a/test/expected/test_sql_indexes.sh_59a1497c13a5e09bc8f95ef02552b2835ebea6e5.out +++ b/test/expected/test_sql_indexes.sh_59a1497c13a5e09bc8f95ef02552b2835ebea6e5.out @@ -1,2 +1,2 @@ -$id $parent $notused  replace($detail, 'SCAN TABLE', 'SCAN')  - 2  0  0 SCAN all_logs VIRTUAL TABLE INDEX 1:SEARCH all_logs USING log_level < ? +$id $parent $notused  replace($detail, 'SCAN TABLE', 'SCAN')  + 2  0  0 SCAN all_logs VIRTUAL TABLE INDEX 1:SEARCH all_logs USING log_level < ? diff --git a/test/expected/test_sql_indexes.sh_69fd19d56a8cd1fc9c7eb9351270eabb491f8233.out b/test/expected/test_sql_indexes.sh_69fd19d56a8cd1fc9c7eb9351270eabb491f8233.out index 641ef07b..7e0f2282 100644 --- a/test/expected/test_sql_indexes.sh_69fd19d56a8cd1fc9c7eb9351270eabb491f8233.out +++ b/test/expected/test_sql_indexes.sh_69fd19d56a8cd1fc9c7eb9351270eabb491f8233.out @@ -1,5 +1,5 @@ log_line  log_time log_level log_msg_format log_msg_values log_part log_idle_msecs log_mark log_comment log_tags log_annotations log_filters log_format  0 2009-07-20 22:59:26.000 info null  0 0 access_log - 1 2009-07-20 22:59:29.000 error null  3000 0 access_log + 1 2009-07-20 22:59:29.000 error null   3000 0 access_log  2 2009-07-20 22:59:29.000 info    null   <NULL>  0  0  <NULL>  <NULL>  <NULL>  <NULL> access_log  - 3 2013-02-15 06:00:31.000 error    null   <NULL>  112777262000  0  <NULL>  <NULL>  <NULL>  <NULL> access_log  + 3 2013-02-15 06:00:31.000 error    null   <NULL>  112777262000  0  <NULL>  <NULL>  <NULL>  <NULL> access_log  diff --git a/test/expected/test_sql_indexes.sh_b615b6737b1e0d383c8ce4a1db56332f11dbc158.out b/test/expected/test_sql_indexes.sh_b615b6737b1e0d383c8ce4a1db56332f11dbc158.out index b33b9f92..3379cd86 100644 --- a/test/expected/test_sql_indexes.sh_b615b6737b1e0d383c8ce4a1db56332f11dbc158.out +++ b/test/expected/test_sql_indexes.sh_b615b6737b1e0d383c8ce4a1db56332f11dbc158.out @@ -1,2 +1,2 @@ -$id $parent $notused  replace($detail, 'SCAN TABLE', 'SCAN')  - 2  0  0 SCAN all_logs VIRTUAL TABLE INDEX 1:SEARCH all_logs USING log_format = ? +$id $parent $notused  replace($detail, 'SCAN TABLE', 'SCAN')  + 2  0  0 SCAN all_logs VIRTUAL TABLE INDEX 1:SEARCH all_logs USING log_format = ? diff --git a/test/expected/test_sql_indexes.sh_dab07d8de7728752ae938a174468d75e85f3ae7e.out b/test/expected/test_sql_indexes.sh_dab07d8de7728752ae938a174468d75e85f3ae7e.out index ac244e18..58986f56 100644 --- a/test/expected/test_sql_indexes.sh_dab07d8de7728752ae938a174468d75e85f3ae7e.out +++ b/test/expected/test_sql_indexes.sh_dab07d8de7728752ae938a174468d75e85f3ae7e.out @@ -1,2 +1,2 @@ -$id $parent $notused  replace($detail, 'SCAN TABLE', 'SCAN')  - 2  0  0 SCAN access_log VIRTUAL TABLE INDEX 1:SEARCH access_log USING log_path GLOB ? +$id $parent $notused  replace($detail, 'SCAN TABLE', 'SCAN')  + 2  0  0 SCAN access_log VIRTUAL TABLE INDEX 1:SEARCH access_log USING log_path GLOB ? diff --git a/test/expected/test_sql_indexes.sh_f7681c234d4f60df16c997a05163aeb058c52870.out b/test/expected/test_sql_indexes.sh_f7681c234d4f60df16c997a05163aeb058c52870.out index 941b16a3..174a27eb 100644 --- a/test/expected/test_sql_indexes.sh_f7681c234d4f60df16c997a05163aeb058c52870.out +++ b/test/expected/test_sql_indexes.sh_f7681c234d4f60df16c997a05163aeb058c52870.out @@ -1,5 +1,5 @@ log_line  log_time log_level log_msg_format log_msg_values log_part log_idle_msecs log_mark log_comment log_tags log_annotations log_filters  0 2009-07-20 22:59:26.000 info null  0 0 - 1 2009-07-20 22:59:29.000 error null  3000 0 + 1 2009-07-20 22:59:29.000 error null   3000 0  2 2009-07-20 22:59:29.000 info    null   <NULL>  0  0  <NULL>  <NULL>  <NULL>  <NULL>  - 3 2013-02-15 06:00:31.000 error    null   <NULL>  112777262000  0  <NULL>  <NULL>  <NULL>  <NULL>  + 3 2013-02-15 06:00:31.000 error    null   <NULL>  112777262000  0  <NULL>  <NULL>  <NULL>  <NULL>  diff --git a/test/expected/test_sql_regexp.sh_51293df041b6969ccecc60204dce3676d0fb006d.out b/test/expected/test_sql_regexp.sh_51293df041b6969ccecc60204dce3676d0fb006d.out index 60c67f8a..df8024ca 100644 --- a/test/expected/test_sql_regexp.sh_51293df041b6969ccecc60204dce3676d0fb006d.out +++ b/test/expected/test_sql_regexp.sh_51293df041b6969ccecc60204dce3676d0fb006d.out @@ -1,2 +1,2 @@ match_index  content  - 0 {"key":"foo","value":4670} + 0 {"key":"foo","value":4670} diff --git a/test/expected/test_sql_search_table.sh_1a0d872ebc492fcecb2e79a0993170d5fc771a5b.out b/test/expected/test_sql_search_table.sh_1a0d872ebc492fcecb2e79a0993170d5fc771a5b.out index c426bf1e..b4d2849d 100644 --- a/test/expected/test_sql_search_table.sh_1a0d872ebc492fcecb2e79a0993170d5fc771a5b.out +++ b/test/expected/test_sql_search_table.sh_1a0d872ebc492fcecb2e79a0993170d5fc771a5b.out @@ -1,2 +1,2 @@ log_line  log_time log_level  comp  opid  tid  user  file  item  line prc reason  req  sid  src  sub vpxa_update match_index  lro_id  entity  operation  SessionId  SessionSubId log_part log_idle_msecs log_mark log_comment log_tags log_annotations log_filters  - 2 2022-06-02 11:58:12.376 info e3979f6 45709 vpxd Originator@6876 vpxLro 0 lro-846064 SessionManager vim.SessionManager.sessionIsActive 52626140-422b-6287-b4e4-344192c6a01d 523e0a4b-6e83-6bcd-9342-22502dd89866  182 0 + 2 2022-06-02 11:58:12.376 info e3979f6 45709 vpxd Originator@6876 vpxLro 0 lro-846064 SessionManager vim.SessionManager.sessionIsActive 52626140-422b-6287-b4e4-344192c6a01d 523e0a4b-6e83-6bcd-9342-22502dd89866  182 0 diff --git a/test/expected/test_sql_search_table.sh_3f5f74863d065418bca5a000e6ad3d9344635164.out b/test/expected/test_sql_search_table.sh_3f5f74863d065418bca5a000e6ad3d9344635164.out index fa908ab1..c1dea225 100644 --- a/test/expected/test_sql_search_table.sh_3f5f74863d065418bca5a000e6ad3d9344635164.out +++ b/test/expected/test_sql_search_table.sh_3f5f74863d065418bca5a000e6ad3d9344635164.out @@ -1,5 +1,5 @@ log_line  log_time log_level match_index  name log_part log_idle_msecs log_mark log_comment log_tags log_annotations log_filters  - 2 2022-08-16 00:32:15.000 info 0 com.apple.cdscheduler  199000 0 + 2 2022-08-16 00:32:15.000 info 0 com.apple.cdscheduler  199000 0 5 2022-08-16 00:32:15.000 info 0 com.apple.install  0 0  8 2022-08-16 00:32:15.000 info   0 com.apple.authd   <NULL>  0  0  <NULL>  <NULL>  <NULL>  <NULL>   8 2022-08-16 00:32:15.000 info   1 com.apple.asl   <NULL>  0  0  <NULL>  <NULL>  <NULL>  <NULL>  diff --git a/test/expected/test_sql_search_table.sh_5aaae556ecb1661602f176215e28f661d3404032.out b/test/expected/test_sql_search_table.sh_5aaae556ecb1661602f176215e28f661d3404032.out index cc50142f..5c1da20e 100644 --- a/test/expected/test_sql_search_table.sh_5aaae556ecb1661602f176215e28f661d3404032.out +++ b/test/expected/test_sql_search_table.sh_5aaae556ecb1661602f176215e28f661d3404032.out @@ -1,4 +1,4 @@ log_line  log_time log_level match_index user  ppid pid cpu_pct mem_pct vsz rss tty stat start_time cpu_time maj_flt min_flt  cmd  cmd_name cmd_args log_part log_idle_msecs log_mark log_comment log_tags log_annotations log_filters  0 2022-06-02 00:01:01.000 info 1 root 2  0  0  0  0 ? S Jun01 0:00 [kthreadd] [kthreadd]  0 0 - 12 2022-06-02 00:02:01.000 info 1 root 2  0  0  0  0 ? S Jun01 0:00 [kthreadd] [kthreadd]  60000 0 - 30 2022-06-02 00:03:01.000 info   1 root <NULL>  2  0  0  0  0 ?  S  Jun01  0:00   <NULL>  <NULL> [kthreadd] [kthreadd]  <NULL>  <NULL>  60000  0  <NULL>  <NULL>  <NULL>  <NULL>  + 12 2022-06-02 00:02:01.000 info 1 root 2  0  0  0  0 ? S Jun01 0:00 [kthreadd] [kthreadd]  60000 0 + 30 2022-06-02 00:03:01.000 info   1 root <NULL>  2  0  0  0  0 ?  S  Jun01  0:00   <NULL>  <NULL> [kthreadd] [kthreadd]  <NULL>  <NULL>  60000  0  <NULL>  <NULL>  <NULL>  <NULL>  diff --git a/test/expected/test_sql_search_table.sh_df0fd242f57a96d40f466493938cda0789a094fa.out b/test/expected/test_sql_search_table.sh_df0fd242f57a96d40f466493938cda0789a094fa.out index 5aa78963..eefd7d8f 100644 --- a/test/expected/test_sql_search_table.sh_df0fd242f57a96d40f466493938cda0789a094fa.out +++ b/test/expected/test_sql_search_table.sh_df0fd242f57a96d40f466493938cda0789a094fa.out @@ -1,24 +1,24 @@ log_line  log_time log_level match_index user  ppid pid cpu_pct mem_pct  vsz rss tty stat start_time cpu_time maj_flt min_flt  cmd  cmd_name  cmd_args log_part log_idle_msecs log_mark log_comment log_tags log_annotations log_filters  - 0 2022-06-02 00:01:01.000 info 0 root 1  0  0 158392 7792 ? Ss Jun01 0:14 /lib/systemd/systemd --switched-root --system --deserialize 16 /lib/systemd/systemd --switched-root --system --deserialize 16  0 0 + 0 2022-06-02 00:01:01.000 info 0 root 1  0  0 158392 7792 ? Ss Jun01 0:14 /lib/systemd/systemd --switched-root --system --deserialize 16 /lib/systemd/systemd --switched-root --system --deserialize 16  0 0 0 2022-06-02 00:01:01.000 info 1 root 2  0  0  0  0 ? S Jun01 0:00 [kthreadd] [kthreadd]  0 0  0 2022-06-02 00:01:01.000 info   2 root <NULL>  3  0  0  0  0 ?  I<  Jun01  0:00   <NULL>  <NULL> [rcu_gp]  [rcu_gp]  <NULL>   <NULL>  0  0  <NULL>  <NULL>  <NULL>  <NULL>   0 2022-06-02 00:01:01.000 info   3 root <NULL>  4  0  0  0  0 ?  I<  Jun01  0:00   <NULL>  <NULL> [rcu_par_gp]  [rcu_par_gp]  <NULL>   <NULL>  0  0  <NULL>  <NULL>  <NULL>  <NULL>  0 2022-06-02 00:01:01.000 info 4 root 6  0  0  0  0 ? I< Jun01 0:00 [kworker/0:0H-kblockd] [kworker/0:0H-kblockd]  0 0 - 12 2022-06-02 00:02:01.000 info 0 root 1  0  0 158392 7792 ? Ss Jun01 0:14 /lib/systemd/systemd --switched-root --system --deserialize 16 /lib/systemd/systemd --switched-root --system --deserialize 16  60000 0 - 12 2022-06-02 00:02:01.000 info   1 root <NULL>  2  0  0  0  0 ?  S  Jun01  0:00   <NULL>  <NULL> [kthreadd]  [kthreadd]  <NULL>   <NULL>  60000  0  <NULL>  <NULL>  <NULL>  <NULL>  - 12 2022-06-02 00:02:01.000 info   2 root <NULL>  3  0  0  0  0 ?  I<  Jun01  0:00   <NULL>  <NULL> [rcu_gp]  [rcu_gp]  <NULL>   <NULL>  60000  0  <NULL>  <NULL>  <NULL>  <NULL>  - 12 2022-06-02 00:02:01.000 info 3 root 4  0  0  0  0 ? I< Jun01 0:00 [rcu_par_gp] [rcu_par_gp]  60000 0 - 12 2022-06-02 00:02:01.000 info 4 root 6  0  0  0  0 ? I< Jun01 0:00 [kworker/0:0H-kblockd] [kworker/0:0H-kblockd]  60000 0 - 12 2022-06-02 00:02:01.000 info   5 root <NULL>  8  0  0  0  0 ?  I<  Jun01  0:00   <NULL>  <NULL> [mm_percpu_wq]  [mm_percpu_wq]  <NULL>   <NULL>  60000  0  <NULL>  <NULL>  <NULL>  <NULL>  - 12 2022-06-02 00:02:01.000 info   6 root <NULL>  9  0  0  0  0 ?  S  Jun01  0:00   <NULL>  <NULL> [ksoftirqd/0]  [ksoftirqd/0]  <NULL>   <NULL>  60000  0  <NULL>  <NULL>  <NULL>  <NULL>  - 12 2022-06-02 00:02:01.000 info 7 root 10  0  0  0  0 ? I Jun01 0:23 [rcu_sched] [rcu_sched]  60000 0 - 12 2022-06-02 00:02:01.000 info 8 root 11  0  0  0  0 ? I Jun01 0:00 [rcu_bh] [rcu_bh]  60000 0 - 12 2022-06-02 00:02:01.000 info   9 root <NULL>  12  0  0  0  0 ?  S  Jun01  0:00   <NULL>  <NULL> [migration/0]  [migration/0]  <NULL>   <NULL>  60000  0  <NULL>  <NULL>  <NULL>  <NULL>  - 12 2022-06-02 00:02:01.000 info   10 root <NULL>  14  0  0  0  0 ?  S  Jun01  0:00   <NULL>  <NULL> [cpuhp/0]  [cpuhp/0]  <NULL>   <NULL>  60000  0  <NULL>  <NULL>  <NULL>  <NULL>  - 30 2022-06-02 00:03:01.000 info 0 root 1  0  0 158392 7792 ? Ss Jun01 0:14 /lib/systemd/systemd --switched-root --system --deserialize 16 /lib/systemd/systemd --switched-root --system --deserialize 16  60000 0 - 30 2022-06-02 00:03:01.000 info 1 root 2  0  0  0  0 ? S Jun01 0:00 [kthreadd] [kthreadd]  60000 0 - 30 2022-06-02 00:03:01.000 info   2 root <NULL>  3  0  0  0  0 ?  I<  Jun01  0:00   <NULL>  <NULL> [rcu_gp]  [rcu_gp]  <NULL>   <NULL>  60000  0  <NULL>  <NULL>  <NULL>  <NULL>  - 30 2022-06-02 00:03:01.000 info   3 root <NULL>  4  0  0  0  0 ?  I<  Jun01  0:00   <NULL>  <NULL> [rcu_par_gp]  [rcu_par_gp]  <NULL>   <NULL>  60000  0  <NULL>  <NULL>  <NULL>  <NULL>  - 30 2022-06-02 00:03:01.000 info 4 root 6  0  0  0  0 ? I< Jun01 0:00 [kworker/0:0H-kblockd] [kworker/0:0H-kblockd]  60000 0 - 30 2022-06-02 00:03:01.000 info 5 root 8  0  0  0  0 ? I< Jun01 0:00 [mm_percpu_wq] [mm_percpu_wq]  60000 0 - 30 2022-06-02 00:03:01.000 info   6 root <NULL>  9  0  0  0  0 ?  S  Jun01  0:00   <NULL>  <NULL> [ksoftirqd/0]  [ksoftirqd/0]  <NULL>   <NULL>  60000  0  <NULL>  <NULL>  <NULL>  <NULL>  + 12 2022-06-02 00:02:01.000 info 0 root 1  0  0 158392 7792 ? Ss Jun01 0:14 /lib/systemd/systemd --switched-root --system --deserialize 16 /lib/systemd/systemd --switched-root --system --deserialize 16  60000 0 + 12 2022-06-02 00:02:01.000 info   1 root <NULL>  2  0  0  0  0 ?  S  Jun01  0:00   <NULL>  <NULL> [kthreadd]  [kthreadd]  <NULL>   <NULL>  60000  0  <NULL>  <NULL>  <NULL>  <NULL>  + 12 2022-06-02 00:02:01.000 info   2 root <NULL>  3  0  0  0  0 ?  I<  Jun01  0:00   <NULL>  <NULL> [rcu_gp]  [rcu_gp]  <NULL>   <NULL>  60000  0  <NULL>  <NULL>  <NULL>  <NULL>  + 12 2022-06-02 00:02:01.000 info 3 root 4  0  0  0  0 ? I< Jun01 0:00 [rcu_par_gp] [rcu_par_gp]  60000 0 + 12 2022-06-02 00:02:01.000 info 4 root 6  0  0  0  0 ? I< Jun01 0:00 [kworker/0:0H-kblockd] [kworker/0:0H-kblockd]  60000 0 + 12 2022-06-02 00:02:01.000 info   5 root <NULL>  8  0  0  0  0 ?  I<  Jun01  0:00   <NULL>  <NULL> [mm_percpu_wq]  [mm_percpu_wq]  <NULL>   <NULL>  60000  0  <NULL>  <NULL>  <NULL>  <NULL>  + 12 2022-06-02 00:02:01.000 info   6 root <NULL>  9  0  0  0  0 ?  S  Jun01  0:00   <NULL>  <NULL> [ksoftirqd/0]  [ksoftirqd/0]  <NULL>   <NULL>  60000  0  <NULL>  <NULL>  <NULL>  <NULL>  + 12 2022-06-02 00:02:01.000 info 7 root 10  0  0  0  0 ? I Jun01 0:23 [rcu_sched] [rcu_sched]  60000 0 + 12 2022-06-02 00:02:01.000 info 8 root 11  0  0  0  0 ? I Jun01 0:00 [rcu_bh] [rcu_bh]  60000 0 + 12 2022-06-02 00:02:01.000 info   9 root <NULL>  12  0  0  0  0 ?  S  Jun01  0:00   <NULL>  <NULL> [migration/0]  [migration/0]  <NULL>   <NULL>  60000  0  <NULL>  <NULL>  <NULL>  <NULL>  + 12 2022-06-02 00:02:01.000 info   10 root <NULL>  14  0  0  0  0 ?  S  Jun01  0:00   <NULL>  <NULL> [cpuhp/0]  [cpuhp/0]  <NULL>   <NULL>  60000  0  <NULL>  <NULL>  <NULL>  <NULL>  + 30 2022-06-02 00:03:01.000 info 0 root 1  0  0 158392 7792 ? Ss Jun01 0:14 /lib/systemd/systemd --switched-root --system --deserialize 16 /lib/systemd/systemd --switched-root --system --deserialize 16  60000 0 + 30 2022-06-02 00:03:01.000 info 1 root 2  0  0  0  0 ? S Jun01 0:00 [kthreadd] [kthreadd]  60000 0 + 30 2022-06-02 00:03:01.000 info   2 root <NULL>  3  0  0  0  0 ?  I<  Jun01  0:00   <NULL>  <NULL> [rcu_gp]  [rcu_gp]  <NULL>   <NULL>  60000  0  <NULL>  <NULL>  <NULL>  <NULL>  + 30 2022-06-02 00:03:01.000 info   3 root <NULL>  4  0  0  0  0 ?  I<  Jun01  0:00   <NULL>  <NULL> [rcu_par_gp]  [rcu_par_gp]  <NULL>   <NULL>  60000  0  <NULL>  <NULL>  <NULL>  <NULL>  + 30 2022-06-02 00:03:01.000 info 4 root 6  0  0  0  0 ? I< Jun01 0:00 [kworker/0:0H-kblockd] [kworker/0:0H-kblockd]  60000 0 + 30 2022-06-02 00:03:01.000 info 5 root 8  0  0  0  0 ? I< Jun01 0:00 [mm_percpu_wq] [mm_percpu_wq]  60000 0 + 30 2022-06-02 00:03:01.000 info   6 root <NULL>  9  0  0  0  0 ?  S  Jun01  0:00   <NULL>  <NULL> [ksoftirqd/0]  [ksoftirqd/0]  <NULL>   <NULL>  60000  0  <NULL>  <NULL>  <NULL>  <NULL>  diff --git a/test/expected/test_sql_search_table.sh_ef9373a76853f345d06234f6e0fe11b5d40da27b.out b/test/expected/test_sql_search_table.sh_ef9373a76853f345d06234f6e0fe11b5d40da27b.out index 1840d22c..826c8ed6 100644 --- a/test/expected/test_sql_search_table.sh_ef9373a76853f345d06234f6e0fe11b5d40da27b.out +++ b/test/expected/test_sql_search_table.sh_ef9373a76853f345d06234f6e0fe11b5d40da27b.out @@ -1,6 +1,6 @@ log_line  log_time log_level  comp  opid  tid  user  file  item  line prc reason  req  sid  src  sub vpxa_update match_index  lro_id  entity  operation  SessionId  SessionSubId log_part log_idle_msecs log_mark log_comment log_tags log_annotations log_filters  log_body  0 2022-06-02 11:58:12.193 info 7e1280cf 45715 vpxd Originator@6876 vpxLro 0 lro-846063 SessionManager vim.SessionManager.sessionIsActive 528e6e0c-246d-58b5-3234-278c6e0c5d0d 52c289ac-2563-48d5-8a8e-f178da022c0d  0 0 [VpxLRO] -- BEGIN lro-846063 -- SessionManager -- vim.Sessio⋯8b5-3234-278c6e0c5d0d(52c289ac-2563-48d5-8a8e-f178da022c0d) - 2 2022-06-02 11:58:12.376 info e3979f6 45709 vpxd Originator@6876 vpxLro 0 lro-846064 SessionManager vim.SessionManager.sessionIsActive 52626140-422b-6287-b4e4-344192c6a01d 523e0a4b-6e83-6bcd-9342-22502dd89866  182 0 [VpxLRO] -- BEGIN lro-846064 -- SessionManager -- vim.Sessio⋯287-b4e4-344192c6a01d(523e0a4b-6e83-6bcd-9342-22502dd89866) - 4 2022-06-02 11:58:12.623 info  <NULL> l3wrhr4o-cbf-h5:70001034-60 47524 <NULL> <NULL> <NULL> <NULL> vpxd <NULL> <NULL> <NULL> Originator@6876 vpxLro  <NULL>  0 lro-846066 ChangeLogCollector vim.cdc.ChangeLogCollector.waitForChanges 526861fc-0c28-1930-ae5e-d8c2772bf8c2 52a7a308-9646-c054-f1e7-16131c1a7db6  <NULL>  246  0  <NULL>  <NULL>  <NULL>  <NULL> [VpxLRO] -- BEGIN lro-846066 -- ChangeLogCollector -- vim.c⋯1930-ae5e-d8c2772bf8c2(52a7a308-9646-c054-f1e7-16131c1a7db6)  - 6 2022-06-02 11:58:12.736 info  <NULL> 499b440  48432 <NULL> <NULL> <NULL> <NULL> vpxd <NULL> <NULL> <NULL> Originator@6876 vpxLro  <NULL>  0 lro-846067 SessionManager  vim.SessionManager.sessionIsActive  521fe9f6-d061-11a2-ac86-badb3c071373 524cba9b-2cc4-9b70-32e4-421452a404d7  <NULL>  113  0  <NULL>  <NULL>  <NULL>  <NULL> [VpxLRO] -- BEGIN lro-846067 -- SessionManager -- vim.Sessio⋯1a2-ac86-badb3c071373(524cba9b-2cc4-9b70-32e4-421452a404d7)  - 8 2022-06-02 11:58:12.740 info 55a419df 48035 vpxd Originator@6876 vpxLro 0 lro-846068 SessionManager vim.SessionManager.sessionIsActive 52585600-b0bc-76b1-c4d5-4d7708671c5e 523b68ba-e312-9909-a3ca-39cc86aaf206  4 0 [VpxLRO] -- BEGIN lro-846068 -- SessionManager -- vim.Sessio⋯6b1-c4d5-4d7708671c5e(523b68ba-e312-9909-a3ca-39cc86aaf206) + 2 2022-06-02 11:58:12.376 info e3979f6 45709 vpxd Originator@6876 vpxLro 0 lro-846064 SessionManager vim.SessionManager.sessionIsActive 52626140-422b-6287-b4e4-344192c6a01d 523e0a4b-6e83-6bcd-9342-22502dd89866   182 0 [VpxLRO] -- BEGIN lro-846064 -- SessionManager -- vim.Sessio⋯287-b4e4-344192c6a01d(523e0a4b-6e83-6bcd-9342-22502dd89866) + 4 2022-06-02 11:58:12.623 info  <NULL> l3wrhr4o-cbf-h5:70001034-60 47524 <NULL> <NULL> <NULL> <NULL> vpxd <NULL> <NULL> <NULL> Originator@6876 vpxLro  <NULL>  0 lro-846066 ChangeLogCollector vim.cdc.ChangeLogCollector.waitForChanges 526861fc-0c28-1930-ae5e-d8c2772bf8c2 52a7a308-9646-c054-f1e7-16131c1a7db6  <NULL>  246  0  <NULL>  <NULL>  <NULL>  <NULL> [VpxLRO] -- BEGIN lro-846066 -- ChangeLogCollector -- vim.c⋯1930-ae5e-d8c2772bf8c2(52a7a308-9646-c054-f1e7-16131c1a7db6)  + 6 2022-06-02 11:58:12.736 info  <NULL> 499b440  48432 <NULL> <NULL> <NULL> <NULL> vpxd <NULL> <NULL> <NULL> Originator@6876 vpxLro  <NULL>  0 lro-846067 SessionManager  vim.SessionManager.sessionIsActive  521fe9f6-d061-11a2-ac86-badb3c071373 524cba9b-2cc4-9b70-32e4-421452a404d7  <NULL>   113  0  <NULL>  <NULL>  <NULL>  <NULL> [VpxLRO] -- BEGIN lro-846067 -- SessionManager -- vim.Sessio⋯1a2-ac86-badb3c071373(524cba9b-2cc4-9b70-32e4-421452a404d7)  + 8 2022-06-02 11:58:12.740 info 55a419df 48035 vpxd Originator@6876 vpxLro 0 lro-846068 SessionManager vim.SessionManager.sessionIsActive 52585600-b0bc-76b1-c4d5-4d7708671c5e 523b68ba-e312-9909-a3ca-39cc86aaf206   4 0 [VpxLRO] -- BEGIN lro-846068 -- SessionManager -- vim.Sessio⋯6b1-c4d5-4d7708671c5e(523b68ba-e312-9909-a3ca-39cc86aaf206) diff --git a/test/expected/test_sql_views_vtab.sh_62d15cb9d5a9259f198aa01ca8ed200d6da38d68.out b/test/expected/test_sql_views_vtab.sh_62d15cb9d5a9259f198aa01ca8ed200d6da38d68.out index 50a3a4c4..36c95379 100644 --- a/test/expected/test_sql_views_vtab.sh_62d15cb9d5a9259f198aa01ca8ed200d6da38d68.out +++ b/test/expected/test_sql_views_vtab.sh_62d15cb9d5a9259f198aa01ca8ed200d6da38d68.out @@ -1,3 +1,3 @@ -view_name filter_id enabled type language pattern  -log  1  1 in regex vmk -log  2  1 in regex vmk1 +view_name filter_id enabled type language pattern  +log 1 1 in regex vmk +log 2 1 in regex vmk1 diff --git a/test/expected/test_sql_views_vtab.sh_81dc3eb51ec4dc3066a2365524001242c423a9cf.out b/test/expected/test_sql_views_vtab.sh_81dc3eb51ec4dc3066a2365524001242c423a9cf.out index 42f642a3..79b31c39 100644 --- a/test/expected/test_sql_views_vtab.sh_81dc3eb51ec4dc3066a2365524001242c423a9cf.out +++ b/test/expected/test_sql_views_vtab.sh_81dc3eb51ec4dc3066a2365524001242c423a9cf.out @@ -1,2 +1,2 @@ -view_name filter_id enabled type language pattern  -log  0  1 out sql 1 +view_name filter_id enabled type language pattern  +log 0 1 out sql 1 diff --git a/test/expected/test_sql_views_vtab.sh_a2c0f0e51b3f85ea2a05ecdcacaad962b4fe5d4f.out b/test/expected/test_sql_views_vtab.sh_a2c0f0e51b3f85ea2a05ecdcacaad962b4fe5d4f.out index 3f4ee459..dae64c0c 100644 --- a/test/expected/test_sql_views_vtab.sh_a2c0f0e51b3f85ea2a05ecdcacaad962b4fe5d4f.out +++ b/test/expected/test_sql_views_vtab.sh_a2c0f0e51b3f85ea2a05ecdcacaad962b4fe5d4f.out @@ -1,2 +1,2 @@ -view_name filter_id enabled type language pattern  -log  1  1 in regex vmk +view_name filter_id enabled type language pattern  +log 1 1 in regex vmk