Kouhei Sutou
null+****@clear*****
Mon Apr 4 00:55:05 JST 2016
Kouhei Sutou 2016-04-04 00:55:05 +0900 (Mon, 04 Apr 2016) New Revision: 01888de4af5f19d95c07f91245ad0b7c97726461 https://github.com/groonga/groonga/commit/01888de4af5f19d95c07f91245ad0b7c97726461 Message: geo_in_rectangle: selector is worked without index Modified files: lib/geo.c test/command/suite/select/filter/geo_in_rectangle/no_index.expected Modified: lib/geo.c (+2 -1) =================================================================== --- lib/geo.c 2016-04-03 23:50:55 +0900 (90eb309) +++ lib/geo.c 2016-04-04 00:55:05 +0900 (ad61603) @@ -1262,7 +1262,8 @@ in_rectangle_data_prepare(grn_ctx *ctx, grn_obj *index, in_rectangle_data *data) { if (!index) { - ERR(GRN_INVALID_ARGUMENT, "%s: index column is missing", process_name); + ERR(GRN_FUNCTION_NOT_IMPLEMENTED, + "%s: index column is missing", process_name); goto exit; } Modified: test/command/suite/select/filter/geo_in_rectangle/no_index.expected (+48 -1) =================================================================== --- test/command/suite/select/filter/geo_in_rectangle/no_index.expected 2016-04-03 23:50:55 +0900 (4e8ccdb) +++ test/command/suite/select/filter/geo_in_rectangle/no_index.expected 2016-04-04 00:55:05 +0900 (bf5f93e) @@ -1,5 +1,52 @@ column_remove Locations shop [[0,0.0,0.0],true] select Shops --sortby '+_score, +name' --output_columns 'name, _score, location' --filter 'geo_in_rectangle(location, "128500000x502800000", "128300000x503000000")' --scorer '_score = geo_distance(location, "128450000x502900000")' -[[[-22,0.0,0.0],"geo_in_rectangle(): index column is missing"],[]] +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 4 + ], + [ + [ + "name", + "ShortText" + ], + [ + "_score", + "Int32" + ], + [ + "location", + "WGS84GeoPoint" + ] + ], + [ + "ふるや古賀音庵 和菓子", + 1655, + "128450171x502833856" + ], + [ + "代官山たい焼き黒鯛", + 3480, + "128341242x502937402" + ], + [ + "たいやきひいらぎ", + 3956, + "128331724x502961461" + ], + [ + "薄皮たい焼き あづきちゃん", + 4736, + "128309436x502823531" + ] + ] + ] +] #|e| geo_in_rectangle(): index column is missing -------------- next part -------------- HTML����������������������������...ダウンロード
