Kouhei Sutou
null+****@clear*****
Fri Oct 24 23:24:20 JST 2014
Kouhei Sutou 2014-10-24 23:24:20 +0900 (Fri, 24 Oct 2014) New Revision: 4b8a62f6f41b545acc08aa684ef813bba70a1d31 https://github.com/groonga/groonga/commit/4b8a62f6f41b545acc08aa684ef813bba70a1d31 Message: test: reduce accuracy to avoid overflow as _score value Modified files: test/command/suite/select/filter/geo_in_circle/approximate_type/default/no_index.expected test/command/suite/select/filter/geo_in_circle/approximate_type/default/no_index.test test/command/suite/select/filter/geo_in_circle/approximate_type/default/not_use_index.expected test/command/suite/select/filter/geo_in_circle/approximate_type/default/not_use_index.test test/command/suite/select/filter/geo_in_circle/approximate_type/default/use_index.expected test/command/suite/select/filter/geo_in_circle/approximate_type/default/use_index.test test/command/suite/select/filter/geo_in_circle/approximate_type/ellip/not_use_index.expected test/command/suite/select/filter/geo_in_circle/approximate_type/ellip/not_use_index.test test/command/suite/select/filter/geo_in_circle/approximate_type/ellip/use_index.expected test/command/suite/select/filter/geo_in_circle/approximate_type/ellip/use_index.test test/command/suite/select/filter/geo_in_circle/approximate_type/ellipsoid/not_use_index.expected test/command/suite/select/filter/geo_in_circle/approximate_type/ellipsoid/not_use_index.test test/command/suite/select/filter/geo_in_circle/approximate_type/ellipsoid/use_index.expected test/command/suite/select/filter/geo_in_circle/approximate_type/ellipsoid/use_index.test test/command/suite/select/filter/geo_in_circle/approximate_type/rect/not_use_index.expected test/command/suite/select/filter/geo_in_circle/approximate_type/rect/not_use_index.test test/command/suite/select/filter/geo_in_circle/approximate_type/rect/use_index.expected test/command/suite/select/filter/geo_in_circle/approximate_type/rect/use_index.test test/command/suite/select/filter/geo_in_circle/approximate_type/rectangle/not_use_index.expected test/command/suite/select/filter/geo_in_circle/approximate_type/rectangle/not_use_index.test test/command/suite/select/filter/geo_in_circle/approximate_type/rectangle/use_index.expected test/command/suite/select/filter/geo_in_circle/approximate_type/rectangle/use_index.test test/command/suite/select/filter/geo_in_circle/approximate_type/sphere/not_use_index.expected test/command/suite/select/filter/geo_in_circle/approximate_type/sphere/not_use_index.test test/command/suite/select/filter/geo_in_circle/approximate_type/sphere/use_index.expected test/command/suite/select/filter/geo_in_circle/approximate_type/sphere/use_index.test test/command/suite/select/filter/geo_in_circle/approximate_type/sphr/not_use_index.expected test/command/suite/select/filter/geo_in_circle/approximate_type/sphr/not_use_index.test test/command/suite/select/filter/geo_in_circle/approximate_type/sphr/use_index.expected test/command/suite/select/filter/geo_in_circle/approximate_type/sphr/use_index.test Modified: test/command/suite/select/filter/geo_in_circle/approximate_type/default/no_index.expected (+1 -1) =================================================================== --- test/command/suite/select/filter/geo_in_circle/approximate_type/default/no_index.expected 2014-10-24 22:36:01 +0900 (509bfb1) +++ test/command/suite/select/filter/geo_in_circle/approximate_type/default/no_index.expected 2014-10-24 23:24:20 +0900 (1cebde3) @@ -1,5 +1,5 @@ column_remove Locations shop [[0,0.0,0.0],true] -select Shops --sortby '+_score, +name' --output_columns 'name, _score, location' --filter 'geo_in_circle(location, "128429532x503148672", 3000)' --scorer '_score = geo_distance(location, "128429532x503148672") * 1000 * 1000' +select Shops --sortby '+_score, +name' --output_columns 'name, _score, location' --filter 'geo_in_circle(location, "128429532x503148672", 3000)' --scorer '_score = geo_distance(location, "128429532x503148672") * 1000' [[[-22,0.0,0.0],"geo_in_circle(): index for <Shops.location> is missing"],[]] #|e| geo_in_circle(): index for <Shops.location> is missing Modified: test/command/suite/select/filter/geo_in_circle/approximate_type/default/no_index.test (+1 -1) =================================================================== --- test/command/suite/select/filter/geo_in_circle/approximate_type/default/no_index.test 2014-10-24 22:36:01 +0900 (a9a23aa) +++ test/command/suite/select/filter/geo_in_circle/approximate_type/default/no_index.test 2014-10-24 23:24:20 +0900 (6f1cd28) @@ -5,4 +5,4 @@ column_remove Locations shop select Shops --sortby '+_score, +name' \ --output_columns 'name, _score, location' \ --filter 'geo_in_circle(location, "128429532x503148672", 3000)' \ - --scorer '_score = geo_distance(location, "128429532x503148672") * 1000 * 1000' + --scorer '_score = geo_distance(location, "128429532x503148672") * 1000' Modified: test/command/suite/select/filter/geo_in_circle/approximate_type/default/not_use_index.expected (+12 -12) =================================================================== --- test/command/suite/select/filter/geo_in_circle/approximate_type/default/not_use_index.expected 2014-10-24 22:36:01 +0900 (5d15fa8) +++ test/command/suite/select/filter/geo_in_circle/approximate_type/default/not_use_index.expected 2014-10-24 23:24:20 +0900 (8f05c7d) @@ -1,4 +1,4 @@ -select Shops --sortby '+_score, +name' --output_columns 'name, _score, location' --filter 'geo_in_circle(location, "128429532x503148672", 3000) > 0' --scorer '_score = geo_distance(location, "128429532x503148672") * 1000 * 1000' +select Shops --sortby '+_score, +name' --output_columns 'name, _score, location' --filter 'geo_in_circle(location, "128429532x503148672", 3000) > 0' --scorer '_score = geo_distance(location, "128429532x503148672") * 1000' [ [ 0, @@ -25,39 +25,39 @@ select Shops --sortby '+_score, +name' --output_columns 'name, _score, locatio ] ], [ - "柳屋 たい焼き", - -2147483648, - "128467228x503222332" - ], - [ "銀座 かずや", - 280743810, + 280743, "128424629x503139222" ], [ "たい焼き鉄次 大丸東京店", - 810303031, + 810303, "128451283x503166852" ], [ "たいやき神田達磨 八重洲店", - 970517026, + 970517, "128453260x503174156" ], [ "にしみや 甘味処", - 1056698886, + 1056698, "128418570x503188661" ], [ "築地 さのきや", - 1186376492, + 1186376, "128397312x503174596" ], [ "しげ田", - 1530425643, + 1530425, "128421454x503208983" + ], + [ + "柳屋 たい焼き", + 2179591, + "128467228x503222332" ] ] ] Modified: test/command/suite/select/filter/geo_in_circle/approximate_type/default/not_use_index.test (+1 -1) =================================================================== --- test/command/suite/select/filter/geo_in_circle/approximate_type/default/not_use_index.test 2014-10-24 22:36:01 +0900 (26de1f7) +++ test/command/suite/select/filter/geo_in_circle/approximate_type/default/not_use_index.test 2014-10-24 23:24:20 +0900 (4e83520) @@ -3,4 +3,4 @@ select Shops --sortby '+_score, +name' \ --output_columns 'name, _score, location' \ --filter 'geo_in_circle(location, "128429532x503148672", 3000) > 0' \ - --scorer '_score = geo_distance(location, "128429532x503148672") * 1000 * 1000' + --scorer '_score = geo_distance(location, "128429532x503148672") * 1000' Modified: test/command/suite/select/filter/geo_in_circle/approximate_type/default/use_index.expected (+12 -12) =================================================================== --- test/command/suite/select/filter/geo_in_circle/approximate_type/default/use_index.expected 2014-10-24 22:36:01 +0900 (b993d5e) +++ test/command/suite/select/filter/geo_in_circle/approximate_type/default/use_index.expected 2014-10-24 23:24:20 +0900 (7432bc0) @@ -1,4 +1,4 @@ -select Shops --sortby '+_score, +name' --output_columns 'name, _score, location' --filter 'geo_in_circle(location, "128429532x503148672", 3000)' --scorer '_score = geo_distance(location, "128429532x503148672") * 1000 * 1000' +select Shops --sortby '+_score, +name' --output_columns 'name, _score, location' --filter 'geo_in_circle(location, "128429532x503148672", 3000)' --scorer '_score = geo_distance(location, "128429532x503148672") * 1000' [ [ 0, @@ -25,39 +25,39 @@ select Shops --sortby '+_score, +name' --output_columns 'name, _score, locatio ] ], [ - "柳屋 たい焼き", - -2147483648, - "128467228x503222332" - ], - [ "銀座 かずや", - 280743810, + 280743, "128424629x503139222" ], [ "たい焼き鉄次 大丸東京店", - 810303031, + 810303, "128451283x503166852" ], [ "たいやき神田達磨 八重洲店", - 970517026, + 970517, "128453260x503174156" ], [ "にしみや 甘味処", - 1056698886, + 1056698, "128418570x503188661" ], [ "築地 さのきや", - 1186376492, + 1186376, "128397312x503174596" ], [ "しげ田", - 1530425643, + 1530425, "128421454x503208983" + ], + [ + "柳屋 たい焼き", + 2179591, + "128467228x503222332" ] ] ] Modified: test/command/suite/select/filter/geo_in_circle/approximate_type/default/use_index.test (+1 -1) =================================================================== --- test/command/suite/select/filter/geo_in_circle/approximate_type/default/use_index.test 2014-10-24 22:36:01 +0900 (c8e2688) +++ test/command/suite/select/filter/geo_in_circle/approximate_type/default/use_index.test 2014-10-24 23:24:20 +0900 (01dd309) @@ -3,4 +3,4 @@ select Shops --sortby '+_score, +name' \ --output_columns 'name, _score, location' \ --filter 'geo_in_circle(location, "128429532x503148672", 3000)' \ - --scorer '_score = geo_distance(location, "128429532x503148672") * 1000 * 1000' + --scorer '_score = geo_distance(location, "128429532x503148672") * 1000' Modified: test/command/suite/select/filter/geo_in_circle/approximate_type/ellip/not_use_index.expected (+12 -12) =================================================================== --- test/command/suite/select/filter/geo_in_circle/approximate_type/ellip/not_use_index.expected 2014-10-24 22:36:01 +0900 (b5a66c9) +++ test/command/suite/select/filter/geo_in_circle/approximate_type/ellip/not_use_index.expected 2014-10-24 23:24:20 +0900 (223df5d) @@ -1,4 +1,4 @@ -select Shops --sortby '+_score, +name' --output_columns 'name, _score, location' --filter 'geo_in_circle(location, "128429532x503148672", 3000, "ellip") > 0' --scorer '_score = geo_distance(location, "128429532x503148672", "ellip") * 1000 * 1000' +select Shops --sortby '+_score, +name' --output_columns 'name, _score, location' --filter 'geo_in_circle(location, "128429532x503148672", 3000, "ellip") > 0' --scorer '_score = geo_distance(location, "128429532x503148672", "ellip") * 1000' [ [ 0, @@ -25,39 +25,39 @@ select Shops --sortby '+_score, +name' --output_columns 'name, _score, locatio ] ], [ - "柳屋 たい焼き", - -2147483648, - "128467228x503222332" - ], - [ "銀座 かずや", - 281623827, + 281623, "128424629x503139222" ], [ "たい焼き鉄次 大丸東京店", - 811420890, + 811420, "128451283x503166852" ], [ "たいやき神田達磨 八重洲店", - 972359708, + 972359, "128453260x503174156" ], [ "にしみや 甘味処", - 1060891168, + 1060891, "128418570x503188661" ], [ "築地 さのきや", - 1187926579, + 1187926, "128397312x503174596" ], [ "しげ田", - 1537012099, + 1537012, "128421454x503208983" + ], + [ + "柳屋 たい焼き", + 2186479, + "128467228x503222332" ] ] ] Modified: test/command/suite/select/filter/geo_in_circle/approximate_type/ellip/not_use_index.test (+1 -1) =================================================================== --- test/command/suite/select/filter/geo_in_circle/approximate_type/ellip/not_use_index.test 2014-10-24 22:36:01 +0900 (645e68d) +++ test/command/suite/select/filter/geo_in_circle/approximate_type/ellip/not_use_index.test 2014-10-24 23:24:20 +0900 (0e50906) @@ -3,4 +3,4 @@ select Shops --sortby '+_score, +name' \ --output_columns 'name, _score, location' \ --filter 'geo_in_circle(location, "128429532x503148672", 3000, "ellip") > 0' \ - --scorer '_score = geo_distance(location, "128429532x503148672", "ellip") * 1000 * 1000' + --scorer '_score = geo_distance(location, "128429532x503148672", "ellip") * 1000' Modified: test/command/suite/select/filter/geo_in_circle/approximate_type/ellip/use_index.expected (+12 -12) =================================================================== --- test/command/suite/select/filter/geo_in_circle/approximate_type/ellip/use_index.expected 2014-10-24 22:36:01 +0900 (d314e55) +++ test/command/suite/select/filter/geo_in_circle/approximate_type/ellip/use_index.expected 2014-10-24 23:24:20 +0900 (57a4485) @@ -1,4 +1,4 @@ -select Shops --sortby '+_score, +name' --output_columns 'name, _score, location' --filter 'geo_in_circle(location, "128429532x503148672", 3000, "ellip")' --scorer '_score = geo_distance(location, "128429532x503148672", "ellip") * 1000 * 1000' +select Shops --sortby '+_score, +name' --output_columns 'name, _score, location' --filter 'geo_in_circle(location, "128429532x503148672", 3000, "ellip")' --scorer '_score = geo_distance(location, "128429532x503148672", "ellip") * 1000' [ [ 0, @@ -25,39 +25,39 @@ select Shops --sortby '+_score, +name' --output_columns 'name, _score, locatio ] ], [ - "柳屋 たい焼き", - -2147483648, - "128467228x503222332" - ], - [ "銀座 かずや", - 281623827, + 281623, "128424629x503139222" ], [ "たい焼き鉄次 大丸東京店", - 811420890, + 811420, "128451283x503166852" ], [ "たいやき神田達磨 八重洲店", - 972359708, + 972359, "128453260x503174156" ], [ "にしみや 甘味処", - 1060891168, + 1060891, "128418570x503188661" ], [ "築地 さのきや", - 1187926579, + 1187926, "128397312x503174596" ], [ "しげ田", - 1537012099, + 1537012, "128421454x503208983" + ], + [ + "柳屋 たい焼き", + 2186479, + "128467228x503222332" ] ] ] Modified: test/command/suite/select/filter/geo_in_circle/approximate_type/ellip/use_index.test (+1 -1) =================================================================== --- test/command/suite/select/filter/geo_in_circle/approximate_type/ellip/use_index.test 2014-10-24 22:36:01 +0900 (a3aa0fa) +++ test/command/suite/select/filter/geo_in_circle/approximate_type/ellip/use_index.test 2014-10-24 23:24:20 +0900 (fddb4f5) @@ -3,4 +3,4 @@ select Shops --sortby '+_score, +name' \ --output_columns 'name, _score, location' \ --filter 'geo_in_circle(location, "128429532x503148672", 3000, "ellip")' \ - --scorer '_score = geo_distance(location, "128429532x503148672", "ellip") * 1000 * 1000' + --scorer '_score = geo_distance(location, "128429532x503148672", "ellip") * 1000' Modified: test/command/suite/select/filter/geo_in_circle/approximate_type/ellipsoid/not_use_index.expected (+12 -12) =================================================================== --- test/command/suite/select/filter/geo_in_circle/approximate_type/ellipsoid/not_use_index.expected 2014-10-24 22:36:01 +0900 (6bee214) +++ test/command/suite/select/filter/geo_in_circle/approximate_type/ellipsoid/not_use_index.expected 2014-10-24 23:24:20 +0900 (9ae2723) @@ -1,4 +1,4 @@ -select Shops --sortby '+_score, +name' --output_columns 'name, _score, location' --filter 'geo_in_circle(location, "128429532x503148672", 3000, "ellipsoid") > 0' --scorer '_score = geo_distance(location, "128429532x503148672", "ellipsoid") * 1000 * 1000' +select Shops --sortby '+_score, +name' --output_columns 'name, _score, location' --filter 'geo_in_circle(location, "128429532x503148672", 3000, "ellipsoid") > 0' --scorer '_score = geo_distance(location, "128429532x503148672", "ellipsoid") * 1000' [ [ 0, @@ -25,39 +25,39 @@ select Shops --sortby '+_score, +name' --output_columns 'name, _score, locatio ] ], [ - "柳屋 たい焼き", - -2147483648, - "128467228x503222332" - ], - [ "銀座 かずや", - 281623827, + 281623, "128424629x503139222" ], [ "たい焼き鉄次 大丸東京店", - 811420890, + 811420, "128451283x503166852" ], [ "たいやき神田達磨 八重洲店", - 972359708, + 972359, "128453260x503174156" ], [ "にしみや 甘味処", - 1060891168, + 1060891, "128418570x503188661" ], [ "築地 さのきや", - 1187926579, + 1187926, "128397312x503174596" ], [ "しげ田", - 1537012099, + 1537012, "128421454x503208983" + ], + [ + "柳屋 たい焼き", + 2186479, + "128467228x503222332" ] ] ] Modified: test/command/suite/select/filter/geo_in_circle/approximate_type/ellipsoid/not_use_index.test (+1 -1) =================================================================== --- test/command/suite/select/filter/geo_in_circle/approximate_type/ellipsoid/not_use_index.test 2014-10-24 22:36:01 +0900 (47c4fc3) +++ test/command/suite/select/filter/geo_in_circle/approximate_type/ellipsoid/not_use_index.test 2014-10-24 23:24:20 +0900 (eaf341a) @@ -3,4 +3,4 @@ select Shops --sortby '+_score, +name' \ --output_columns 'name, _score, location' \ --filter 'geo_in_circle(location, "128429532x503148672", 3000, "ellipsoid") > 0' \ - --scorer '_score = geo_distance(location, "128429532x503148672", "ellipsoid") * 1000 * 1000' + --scorer '_score = geo_distance(location, "128429532x503148672", "ellipsoid") * 1000' Modified: test/command/suite/select/filter/geo_in_circle/approximate_type/ellipsoid/use_index.expected (+12 -12) =================================================================== --- test/command/suite/select/filter/geo_in_circle/approximate_type/ellipsoid/use_index.expected 2014-10-24 22:36:01 +0900 (c6c1bd9) +++ test/command/suite/select/filter/geo_in_circle/approximate_type/ellipsoid/use_index.expected 2014-10-24 23:24:20 +0900 (ea30896) @@ -1,4 +1,4 @@ -select Shops --sortby '+_score, +name' --output_columns 'name, _score, location' --filter 'geo_in_circle(location, "128429532x503148672", 3000, "ellipsoid")' --scorer '_score = geo_distance(location, "128429532x503148672", "ellipsoid") * 1000 * 1000' +select Shops --sortby '+_score, +name' --output_columns 'name, _score, location' --filter 'geo_in_circle(location, "128429532x503148672", 3000, "ellipsoid")' --scorer '_score = geo_distance(location, "128429532x503148672", "ellipsoid") * 1000' [ [ 0, @@ -25,39 +25,39 @@ select Shops --sortby '+_score, +name' --output_columns 'name, _score, locatio ] ], [ - "柳屋 たい焼き", - -2147483648, - "128467228x503222332" - ], - [ "銀座 かずや", - 281623827, + 281623, "128424629x503139222" ], [ "たい焼き鉄次 大丸東京店", - 811420890, + 811420, "128451283x503166852" ], [ "たいやき神田達磨 八重洲店", - 972359708, + 972359, "128453260x503174156" ], [ "にしみや 甘味処", - 1060891168, + 1060891, "128418570x503188661" ], [ "築地 さのきや", - 1187926579, + 1187926, "128397312x503174596" ], [ "しげ田", - 1537012099, + 1537012, "128421454x503208983" + ], + [ + "柳屋 たい焼き", + 2186479, + "128467228x503222332" ] ] ] Modified: test/command/suite/select/filter/geo_in_circle/approximate_type/ellipsoid/use_index.test (+1 -1) =================================================================== --- test/command/suite/select/filter/geo_in_circle/approximate_type/ellipsoid/use_index.test 2014-10-24 22:36:01 +0900 (57cc913) +++ test/command/suite/select/filter/geo_in_circle/approximate_type/ellipsoid/use_index.test 2014-10-24 23:24:20 +0900 (f9ab95e) @@ -3,4 +3,4 @@ select Shops --sortby '+_score, +name' \ --output_columns 'name, _score, location' \ --filter 'geo_in_circle(location, "128429532x503148672", 3000, "ellipsoid")' \ - --scorer '_score = geo_distance(location, "128429532x503148672", "ellipsoid") * 1000 * 1000' + --scorer '_score = geo_distance(location, "128429532x503148672", "ellipsoid") * 1000' Modified: test/command/suite/select/filter/geo_in_circle/approximate_type/rect/not_use_index.expected (+12 -12) =================================================================== --- test/command/suite/select/filter/geo_in_circle/approximate_type/rect/not_use_index.expected 2014-10-24 22:36:01 +0900 (c1859e8) +++ test/command/suite/select/filter/geo_in_circle/approximate_type/rect/not_use_index.expected 2014-10-24 23:24:20 +0900 (76a0c7a) @@ -1,4 +1,4 @@ -select Shops --sortby '+_score, +name' --output_columns 'name, _score, location' --filter 'geo_in_circle(location, "128429532x503148672", 3000, "rect") > 0' --scorer '_score = geo_distance(location, "128429532x503148672", "rect") * 1000 * 1000' +select Shops --sortby '+_score, +name' --output_columns 'name, _score, location' --filter 'geo_in_circle(location, "128429532x503148672", 3000, "rect") > 0' --scorer '_score = geo_distance(location, "128429532x503148672", "rect") * 1000' [ [ 0, @@ -25,39 +25,39 @@ select Shops --sortby '+_score, +name' --output_columns 'name, _score, locatio ] ], [ - "柳屋 たい焼き", - -2147483648, - "128467228x503222332" - ], - [ "銀座 かずや", - 280743810, + 280743, "128424629x503139222" ], [ "たい焼き鉄次 大丸東京店", - 810303031, + 810303, "128451283x503166852" ], [ "たいやき神田達磨 八重洲店", - 970517026, + 970517, "128453260x503174156" ], [ "にしみや 甘味処", - 1056698886, + 1056698, "128418570x503188661" ], [ "築地 さのきや", - 1186376492, + 1186376, "128397312x503174596" ], [ "しげ田", - 1530425643, + 1530425, "128421454x503208983" + ], + [ + "柳屋 たい焼き", + 2179591, + "128467228x503222332" ] ] ] Modified: test/command/suite/select/filter/geo_in_circle/approximate_type/rect/not_use_index.test (+1 -1) =================================================================== --- test/command/suite/select/filter/geo_in_circle/approximate_type/rect/not_use_index.test 2014-10-24 22:36:01 +0900 (7d494fc) +++ test/command/suite/select/filter/geo_in_circle/approximate_type/rect/not_use_index.test 2014-10-24 23:24:20 +0900 (84be315) @@ -3,4 +3,4 @@ select Shops --sortby '+_score, +name' \ --output_columns 'name, _score, location' \ --filter 'geo_in_circle(location, "128429532x503148672", 3000, "rect") > 0' \ - --scorer '_score = geo_distance(location, "128429532x503148672", "rect") * 1000 * 1000' + --scorer '_score = geo_distance(location, "128429532x503148672", "rect") * 1000' Modified: test/command/suite/select/filter/geo_in_circle/approximate_type/rect/use_index.expected (+12 -12) =================================================================== --- test/command/suite/select/filter/geo_in_circle/approximate_type/rect/use_index.expected 2014-10-24 22:36:01 +0900 (0d288fa) +++ test/command/suite/select/filter/geo_in_circle/approximate_type/rect/use_index.expected 2014-10-24 23:24:20 +0900 (9a370e1) @@ -1,4 +1,4 @@ -select Shops --sortby '+_score, +name' --output_columns 'name, _score, location' --filter 'geo_in_circle(location, "128429532x503148672", 3000, "rect")' --scorer '_score = geo_distance(location, "128429532x503148672", "rect") * 1000 * 1000' +select Shops --sortby '+_score, +name' --output_columns 'name, _score, location' --filter 'geo_in_circle(location, "128429532x503148672", 3000, "rect")' --scorer '_score = geo_distance(location, "128429532x503148672", "rect") * 1000' [ [ 0, @@ -25,39 +25,39 @@ select Shops --sortby '+_score, +name' --output_columns 'name, _score, locatio ] ], [ - "柳屋 たい焼き", - -2147483648, - "128467228x503222332" - ], - [ "銀座 かずや", - 280743810, + 280743, "128424629x503139222" ], [ "たい焼き鉄次 大丸東京店", - 810303031, + 810303, "128451283x503166852" ], [ "たいやき神田達磨 八重洲店", - 970517026, + 970517, "128453260x503174156" ], [ "にしみや 甘味処", - 1056698886, + 1056698, "128418570x503188661" ], [ "築地 さのきや", - 1186376492, + 1186376, "128397312x503174596" ], [ "しげ田", - 1530425643, + 1530425, "128421454x503208983" + ], + [ + "柳屋 たい焼き", + 2179591, + "128467228x503222332" ] ] ] Modified: test/command/suite/select/filter/geo_in_circle/approximate_type/rect/use_index.test (+1 -1) =================================================================== --- test/command/suite/select/filter/geo_in_circle/approximate_type/rect/use_index.test 2014-10-24 22:36:01 +0900 (06b1ae2) +++ test/command/suite/select/filter/geo_in_circle/approximate_type/rect/use_index.test 2014-10-24 23:24:20 +0900 (bfd6af9) @@ -3,4 +3,4 @@ select Shops --sortby '+_score, +name' \ --output_columns 'name, _score, location' \ --filter 'geo_in_circle(location, "128429532x503148672", 3000, "rect")' \ - --scorer '_score = geo_distance(location, "128429532x503148672", "rect") * 1000 * 1000' + --scorer '_score = geo_distance(location, "128429532x503148672", "rect") * 1000' Modified: test/command/suite/select/filter/geo_in_circle/approximate_type/rectangle/not_use_index.expected (+12 -12) =================================================================== --- test/command/suite/select/filter/geo_in_circle/approximate_type/rectangle/not_use_index.expected 2014-10-24 22:36:01 +0900 (4827ea5) +++ test/command/suite/select/filter/geo_in_circle/approximate_type/rectangle/not_use_index.expected 2014-10-24 23:24:20 +0900 (036f07b) @@ -1,4 +1,4 @@ -select Shops --sortby '+_score, +name' --output_columns 'name, _score, location' --filter 'geo_in_circle(location, "128429532x503148672", 3000, "rectangle") > 0' --scorer '_score = geo_distance(location, "128429532x503148672", "rectangle") * 1000 * 1000' +select Shops --sortby '+_score, +name' --output_columns 'name, _score, location' --filter 'geo_in_circle(location, "128429532x503148672", 3000, "rectangle") > 0' --scorer '_score = geo_distance(location, "128429532x503148672", "rectangle") * 1000' [ [ 0, @@ -25,39 +25,39 @@ select Shops --sortby '+_score, +name' --output_columns 'name, _score, locatio ] ], [ - "柳屋 たい焼き", - -2147483648, - "128467228x503222332" - ], - [ "銀座 かずや", - 280743810, + 280743, "128424629x503139222" ], [ "たい焼き鉄次 大丸東京店", - 810303031, + 810303, "128451283x503166852" ], [ "たいやき神田達磨 八重洲店", - 970517026, + 970517, "128453260x503174156" ], [ "にしみや 甘味処", - 1056698886, + 1056698, "128418570x503188661" ], [ "築地 さのきや", - 1186376492, + 1186376, "128397312x503174596" ], [ "しげ田", - 1530425643, + 1530425, "128421454x503208983" + ], + [ + "柳屋 たい焼き", + 2179591, + "128467228x503222332" ] ] ] Modified: test/command/suite/select/filter/geo_in_circle/approximate_type/rectangle/not_use_index.test (+1 -1) =================================================================== --- test/command/suite/select/filter/geo_in_circle/approximate_type/rectangle/not_use_index.test 2014-10-24 22:36:01 +0900 (dc9b938) +++ test/command/suite/select/filter/geo_in_circle/approximate_type/rectangle/not_use_index.test 2014-10-24 23:24:20 +0900 (99b44e9) @@ -3,4 +3,4 @@ select Shops --sortby '+_score, +name' \ --output_columns 'name, _score, location' \ --filter 'geo_in_circle(location, "128429532x503148672", 3000, "rectangle") > 0' \ - --scorer '_score = geo_distance(location, "128429532x503148672", "rectangle") * 1000 * 1000' + --scorer '_score = geo_distance(location, "128429532x503148672", "rectangle") * 1000' Modified: test/command/suite/select/filter/geo_in_circle/approximate_type/rectangle/use_index.expected (+12 -12) =================================================================== --- test/command/suite/select/filter/geo_in_circle/approximate_type/rectangle/use_index.expected 2014-10-24 22:36:01 +0900 (fb53d88) +++ test/command/suite/select/filter/geo_in_circle/approximate_type/rectangle/use_index.expected 2014-10-24 23:24:20 +0900 (42a932a) @@ -1,4 +1,4 @@ -select Shops --sortby '+_score, +name' --output_columns 'name, _score, location' --filter 'geo_in_circle(location, "128429532x503148672", 3000, "rectangle")' --scorer '_score = geo_distance(location, "128429532x503148672", "rectangle") * 1000 * 1000' +select Shops --sortby '+_score, +name' --output_columns 'name, _score, location' --filter 'geo_in_circle(location, "128429532x503148672", 3000, "rectangle")' --scorer '_score = geo_distance(location, "128429532x503148672", "rectangle") * 1000' [ [ 0, @@ -25,39 +25,39 @@ select Shops --sortby '+_score, +name' --output_columns 'name, _score, locatio ] ], [ - "柳屋 たい焼き", - -2147483648, - "128467228x503222332" - ], - [ "銀座 かずや", - 280743810, + 280743, "128424629x503139222" ], [ "たい焼き鉄次 大丸東京店", - 810303031, + 810303, "128451283x503166852" ], [ "たいやき神田達磨 八重洲店", - 970517026, + 970517, "128453260x503174156" ], [ "にしみや 甘味処", - 1056698886, + 1056698, "128418570x503188661" ], [ "築地 さのきや", - 1186376492, + 1186376, "128397312x503174596" ], [ "しげ田", - 1530425643, + 1530425, "128421454x503208983" + ], + [ + "柳屋 たい焼き", + 2179591, + "128467228x503222332" ] ] ] Modified: test/command/suite/select/filter/geo_in_circle/approximate_type/rectangle/use_index.test (+1 -1) =================================================================== --- test/command/suite/select/filter/geo_in_circle/approximate_type/rectangle/use_index.test 2014-10-24 22:36:01 +0900 (fbc4ed7) +++ test/command/suite/select/filter/geo_in_circle/approximate_type/rectangle/use_index.test 2014-10-24 23:24:20 +0900 (9c66329) @@ -3,4 +3,4 @@ select Shops --sortby '+_score, +name' \ --output_columns 'name, _score, location' \ --filter 'geo_in_circle(location, "128429532x503148672", 3000, "rectangle")' \ - --scorer '_score = geo_distance(location, "128429532x503148672", "rectangle") * 1000 * 1000' + --scorer '_score = geo_distance(location, "128429532x503148672", "rectangle") * 1000' Modified: test/command/suite/select/filter/geo_in_circle/approximate_type/sphere/not_use_index.expected (+12 -12) =================================================================== --- test/command/suite/select/filter/geo_in_circle/approximate_type/sphere/not_use_index.expected 2014-10-24 22:36:01 +0900 (9b78903) +++ test/command/suite/select/filter/geo_in_circle/approximate_type/sphere/not_use_index.expected 2014-10-24 23:24:20 +0900 (74c60c0) @@ -1,4 +1,4 @@ -select Shops --sortby '+_score, +name' --output_columns 'name, _score, location' --filter 'geo_in_circle(location, "128429532x503148672", 3000, "sphere") > 0' --scorer '_score = geo_distance(location, "128429532x503148672", "sphere") * 1000 * 1000' +select Shops --sortby '+_score, +name' --output_columns 'name, _score, location' --filter 'geo_in_circle(location, "128429532x503148672", 3000, "sphere") > 0' --scorer '_score = geo_distance(location, "128429532x503148672", "sphere") * 1000' [ [ 0, @@ -25,39 +25,39 @@ select Shops --sortby '+_score, +name' --output_columns 'name, _score, locatio ] ], [ - "柳屋 たい焼き", - -2147483648, - "128467228x503222332" - ], - [ "銀座 かずや", - 280743810, + 280743, "128424629x503139222" ], [ "たい焼き鉄次 大丸東京店", - 810303031, + 810303, "128451283x503166852" ], [ "たいやき神田達磨 八重洲店", - 970517025, + 970517, "128453260x503174156" ], [ "にしみや 甘味処", - 1056698886, + 1056698, "128418570x503188661" ], [ "築地 さのきや", - 1186376491, + 1186376, "128397312x503174596" ], [ "しげ田", - 1530425641, + 1530425, "128421454x503208983" + ], + [ + "柳屋 たい焼き", + 2179591, + "128467228x503222332" ] ] ] Modified: test/command/suite/select/filter/geo_in_circle/approximate_type/sphere/not_use_index.test (+1 -1) =================================================================== --- test/command/suite/select/filter/geo_in_circle/approximate_type/sphere/not_use_index.test 2014-10-24 22:36:01 +0900 (46cdc55) +++ test/command/suite/select/filter/geo_in_circle/approximate_type/sphere/not_use_index.test 2014-10-24 23:24:20 +0900 (3fcb991) @@ -3,4 +3,4 @@ select Shops --sortby '+_score, +name' \ --output_columns 'name, _score, location' \ --filter 'geo_in_circle(location, "128429532x503148672", 3000, "sphere") > 0' \ - --scorer '_score = geo_distance(location, "128429532x503148672", "sphere") * 1000 * 1000' + --scorer '_score = geo_distance(location, "128429532x503148672", "sphere") * 1000' Modified: test/command/suite/select/filter/geo_in_circle/approximate_type/sphere/use_index.expected (+12 -12) =================================================================== --- test/command/suite/select/filter/geo_in_circle/approximate_type/sphere/use_index.expected 2014-10-24 22:36:01 +0900 (ae98f36) +++ test/command/suite/select/filter/geo_in_circle/approximate_type/sphere/use_index.expected 2014-10-24 23:24:20 +0900 (d6a9bbb) @@ -1,4 +1,4 @@ -select Shops --sortby '+_score, +name' --output_columns 'name, _score, location' --filter 'geo_in_circle(location, "128429532x503148672", 3000, "sphere")' --scorer '_score = geo_distance(location, "128429532x503148672", "sphere") * 1000 * 1000' +select Shops --sortby '+_score, +name' --output_columns 'name, _score, location' --filter 'geo_in_circle(location, "128429532x503148672", 3000, "sphere")' --scorer '_score = geo_distance(location, "128429532x503148672", "sphere") * 1000' [ [ 0, @@ -25,39 +25,39 @@ select Shops --sortby '+_score, +name' --output_columns 'name, _score, locatio ] ], [ - "柳屋 たい焼き", - -2147483648, - "128467228x503222332" - ], - [ "銀座 かずや", - 280743810, + 280743, "128424629x503139222" ], [ "たい焼き鉄次 大丸東京店", - 810303031, + 810303, "128451283x503166852" ], [ "たいやき神田達磨 八重洲店", - 970517025, + 970517, "128453260x503174156" ], [ "にしみや 甘味処", - 1056698886, + 1056698, "128418570x503188661" ], [ "築地 さのきや", - 1186376491, + 1186376, "128397312x503174596" ], [ "しげ田", - 1530425641, + 1530425, "128421454x503208983" + ], + [ + "柳屋 たい焼き", + 2179591, + "128467228x503222332" ] ] ] Modified: test/command/suite/select/filter/geo_in_circle/approximate_type/sphere/use_index.test (+1 -1) =================================================================== --- test/command/suite/select/filter/geo_in_circle/approximate_type/sphere/use_index.test 2014-10-24 22:36:01 +0900 (a414ea1) +++ test/command/suite/select/filter/geo_in_circle/approximate_type/sphere/use_index.test 2014-10-24 23:24:20 +0900 (4f3d54e) @@ -3,4 +3,4 @@ select Shops --sortby '+_score, +name' \ --output_columns 'name, _score, location' \ --filter 'geo_in_circle(location, "128429532x503148672", 3000, "sphere")' \ - --scorer '_score = geo_distance(location, "128429532x503148672", "sphere") * 1000 * 1000' + --scorer '_score = geo_distance(location, "128429532x503148672", "sphere") * 1000' Modified: test/command/suite/select/filter/geo_in_circle/approximate_type/sphr/not_use_index.expected (+12 -12) =================================================================== --- test/command/suite/select/filter/geo_in_circle/approximate_type/sphr/not_use_index.expected 2014-10-24 22:36:01 +0900 (0e07107) +++ test/command/suite/select/filter/geo_in_circle/approximate_type/sphr/not_use_index.expected 2014-10-24 23:24:20 +0900 (e53ee46) @@ -1,4 +1,4 @@ -select Shops --sortby '+_score, +name' --output_columns 'name, _score, location' --filter 'geo_in_circle(location, "128429532x503148672", 3000, "sphr") > 0' --scorer '_score = geo_distance(location, "128429532x503148672", "sphr") * 1000 * 1000' +select Shops --sortby '+_score, +name' --output_columns 'name, _score, location' --filter 'geo_in_circle(location, "128429532x503148672", 3000, "sphr") > 0' --scorer '_score = geo_distance(location, "128429532x503148672", "sphr") * 1000' [ [ 0, @@ -25,39 +25,39 @@ select Shops --sortby '+_score, +name' --output_columns 'name, _score, locatio ] ], [ - "柳屋 たい焼き", - -2147483648, - "128467228x503222332" - ], - [ "銀座 かずや", - 280743810, + 280743, "128424629x503139222" ], [ "たい焼き鉄次 大丸東京店", - 810303031, + 810303, "128451283x503166852" ], [ "たいやき神田達磨 八重洲店", - 970517025, + 970517, "128453260x503174156" ], [ "にしみや 甘味処", - 1056698886, + 1056698, "128418570x503188661" ], [ "築地 さのきや", - 1186376491, + 1186376, "128397312x503174596" ], [ "しげ田", - 1530425641, + 1530425, "128421454x503208983" + ], + [ + "柳屋 たい焼き", + 2179591, + "128467228x503222332" ] ] ] Modified: test/command/suite/select/filter/geo_in_circle/approximate_type/sphr/not_use_index.test (+1 -1) =================================================================== --- test/command/suite/select/filter/geo_in_circle/approximate_type/sphr/not_use_index.test 2014-10-24 22:36:01 +0900 (de003f4) +++ test/command/suite/select/filter/geo_in_circle/approximate_type/sphr/not_use_index.test 2014-10-24 23:24:20 +0900 (6067f03) @@ -3,4 +3,4 @@ select Shops --sortby '+_score, +name' \ --output_columns 'name, _score, location' \ --filter 'geo_in_circle(location, "128429532x503148672", 3000, "sphr") > 0' \ - --scorer '_score = geo_distance(location, "128429532x503148672", "sphr") * 1000 * 1000' + --scorer '_score = geo_distance(location, "128429532x503148672", "sphr") * 1000' Modified: test/command/suite/select/filter/geo_in_circle/approximate_type/sphr/use_index.expected (+12 -12) =================================================================== --- test/command/suite/select/filter/geo_in_circle/approximate_type/sphr/use_index.expected 2014-10-24 22:36:01 +0900 (7fefeed) +++ test/command/suite/select/filter/geo_in_circle/approximate_type/sphr/use_index.expected 2014-10-24 23:24:20 +0900 (9594d8c) @@ -1,4 +1,4 @@ -select Shops --sortby '+_score, +name' --output_columns 'name, _score, location' --filter 'geo_in_circle(location, "128429532x503148672", 3000, "sphr")' --scorer '_score = geo_distance(location, "128429532x503148672", "sphr") * 1000 * 1000' +select Shops --sortby '+_score, +name' --output_columns 'name, _score, location' --filter 'geo_in_circle(location, "128429532x503148672", 3000, "sphr")' --scorer '_score = geo_distance(location, "128429532x503148672", "sphr") * 1000' [ [ 0, @@ -25,39 +25,39 @@ select Shops --sortby '+_score, +name' --output_columns 'name, _score, locatio ] ], [ - "柳屋 たい焼き", - -2147483648, - "128467228x503222332" - ], - [ "銀座 かずや", - 280743810, + 280743, "128424629x503139222" ], [ "たい焼き鉄次 大丸東京店", - 810303031, + 810303, "128451283x503166852" ], [ "たいやき神田達磨 八重洲店", - 970517025, + 970517, "128453260x503174156" ], [ "にしみや 甘味処", - 1056698886, + 1056698, "128418570x503188661" ], [ "築地 さのきや", - 1186376491, + 1186376, "128397312x503174596" ], [ "しげ田", - 1530425641, + 1530425, "128421454x503208983" + ], + [ + "柳屋 たい焼き", + 2179591, + "128467228x503222332" ] ] ] Modified: test/command/suite/select/filter/geo_in_circle/approximate_type/sphr/use_index.test (+1 -1) =================================================================== --- test/command/suite/select/filter/geo_in_circle/approximate_type/sphr/use_index.test 2014-10-24 22:36:01 +0900 (758f550) +++ test/command/suite/select/filter/geo_in_circle/approximate_type/sphr/use_index.test 2014-10-24 23:24:20 +0900 (212e080) @@ -3,4 +3,4 @@ select Shops --sortby '+_score, +name' \ --output_columns 'name, _score, location' \ --filter 'geo_in_circle(location, "128429532x503148672", 3000, "sphr")' \ - --scorer '_score = geo_distance(location, "128429532x503148672", "sphr") * 1000 * 1000' + --scorer '_score = geo_distance(location, "128429532x503148672", "sphr") * 1000' -------------- next part -------------- HTML����������������������������...Download