test/cetus
1
0
Fork 0
mirror of https://gitee.com/wangbin579/cetus.git synced 2024-12-02 03:47:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix order by related problems

Browse Source
This commit is contained in:
lazio579 2018-11-28 12:02:33 +08:00
parent 9c72a1a87d
commit c7cc0278b1
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/resultset_merge.c
View File

@ -1846,9 +1846,8 @@ heap_adjust(heap_type *heap, int s, int m, int *compare_failed)
j++;
} else if (!heap->element[j + 1]->is_over) {
if (!heap->element[j]->refreshed && !heap->element[j + 1]->refreshed) {
if (!heap->element[j]->is_prior_to) {
if (heap->element[j]->is_prior_to == -1) {
j++;
} else {
}
} else {
is_dup = 0;
@ -1857,7 +1856,7 @@ heap_adjust(heap_type *heap, int s, int m, int *compare_failed)
heap->element[j + 1]->record->data, &(heap->order_para),
heap->element[j]->index, heap->element[j + 1]->index, &is_dup, compare_failed)) {
j++;
heap->element[j]->is_prior_to = 0;
heap->element[j]->is_prior_to = -1;
} else {
if (is_dup) {

2
src/resultset_merge.h
View File

@ -54,11 +54,11 @@ typedef struct ORDER_BY {
typedef struct {
GList *record;
int index;
int is_prior_to;
unsigned int is_over:1;
unsigned int is_err:1;
unsigned int refreshed:1;
unsigned int is_dup:1;
unsigned int is_prior_to:1;
} heap_element;
typedef struct order_by_para_s {