null+****@clear*****
null+****@clear*****
2011年 11月 23日 (水) 19:10:21 JST
Kouhei Sutou 2011-11-23 10:10:21 +0000 (Wed, 23 Nov 2011)
New Revision: 7882e26e861358e725995735f0c11bc04dccb869
Log:
geo_cursor -> cursor_geo.
Modified files:
ha_mroonga.cc
ha_mroonga.h
Modified: ha_mroonga.cc (+9 -9)
===================================================================
--- ha_mroonga.cc 2011-11-23 10:09:28 +0000 (fb355d5)
+++ ha_mroonga.cc 2011-11-23 10:10:21 +0000 (5e7026a)
@@ -1361,7 +1361,7 @@ ha_mroonga::ha_mroonga(handlerton *hton, TABLE_SHARE *share)
grn_columns = NULL;
cursor = NULL;
index_table_cursor = NULL;
- geo_cursor = NULL;
+ cursor_geo = NULL;
GRN_WGS84_GEO_POINT_INIT(&top_left_point, 0);
GRN_WGS84_GEO_POINT_INIT(&bottom_right_point, 0);
score_column = NULL;
@@ -5685,9 +5685,9 @@ void ha_mroonga::clear_cursor()
void ha_mroonga::clear_cursor_geo()
{
MRN_DBUG_ENTER_METHOD();
- if (geo_cursor) {
- grn_obj_unlink(ctx, geo_cursor);
- geo_cursor = NULL;
+ if (cursor_geo) {
+ grn_obj_unlink(ctx, cursor_geo);
+ cursor_geo = NULL;
}
DBUG_VOID_RETURN;
}
@@ -5745,10 +5745,10 @@ int ha_mroonga::wrapper_get_next_record(uchar *buf)
int error = 0;
do {
GRN_BULK_REWIND(&key_buffer);
- if (geo_cursor) {
+ if (cursor_geo) {
grn_id found_record_id;
grn_posting *posting;
- posting = grn_geo_cursor_next(ctx, geo_cursor);
+ posting = grn_geo_cursor_next(ctx, cursor_geo);
if (!posting) {
error = HA_ERR_END_OF_FILE;
clear_cursor_geo();
@@ -5822,9 +5822,9 @@ int ha_mroonga::wrapper_get_next_record(uchar *buf)
int ha_mroonga::storage_get_next_record(uchar *buf)
{
MRN_DBUG_ENTER_METHOD();
- if (geo_cursor) {
+ if (cursor_geo) {
grn_posting *posting;
- posting = grn_geo_cursor_next(ctx, geo_cursor);
+ posting = grn_geo_cursor_next(ctx, cursor_geo);
if (posting) {
record_id = posting->rid;
} else {
@@ -5892,7 +5892,7 @@ int ha_mroonga::generic_geo_open_cursor(const uchar *key,
if (find_flag & HA_READ_MBR_CONTAIN) {
grn_obj *index = grn_index_columns[active_index];
geo_store_rectangle(key);
- geo_cursor = grn_geo_cursor_open_in_rectangle(ctx,
+ cursor_geo = grn_geo_cursor_open_in_rectangle(ctx,
index,
&top_left_point,
&bottom_right_point,
Modified: ha_mroonga.h (+1 -1)
===================================================================
--- ha_mroonga.h 2011-11-23 10:09:28 +0000 (6b68696)
+++ ha_mroonga.h 2011-11-23 10:10:21 +0000 (8182148)
@@ -154,7 +154,7 @@ private:
grn_obj bottom_right_point;
grn_table_cursor *cursor;
grn_table_cursor *index_table_cursor;
- grn_obj *geo_cursor;
+ grn_obj *cursor_geo;
grn_obj *score_column;
grn_obj *key_accessor;