Skip to content
/ server Public

MDEV-38878 Archive index_read_idx function isn't virtual #4670

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
grooverdan merged 1 commit into from
Feb 23, 2026
+5 −17
Merged

MDEV-38878 Archive index_read_idx function isn't virtual #4670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 2 additions & 12 deletions storage/archive/ha_archive.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1162,24 +1162,14 @@ IO_AND_CPU_COST ha_archive::rnd_pos_time(ha_rows rows)
*/
int ha_archive::index_read(uchar *buf, const uchar *key,
uint key_len, enum ha_rkey_function find_flag)
{
int rc;
DBUG_ENTER("ha_archive::index_read");
rc= index_read_idx(buf, active_index, key, key_len, find_flag);
DBUG_RETURN(rc);
}


int ha_archive::index_read_idx(uchar *buf, uint index, const uchar *key,
uint key_len, enum ha_rkey_function find_flag)
{
int rc;
bool found= 0;
KEY *mkey= &table->key_info[index];
KEY *mkey= &table->key_info[active_index];
current_k_offset= mkey->key_part->offset;
current_key= key;
current_key_len= key_len;
DBUG_ENTER("ha_archive::index_read_idx");
DBUG_ENTER("ha_archive::index_read");

rc= rnd_init(TRUE);

Expand Down
8 changes: 3 additions & 5 deletions storage/archive/ha_archive.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,11 +115,9 @@ class ha_archive final : public handler
ulonglong blocks) override;
IO_AND_CPU_COST rnd_pos_time(ha_rows rows) override;
int index_init(uint keynr, bool sorted) override;
virtual int index_read(uchar * buf, const uchar * key,
uint key_len, enum ha_rkey_function find_flag)
override;
virtual int index_read_idx(uchar * buf, uint index, const uchar * key,
uint key_len, enum ha_rkey_function find_flag);
int index_read(uchar * buf, const uchar * key,
uint key_len, enum ha_rkey_function find_flag)
override;
int index_next(uchar * buf) override;
int open(const char *name, int mode, uint test_if_locked) override;
int close(void) override;
Expand Down
Loading