Skip to content

Support reverse-index-sort #57

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

Open
jgadling wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Support reverse-index-sort #57

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e69d5d3
Allow multiple rows to be returned for each element in the IN() clause.
jgadling Jun 8, 2011
688b057
Bandaid implementation of reverse-index-order for = and IN() queries.
jgadling Jun 8, 2011
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
32 changes: 28 additions & 4 deletions handlersocket/database.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -796,23 +796,42 @@ dbcontext::cmd_find_internal(dbcallback_i& cb, const prep_stmt& pst,
size_t modified_count = 0;
int r = 0;
bool is_first = true;
bool in_loop = false;
for (uint32_t cnt = 0; cnt < limit + skip;) {
if (is_first) {
is_first = false;
const key_part_map kpm = (1U << args.kvalslen) - 1;
r = hnd->index_read_map(table->record[0], key_buf, kpm, find_flag);
} else if (args.invalues_keypart >= 0) {
if (args.op.begin()[0] == '^') {
r = hnd->index_read_last_map(table->record[0], key_buf, kpm);
}
else {
r = hnd->index_read_map(table->record[0], key_buf, kpm, find_flag);
}
if (args.invalues_keypart >= 0) {
in_loop = true;
}
} else if (!in_loop && args.invalues_keypart >= 0) {
if (++invalues_idx >= args.invalueslen) {
break;
}
kplen_sum = prepare_keybuf(args, key_buf, table, kinfo, invalues_idx);
const key_part_map kpm = (1U << args.kvalslen) - 1;
r = hnd->index_read_map(table->record[0], key_buf, kpm, find_flag);
if (args.op.begin()[0] == '^') {
r = hnd->index_read_last_map(table->record[0], key_buf, kpm);
} else {
r = hnd->index_read_map(table->record[0], key_buf, kpm, find_flag);
}
in_loop = true;
} else {
switch (find_flag) {
case HA_READ_BEFORE_KEY:
case HA_READ_KEY_OR_PREV:
r = hnd->index_prev(table->record[0]);
if (args.op.begin()[0] == '^') {
if (key_cmp_if_same(table, key_buf, hnd->active_index, kplen_sum)) {
r = HA_ERR_END_OF_FILE; /* to finish the loop */
}
}
break;
case HA_READ_AFTER_KEY:
case HA_READ_KEY_OR_NEXT:
Expand Down Expand Up @@ -852,7 +871,8 @@ dbcontext::cmd_find_internal(dbcallback_i& cb, const prep_stmt& pst,
}
++cnt;
}
if (args.invalues_keypart >= 0 && r == HA_ERR_KEY_NOT_FOUND) {
if (args.invalues_keypart >= 0 && r != 0 ) {
in_loop = false;
continue;
}
if (r != 0 && r != HA_ERR_RECORD_DELETED) {
Expand Down Expand Up @@ -1147,6 +1167,9 @@ dbcontext::cmd_exec(dbcallback_i& cb, const cmd_exec_args& args)
case '<':
find_flag = HA_READ_KEY_OR_PREV;
break;
case '^':
find_flag = HA_READ_KEY_OR_PREV;
break;
default:
return cb.dbcb_resp_short(2, "op");
}
Expand Down Expand Up @@ -1181,3 +1204,4 @@ dbcontext::set_statistics(size_t num_conns, size_t num_active)

};