[tests] fix index test

2 years ago · 7db3c7d3cf
parent 36e9433891
commit 7db3c7d3cf
28 changed files with 80 additions and 62 deletions
--- a/src/base/auto_mem.hh
+++ b/src/base/auto_mem.hh
@ -34,6 +34,7 @@

 #include <exception>

+#include <assert.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
--- a/test/expected/expected.am
+++ b/test/expected/expected.am
@ -326,6 +326,58 @@ EXPECTED_FILES = \
    $(srcdir)/%reldir%/test_pretty_print.sh_a6d9042e5e95f2a49194bd80c1eed154813ddf41.out \
    $(srcdir)/%reldir%/test_pretty_print.sh_cd361eeca7e91bfab942b75d6c3422c7a456a111.err \
    $(srcdir)/%reldir%/test_pretty_print.sh_cd361eeca7e91bfab942b75d6c3422c7a456a111.out \
+    $(srcdir)/%reldir%/test_regex101.sh_0fa3663a45aca6a328cb728872af7ed7ee896f1c.err \
+    $(srcdir)/%reldir%/test_regex101.sh_0fa3663a45aca6a328cb728872af7ed7ee896f1c.out \
+    $(srcdir)/%reldir%/test_regex101.sh_182ae9244db314a953af2bee969726e381bc5a32.err \
+    $(srcdir)/%reldir%/test_regex101.sh_182ae9244db314a953af2bee969726e381bc5a32.out \
+    $(srcdir)/%reldir%/test_regex101.sh_2158f1f011ba8e1b152396c072790c076fdb8ce8.err \
+    $(srcdir)/%reldir%/test_regex101.sh_2158f1f011ba8e1b152396c072790c076fdb8ce8.out \
+    $(srcdir)/%reldir%/test_regex101.sh_281af24141680330791db7f7c5fa70833ce08a6b.err \
+    $(srcdir)/%reldir%/test_regex101.sh_281af24141680330791db7f7c5fa70833ce08a6b.out \
+    $(srcdir)/%reldir%/test_regex101.sh_35703b13990785632cca82123fb3883797959c0b.err \
+    $(srcdir)/%reldir%/test_regex101.sh_35703b13990785632cca82123fb3883797959c0b.out \
+    $(srcdir)/%reldir%/test_regex101.sh_366730cac50b4a09b7de4b84641791470b1cb9a3.err \
+    $(srcdir)/%reldir%/test_regex101.sh_366730cac50b4a09b7de4b84641791470b1cb9a3.out \
+    $(srcdir)/%reldir%/test_regex101.sh_3d18474a3e472fff6e23e0c41337ec9188fee591.err \
+    $(srcdir)/%reldir%/test_regex101.sh_3d18474a3e472fff6e23e0c41337ec9188fee591.out \
+    $(srcdir)/%reldir%/test_regex101.sh_442cc58676590a3604d5c2183f5fe0a75c98351a.err \
+    $(srcdir)/%reldir%/test_regex101.sh_442cc58676590a3604d5c2183f5fe0a75c98351a.out \
+    $(srcdir)/%reldir%/test_regex101.sh_566fd88d216a44bc1c6e23f2d6f2d0caf99d42f9.err \
+    $(srcdir)/%reldir%/test_regex101.sh_566fd88d216a44bc1c6e23f2d6f2d0caf99d42f9.out \
+    $(srcdir)/%reldir%/test_regex101.sh_5f2f7ecb6ab9cbec4b41385b91bd038906b8a7b2.err \
+    $(srcdir)/%reldir%/test_regex101.sh_5f2f7ecb6ab9cbec4b41385b91bd038906b8a7b2.out \
+    $(srcdir)/%reldir%/test_regex101.sh_629bde30483e0a6461076e9058f3a5eb81ae0425.err \
+    $(srcdir)/%reldir%/test_regex101.sh_629bde30483e0a6461076e9058f3a5eb81ae0425.out \
+    $(srcdir)/%reldir%/test_regex101.sh_630db454054cf92ec9bd0f4e3e83300047f583ff.err \
+    $(srcdir)/%reldir%/test_regex101.sh_630db454054cf92ec9bd0f4e3e83300047f583ff.out \
+    $(srcdir)/%reldir%/test_regex101.sh_771af6f3d29b8350542d5c6e98bdbf4c223cd531.err \
+    $(srcdir)/%reldir%/test_regex101.sh_771af6f3d29b8350542d5c6e98bdbf4c223cd531.out \
+    $(srcdir)/%reldir%/test_regex101.sh_7991a5b617867cf37c9f7baa85ffa425f7d455a2.err \
+    $(srcdir)/%reldir%/test_regex101.sh_7991a5b617867cf37c9f7baa85ffa425f7d455a2.out \
+    $(srcdir)/%reldir%/test_regex101.sh_79ee3f5fe71ccec97b2619d8c1f74ca97ffd2243.err \
+    $(srcdir)/%reldir%/test_regex101.sh_79ee3f5fe71ccec97b2619d8c1f74ca97ffd2243.out \
+    $(srcdir)/%reldir%/test_regex101.sh_7de76c174c58d67bf93e8f01d6d55ebb6a023f10.err \
+    $(srcdir)/%reldir%/test_regex101.sh_7de76c174c58d67bf93e8f01d6d55ebb6a023f10.out \
+    $(srcdir)/%reldir%/test_regex101.sh_8a43e6657d4f60e68d31eb8302542ca28e80d077.err \
+    $(srcdir)/%reldir%/test_regex101.sh_8a43e6657d4f60e68d31eb8302542ca28e80d077.out \
+    $(srcdir)/%reldir%/test_regex101.sh_8e93a3b6b941847c71409a297779fbb0a6666a51.err \
+    $(srcdir)/%reldir%/test_regex101.sh_8e93a3b6b941847c71409a297779fbb0a6666a51.out \
+    $(srcdir)/%reldir%/test_regex101.sh_95c56a9d146ec9a7c2196559d316f928b2ae6ae9.err \
+    $(srcdir)/%reldir%/test_regex101.sh_95c56a9d146ec9a7c2196559d316f928b2ae6ae9.out \
+    $(srcdir)/%reldir%/test_regex101.sh_9d101ee29c45cdb8c0f117ad736c9a5dd5da5839.err \
+    $(srcdir)/%reldir%/test_regex101.sh_9d101ee29c45cdb8c0f117ad736c9a5dd5da5839.out \
+    $(srcdir)/%reldir%/test_regex101.sh_c43e07df9b3068696fdc8759c7561135db981b38.err \
+    $(srcdir)/%reldir%/test_regex101.sh_c43e07df9b3068696fdc8759c7561135db981b38.out \
+    $(srcdir)/%reldir%/test_regex101.sh_cbd859487e4ea011cd6e0f0f114d70158bfd8b43.err \
+    $(srcdir)/%reldir%/test_regex101.sh_cbd859487e4ea011cd6e0f0f114d70158bfd8b43.out \
+    $(srcdir)/%reldir%/test_regex101.sh_cf6c0a9f0f04e24ce1fae7a0a434830b14447f83.err \
+    $(srcdir)/%reldir%/test_regex101.sh_cf6c0a9f0f04e24ce1fae7a0a434830b14447f83.out \
+    $(srcdir)/%reldir%/test_regex101.sh_d84597760285c3964b258726341e018f6cd49954.err \
+    $(srcdir)/%reldir%/test_regex101.sh_d84597760285c3964b258726341e018f6cd49954.out \
+    $(srcdir)/%reldir%/test_regex101.sh_f23e393dbf23d0d8e276e9b7610c7b74d79980f8.err \
+    $(srcdir)/%reldir%/test_regex101.sh_f23e393dbf23d0d8e276e9b7610c7b74d79980f8.out \
+    $(srcdir)/%reldir%/test_regex101.sh_fc41b6ee90cbf038620151f16d164b361acf82dd.err \
+    $(srcdir)/%reldir%/test_regex101.sh_fc41b6ee90cbf038620151f16d164b361acf82dd.out \
    $(srcdir)/%reldir%/test_sessions.sh_0300a1391c33b1c45ddfa90198a6bd0a5404a77f.err \
    $(srcdir)/%reldir%/test_sessions.sh_0300a1391c33b1c45ddfa90198a6bd0a5404a77f.out \
    $(srcdir)/%reldir%/test_sessions.sh_17b85654b929b2a8fc1705a170ced544783292fa.err \
