null+****@clear*****
null+****@clear*****
2012年 3月 18日 (日) 18:02:26 JST
Kouhei Sutou 2012-03-18 18:02:26 +0900 (Sun, 18 Mar 2012)
New Revision: c8ff996fdc8bafe25af7397c413e9b30bced7abd
Log:
uint32 -> uint
Modified files:
ha_mroonga.cc
ha_mroonga.h
Modified: ha_mroonga.cc (+8 -8)
===================================================================
--- ha_mroonga.cc 2012-03-18 17:47:26 +0900 (6d9dcf2)
+++ ha_mroonga.cc 2012-03-18 18:02:26 +0900 (b64405f)
@@ -8844,9 +8844,9 @@ int ha_mroonga::storage_encode_key(Field *field, const uchar *key,
DBUG_RETURN(error);
}
-uint32 ha_mroonga::storage_encode_multiple_column_key_float(const uchar *key,
- uchar *buffer,
- bool decode)
+uint ha_mroonga::storage_encode_multiple_column_key_float(const uchar *key,
+ uchar *buffer,
+ bool decode)
{
MRN_DBUG_ENTER_METHOD();
uint data_size = 4;
@@ -8865,12 +8865,12 @@ uint32 ha_mroonga::storage_encode_multiple_column_key_float(const uchar *key,
DBUG_RETURN(data_size);
}
-uint32 ha_mroonga::storage_encode_multiple_column_key_double(const uchar *key,
- uchar *buffer,
- bool decode)
+uint ha_mroonga::storage_encode_multiple_column_key_double(const uchar *key,
+ uchar *buffer,
+ bool decode)
{
MRN_DBUG_ENTER_METHOD();
- uint32 data_size = 8;
+ uint data_size = 8;
double double_value = 0.0;
float8get(double_value, key);
int n_bits = (data_size * 8 - 1);
@@ -8923,7 +8923,7 @@ int ha_mroonga::storage_encode_multiple_column_key(KEY *key_info,
TYPE_DOUBLE,
TYPE_BYTE_SEQUENCE
} data_type = TYPE_UNKNOWN;
- uint32 data_size = 0;
+ uint data_size = 0;
long long int long_long_value = 0;
switch (field->real_type()) {
case MYSQL_TYPE_DECIMAL:
Modified: ha_mroonga.h (+6 -6)
===================================================================
--- ha_mroonga.h 2012-03-18 17:47:26 +0900 (fac5516)
+++ ha_mroonga.h 2012-03-18 18:02:26 +0900 (848ffa7)
@@ -533,12 +533,12 @@ private:
uchar *buf, uint *size);
#endif
int storage_encode_key(Field *field, const uchar *key, uchar *buf, uint *size);
- uint32 storage_encode_multiple_column_key_float(const uchar *key,
- uchar *buffer,
- bool decode);
- uint32 storage_encode_multiple_column_key_double(const uchar *key,
- uchar *buffer,
- bool decode);
+ uint storage_encode_multiple_column_key_float(const uchar *key,
+ uchar *buffer,
+ bool decode);
+ uint storage_encode_multiple_column_key_double(const uchar *key,
+ uchar *buffer,
+ bool decode);
int storage_encode_multiple_column_key(KEY *key_info,
const uchar *key, uint key_length,
uchar *buffer, uint *encoded_length,