Kouhei Sutou 2019-03-04 11:51:00 +0900 (Mon, 04 Mar 2019) Revision: 23fad4c4690cab43254956fa51baa792144eaa23 https://github.com/groonga/groonga/commit/23fad4c4690cab43254956fa51baa792144eaa23 Message: test expr optimize: disable optimization Because expected log is for non optimization. We can remove this change and update expected when we enable this optimization by default. Modified files: test/command/suite/select/function/sub_filter/and/match.expected test/command/suite/select/function/sub_filter/and/match.test Modified: test/command/suite/select/function/sub_filter/and/match.expected (+15 -6) =================================================================== --- test/command/suite/select/function/sub_filter/and/match.expected 2019-03-04 11:45:53 +0900 (ad7c5a06e) +++ test/command/suite/select/function/sub_filter/and/match.expected 2019-03-04 11:51:00 +0900 (2895946c1) @@ -33,7 +33,9 @@ load --table Packages {"_key": "mroonga", "files": ["ha_mroonga.cc", "ha_mroonga.hpp"]} ] [[0,0.0,0.0],3] -select Packages --filter '_key @ "rroonga" && sub_filter(files, "revision >= 10 && revision < 40")' --output_columns '_key, _score, files, files.revision' +log_level --level info +[[0,0.0,0.0],true] +select Packages --filter '_key @ "rroonga" && sub_filter(files, "revision >= 10 && revision < 40")' --output_columns '_key, files, files.revision' [ [ 0, @@ -51,10 +53,6 @@ select Packages --filter '_key @ "rroonga" && sub_filter(files, "revision >= 1 "ShortText" ], [ - "_score", - "Int32" - ], - [ "files", "Files" ], @@ -65,7 +63,6 @@ select Packages --filter '_key @ "rroonga" && sub_filter(files, "revision >= 1 ], [ "rroonga", - 5, [ "lib/groonga.rb", "README.textile" @@ -78,3 +75,15 @@ select Packages --filter '_key @ "rroonga" && sub_filter(files, "revision >= 1 ] ] ] +#|i| [object][search][index][key][exact] <Names.packages_key_index> +#|i| grn_ii_sel > (rroonga) +#|i| n=6 (rroonga) +#|i| exact: 1 +#|i| hits=1 +#|i| [table][select][index][selector][no-index][sub_filter] <Packages> +#|i| [sub_filter][pre-filter][column][vector] <Packages.files> -> <Files> +#|i| [table][select][index][range] <Revisions.files_revision_index> +#|i| [table][select][index][range] <Revisions.files_revision_index> +#|i| [accessor][resolve][data-column][index] <Files.packages_files_index> +log_level --level notice +[[0,0.0,0.0],true] Modified: test/command/suite/select/function/sub_filter/and/match.test (+7 -1) =================================================================== --- test/command/suite/select/function/sub_filter/and/match.test 2019-03-04 11:45:53 +0900 (6a3ed581e) +++ test/command/suite/select/function/sub_filter/and/match.test 2019-03-04 11:51:00 +0900 (6c5b79660) @@ -1,3 +1,5 @@ +#$GRN_EXPR_OPTIMIZE=no + table_create Files TABLE_PAT_KEY ShortText column_create Files revision COLUMN_SCALAR UInt32 @@ -30,6 +32,10 @@ load --table Packages {"_key": "mroonga", "files": ["ha_mroonga.cc", "ha_mroonga.hpp"]} ] +#@add-important-log-levels info +log_level --level info select Packages \ --filter '_key @ "rroonga" && sub_filter(files, "revision >= 10 && revision < 40")' \ - --output_columns '_key, _score, files, files.revision' + --output_columns '_key, files, files.revision' +log_level --level notice +#@remove-important-log-levels info -------------- next part -------------- An HTML attachment was scrubbed... URL: <https://lists.osdn.me/mailman/archives/groonga-commit/attachments/20190304/c35efc76/attachment-0001.html>