@ -504,8 +556,6 @@ EXPECTED_FILES = \
    $(srcdir)/%reldir%/test_sql.sh_f8340cb4c62aabd839ea09235b6ebe41b2bb48f4.out \
    $(srcdir)/%reldir%/test_sql_anno.sh_028d5d5af2f3519b59d349d41cb7ecf385253b51.err \
    $(srcdir)/%reldir%/test_sql_anno.sh_028d5d5af2f3519b59d349d41cb7ecf385253b51.out \
-    $(srcdir)/%reldir%/test_sql_anno.sh_08f137b4b2e1dcc15efa8c0164a13e5db4e8856b.err \
-    $(srcdir)/%reldir%/test_sql_anno.sh_08f137b4b2e1dcc15efa8c0164a13e5db4e8856b.out \
    $(srcdir)/%reldir%/test_sql_anno.sh_0a37c43350ddd7a2d0d75695be32fac083ad04a4.err \
    $(srcdir)/%reldir%/test_sql_anno.sh_0a37c43350ddd7a2d0d75695be32fac083ad04a4.out \
    $(srcdir)/%reldir%/test_sql_anno.sh_1151e5b727f6b57070bf2c8f047f1d7e02b803a6.err \
@ -608,10 +658,10 @@ EXPECTED_FILES = \
    $(srcdir)/%reldir%/test_sql_fs_func.sh_e24cf3f35643f945392e7d7a4ca82fea98b4519e.out \
    $(srcdir)/%reldir%/test_sql_fs_func.sh_f31f240313ddec806aa6f353ceed707dfd9aaf16.err \
    $(srcdir)/%reldir%/test_sql_fs_func.sh_f31f240313ddec806aa6f353ceed707dfd9aaf16.out \
