Skip to content

Commit bdae74f

Browse files
committed
[views_vtab] only pay attention to top_time if selection is the same
Related to #625
1 parent 6da2534 commit bdae74f

5 files changed

Lines changed: 21 additions & 3 deletions

src/views_vtab.cc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,9 @@ CREATE TABLE lnav_db.lnav_views (
610610
if (!tc.is_selectable()) {
611611
selection = top_row;
612612
}
613-
} else if (top_time != nullptr && time_source != nullptr) {
613+
} else if (top_time != nullptr && time_source != nullptr
614+
&& selection == tc.get_selection())
615+
{
614616
auto sel = tc.get_selection();
615617
date_time_scanner dts;
616618
timeval tv;
@@ -623,7 +625,6 @@ CREATE TABLE lnav_db.lnav_views (
623625

624626
if (last_ri_opt) {
625627
auto last_time = last_ri_opt->ri_time;
626-
last_time.tv_usec = rounddown(last_time.tv_usec, 1000);
627628
if (tv != last_time) {
628629
time_source->row_for_time(tv) |
629630
[&tc, &selection](auto row) {
@@ -744,7 +745,7 @@ CREATE TABLE lnav_db.lnav_views (
744745
auto wrap_words = vo.vo_word_wrap.value() == word_wrap_t::normal;
745746
tc.set_word_wrap(wrap_words);
746747
if (wrap_words) {
747-
left = 0; // reset horizontal scroll position
748+
left = 0; // reset horizontal scroll position
748749
}
749750
}
750751
if (vo.vo_hidden_fields) {

test/expected/Makefile.am

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1402,6 +1402,8 @@ dist_noinst_DATA = \
14021402
test_sql_views_vtab.sh_2180f813a15d33b5aa1f96a2625534c329d0df47.out \
14031403
test_sql_views_vtab.sh_28e23f4e98b1acd6478e39844fd9306b444550c3.err \
14041404
test_sql_views_vtab.sh_28e23f4e98b1acd6478e39844fd9306b444550c3.out \
1405+
test_sql_views_vtab.sh_2e9cf255d69c1bc29ead5db05a67d82c10adf60d.err \
1406+
test_sql_views_vtab.sh_2e9cf255d69c1bc29ead5db05a67d82c10adf60d.out \
14051407
test_sql_views_vtab.sh_32acc1a8bb5028636fdbf08f077f9a835ab51bec.err \
14061408
test_sql_views_vtab.sh_32acc1a8bb5028636fdbf08f077f9a835ab51bec.out \
14071409
test_sql_views_vtab.sh_362e2302a2ccec4438d822a909c04f810d6d86f6.err \

test/expected/test_sql_views_vtab.sh_2e9cf255d69c1bc29ead5db05a67d82c10adf60d.err

Whitespace-only changes.
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
bytes_read: 0
2+
duration: 0.000724
3+
2024-05-26T11:44:00.654197Z 10.10.10.132 "GET mirrors.tnonline.net:400/gentoo/gentoo-distfiles/distfiles/b6/libvirt-python-9.9.0.tar.gz HTTP/2.0" 200 246357 handled request
4+
request/headers/User-Agent#: Mozilla/5.0 AppleWebKit/537.36 (KHTML, like Gecko; compatible; bingbot/2.0; +http://www.bing.com/bingbot.htm) Chrome/116.0.1938.76 Safari/537.36
5+
bytes_read: 0
6+
duration: 0.024627
7+
2024-05-26T14:16:03.414651Z 240e:1:1::1234 "GET mirrors.tnonline.net/res/browse.css HTTP/3.0" 200 1577 handled request
8+
request/headers/User-Agent#: Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) HeadlessChrome/117.0.5938.60 Safari/537.36
9+
bytes_read: 0
10+
duration: 0.000276

test/test_sql_views_vtab.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ export TZ=UTC
44
export YES_COLOR=1
55
unset XDG_CONFIG_HOME
66

7+
run_cap_test ${lnav_test} -n \
8+
-c ";UPDATE lnav_top_view SET selection=6" \
9+
-c ";UPDATE lnav_top_view SET selection=6" \
10+
${test_dir}/logfile_caddy_log.1
11+
712
run_test ${lnav_test} -n \
813
-c ";SELECT view_name,basename(filepath),visible FROM lnav_view_files" \
914
-c ":write-csv-to -" \

0 commit comments

Comments
 (0)