Kouhei Sutou
null+****@clear*****
Tue Nov 27 18:04:51 JST 2012
Kouhei Sutou 2012-11-27 18:04:51 +0900 (Tue, 27 Nov 2012) New Revision: 67a68445742487d0939135410728abe67847dcc8 https://github.com/groonga/groonga/commit/67a68445742487d0939135410728abe67847dcc8 Log: test: add missing double quotes to JSON keys Modified files: test/command/suite/select/filter/set_operation/not_and/and.expected test/command/suite/select/filter/set_operation/not_and/and.test test/command/suite/select/filter/set_operation/not_and/not_and.expected test/command/suite/select/filter/set_operation/not_and/not_and.test test/command/suite/select/filter/set_operation/not_and/or.expected test/command/suite/select/filter/set_operation/not_and/or.test test/command/suite/select/filter/set_operation/not_and/single_expression.expected test/command/suite/select/filter/set_operation/not_and/single_expression.test test/command/suite/select/score/need_temporary_table/and.expected test/command/suite/select/score/need_temporary_table/and.test test/command/suite/select/score/need_temporary_table/or.expected test/command/suite/select/score/need_temporary_table/or.test Modified: test/command/suite/select/filter/set_operation/not_and/and.expected (+4 -4) =================================================================== --- test/command/suite/select/filter/set_operation/not_and/and.expected 2012-11-27 17:57:44 +0900 (81d358d) +++ test/command/suite/select/filter/set_operation/not_and/and.expected 2012-11-27 18:04:51 +0900 (bcf31ba) @@ -8,10 +8,10 @@ column_create Tags index COLUMN_INDEX Movies tags [[0,0.0,0.0],true] load --table Movies [ -{"_key": "Seven Samurai", tags: ["Samurai", "Japanese", "Kurosawa Akira"]}, -{"_key": "The Last Samurai", tags: ["Samurai", "English", "Tom Cruise"]}, -{"_key": "The Matrix", tags: ["Keanu Reeves", "SF", "English"]}, -{"_key": "Star Wars", tags: ["George Lucas", "SF", "English"]} +{"_key": "Seven Samurai", "tags": ["Samurai", "Japanese", "Kurosawa Akira"]}, +{"_key": "The Last Samurai", "tags": ["Samurai", "English", "Tom Cruise"]}, +{"_key": "The Matrix", "tags": ["Keanu Reeves", "SF", "English"]}, +{"_key": "Star Wars", "tags": ["George Lucas", "SF", "English"]} ] [[0,0.0,0.0],4] select Movies --filter 'tags @ "English" &! (tags @ "Keanu Reeves" && tags @ "SF")' Modified: test/command/suite/select/filter/set_operation/not_and/and.test (+4 -4) =================================================================== --- test/command/suite/select/filter/set_operation/not_and/and.test 2012-11-27 17:57:44 +0900 (33e179d) +++ test/command/suite/select/filter/set_operation/not_and/and.test 2012-11-27 18:04:51 +0900 (81482e3) @@ -7,10 +7,10 @@ column_create Tags index COLUMN_INDEX Movies tags load --table Movies [ -{"_key": "Seven Samurai", tags: ["Samurai", "Japanese", "Kurosawa Akira"]}, -{"_key": "The Last Samurai", tags: ["Samurai", "English", "Tom Cruise"]}, -{"_key": "The Matrix", tags: ["Keanu Reeves", "SF", "English"]}, -{"_key": "Star Wars", tags: ["George Lucas", "SF", "English"]} +{"_key": "Seven Samurai", "tags": ["Samurai", "Japanese", "Kurosawa Akira"]}, +{"_key": "The Last Samurai", "tags": ["Samurai", "English", "Tom Cruise"]}, +{"_key": "The Matrix", "tags": ["Keanu Reeves", "SF", "English"]}, +{"_key": "Star Wars", "tags": ["George Lucas", "SF", "English"]} ] select Movies \ Modified: test/command/suite/select/filter/set_operation/not_and/not_and.expected (+4 -4) =================================================================== --- test/command/suite/select/filter/set_operation/not_and/not_and.expected 2012-11-27 17:57:44 +0900 (8fc55d9) +++ test/command/suite/select/filter/set_operation/not_and/not_and.expected 2012-11-27 18:04:51 +0900 (7a7f514) @@ -8,10 +8,10 @@ column_create Tags index COLUMN_INDEX Movies tags [[0,0.0,0.0],true] load --table Movies [ -{"_key": "Seven Samurai", tags: ["Samurai", "Japanese", "Kurosawa Akira"]}, -{"_key": "The Last Samurai", tags: ["Samurai", "English", "Tom Cruise"]}, -{"_key": "The Matrix", tags: ["Keanu Reeves", "SF", "English"]}, -{"_key": "Star Wars", tags: ["George Lucas", "SF", "English"]} +{"_key": "Seven Samurai", "tags": ["Samurai", "Japanese", "Kurosawa Akira"]}, +{"_key": "The Last Samurai", "tags": ["Samurai", "English", "Tom Cruise"]}, +{"_key": "The Matrix", "tags": ["Keanu Reeves", "SF", "English"]}, +{"_key": "Star Wars", "tags": ["George Lucas", "SF", "English"]} ] [[0,0.0,0.0],4] select Movies --filter 'tags @ "English" &! (tags @ "SF" &! tags @ "Keanu Reeves")' Modified: test/command/suite/select/filter/set_operation/not_and/not_and.test (+4 -4) =================================================================== --- test/command/suite/select/filter/set_operation/not_and/not_and.test 2012-11-27 17:57:44 +0900 (3ece8c5) +++ test/command/suite/select/filter/set_operation/not_and/not_and.test 2012-11-27 18:04:51 +0900 (c8b5ce1) @@ -7,10 +7,10 @@ column_create Tags index COLUMN_INDEX Movies tags load --table Movies [ -{"_key": "Seven Samurai", tags: ["Samurai", "Japanese", "Kurosawa Akira"]}, -{"_key": "The Last Samurai", tags: ["Samurai", "English", "Tom Cruise"]}, -{"_key": "The Matrix", tags: ["Keanu Reeves", "SF", "English"]}, -{"_key": "Star Wars", tags: ["George Lucas", "SF", "English"]} +{"_key": "Seven Samurai", "tags": ["Samurai", "Japanese", "Kurosawa Akira"]}, +{"_key": "The Last Samurai", "tags": ["Samurai", "English", "Tom Cruise"]}, +{"_key": "The Matrix", "tags": ["Keanu Reeves", "SF", "English"]}, +{"_key": "Star Wars", "tags": ["George Lucas", "SF", "English"]} ] select Movies \ Modified: test/command/suite/select/filter/set_operation/not_and/or.expected (+4 -4) =================================================================== --- test/command/suite/select/filter/set_operation/not_and/or.expected 2012-11-27 17:57:44 +0900 (10af86d) +++ test/command/suite/select/filter/set_operation/not_and/or.expected 2012-11-27 18:04:51 +0900 (e035dd6) @@ -8,10 +8,10 @@ column_create Tags index COLUMN_INDEX Movies tags [[0,0.0,0.0],true] load --table Movies [ -{"_key": "Seven Samurai", tags: ["Samurai", "Japanese", "Kurosawa Akira"]}, -{"_key": "The Last Samurai", tags: ["Samurai", "English", "Tom Cruise"]}, -{"_key": "The Matrix", tags: ["Keanu Reeves", "SF", "English"]}, -{"_key": "Star Wars", tags: ["George Lucas", "SF", "English"]} +{"_key": "Seven Samurai", "tags": ["Samurai", "Japanese", "Kurosawa Akira"]}, +{"_key": "The Last Samurai", "tags": ["Samurai", "English", "Tom Cruise"]}, +{"_key": "The Matrix", "tags": ["Keanu Reeves", "SF", "English"]}, +{"_key": "Star Wars", "tags": ["George Lucas", "SF", "English"]} ] [[0,0.0,0.0],4] select Movies --filter 'tags @ "English" &! (tags @ "Keanu Reeves" || tags @ "George Lucas")' Modified: test/command/suite/select/filter/set_operation/not_and/or.test (+4 -4) =================================================================== --- test/command/suite/select/filter/set_operation/not_and/or.test 2012-11-27 17:57:44 +0900 (400a0b6) +++ test/command/suite/select/filter/set_operation/not_and/or.test 2012-11-27 18:04:51 +0900 (6c82c7d) @@ -7,10 +7,10 @@ column_create Tags index COLUMN_INDEX Movies tags load --table Movies [ -{"_key": "Seven Samurai", tags: ["Samurai", "Japanese", "Kurosawa Akira"]}, -{"_key": "The Last Samurai", tags: ["Samurai", "English", "Tom Cruise"]}, -{"_key": "The Matrix", tags: ["Keanu Reeves", "SF", "English"]}, -{"_key": "Star Wars", tags: ["George Lucas", "SF", "English"]} +{"_key": "Seven Samurai", "tags": ["Samurai", "Japanese", "Kurosawa Akira"]}, +{"_key": "The Last Samurai", "tags": ["Samurai", "English", "Tom Cruise"]}, +{"_key": "The Matrix", "tags": ["Keanu Reeves", "SF", "English"]}, +{"_key": "Star Wars", "tags": ["George Lucas", "SF", "English"]} ] select Movies \ Modified: test/command/suite/select/filter/set_operation/not_and/single_expression.expected (+4 -4) =================================================================== --- test/command/suite/select/filter/set_operation/not_and/single_expression.expected 2012-11-27 17:57:44 +0900 (220166e) +++ test/command/suite/select/filter/set_operation/not_and/single_expression.expected 2012-11-27 18:04:51 +0900 (c246fe5) @@ -8,10 +8,10 @@ column_create Tags index COLUMN_INDEX Movies tags [[0,0.0,0.0],true] load --table Movies [ -{"_key": "Seven Samurai", tags: ["Samurai", "Japanese", "Kurosawa Akira"]}, -{"_key": "The Last Samurai", tags: ["Samurai", "English", "Tom Cruise"]}, -{"_key": "The Matrix", tags: ["Keanu Reeves", "SF", "English"]}, -{"_key": "Star Wars", tags: ["George Lucas", "SF", "English"]} +{"_key": "Seven Samurai", "tags": ["Samurai", "Japanese", "Kurosawa Akira"]}, +{"_key": "The Last Samurai", "tags": ["Samurai", "English", "Tom Cruise"]}, +{"_key": "The Matrix", "tags": ["Keanu Reeves", "SF", "English"]}, +{"_key": "Star Wars", "tags": ["George Lucas", "SF", "English"]} ] [[0,0.0,0.0],4] select Movies --filter 'tags @ "English" &! tags @ "SF"' Modified: test/command/suite/select/filter/set_operation/not_and/single_expression.test (+4 -4) =================================================================== --- test/command/suite/select/filter/set_operation/not_and/single_expression.test 2012-11-27 17:57:44 +0900 (7bf2608) +++ test/command/suite/select/filter/set_operation/not_and/single_expression.test 2012-11-27 18:04:51 +0900 (83f30ff) @@ -7,10 +7,10 @@ column_create Tags index COLUMN_INDEX Movies tags load --table Movies [ -{"_key": "Seven Samurai", tags: ["Samurai", "Japanese", "Kurosawa Akira"]}, -{"_key": "The Last Samurai", tags: ["Samurai", "English", "Tom Cruise"]}, -{"_key": "The Matrix", tags: ["Keanu Reeves", "SF", "English"]}, -{"_key": "Star Wars", tags: ["George Lucas", "SF", "English"]} +{"_key": "Seven Samurai", "tags": ["Samurai", "Japanese", "Kurosawa Akira"]}, +{"_key": "The Last Samurai", "tags": ["Samurai", "English", "Tom Cruise"]}, +{"_key": "The Matrix", "tags": ["Keanu Reeves", "SF", "English"]}, +{"_key": "Star Wars", "tags": ["George Lucas", "SF", "English"]} ] select Movies --filter 'tags @ "English" &! tags @ "SF"' Modified: test/command/suite/select/score/need_temporary_table/and.expected (+4 -4) =================================================================== --- test/command/suite/select/score/need_temporary_table/and.expected 2012-11-27 17:57:44 +0900 (b05d3bb) +++ test/command/suite/select/score/need_temporary_table/and.expected 2012-11-27 18:04:51 +0900 (c2881c3) @@ -8,10 +8,10 @@ column_create Tags index COLUMN_INDEX Movies tags [[0,0.0,0.0],true] load --table Movies [ -{"_key": "Seven Samurai", tags: ["Samurai", "Japanese", "Kurosawa Akira"]}, -{"_key": "The Last Samurai", tags: ["Samurai", "English", "Tom Cruise"]}, -{"_key": "The Matrix", tags: ["Keanu Reeves", "SF", "English"]}, -{"_key": "Star Wars", tags: ["George Lucas", "SF", "English"]} +{"_key": "Seven Samurai", "tags": ["Samurai", "Japanese", "Kurosawa Akira"]}, +{"_key": "The Last Samurai", "tags": ["Samurai", "English", "Tom Cruise"]}, +{"_key": "The Matrix", "tags": ["Keanu Reeves", "SF", "English"]}, +{"_key": "Star Wars", "tags": ["George Lucas", "SF", "English"]} ] [[0,0.0,0.0],4] select Movies --output_columns "_key, _score" --filter '(tags @ "English" || tags @ "Samurai") && (tags @ "SF" &! tags @ "Keanu Reeves")' Modified: test/command/suite/select/score/need_temporary_table/and.test (+4 -4) =================================================================== --- test/command/suite/select/score/need_temporary_table/and.test 2012-11-27 17:57:44 +0900 (ecf42ae) +++ test/command/suite/select/score/need_temporary_table/and.test 2012-11-27 18:04:51 +0900 (a4da7b9) @@ -7,10 +7,10 @@ column_create Tags index COLUMN_INDEX Movies tags load --table Movies [ -{"_key": "Seven Samurai", tags: ["Samurai", "Japanese", "Kurosawa Akira"]}, -{"_key": "The Last Samurai", tags: ["Samurai", "English", "Tom Cruise"]}, -{"_key": "The Matrix", tags: ["Keanu Reeves", "SF", "English"]}, -{"_key": "Star Wars", tags: ["George Lucas", "SF", "English"]} +{"_key": "Seven Samurai", "tags": ["Samurai", "Japanese", "Kurosawa Akira"]}, +{"_key": "The Last Samurai", "tags": ["Samurai", "English", "Tom Cruise"]}, +{"_key": "The Matrix", "tags": ["Keanu Reeves", "SF", "English"]}, +{"_key": "Star Wars", "tags": ["George Lucas", "SF", "English"]} ] select Movies \ Modified: test/command/suite/select/score/need_temporary_table/or.expected (+4 -4) =================================================================== --- test/command/suite/select/score/need_temporary_table/or.expected 2012-11-27 17:57:44 +0900 (27d78fb) +++ test/command/suite/select/score/need_temporary_table/or.expected 2012-11-27 18:04:51 +0900 (3ad268e) @@ -8,10 +8,10 @@ column_create Tags index COLUMN_INDEX Movies tags [[0,0.0,0.0],true] load --table Movies [ -{"_key": "Seven Samurai", tags: ["Samurai", "Japanese", "Japan", "Kurosawa Akira"]}, -{"_key": "The Last Samurai", tags: ["Samurai", "English", "Japanese", "US", "Japan", "Tom Cruise"]}, -{"_key": "The Matrix", tags: ["Keanu Reeves", "SF", "English", "US"]}, -{"_key": "Star Wars", tags: ["George Lucas", "SF", "English", "US"]} +{"_key": "Seven Samurai", "tags": ["Samurai", "Japanese", "Japan", "Kurosawa Akira"]}, +{"_key": "The Last Samurai", "tags": ["Samurai", "English", "Japanese", "US", "Japan", "Tom Cruise"]}, +{"_key": "The Matrix", "tags": ["Keanu Reeves", "SF", "English", "US"]}, +{"_key": "Star Wars", "tags": ["George Lucas", "SF", "English", "US"]} ] [[0,0.0,0.0],4] select Movies --output_columns "_key, _score" --filter '(tags @ "English" && tags @ "SF") || (tags @ "US" &! tags @ "Keanu Reeves")' Modified: test/command/suite/select/score/need_temporary_table/or.test (+4 -4) =================================================================== --- test/command/suite/select/score/need_temporary_table/or.test 2012-11-27 17:57:44 +0900 (a913000) +++ test/command/suite/select/score/need_temporary_table/or.test 2012-11-27 18:04:51 +0900 (b87ad66) @@ -7,10 +7,10 @@ column_create Tags index COLUMN_INDEX Movies tags load --table Movies [ -{"_key": "Seven Samurai", tags: ["Samurai", "Japanese", "Japan", "Kurosawa Akira"]}, -{"_key": "The Last Samurai", tags: ["Samurai", "English", "Japanese", "US", "Japan", "Tom Cruise"]}, -{"_key": "The Matrix", tags: ["Keanu Reeves", "SF", "English", "US"]}, -{"_key": "Star Wars", tags: ["George Lucas", "SF", "English", "US"]} +{"_key": "Seven Samurai", "tags": ["Samurai", "Japanese", "Japan", "Kurosawa Akira"]}, +{"_key": "The Last Samurai", "tags": ["Samurai", "English", "Japanese", "US", "Japan", "Tom Cruise"]}, +{"_key": "The Matrix", "tags": ["Keanu Reeves", "SF", "English", "US"]}, +{"_key": "Star Wars", "tags": ["George Lucas", "SF", "English", "US"]} ] select Movies \ -------------- next part -------------- HTML����������������������������...다운로드