-    $(srcdir)/%reldir%/test_sql_indexes.sh_52a024607c9339423b749ac1a2eb3e49fe9776e5.err \
-    $(srcdir)/%reldir%/test_sql_indexes.sh_52a024607c9339423b749ac1a2eb3e49fe9776e5.out \
-    $(srcdir)/%reldir%/test_sql_indexes.sh_5815cff21c4a1b7c4a976b5574eb930b2605cd2f.err \
-    $(srcdir)/%reldir%/test_sql_indexes.sh_5815cff21c4a1b7c4a976b5574eb930b2605cd2f.out \
+    $(srcdir)/%reldir%/test_sql_indexes.sh_541a8e35f34a206e340a3880128b6ce137847872.err \
+    $(srcdir)/%reldir%/test_sql_indexes.sh_541a8e35f34a206e340a3880128b6ce137847872.out \
+    $(srcdir)/%reldir%/test_sql_indexes.sh_dab07d8de7728752ae938a174468d75e85f3ae7e.err \
+    $(srcdir)/%reldir%/test_sql_indexes.sh_dab07d8de7728752ae938a174468d75e85f3ae7e.out \
    $(srcdir)/%reldir%/test_sql_json_func.sh_017d24148f3e28f719429b709f4aa5478f458443.err \
    $(srcdir)/%reldir%/test_sql_json_func.sh_017d24148f3e28f719429b709f4aa5478f458443.out \
    $(srcdir)/%reldir%/test_sql_json_func.sh_191436b38db80b1dd9e7e0814c31c5fa7239dc51.err \
