@@ -1676,8 +1676,8 @@ void ha_rocksdb::convert_record_to_storage_format(rocksdb::Slice *packed_rec)
16761676
16771677 for (uint i=0 ; i < table->s ->fields ; i++)
16781678 {
1679- /* Don't pack decode-able PK key parts */
1680- if (field_enc[i].skip )
1679+ /* Don't pack decodable PK key parts */
1680+ if (field_enc[i].dont_store )
16811681 continue ;
16821682
16831683 Field *field= table->field [i];
@@ -1782,7 +1782,7 @@ int ha_rocksdb::convert_record_from_storage_format(uchar * buf)
17821782
17831783 for (uint i=0 ; i < table->s ->fields ; i++)
17841784 {
1785- if (field_enc[i].skip )
1785+ if (field_enc[i].dont_store )
17861786 continue ;
17871787
17881788 Field *field= table->field [i];
@@ -1882,6 +1882,10 @@ int ha_rocksdb::convert_record_from_storage_format(uchar * buf)
18821882
18831883/*
18841884 Setup data needed to convert table->record[] to and from record storage format.
1885+
1886+ @seealso
1887+ ha_rocksdb::convert_record_to_storage_format,
1888+ ha_rocksdb::convert_record_from_storage_format
18851889*/
18861890
18871891void ha_rocksdb::setup_field_converters ()
@@ -1896,7 +1900,7 @@ void ha_rocksdb::setup_field_converters()
18961900 for (i= 0 ; i < table->s ->fields ; i++)
18971901 {
18981902 Field *field= table->field [i];
1899- field_enc[i].skip = false ;
1903+ field_enc[i].dont_store = false ;
19001904
19011905 /*
19021906 Check if this field is
@@ -1910,10 +1914,11 @@ void ha_rocksdb::setup_field_converters()
19101914 KEY *pk_info= &table->key_info [table->s ->primary_key ];
19111915 for (uint kp= 0 ; kp < pk_info->user_defined_key_parts ; kp++)
19121916 {
1917+ /* key_part->fieldnr is counted from 1 */
19131918 if (field->field_index + 1 == pk_info->key_part [kp].fieldnr )
19141919 {
19151920 if (pk_descr->can_unpack (kp))
1916- field_enc[i].skip = true ; /* Don't store */
1921+ field_enc[i].dont_store = true ;
19171922 break ;
19181923 }
19191924 }
0 commit comments