diff --git a/src/box/key_def.h b/src/box/key_def.h
index 85bed92bbff8d1fe618292e678bdff774be513aa..bf3e63b6d78f4cf187385d445425a6f0f8431c0c 100644
--- a/src/box/key_def.h
+++ b/src/box/key_def.h
@@ -107,7 +107,7 @@ struct key_part {
* the indexed field (tuple_field::offset_slot).
* Valid only if key_part::format_epoch equals the epoch
* of the tuple format. This value is updated in
- * tuple_field_by_part_raw to always store the
+ * tuple_field_raw_by_part to always store the
* offset corresponding to the last used tuple format.
*/
int32_t offset_slot_cache;
diff --git a/src/box/tuple.h b/src/box/tuple.h
index d2da267132bcc04e12d787cb75d4ce5462f9a6d4..0a3d9696a142f2420baf8d99a8e725fd13cea178 100644
--- a/src/box/tuple.h
+++ b/src/box/tuple.h
@@ -540,7 +540,7 @@ tuple_field_by_path(const struct tuple *tuple, uint32_t fieldno,
static inline const char *
tuple_field_by_part(const struct tuple *tuple, struct key_part *part)
{
- return tuple_field_by_part_raw(tuple_format(tuple), tuple_data(tuple),
+ return tuple_field_raw_by_part(tuple_format(tuple), tuple_data(tuple),
tuple_field_map(tuple), part);
}
diff --git a/src/box/tuple_compare.cc b/src/box/tuple_compare.cc
index 1d1ab8711ec12a3a090ebfb852be302a154ffd86..ded802c7db5e1a77d5a325ec41e0a4b5d2600fea 100644
--- a/src/box/tuple_compare.cc
+++ b/src/box/tuple_compare.cc
@@ -439,10 +439,10 @@ tuple_common_key_parts(const struct tuple *tuple_a, const struct tuple *tuple_b,
for (i = 0; i < key_def->part_count; i++) {
struct key_part *part = (struct key_part *)&key_def->parts[i];
const char *field_a =
- tuple_field_by_part_raw(tuple_a_format, tuple_a_raw,
+ tuple_field_raw_by_part(tuple_a_format, tuple_a_raw,
tuple_a_field_map, part);
const char *field_b =
- tuple_field_by_part_raw(tuple_b_format, tuple_b_raw,
+ tuple_field_raw_by_part(tuple_b_format, tuple_b_raw,
tuple_b_field_map, part);
enum mp_type a_type = field_a != NULL ?
mp_typeof(*field_a) : MP_NIL;
@@ -510,9 +510,9 @@ tuple_compare_slowpath(const struct tuple *tuple_a, const struct tuple *tuple_b,
for (; part < end; part++) {
if (has_json_paths) {
- field_a = tuple_field_by_part_raw(format_a, tuple_a_raw,
+ field_a = tuple_field_raw_by_part(format_a, tuple_a_raw,
field_map_a, part);
- field_b = tuple_field_by_part_raw(format_b, tuple_b_raw,
+ field_b = tuple_field_raw_by_part(format_b, tuple_b_raw,
field_map_b, part);
} else {
field_a = tuple_field_raw(format_a, tuple_a_raw,
@@ -567,9 +567,9 @@ tuple_compare_slowpath(const struct tuple *tuple_a, const struct tuple *tuple_b,
end = key_def->parts + key_def->part_count;
for (; part < end; ++part) {
if (has_json_paths) {
- field_a = tuple_field_by_part_raw(format_a, tuple_a_raw,
+ field_a = tuple_field_raw_by_part(format_a, tuple_a_raw,
field_map_a, part);
- field_b = tuple_field_by_part_raw(format_b, tuple_b_raw,
+ field_b = tuple_field_raw_by_part(format_b, tuple_b_raw,
field_map_b, part);
} else {
field_a = tuple_field_raw(format_a, tuple_a_raw,
@@ -609,7 +609,7 @@ tuple_compare_with_key_slowpath(const struct tuple *tuple, const char *key,
if (likely(part_count == 1)) {
const char *field;
if (has_json_paths) {
- field = tuple_field_by_part_raw(format, tuple_raw,
+ field = tuple_field_raw_by_part(format, tuple_raw,
field_map, part);
} else {
field = tuple_field_raw(format, tuple_raw, field_map,
@@ -640,7 +640,7 @@ tuple_compare_with_key_slowpath(const struct tuple *tuple, const char *key,
for (; part < end; ++part, mp_next(&key)) {
const char *field;
if (has_json_paths) {
- field = tuple_field_by_part_raw(format, tuple_raw,
+ field = tuple_field_raw_by_part(format, tuple_raw,
field_map, part);
} else {
field = tuple_field_raw(format, tuple_raw, field_map,
diff --git a/src/box/tuple_extract_key.cc b/src/box/tuple_extract_key.cc
index ab765ed16cbdfbe85068d2e25d1dcfc1cedcbca5..5cf467248d90c03497e9aa075b3c155d99e7e87d 100644
--- a/src/box/tuple_extract_key.cc
+++ b/src/box/tuple_extract_key.cc
@@ -130,7 +130,7 @@ tuple_extract_key_slowpath(const struct tuple *tuple,
field = tuple_field_raw(format, data, field_map,
key_def->parts[i].fieldno);
} else {
- field = tuple_field_by_part_raw(format, data, field_map,
+ field = tuple_field_raw_by_part(format, data, field_map,
&key_def->parts[i]);
}
if (has_optional_parts && field == NULL) {
@@ -177,7 +177,7 @@ tuple_extract_key_slowpath(const struct tuple *tuple,
field = tuple_field_raw(format, data, field_map,
key_def->parts[i].fieldno);
} else {
- field = tuple_field_by_part_raw(format, data, field_map,
+ field = tuple_field_raw_by_part(format, data, field_map,
&key_def->parts[i]);
}
if (has_optional_parts && field == NULL) {
diff --git a/src/box/tuple_format.h b/src/box/tuple_format.h
index 334093968f599dcd39aaaa34a32938f1becbb8ef..0b5616f39a737fc0d819c387ecf7e16037560dae 100644
--- a/src/box/tuple_format.h
+++ b/src/box/tuple_format.h
@@ -533,7 +533,7 @@ tuple_field_raw_by_full_path(struct tuple_format *format, const char *tuple,
* @retval Field data if the field exists or NULL.
*/
static inline const char *
-tuple_field_by_part_raw(struct tuple_format *format, const char *data,
+tuple_field_raw_by_part(struct tuple_format *format, const char *data,
const uint32_t *field_map, struct key_part *part)
{
if (unlikely(part->format_epoch != format->epoch)) {
diff --git a/src/box/tuple_hash.cc b/src/box/tuple_hash.cc
index f26eb66b4068ddb6c205b424e46e30ca75cd6725..79349fcdceba1314cdf31ef3230a4ba86190aa59 100644
--- a/src/box/tuple_hash.cc
+++ b/src/box/tuple_hash.cc
@@ -370,7 +370,7 @@ tuple_hash_slowpath(const struct tuple *tuple, struct key_def *key_def)
const uint32_t *field_map = tuple_field_map(tuple);
const char *field;
if (has_json_paths) {
- field = tuple_field_by_part_raw(format, tuple_raw, field_map,
+ field = tuple_field_raw_by_part(format, tuple_raw, field_map,
key_def->parts);
} else {
field = tuple_field_raw(format, tuple_raw, field_map,
@@ -391,7 +391,7 @@ tuple_hash_slowpath(const struct tuple *tuple, struct key_def *key_def)
if (prev_fieldno + 1 != key_def->parts[part_id].fieldno) {
struct key_part *part = &key_def->parts[part_id];
if (has_json_paths) {
- field = tuple_field_by_part_raw(format, tuple_raw,
+ field = tuple_field_raw_by_part(format, tuple_raw,
field_map, part);
} else {
field = tuple_field_raw(format, tuple_raw, field_map,
diff --git a/src/box/vy_stmt.h b/src/box/vy_stmt.h
index c3381402904e120f4c21e4d71109e1d47e27661b..d131a4612143d2da8dea7a67dbf36e6cb9ce442a 100644
--- a/src/box/vy_stmt.h
+++ b/src/box/vy_stmt.h
@@ -691,7 +691,7 @@ vy_tuple_key_contains_null(const struct tuple *tuple, struct key_def *def)
for (struct key_part *part = def->parts, *end = part + def->part_count;
part < end; ++part) {
const char *field =
- tuple_field_by_part_raw(format, data, field_map, part);
+ tuple_field_raw_by_part(format, data, field_map, part);
if (field == NULL || mp_typeof(*field) == MP_NIL)
return true;
}