[fs] check for file with hash before splitting

Related to #1553

Author: tstack

src/base/fs_util.cc

@@ -315,10 +315,8 @@ path_transcoder::to_shell_arg(std::string arg)
 std::pair<std::string, file_location_t>
 split_file_location(const std::string& file_path_str)
 {
-    auto hash_index = file_path_str.rfind('#');
-    if (hash_index != std::string::npos) {
-        return std::make_pair(file_path_str.substr(0, hash_index),
-                              file_path_str.substr(hash_index));
+    if (access(file_path_str.c_str(), R_OK) == 0) {
+        return {file_path_str, file_location_t{mapbox::util::no_init{}}};
     }
 
     auto colon_index = file_path_str.rfind(':');
@@ -336,6 +334,12 @@ split_file_location(const std::string& file_path_str)
                  file_path_str.c_str());
     }
 
+    auto hash_index = file_path_str.rfind('#');
+    if (hash_index != std::string::npos) {
+        return std::make_pair(file_path_str.substr(0, hash_index),
+                              file_path_str.substr(hash_index));
+    }
+
     return std::make_pair(file_path_str,
                           file_location_t{mapbox::util::no_init{}});
 }

src/logfile_sub_source.cc

@@ -1038,6 +1038,14 @@ logfile_sub_source::rebuild_index(std::optional<ui_clock::time_point> deadline)
         }
     }
 
+    if (!all_time_ordered_formats
+        && retval == rebuild_result::rr_partial_rebuild)
+    {
+        force = true;
+        full_sort = true;
+        retval = rebuild_result::rr_full_rebuild;
+    }
+
     if (this->lss_index.reserve(total_lines + est_remaining_lines)) {
         // The index array was reallocated, just do a full sort/rebuild since
         // it's been cleared out.

test/#with/bye.txt

@@ -0,0 +1 @@
+bye

test/#with/hw.txt

@@ -0,0 +1 @@
+hello

test/expected/Makefile.am

@@ -478,6 +478,8 @@ dist_noinst_DATA = \
     test_logfile.sh_ccb0d31813367c8d9dc5b5df383fac5b780711c1.out \
     test_logfile.sh_d14f6d8888652321206549df8a9535399f0fd372.err \
     test_logfile.sh_d14f6d8888652321206549df8a9535399f0fd372.out \
+    test_logfile.sh_d6a1bccd9d5e7cfe2c3a76552d99b66e78d09fc9.err \
+    test_logfile.sh_d6a1bccd9d5e7cfe2c3a76552d99b66e78d09fc9.out \
     test_logfile.sh_de8d59879fe6aa5a012b0748ff77ae26c07aea89.err \
     test_logfile.sh_de8d59879fe6aa5a012b0748ff77ae26c07aea89.out \
     test_logfile.sh_e333be9b8e7322b0e5e09b1e49e11eca8c468dee.err \

test/expected/test_logfile.sh_d6a1bccd9d5e7cfe2c3a76552d99b66e78d09fc9.err

@@ -0,0 +1 @@
+bye

test/expected/test_logfile.sh_d6a1bccd9d5e7cfe2c3a76552d99b66e78d09fc9.out

@@ -778,3 +778,5 @@ run_cap_test ${lnav_test} -n ${test_dir}/logfile_logfmt.0
 run_cap_test ${lnav_test} -n ${test_dir}/logfile_laravel.0
 
 run_cap_test ${lnav_test} -n ${test_dir}/logfile_laravel.1
+
+run_cap_test ${lnav_test} -n ${test_dir}/\#with