Archives
/
lnav
mirror of https://github.com/tstack/lnav
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[session] restore bookmarks for non-time-ordered formats

Browse Source 
The optimization to load bookmarks by a timestamp search
does not work for formats that are not time-ordered.
pull/1161/merge
Tim Stack 11 months ago
parent 3cc827d613
commit 73b2b28ec5
3 changed files with 109 additions and 87 deletions
Show Stats Download Patch File Download Diff File

180
src/session_data.cc
Unescape Escape View File

@ -459,6 +459,7 @@ load_time_bookmarks()
++file_iter)
{
auto lf = (*file_iter)->get_file();
const auto* format = lf->get_format_ptr();
content_line_t base_content_line;
if (lf == nullptr) {
@ -522,22 +523,29 @@ load_time_bookmarks()
continue;
}
if (!dts.scan(log_time,
strlen(log_time),
nullptr,
&log_tm,
log_tv))
if (dts.scan(log_time,
strlen(log_time),
nullptr,
&log_tm,
log_tv)
== nullptr)
{
log_warning("bad log time: %s", log_time);
continue;
}
auto line_iter
= std::lower_bound(lf->begin(), lf->end(), log_tv);
auto line_iter = format->lf_time_ordered
? std::lower_bound(lf->begin(), lf->end(), log_tv)
: lf->begin();
while (line_iter != lf->end()) {
struct timeval line_tv = line_iter->get_timeval();
const auto line_tv = line_iter->get_timeval();
if (line_tv != log_tv) {
break;
if (format->lf_time_ordered) {
break;
}
++line_iter;
continue;
}
auto cl = content_line_t(
@ -556,92 +564,90 @@ load_time_bookmarks()
.update(cl)
.to_string();
if (line_hash == log_hash) {
auto& bm_meta = lf->get_bookmark_metadata();
auto line_number = static_cast<uint32_t>(
std::distance(lf->begin(), line_iter));
content_line_t line_cl = content_line_t(
base_content_line + line_number);
bool meta = false;
if (part_name != nullptr && part_name[0] != '\0') {
lss.set_user_mark(&textview_curses::BM_META,
line_cl);
bm_meta[line_number].bm_name = part_name;
meta = true;
}
if (comment != nullptr && comment[0] != '\0') {
if (line_hash != log_hash) {
++line_iter;
continue;
}
auto& bm_meta = lf->get_bookmark_metadata();
auto line_number = static_cast<uint32_t>(
std::distance(lf->begin(), line_iter));
content_line_t line_cl
= content_line_t(base_content_line + line_number);
bool meta = false;
if (part_name != nullptr && part_name[0] != '\0') {
lss.set_user_mark(&textview_curses::BM_META,
line_cl);
bm_meta[line_number].bm_name = part_name;
meta = true;
}
if (comment != nullptr && comment[0] != '\0') {
lss.set_user_mark(&textview_curses::BM_META,
line_cl);
bm_meta[line_number].bm_comment = comment;
meta = true;
}
if (tags != nullptr && tags[0] != '\0') {
auto_mem<yajl_val_s> tag_list(yajl_tree_free);
char error_buffer[1024];
tag_list = yajl_tree_parse(
tags, error_buffer, sizeof(error_buffer));
if (!YAJL_IS_ARRAY(tag_list.in())) {
log_error("invalid tags column: %s", tags);
} else {
lss.set_user_mark(&textview_curses::BM_META,
line_cl);
bm_meta[line_number].bm_comment = comment;
meta = true;
}
if (tags != nullptr && tags[0] != '\0') {
auto_mem<yajl_val_s> tag_list(yajl_tree_free);
char error_buffer[1024];
tag_list = yajl_tree_parse(
tags, error_buffer, sizeof(error_buffer));
if (!YAJL_IS_ARRAY(tag_list.in())) {
log_error("invalid tags column: %s", tags);
} else {
lss.set_user_mark(&textview_curses::BM_META,
line_cl);
for (size_t lpc = 0;
lpc < tag_list.in()->u.array.len;
lpc++)
{
yajl_val elem
= tag_list.in()
->u.array.values[lpc];
if (!YAJL_IS_STRING(elem)) {
continue;
}
bookmark_metadata::KNOWN_TAGS.insert(
elem->u.string);
bm_meta[line_number].add_tag(
elem->u.string);
for (size_t lpc = 0;
lpc < tag_list.in()->u.array.len;
lpc++)
{
yajl_val elem
= tag_list.in()->u.array.values[lpc];
if (!YAJL_IS_STRING(elem)) {
continue;
}
}
meta = true;
}
if (annotations != nullptr
&& annotations[0] != '\0')
{
static const intern_string_t SRC
= intern_string::lookup("annotations");
const auto anno_sf
= string_fragment::from_c_str(annotations);
auto parse_res = logmsg_annotations_handlers
.parser_for(SRC)
.of(anno_sf);
if (parse_res.isErr()) {
log_error(
"unable to parse annotations JSON -- "
"%s",
parse_res.unwrapErr()[0]
.to_attr_line()
.get_string()
.c_str());
} else {
lss.set_user_mark(&textview_curses::BM_META,
line_cl);
bm_meta[line_number].bm_annotations
= parse_res.unwrap();
meta = true;
bookmark_metadata::KNOWN_TAGS.insert(
elem->u.string);
bm_meta[line_number].add_tag(
elem->u.string);
}
}
if (!meta) {
marked_session_lines.push_back(line_cl);
lss.set_user_mark(&textview_curses::BM_USER,
meta = true;
}
if (annotations != nullptr && annotations[0] != '\0') {
static const intern_string_t SRC
= intern_string::lookup("annotations");
const auto anno_sf
= string_fragment::from_c_str(annotations);
auto parse_res
= logmsg_annotations_handlers.parser_for(SRC)
.of(anno_sf);
if (parse_res.isErr()) {
log_error(
"unable to parse annotations JSON -- "
"%s",
parse_res.unwrapErr()[0]
.to_attr_line()
.get_string()
.c_str());
} else {
lss.set_user_mark(&textview_curses::BM_META,
line_cl);
bm_meta[line_number].bm_annotations
= parse_res.unwrap();
meta = true;
}
reload_needed = true;
}
++line_iter;
if (!meta) {
marked_session_lines.push_back(line_cl);
lss.set_user_mark(&textview_curses::BM_USER,
line_cl);
}
reload_needed = true;
break;
}
break;
}

4
test/expected/expected.am
Unescape Escape View File

@ -388,6 +388,8 @@ EXPECTED_FILES = \
$(srcdir)/%reldir%/test_meta.sh_48e85ba0c0945a5085fb4ee255771406061a9c17.out \
$(srcdir)/%reldir%/test_meta.sh_4c39b356748c67ccf8a6027a1af88da532f8252a.err \
$(srcdir)/%reldir%/test_meta.sh_4c39b356748c67ccf8a6027a1af88da532f8252a.out \
$(srcdir)/%reldir%/test_meta.sh_65325d1bcb58e530a8d681685fea56803f67a2eb.err \
$(srcdir)/%reldir%/test_meta.sh_65325d1bcb58e530a8d681685fea56803f67a2eb.out \
$(srcdir)/%reldir%/test_meta.sh_7b75763926d832bf9784ca234a060859770aabe7.err \
$(srcdir)/%reldir%/test_meta.sh_7b75763926d832bf9784ca234a060859770aabe7.out \
$(srcdir)/%reldir%/test_meta.sh_811b1a8a176b25001a89e35b295a1117ab76969b.err \
@ -404,6 +406,8 @@ EXPECTED_FILES = \
$(srcdir)/%reldir%/test_meta.sh_c8fb22932af2467a2651797a8a8d8cddcd09431d.out \
$(srcdir)/%reldir%/test_meta.sh_d6af0b41066ca3be0bbce89c83c011f4ecfa516e.err \
$(srcdir)/%reldir%/test_meta.sh_d6af0b41066ca3be0bbce89c83c011f4ecfa516e.out \
$(srcdir)/%reldir%/test_meta.sh_f7c55356df0d71c51eb7629c5a81f347083ce1ef.err \
$(srcdir)/%reldir%/test_meta.sh_f7c55356df0d71c51eb7629c5a81f347083ce1ef.out \
$(srcdir)/%reldir%/test_meta.sh_fd09cb565f44a114d8c9a519e571918e30262eaf.err \
$(srcdir)/%reldir%/test_meta.sh_fd09cb565f44a114d8c9a519e571918e30262eaf.out \
$(srcdir)/%reldir%/test_meta.sh_fdf4a91aa55262255816dff7d605f1f0a5d6fe92.err \

12
test/test_meta.sh
Unescape Escape View File

@ -110,6 +110,18 @@ run_cap_test ${lnav_test} -n -f- \
This is `markdown` now!
EOF
run_cap_test ${lnav_test} -n \
-c ":goto 46" \
-c ":tag bro-test" \
-c ":save-session" \
-c ";SELECT log_line, log_tags FROM bro_http_log WHERE log_tags IS NOT NULL" \
${test_dir}/logfile_bro_http.log.0
run_cap_test ${lnav_test} -n \
-c ":load-session" \
-c ";SELECT log_line, log_tags FROM bro_http_log WHERE log_tags IS NOT NULL" \
${test_dir}/logfile_bro_http.log.0
export TEST_ANNO=1
run_cap_test ${lnav_test} -d /tmp/lnav.err -I ${test_dir} -n \
-c ':annotate' \

Write Preview
Loading…
Cancel
Save