--- a/test/expected/test_cmds.sh_1ffb06d63469f0e6dae94af026f77d5b255386c2.out
+++ b/test/expected/test_cmds.sh_1ffb06d63469f0e6dae94af026f77d5b255386c2.out
@ -1,3 +0,0 @@
-192.168.202.254 - - [20/Jul/2009:22:59:26 +0000] "GET /vmw/cgi/tramp HTTP/1.0" 200 134 "-" "gPXE/0.9.7"
-[31m192.168.202.254[0m[31m - [0m[31m-[0m[31m [[0m[31m20/Jul/2009:22:59:29 +0000[0m[31m] "[0m[31mGET[0m[31m [0m[31m/vmw/vSphere/default/vmkboot.gz[0m[31m [0m[31mHTTP/1.0[0m[31m" 404 46210 "[0m[31m-[0m[31m" "[0m[31mgPXE/0.9.7[0m[31m"[0m
-192.168.202.254 - - [20/Jul/2009:22:59:29 +0000] "GET /vmw/vSphere/default/vmkernel.gz HTTP/1.0" 200 78929 "-" "gPXE/0.9.7"
--- a/test/expected/test_cmds.sh_63e1925e9d7aadcdaa54a35a29711d7ecaad8d27.out
+++ b/test/expected/test_cmds.sh_63e1925e9d7aadcdaa54a35a29711d7ecaad8d27.out
@ -1,3 +0,0 @@
-192.168.202.254 - - [20/Jul/2009:22:59:26 +0000] "GET /vmw/cgi/tramp HTTP/1.0" 200 134 "-" "gPXE/0.9.7"
-[31m192.168.202.254[0m[31m - [0m[31m-[0m[31m [[0m[31m20/Jul/2009:22:59:29 +0000[0m[31m] "[0m[31mGET[0m[31m [0m[31m/vmw/vSphere/default/vmkboot.gz[0m[31m [0m[31mHTTP/1.0[0m[31m" 404 46210 "[0m[31m-[0m[31m" "[0m[31mgPXE/0.9.7[0m[31m"[0m
-192.168.202.254 - - [20/Jul/2009:22:59:29 +0000] "GET /vmw/vSphere/default/vmkernel.gz HTTP/1.0" 200 78929 "-" "gPXE/0.9.7"
--- a/test/expected/test_regex101.sh_0fa3663a45aca6a328cb728872af7ed7ee896f1c.err
+++ b/test/expected/test_regex101.sh_0fa3663a45aca6a328cb728872af7ed7ee896f1c.err
@ -1,2 +1,2 @@
 [31m✘ error[0m: regex “[1mstd[0m” of format “[1msyslog_log[0m” has not been pushed to regex101.com
-[36m =[0m [36mhelp[0m: use the “[1m[34mpush[0m” subcommand to create the regex on regex101.com for easy editing
+[36m =[0m [36mhelp[0m: use the “[1m[36mpush[0m” subcommand to create the regex on regex101.com for easy editing
--- a/test/expected/test_regex101.sh_7991a5b617867cf37c9f7baa85ffa425f7d455a2.err
+++ b/test/expected/test_regex101.sh_7991a5b617867cf37c9f7baa85ffa425f7d455a2.err
@ -1,5 +1,5 @@
 [31m✘ error[0m: expecting an operation to perform on the [1mstd[0m regex using regex101.com
 [36m =[0m [36mhelp[0m: the available subcommands are:
-          • [1m[34mpush[0m: create/update an entry for this regex on regex101.com
-          • [1m[34mpull[0m: create a patch format file for this regular expression based on the entry in regex101.com
-          • [1m[34mdelete[0m: delete the entry regex101.com that was created by a push operation
+          • [1m[36mpush[0m: create/update an entry for this regex on regex101.com
+          • [1m[36mpull[0m: create a patch format file for this regular expression based on the entry in regex101.com
+          • [1m[36mdelete[0m: delete the entry regex101.com that was created by a push operation
--- a/test/expected/test_regex101.sh_8e93a3b6b941847c71409a297779fbb0a6666a51.err
+++ b/test/expected/test_regex101.sh_8e93a3b6b941847c71409a297779fbb0a6666a51.err
@ -1,3 +1,3 @@
 [31m✘ error[0m: expecting an operation to perform on the [1mstd[0m regular expression
 [36m =[0m [36mhelp[0m: the available subcommands are:
-          • [1m[34mregex101[0m: use regex101.com to edit this regular expression
+          • [1m[36mregex101[0m: use regex101.com to edit this regular expression
--- a/test/expected/test_regex101.sh_95c56a9d146ec9a7c2196559d316f928b2ae6ae9.err
+++ b/test/expected/test_regex101.sh_95c56a9d146ec9a7c2196559d316f928b2ae6ae9.err
@ -1,4 +1,4 @@
 [31m✘ error[0m: unable to import: [1mabc[0m
 [31mreason[0m: expecting a format name that matches the regular expression “^\w+$”
 [36m =[0m [36mnote[0m:    “def-jkl”
-                [36m^ matched up to here[0m
+                [32m^ matched up to here[0m
--- a/test/expected/test_regex101.sh_d84597760285c3964b258726341e018f6cd49954.err
+++ b/test/expected/test_regex101.sh_d84597760285c3964b258726341e018f6cd49954.err
@ -2,6 +2,6 @@
 [36m =[0m [36mnote[0m: this regex is currently associated with the following regex101.com entry:
            [1mhttps://regex101.com/r/zpEnjV[0m
 [36m =[0m [36mhelp[0m: the available subcommands are:
-          • [1m[34mpush[0m: create/update an entry for this regex on regex101.com
-          • [1m[34mpull[0m: create a patch format file for this regular expression based on the entry in regex101.com
-          • [1m[34mdelete[0m: delete the entry regex101.com that was created by a push operation
+          • [1m[36mpush[0m: create/update an entry for this regex on regex101.com
+          • [1m[36mpull[0m: create a patch format file for this regular expression based on the entry in regex101.com
+          • [1m[36mdelete[0m: delete the entry regex101.com that was created by a push operation
--- a/test/expected/test_sql.sh_1ed6e8b3194bf16477cce9542fe1d9750560cbd1.err
+++ b/test/expected/test_sql.sh_1ed6e8b3194bf16477cce9542fe1d9750560cbd1.err
--- a/test/expected/test_sql.sh_1ed6e8b3194bf16477cce9542fe1d9750560cbd1.out
+++ b/test/expected/test_sql.sh_1ed6e8b3194bf16477cce9542fe1d9750560cbd1.out
@ -1,3 +0,0 @@
-Min: 0                  [42m  [0m 1-23 [43m  [0m 24-48 [41m  [0m 49+                   Max: 291,690
-[41m [0m[43mW[0m[42me[0m[42md[0m[42m [0m[42mN[0mo[42mv[0m[42m [0m[42m0[0m[42m2[0m[42m [0m[42m1[0m[42m7[0m[42m:[0m1[42m5[0m[42m:[0m00[42m [0m  [42m [0m[42m [0m [42m [0m[42m [0m [42m [0m                [42m [0m                       [42m [0m      [42m [0m
-[43m [0m[42mW[0m[42me[0m[42md[0m[42m [0m[42mN[0m[42mo[0mv[42m [0m02 [42m1[0m[42m7[0m:2[42m0[0m:00                                                          
--- a/test/expected/test_sql.sh_1fb2a7366f0f271643e0ee30d76e03b643ff7dce.err
+++ b/test/expected/test_sql.sh_1fb2a7366f0f271643e0ee30d76e03b643ff7dce.err
--- a/test/expected/test_sql.sh_1fb2a7366f0f271643e0ee30d76e03b643ff7dce.out
+++ b/test/expected/test_sql.sh_1fb2a7366f0f271643e0ee30d76e03b643ff7dce.out
@ -1,2 +0,0 @@
-[1mlog_msg_instance [0m[1m  col_0   [0m
-[1m               1[0m[1m [0m[1meth0.IPv4 [0m
--- a/test/expected/test_sql.sh_264a70cabc0609e47d9e39b23376321c9aec6e23.err
+++ b/test/expected/test_sql.sh_264a70cabc0609e47d9e39b23376321c9aec6e23.err
--- a/test/expected/test_sql.sh_264a70cabc0609e47d9e39b23376321c9aec6e23.out
+++ b/test/expected/test_sql.sh_264a70cabc0609e47d9e39b23376321c9aec6e23.out
@ -1,3 +0,0 @@
-Min: 0                  [42m  [0m 1-23 [43m  [0m 24-48 [41m  [0m 49+                   Max: 291,690
-[41m [0m[43mT[0m[42mh[0m[42mu[0m[42m [0m[42mN[0mo[42mv[0m[42m [0m[42m0[0m[42m3[0m[42m [0m[42m0[0m[42m0[0m[42m:[0m1[42m5[0m[42m:[0m00[42m [0m  [42m [0m[42m [0m [42m [0m[42m [0m [42m [0m                [42m [0m                       [42m [0m      [42m [0m
-[43m [0m[42mT[0m[42mh[0m[42mu[0m[42m [0m[42mN[0m[42mo[0mv[42m [0m03 [42m0[0m[42m0[0m:2[42m0[0m:00                                                          
--- a/test/expected/test_sql.sh_3f6b92e7948d40b9d2df06112f30ce899bb0d7f5.err
+++ b/test/expected/test_sql.sh_3f6b92e7948d40b9d2df06112f30ce899bb0d7f5.err
--- a/test/expected/test_sql.sh_3f6b92e7948d40b9d2df06112f30ce899bb0d7f5.out
+++ b/test/expected/test_sql.sh_3f6b92e7948d40b9d2df06112f30ce899bb0d7f5.out
@ -1,3 +0,0 @@
-[1mlog_line [0m[1mlog_msg_instance [0m[1m  col_0   [0m
-[1m       0[0m[1m [0m[1m               0[0m[1m [0m[1meth0.IPv4 [0m
-       7                1 eth0.IPv4 
--- a/test/expected/test_sql_anno.sh_08f137b4b2e1dcc15efa8c0164a13e5db4e8856b.err
+++ b/test/expected/test_sql_anno.sh_08f137b4b2e1dcc15efa8c0164a13e5db4e8856b.err
--- a/test/expected/test_sql_anno.sh_08f137b4b2e1dcc15efa8c0164a13e5db4e8856b.out
+++ b/test/expected/test_sql_anno.sh_08f137b4b2e1dcc15efa8c0164a13e5db4e8856b.out
@ -1,11 +0,0 @@
-                 SELECT * from vmw_log, regexp_capture(log_body, '--> /SessionStats/SessionPool/Session/(?<line>[^\n]+)')
-     sql_keyword ------
-        sql_oper        -
-     sql_keyword          ----
-       sql_ident               -------
-       sql_comma                      -
-       sql_ident                        --------------
-        sql_func                        --------------------------------------------------------------------------------
-       sql_ident                                       --------
-       sql_comma                                               -
-      sql_string                                                 -------------------------------------------------------
--- a/test/expected/test_sql_indexes.sh_52a024607c9339423b749ac1a2eb3e49fe9776e5.err
+++ b/test/expected/test_sql_indexes.sh_52a024607c9339423b749ac1a2eb3e49fe9776e5.err
--- a/test/expected/test_sql_indexes.sh_52a024607c9339423b749ac1a2eb3e49fe9776e5.out
+++ b/test/expected/test_sql_indexes.sh_52a024607c9339423b749ac1a2eb3e49fe9776e5.out
@ -1,2 +0,0 @@
-[1m[7mid [0m[1m[7mparent [0m[1m[7mnotused [0m[1m                                   detail                                     [0m
-[1m[7m 2[0m[1m[7m [0m[1m[7m     0[0m[1m[7m [0m[1m[7m      0[0m[1m[7m [0m[1m[7mSCAN syslog_log VIRTUAL TABLE INDEX 1:SEARCH syslog_log USING log_path GLOB[0m[1m ? [0m
--- a/test/expected/test_sql_indexes.sh_541a8e35f34a206e340a3880128b6ce137847872.err
+++ b/test/expected/test_sql_indexes.sh_541a8e35f34a206e340a3880128b6ce137847872.err
--- a/test/expected/test_sql_indexes.sh_541a8e35f34a206e340a3880128b6ce137847872.out
+++ b/test/expected/test_sql_indexes.sh_541a8e35f34a206e340a3880128b6ce137847872.out
@ -0,0 +1,5 @@
+[1mlog_line [0m[1mlog_part [0m[1m       log_time         [0m[1m[7mlog_idle_msecs [0m[1mlog_level [0m[1mlog_mark [0m[1mlog_comment [0m[1mlog_tags [0m[1mlog_filters [0m[1m     c_ip       [0m[1mcs_method [0m[1mcs_referer [0m[1mcs_uri_query [0m[1m          cs_uri_stem            [0m[1mcs_user_agent [0m[1mcs_username [0m[1mcs_version [0m[1m[7msc_bytes [0m[1msc_status [0m[1mcs_host [0m[1m  log_unique_path    [0m
+[1m[7m [0m[1m      0[0m[1m [0m[1m  <[0m[1mNULL[0m[1m>[0m[1m [0m[1m2009-07-20 22:59:26.000[0m[1m [0m[1m             0[0m[1m [0m[1minfo     [0m[1m [0m[1m       0[0m[1m [0m[1m     <[0m[1mNULL[0m[1m>[0m[1m [0m[1m  <[0m[1mNULL[0m[1m>[0m[1m [0m[1m     <[0m[1mNULL[0m[1m>[0m[1m [0m[1m192.168.202.254[0m[1m [0m[1mGET      [0m[1m [0m[1m-         [0m[1m [0m[1m      <[0m[1mNULL[0m[1m>[0m[1m [0m[1m/vmw/cgi/tramp                  [0m[1m [0m[1mgPXE/0.9.7   [0m[1m [0m[1m-          [0m[1m [0m[1mHTTP/1.0  [0m[1m [0m[1m     134[0m[1m [0m[1m      200[0m[1m [0m[1m <[0m[1mNULL[0m[1m>[0m[1m [0m[1mlogfile_access_log.0 [0m
+[7m [0m[7m [0m     1   <NULL> 2009-07-20 22:59:29.000           3000 error            0      <NULL>   <NULL>      <NULL> 192.168.202.254 GET       -                <NULL> /vmw/vSphere/default/vmkboot.gz  gPXE/0.9.7    -           HTTP/1.0      46210       404  <NULL> logfile_access_log.0 
+[1m[7m [0m[1m      2[0m[1m [0m[1m  <[0m[1mNULL[0m[1m>[0m[1m [0m[1m2009-07-20 22:59:29.000[0m[1m [0m[1m             0[0m[1m [0m[1minfo     [0m[1m [0m[1m       0[0m[1m [0m[1m     <[0m[1mNULL[0m[1m>[0m[1m [0m[1m  <[0m[1mNULL[0m[1m>[0m[1m [0m[1m     <[0m[1mNULL[0m[1m>[0m[1m [0m[1m192.168.202.254[0m[1m [0m[1mGET      [0m[1m [0m[1m-         [0m[1m [0m[1m      <[0m[1mNULL[0m[1m>[0m[1m [0m[1m/vmw/vSphere/default/vmkernel.gz[0m[1m [0m[1mgPXE/0.9.7   [0m[1m [0m[1m-          [0m[1m [0m[1mHTTP/1.0  [0m[1m [0m[1m   78929[0m[1m [0m[1m      200[0m[1m [0m[1m <[0m[1mNULL[0m[1m>[0m[1m [0m[1mlogfile_access_log.0 [0m
+[7m       3[0m[7m [0m[7m  <[0m[7mNULL[0m[7m>[0m[7m [0m[7m2013-02-15 06:00:31.000[0m[7m [0m[7m  112777262000[0m[7m [0m[7merror    [0m[7m [0m[7m       0[0m[7m [0m[7m     <[0m[7mNULL[0m[7m>[0m[7m [0m[7m  <[0m[7mNULL[0m[7m>[0m[7m [0m[7m     <[0m[7mNULL[0m[7m>[0m[7m [0m[7m10.112.81.15[0m[7m   [0m[7m [0m[7m<[0m[7mNULL[0m[7m>   [0m[7m [0m[7m-         [0m[7m [0m[7m      <[0m[7mNULL[0m[7m>[0m[7m [0m[7m<[0m[7mNULL[0m[7m>                          [0m[7m [0m[7m-            [0m[7m [0m[7m-          [0m[7m [0m[7m<[0m[7mNULL[0m[7m>    [0m[7m [0m[7m       0[0m[7m [0m[7m      400[0m[7m [0m[7m <[0m[7mNULL[0m[7m>[0m[7m [0m[7mlogfile_access_log.[0m1 
--- a/test/expected/test_sql_indexes.sh_5815cff21c4a1b7c4a976b5574eb930b2605cd2f.err
+++ b/test/expected/test_sql_indexes.sh_5815cff21c4a1b7c4a976b5574eb930b2605cd2f.err
--- a/test/expected/test_sql_indexes.sh_5815cff21c4a1b7c4a976b5574eb930b2605cd2f.out
+++ b/test/expected/test_sql_indexes.sh_5815cff21c4a1b7c4a976b5574eb930b2605cd2f.out
@ -1,12 +0,0 @@
-[1mlog_line [0m[1mlog_part [0m[1m       log_time         [0m[1m[7mlog_idle_msecs [0m[1mlog_level [0m[1mlog_mark [0m[1mlog_comment [0m[1mlog_tags [0m[1mlog_filters [0m[1mlog_hostname [0m[1mlog_msgid [0m[1mlog_pid [0m[1mlog_pri [0m[1mlog_procname [0m[1mlog_struct [0m[1m log_syslog_tag  [0m[1msyslog_version [0m
-[1m       0[0m[1m [0m[1m  <[0m[1mNULL[0m[1m>[0m[1m [0m[1m2006-12-03 09:23:38.000[0m[1m [0m[1m             0[0m[1m [0m[1merror    [0m[1m [0m[1m       0[0m[1m [0m[1m     <[0m[1mNULL[0m[1m>[0m[1m [0m[1m  <[0m[1mNULL[0m[1m>[0m[1m [0m[1m     <[0m[1mNULL[0m[1m>[0m[1m [0m[1mveridian    [0m[1m [0m[1m   <[0m[1mNULL[0m[1m>[0m[1m [0m[1m7998   [0m[1m [0m[1m <[0m[1mNULL[0m[1m>[0m[1m [0m[1mautomount   [0m[1m [0m[1m    <[0m[1mNULL[0m[1m>[0m[1m [0m[1mautomount[7998] [0m[1m [0m[1m        <[0m[1mNULL[0m[1m> [0m
-       1   <NULL> 2006-12-03 09:23:38.000              0 info             0      <NULL>   <NULL>      <NULL> veridian        <NULL> 16442    <NULL> automount        <NULL> automount[16442]         <NULL> 
-[1m       2[0m[1m [0m[1m  <[0m[1mNULL[0m[1m>[0m[1m [0m[1m2006-12-03 09:23:38.000[0m[1m [0m[1m             0[0m[1m [0m[1merror    [0m[1m [0m[1m       0[0m[1m [0m[1m     <[0m[1mNULL[0m[1m>[0m[1m [0m[1m  <[0m[1mNULL[0m[1m>[0m[1m [0m[1m     <[0m[1mNULL[0m[1m>[0m[1m [0m[1mveridian    [0m[1m [0m[1m   <[0m[1mNULL[0m[1m>[0m[1m [0m[1m7999   [0m[1m [0m[1m <[0m[1mNULL[0m[1m>[0m[1m [0m[1mautomount   [0m[1m [0m[1m    <[0m[1mNULL[0m[1m>[0m[1m [0m[1mautomount[7999] [0m[1m [0m[1m        <[0m[1mNULL[0m[1m> [0m
-[7m [0m      3   <NULL> 2007-01-03 09:47:02.000     2679804000 info             0      <NULL>   <NULL>      <NULL> veridian        <NULL> <NULL>   <NULL> sudo             <NULL> sudo                     <NULL> 
-[1m[7m       4[0m[1m[7m [0m[1m[7m  <[0m[1mNULL[0m[1m>[0m[1m [0m[1m2007-11-03 09:23:38.000[0m[1m [0m[1m   26264196000[0m[1m [0m[1merror    [0m[1m [0m[1m       0[0m[1m [0m[1m     <[0m[1mNULL[0m[1m>[0m[1m [0m[1m  <[0m[1mNULL[0m[1m>[0m[1m [0m[1m     <[0m[1mNULL[0m[1m>[0m[1m [0m[1mveridian    [0m[1m [0m[1m   <[0m[1mNULL[0m[1m>[0m[1m [0m[1m7998   [0m[1m [0m[1m <[0m[1mNULL[0m[1m>[0m[1m [0m[1mautomount   [0m[1m [0m[1m    <[0m[1mNULL[0m[1m>[0m[1m [0m[1mautomount[7998] [0m[1m [0m[1m        <[0m[1mNULL[0m[1m> [0m
-       5   <NULL> 2007-11-03 09:23:38.000              0 info             0      <NULL>   <NULL>      <NULL> veridian        <NULL> 16442    <NULL> automount        <NULL> automount[16442]         <NULL> 
-[1m       6[0m[1m [0m[1m  <[0m[1mNULL[0m[1m>[0m[1m [0m[1m2007-11-03 09:23:38.000[0m[1m [0m[1m             0[0m[1m [0m[1merror    [0m[1m [0m[1m       0[0m[1m [0m[1m     <[0m[1mNULL[0m[1m>[0m[1m [0m[1m  <[0m[1mNULL[0m[1m>[0m[1m [0m[1m     <[0m[1mNULL[0m[1m>[0m[1m [0m[1mveridian    [0m[1m [0m[1m   <[0m[1mNULL[0m[1m>[0m[1m [0m[1m7999   [0m[1m [0m[1m <[0m[1mNULL[0m[1m>[0m[1m [0m[1mautomount   [0m[1m [0m[1m    <[0m[1mNULL[0m[1m>[0m[1m [0m[1mautomount[7999] [0m[1m [0m[1m        <[0m[1mNULL[0m[1m> [0m
-[7m [0m      7   <NULL> 2007-11-03 09:47:02.000        1404000 info             0      <NULL>   <NULL>      <NULL> veridian        <NULL> <NULL>   <NULL> sudo             <NULL> sudo                     <NULL> 
-[1m[7m       8[0m[1m[7m [0m[1m[7m  <[0m[1m[7mNULL[0m[1m[7m>[0m[1m[7m [0m[1m[7m2021-11-03 09:23:38.000[0m[1m[7m [0m[1m[7m  441848196000[0m[1m[7m [0m[1m[7minfo     [0m[1m[7m [0m[1m[7m       0[0m[1m[7m [0m[1m[7m     <[0m[1m[7mNULL[0m[1m[7m>[0m[1m[7m [0m[1m[7m  <[0m[1m[7mNULL[0m[1m[7m>[0m[1m[7m [0m[1m[7m     <[0m[1m[7mNULL[0m[1m[7m>[0m[1m[7m [0m[1m[7mveridian    [0m[1m[7m [0m[1m[7m   <[0m[1m[7mNULL[0m[1m[7m>[0m[1m[7m [0m[1m[7m7998   [0m[1m[7m [0m[1m[7m <[0m[1m[7mNULL[0m[1m[7m>[0m[1m[7m [0m[1m[7mfoo         [0m[1m[7m [0m[1m[7m    <[0m[1m[7mNULL[0m[1m[7m>[0m[1m[7m [0m[1m[7mfoo[7998]       [0m[1m[7m [0m[1m[7m        <[0m[1m[7mNULL[0m[1m[7m>[0m[1m [0m
-       9   <NULL> 2021-11-03 09:23:38.000              0 info             0      <NULL>   <NULL>      <NULL> veridian        <NULL> 16442    <NULL> foo              <NULL> foo[16442]               <NULL> 
-[1m      10[0m[1m [0m[1m  <[0m[1mNULL[0m[1m>[0m[1m [0m[1m2021-11-03 09:23:38.000[0m[1m [0m[1m             0[0m[1m [0m[1minfo     [0m[1m [0m[1m       0[0m[1m [0m[1m     <[0m[1mNULL[0m[1m>[0m[1m [0m[1m  <[0m[1mNULL[0m[1m>[0m[1m [0m[1m     <[0m[1mNULL[0m[1m>[0m[1m [0m[1mveridian    [0m[1m [0m[1m   <[0m[1mNULL[0m[1m>[0m[1m [0m[1m7999   [0m[1m [0m[1m <[0m[1mNULL[0m[1m>[0m[1m [0m[1mfoo         [0m[1m [0m[1m    <[0m[1mNULL[0m[1m>[0m[1m [0m[1mfoo[7999]       [0m[1m [0m[1m        <[0m[1mNULL[0m[1m> [0m
--- a/test/expected/test_sql_indexes.sh_dab07d8de7728752ae938a174468d75e85f3ae7e.err
+++ b/test/expected/test_sql_indexes.sh_dab07d8de7728752ae938a174468d75e85f3ae7e.err
--- a/test/expected/test_sql_indexes.sh_dab07d8de7728752ae938a174468d75e85f3ae7e.out
+++ b/test/expected/test_sql_indexes.sh_dab07d8de7728752ae938a174468d75e85f3ae7e.out
@ -0,0 +1,2 @@
+[1m$id [0m[1m$parent [0m[1m$notused [0m[1m                   replace($detail, 'SCAN TABLE', 'SCAN')                     [0m
+[1m2  [0m[1m [0m[1m0      [0m[1m [0m[1m0       [0m[1m [0m[1mSCAN access_log VIRTUAL TABLE INDEX 1:SEARCH access_log USING log_path GLOB ? [0m
--- a/test/test_sql_indexes.sh
+++ b/test/test_sql_indexes.sh
@ -2,11 +2,13 @@

 export YES_COLOR=1

+# XXX sqlite reports different results for the "detail" column, so we
+# have to rewrite it.
 run_cap_test ${lnav_test} -n \
-    -c ";EXPLAIN QUERY PLAN SELECT * FROM syslog_log WHERE log_path GLOB '*/logfile_syslog.*'" \
-    ${test_dir}/logfile_syslog.*
+    -c ";EXPLAIN QUERY PLAN SELECT * FROM access_log WHERE log_path GLOB '*/logfile_access_log.*'" \
+    -c ";SELECT \$id, \$parent, \$notused, replace(\$detail, 'SCAN TABLE', 'SCAN')" \
+    ${test_dir}/logfile_access_log.*

 run_cap_test ${lnav_test} -n \
-    -c ";SELECT * FROM syslog_log WHERE log_path GLOB '*/logfile_syslog.*'" \
-    ${test_dir}/logfile_syslog.*
-
+    -c ";SELECT *,log_unique_path FROM access_log WHERE log_path GLOB '*/logfile_access_log.*'" \
+    ${test_dir}/logfile_access_log.*