Kouhei Sutou
null+****@clear*****
Sat Dec 7 23:06:52 JST 2013
Kouhei Sutou 2013-12-07 23:06:52 +0900 (Sat, 07 Dec 2013) New Revision: 27693cf2eca8b8a5bd3e068692f9b2b6f034eb6d https://github.com/groonga/groonga/commit/27693cf2eca8b8a5bd3e068692f9b2b6f034eb6d Message: geo_in_rectangle: support south/west area TODO: Support area over search such as top-left in north/west and bottom-right in south/east search. Added files: test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/east_out.expected test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/east_out.test test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/east_west_out.expected test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/east_west_out.test test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/north_east_out.expected test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/north_east_out.test test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/north_out.expected test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/north_out.test test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/north_south_out.expected test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/north_south_out.test test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/north_west_out.expected test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/north_west_out.test test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/same_as_mesh.expected test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/same_as_mesh.test test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/south_east_out.expected test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/south_east_out.test test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/south_out.expected test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/south_out.test test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/south_west_out.expected test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/south_west_out.test test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/west_out.expected test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/west_out.test Added: test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/east_out.expected (+39 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/east_out.expected 2013-12-07 23:06:52 +0900 (bc43efe) @@ -0,0 +1,39 @@ +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 --filter 'geo_in_rectangle(point, "-3x-4", "-4x-2")' +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 6 + ], + [ + [ + "point", + "WGS84GeoPoint" + ] + ], + [ + "-3x-2" + ], + [ + "-3x-3" + ], + [ + "-3x-4" + ], + [ + "-4x-2" + ], + [ + "-4x-3" + ], + [ + "-4x-4" + ] + ] + ] +] Added: test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/east_out.test (+4 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/east_out.test 2013-12-07 23:06:52 +0900 (ddbbac8) @@ -0,0 +1,4 @@ +#@include fixture/geo/in_rectangle/south_west.grn + +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 \ + --filter 'geo_in_rectangle(point, "-3x-4", "-4x-2")' Added: test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/east_west_out.expected (+45 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/east_west_out.expected 2013-12-07 23:06:52 +0900 (fc9712a) @@ -0,0 +1,45 @@ +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 --filter 'geo_in_rectangle(point, "-3x-5", "-4x-2")' +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 8 + ], + [ + [ + "point", + "WGS84GeoPoint" + ] + ], + [ + "-3x-2" + ], + [ + "-3x-3" + ], + [ + "-3x-4" + ], + [ + "-3x-5" + ], + [ + "-4x-2" + ], + [ + "-4x-3" + ], + [ + "-4x-4" + ], + [ + "-4x-5" + ] + ] + ] +] Added: test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/east_west_out.test (+4 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/east_west_out.test 2013-12-07 23:06:52 +0900 (23a83c5) @@ -0,0 +1,4 @@ +#@include fixture/geo/in_rectangle/south_west.grn + +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 \ + --filter 'geo_in_rectangle(point, "-3x-5", "-4x-2")' Added: test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/north_east_out.expected (+48 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/north_east_out.expected 2013-12-07 23:06:52 +0900 (1a7271b) @@ -0,0 +1,48 @@ +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 --filter 'geo_in_rectangle(point, "-2x-4", "-4x-2")' +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 9 + ], + [ + [ + "point", + "WGS84GeoPoint" + ] + ], + [ + "-2x-2" + ], + [ + "-2x-3" + ], + [ + "-2x-4" + ], + [ + "-3x-2" + ], + [ + "-3x-3" + ], + [ + "-3x-4" + ], + [ + "-4x-2" + ], + [ + "-4x-3" + ], + [ + "-4x-4" + ] + ] + ] +] Added: test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/north_east_out.test (+4 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/north_east_out.test 2013-12-07 23:06:52 +0900 (18d9ff7) @@ -0,0 +1,4 @@ +#@include fixture/geo/in_rectangle/south_west.grn + +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 \ + --filter 'geo_in_rectangle(point, "-2x-4", "-4x-2")' Added: test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/north_out.expected (+39 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/north_out.expected 2013-12-07 23:06:52 +0900 (e60d059) @@ -0,0 +1,39 @@ +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 --filter 'geo_in_rectangle(point, "-2x-4", "-4x-3")' +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 6 + ], + [ + [ + "point", + "WGS84GeoPoint" + ] + ], + [ + "-2x-3" + ], + [ + "-2x-4" + ], + [ + "-3x-3" + ], + [ + "-3x-4" + ], + [ + "-4x-3" + ], + [ + "-4x-4" + ] + ] + ] +] Added: test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/north_out.test (+4 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/north_out.test 2013-12-07 23:06:52 +0900 (8eabb68) @@ -0,0 +1,4 @@ +#@include fixture/geo/in_rectangle/south_west.grn + +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 \ + --filter 'geo_in_rectangle(point, "-2x-4", "-4x-3")' Added: test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/north_south_out.expected (+45 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/north_south_out.expected 2013-12-07 23:06:52 +0900 (f018851) @@ -0,0 +1,45 @@ +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 --filter 'geo_in_rectangle(point, "-2x-4", "-5x-3")' +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 8 + ], + [ + [ + "point", + "WGS84GeoPoint" + ] + ], + [ + "-2x-3" + ], + [ + "-2x-4" + ], + [ + "-3x-3" + ], + [ + "-3x-4" + ], + [ + "-4x-3" + ], + [ + "-4x-4" + ], + [ + "-5x-3" + ], + [ + "-5x-4" + ] + ] + ] +] Added: test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/north_south_out.test (+4 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/north_south_out.test 2013-12-07 23:06:52 +0900 (5ffacd7) @@ -0,0 +1,4 @@ +#@include fixture/geo/in_rectangle/south_west.grn + +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 \ + --filter 'geo_in_rectangle(point, "-2x-4", "-5x-3")' Added: test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/north_west_out.expected (+48 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/north_west_out.expected 2013-12-07 23:06:52 +0900 (31910f7) @@ -0,0 +1,48 @@ +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 --filter 'geo_in_rectangle(point, "-2x-5", "-4x-3")' +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 9 + ], + [ + [ + "point", + "WGS84GeoPoint" + ] + ], + [ + "-2x-3" + ], + [ + "-2x-4" + ], + [ + "-2x-5" + ], + [ + "-3x-3" + ], + [ + "-3x-4" + ], + [ + "-3x-5" + ], + [ + "-4x-3" + ], + [ + "-4x-4" + ], + [ + "-4x-5" + ] + ] + ] +] Added: test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/north_west_out.test (+4 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/north_west_out.test 2013-12-07 23:06:52 +0900 (6bb1646) @@ -0,0 +1,4 @@ +#@include fixture/geo/in_rectangle/south_west.grn + +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 \ + --filter 'geo_in_rectangle(point, "-2x-5", "-4x-3")' Added: test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/same_as_mesh.expected (+33 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/same_as_mesh.expected 2013-12-07 23:06:52 +0900 (306104b) @@ -0,0 +1,33 @@ +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 --filter 'geo_in_rectangle(point, "-3x-4", "-4x-3")' +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 4 + ], + [ + [ + "point", + "WGS84GeoPoint" + ] + ], + [ + "-3x-3" + ], + [ + "-3x-4" + ], + [ + "-4x-3" + ], + [ + "-4x-4" + ] + ] + ] +] Added: test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/same_as_mesh.test (+4 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/same_as_mesh.test 2013-12-07 23:06:52 +0900 (3df8cdc) @@ -0,0 +1,4 @@ +#@include fixture/geo/in_rectangle/south_west.grn + +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 \ + --filter 'geo_in_rectangle(point, "-3x-4", "-4x-3")' Added: test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/south_east_out.expected (+48 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/south_east_out.expected 2013-12-07 23:06:52 +0900 (aad23bf) @@ -0,0 +1,48 @@ +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 --filter 'geo_in_rectangle(point, "-3x-4", "-5x-2")' +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 9 + ], + [ + [ + "point", + "WGS84GeoPoint" + ] + ], + [ + "-3x-2" + ], + [ + "-3x-3" + ], + [ + "-3x-4" + ], + [ + "-4x-2" + ], + [ + "-4x-3" + ], + [ + "-4x-4" + ], + [ + "-5x-2" + ], + [ + "-5x-3" + ], + [ + "-5x-4" + ] + ] + ] +] Added: test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/south_east_out.test (+4 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/south_east_out.test 2013-12-07 23:06:52 +0900 (b07d8e8) @@ -0,0 +1,4 @@ +#@include fixture/geo/in_rectangle/south_west.grn + +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 \ + --filter 'geo_in_rectangle(point, "-3x-4", "-5x-2")' Added: test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/south_out.expected (+39 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/south_out.expected 2013-12-07 23:06:52 +0900 (555de03) @@ -0,0 +1,39 @@ +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 --filter 'geo_in_rectangle(point, "-3x-4", "-5x-3")' +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 6 + ], + [ + [ + "point", + "WGS84GeoPoint" + ] + ], + [ + "-3x-3" + ], + [ + "-3x-4" + ], + [ + "-4x-3" + ], + [ + "-4x-4" + ], + [ + "-5x-3" + ], + [ + "-5x-4" + ] + ] + ] +] Added: test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/south_out.test (+4 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/south_out.test 2013-12-07 23:06:52 +0900 (b9fddf6) @@ -0,0 +1,4 @@ +#@include fixture/geo/in_rectangle/south_west.grn + +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 \ + --filter 'geo_in_rectangle(point, "-3x-4", "-5x-3")' Added: test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/south_west_out.expected (+48 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/south_west_out.expected 2013-12-07 23:06:52 +0900 (12f704d) @@ -0,0 +1,48 @@ +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 --filter 'geo_in_rectangle(point, "-3x-5", "-5x-3")' +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 9 + ], + [ + [ + "point", + "WGS84GeoPoint" + ] + ], + [ + "-3x-3" + ], + [ + "-3x-4" + ], + [ + "-3x-5" + ], + [ + "-4x-3" + ], + [ + "-4x-4" + ], + [ + "-4x-5" + ], + [ + "-5x-3" + ], + [ + "-5x-4" + ], + [ + "-5x-5" + ] + ] + ] +] Added: test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/south_west_out.test (+4 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/south_west_out.test 2013-12-07 23:06:52 +0900 (e29445a) @@ -0,0 +1,4 @@ +#@include fixture/geo/in_rectangle/south_west.grn + +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 \ + --filter 'geo_in_rectangle(point, "-3x-5", "-5x-3")' Added: test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/west_out.expected (+39 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/west_out.expected 2013-12-07 23:06:52 +0900 (75712cf) @@ -0,0 +1,39 @@ +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 --filter 'geo_in_rectangle(point, "-3x-5", "-4x-3")' +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 6 + ], + [ + [ + "point", + "WGS84GeoPoint" + ] + ], + [ + "-3x-3" + ], + [ + "-3x-4" + ], + [ + "-3x-5" + ], + [ + "-4x-3" + ], + [ + "-4x-4" + ], + [ + "-4x-5" + ] + ] + ] +] Added: test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/west_out.test (+4 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/south_west/use_index/west_out.test 2013-12-07 23:06:52 +0900 (7080f6d) @@ -0,0 +1,4 @@ +#@include fixture/geo/in_rectangle/south_west.grn + +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 \ + --filter 'geo_in_rectangle(point, "-3x-5", "-4x-3")' -------------- next part -------------- HTML����������������������������...Descargar
