1 files changed, 14 insertions, 17 deletions

diff --git a/erts/emulator/beam/erl_db_tree.c b/erts/emulator/beam/erl_db_tree.c
index b421da591b..da2696163a 100644
--- a/erts/emulator/beam/erl_db_tree.c
+++ b/erts/emulator/beam/erl_db_tree.c
@@ -443,9 +443,9 @@ void db_initialize_tree(void)
     ets_select_reverse_exp.code[1] = am_reverse;
     ets_select_reverse_exp.code[2] = 3;
     ets_select_reverse_exp.code[3] =
-	(Eterm) em_apply_bif;
+	(BeamInstr) em_apply_bif;
     ets_select_reverse_exp.code[4] = 
-	(Eterm) &ets_select_reverse;
+	(BeamInstr) &ets_select_reverse;
     return;
 };
 
@@ -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;
@@ -2588,11 +2589,7 @@ static void db_finalize_dbterm_tree(DbUpdateHandle* handle)
 	newDbTerm = &newp->dbterm;
     
 	newDbTerm->size = handle->new_size;
-	newDbTerm->off_heap.mso = NULL;
-	newDbTerm->off_heap.externals = NULL;
-    #ifndef HYBRID /* FIND ME! */
-	newDbTerm->off_heap.funs = NULL;
-    #endif
+	newDbTerm->off_heap.first = NULL;
 	newDbTerm->off_heap.overhead = 0;
 	
 	/* make a flat copy */
@@ -2628,7 +2625,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 +2663,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;
@@ -3023,7 +3020,7 @@ static int doit_select(DbTableTree *tb, TreeDbTerm *this, void *ptr,
     }
     ret = db_prog_match(sc->p, sc->mp,
 			make_tuple(this->dbterm.tpl), 
-			0, &dummy);
+			NULL,0, &dummy);
     if (is_value(ret)) {
 	Uint sz;
 	Eterm *hp;
@@ -3072,7 +3069,7 @@ static int doit_select_count(DbTableTree *tb, TreeDbTerm *this, void *ptr,
     }
     ret = db_prog_match(sc->p, sc->mp,
 			make_tuple(this->dbterm.tpl), 
-			0, &dummy);
+			NULL,0, &dummy);
     if (ret == am_true) {
 	++(sc->got);
     }
@@ -3105,7 +3102,7 @@ static int doit_select_chunk(DbTableTree *tb, TreeDbTerm *this, void *ptr,
 
     ret = db_prog_match(sc->p, sc->mp,
 			make_tuple(this->dbterm.tpl), 
-			0, &dummy);
+			NULL,0, &dummy);
     if (is_value(ret)) {
 	Uint sz;
 	Eterm *hp;
@@ -3158,7 +3155,7 @@ static int doit_select_delete(DbTableTree *tb, TreeDbTerm *this, void *ptr,
 	return 0;
     ret = db_prog_match(sc->p, sc->mp,
 			make_tuple(this->dbterm.tpl), 
-			0, &dummy);
+			NULL,0, &dummy);
     if (ret == am_true) {
 	key = GETKEY(sc->tb, this->dbterm.tpl);
 	linkout_tree(sc->tb, key);