diff options
| author | Sverker Eriksson <[email protected]> | 2010-07-20 13:52:15 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2010-07-20 13:52:15 +0200 |
| commit | 9f44863204c56dcfa38c67db9662f7f1b7e6c582 (patch) | |
| tree | bb1ba0f6b2a174bb0b7825ff6e32ae2abb5061e9 /erts/emulator | |
| parent | c4b4edaaf03ac12e12080cb4a3768edbb6ecf77d (diff) | |
| parent | ac90c289ab5ce18395c5fa53c30b38bc5f50ae1d (diff) | |
| download | otp-9f44863204c56dcfa38c67db9662f7f1b7e6c582.tar.gz otp-9f44863204c56dcfa38c67db9662f7f1b7e6c582.tar.bz2 otp-9f44863204c56dcfa38c67db9662f7f1b7e6c582.zip | |
Merge branch 'sverker/ets_select_hang/OTP-8732' into dev
* sverker/ets_select_hang/OTP-8732:
Fix ets:select hanging on ordered_set with empty list as key.
Diffstat (limited to 'erts/emulator')
| -rw-r--r-- | erts/emulator/beam/erl_db_tree.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/erts/emulator/beam/erl_db_tree.c b/erts/emulator/beam/erl_db_tree.c index b6b3cabafe..96e577ed90 100644 --- a/erts/emulator/beam/erl_db_tree.c +++ b/erts/emulator/beam/erl_db_tree.c @@ -1081,11 +1081,12 @@ static int db_select_continue_tree(Process *p, static int db_select_tree(Process *p, DbTable *tbl, Eterm pattern, int reverse, Eterm *ret) { + /* Strategy: Traverse backwards to build resulting list from tail to head */ DbTableTree *tb = &tbl->tree; DbTreeStack* stack; struct select_context sc; struct mp_info mpi; - Eterm lastkey = NIL; + Eterm lastkey = THE_NON_VALUE; Eterm key; Eterm continuation; unsigned sz; @@ -1293,7 +1294,7 @@ static int db_select_count_tree(Process *p, DbTable *tbl, DbTreeStack* stack; struct select_count_context sc; struct mp_info mpi; - Eterm lastkey = NIL; + Eterm lastkey = THE_NON_VALUE; Eterm key; Eterm continuation; unsigned sz; @@ -1395,7 +1396,7 @@ static int db_select_chunk_tree(Process *p, DbTable *tbl, DbTreeStack* stack; struct select_context sc; struct mp_info mpi; - Eterm lastkey = NIL; + Eterm lastkey = THE_NON_VALUE; Eterm key; Eterm continuation; unsigned sz; @@ -1636,7 +1637,7 @@ static int db_select_delete_tree(Process *p, DbTable *tbl, DbTableTree *tb = &tbl->tree; struct select_delete_context sc; struct mp_info mpi; - Eterm lastkey = NIL; + Eterm lastkey = THE_NON_VALUE; Eterm key; Eterm continuation; unsigned sz; @@ -2628,7 +2629,7 @@ static void traverse_backwards(DbTableTree *tb, { TreeDbTerm *this, *next; - if (lastkey == NIL) { + if (lastkey == THE_NON_VALUE) { stack->pos = stack->slot = 0; if (( this = tb->root ) == NULL) { return; @@ -2666,7 +2667,7 @@ static void traverse_forward(DbTableTree *tb, { TreeDbTerm *this, *next; - if (lastkey == NIL) { + if (lastkey == THE_NON_VALUE) { stack->pos = stack->slot = 0; if (( this = tb->root ) == NULL) { return; |