[session] redo filters if meta changed

Fix dupe test as well.

Author: tstack

src/lnav.indexing.cc

@@ -363,7 +363,8 @@ rebuild_indexes(std::optional<ui_clock::time_point> deadline)
         }
 
         if (retval.rir_completed && !retval.rir_rescan_needed) {
-            std::unordered_map<std::string, std::list<std::shared_ptr<logfile>>>
+            std::unordered_map<std::string,
+                               std::vector<std::shared_ptr<logfile>>>
                 id_to_files;
             auto reload = false;
 
@@ -379,23 +380,25 @@ rebuild_indexes(std::optional<ui_clock::time_point> deadline)
                     continue;
                 }
 
-                lf.sort([](const auto& left, const auto& right) {
-                    const auto& lst = left->get_stat();
-                    const auto& rst = right->get_stat();
-                    return rst.st_size < lst.st_size
-                        || (rst.st_size == lst.st_size
-                            && rst.st_mtime < lst.st_mtime);
-                });
-
-                const auto& dupe_name = lf.front()->get_unique_path();
+                std::sort(lf.begin(),
+                          lf.end(),
+                          [](const auto& left, const auto& right) {
+                              const auto& lst = left->get_stat();
+                              const auto& rst = right->get_stat();
+                              return lst.st_size < rst.st_size
+                                  || (lst.st_size == rst.st_size
+                                      && rst.st_mtime < lst.st_mtime);
+                          });
+
+                const auto& dupe_name = lf.back()->get_unique_path();
                 log_info(
                     "Keeping duplicated file: %s; size=%lld; mtime=%ld; "
                     "path=%s",
-                    lf.front()->get_content_id().c_str(),
-                    lf.front()->get_stat().st_size,
-                    lf.front()->get_stat().st_mtime,
-                    lf.front()->get_filename_as_string().c_str());
-                lf.pop_front();
+                    lf.back()->get_content_id().c_str(),
+                    lf.back()->get_stat().st_size,
+                    lf.back()->get_stat().st_mtime,
+                    lf.back()->get_filename_as_string().c_str());
+                lf.pop_back();
                 std::for_each(
                     lf.begin(), lf.end(), [&dupe_name, &reload](auto& lf) {
                         if (lf->mark_as_duplicate(dupe_name)) {

src/session_data.cc

@@ -470,6 +470,7 @@ load_time_bookmarks()
     auto db_path = lnav::paths::dotlnav() / LOG_METADATA_NAME;
     auto_mem<sqlite3_stmt> stmt(sqlite3_finalize);
     bool reload_needed = false;
+    bool meta_loaded = false;
     auto_mem<char, sqlite3_free> errmsg;
 
     log_info("loading bookmark db: %s", db_path.c_str());
@@ -753,7 +754,9 @@ load_time_bookmarks()
                             lf->set_logline_opid(line_number, opid_sf);
                             meta = true;
                         }
-                        if (!meta && part_name != nullptr) {
+                        if (meta) {
+                            meta_loaded = true;
+                        } else if (part_name != nullptr) {
                             marked_session_lines.emplace_back(
                                 lf->original_line_time(line_iter),
                                 format->get_name(),
@@ -912,6 +915,10 @@ load_time_bookmarks()
     log_info("END select time_offset");
 
     if (reload_needed) {
+        if (meta_loaded) {
+            lss.set_line_meta_changed();
+            lss.text_filters_changed();
+        }
         lnav_data.ld_views[LNV_LOG].reload_data();
     }
 

test/expected/Makefile.am

@@ -812,6 +812,10 @@ dist_noinst_DATA = \
     test_sessions.sh_e988439404f2e97604641c8d087855f3efe052e4.out \
     test_sessions.sh_ee6e1b95e6b4d67eecb842dccb5830e78720a0d2.err \
     test_sessions.sh_ee6e1b95e6b4d67eecb842dccb5830e78720a0d2.out \
+    test_sessions.sh_f02cc1d1dbd8e77ca386d79709a9f2037cbf24d3.err \
+    test_sessions.sh_f02cc1d1dbd8e77ca386d79709a9f2037cbf24d3.out \
+    test_sessions.sh_f3838c3a080fed8fdb4420f961feaa9cdec1263f.err \
+    test_sessions.sh_f3838c3a080fed8fdb4420f961feaa9cdec1263f.out \
     test_sessions.sh_f7c38467cfbd76234192d5f641fa017e3a12cdb0.err \
     test_sessions.sh_f7c38467cfbd76234192d5f641fa017e3a12cdb0.out \
     test_shlexer.sh_14dd967cb2af90899c9e5e45d00b676b5a3163aa.err \

test/expected/test_sessions.sh_f02cc1d1dbd8e77ca386d79709a9f2037cbf24d3.err

@@ -0,0 +1,3 @@
+log_line,log_tags
+0,<NULL>
+1,<NULL>

test/expected/test_sessions.sh_f02cc1d1dbd8e77ca386d79709a9f2037cbf24d3.out

@@ -243,6 +243,24 @@ run_cap_test ${lnav_test} -n \
 rm -rf ./sessions
 mkdir -p $HOME
 
+# tag filter-expr saved in session
+run_cap_test ${lnav_test} -nq \
+    -c ":goto 0" \
+    -c ":tag #bad" \
+    -c ":filter-expr not json_contains(:log_tags, '#bad')" \
+    -c ":save-session" \
+    ${test_dir}/logfile_access_log.0
+
+# tag filter-expr restored from session
+run_cap_test ${lnav_test} -n \
+    -c ":load-session" \
+    -c ";SELECT log_line, log_tags FROM access_log" \
+    -c ":write-csv-to -" \
+    ${test_dir}/logfile_access_log.0
+
+rm -rf ./sessions
+mkdir -p $HOME
+
 # sticky header saved in session for text file
 run_cap_test ${lnav_test} -n \
     -c ':goto 1' \

test/expected/test_sessions.sh_f3838c3a080fed8fdb4420f961feaa9cdec1263f.err

@@ -15,6 +15,8 @@ log,logfile_access_log.0,1
 log,logfile_access_log.1,1
 EOF
 
+touch -t 200711030923 ${test_dir}/logfile_access_log.0
+
 run_cap_test ${lnav_test} -n \
     -c ";SELECT view_name,basename(filepath),visible FROM lnav_view_files" \
     -c ":write-csv-to -" \