From 3428a9bfbd4de8f17516dc0f31c372d2f0e76250 Mon Sep 17 00:00:00 2001
From: Dominik Gleich <dominik.gleich@memgraph.io>
Date: Fri, 5 May 2017 11:33:45 +0200
Subject: [PATCH] Fix assert fail.

Summary: Assert fail introduced by me, by incorrectly fixing skiplist find_or_larger.

Reviewers: teon.banek

Reviewed By: teon.banek

Subscribers: pullbot

Differential Revision: https://phabricator.memgraph.io/D349
---
 src/data_structures/concurrent/skiplist.hpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/data_structures/concurrent/skiplist.hpp b/src/data_structures/concurrent/skiplist.hpp
index f0a4d8ea2..02c4c06df 100644
--- a/src/data_structures/concurrent/skiplist.hpp
+++ b/src/data_structures/concurrent/skiplist.hpp
@@ -796,9 +796,7 @@ class SkipList : private Lockable<lock_t> {
     while (true) {
       // try to descend down first while the next key on this layer overshoots
       // or the next key is marked for deletion
-      for (; h >= 0 && (less(item, node = pred->forward(h)) ||
-                        (node && node->flags.is_marked()));
-           --h) {
+      for (; h >= 0 && less(item, node = pred->forward(h)); --h) {
       }
 
       // if we overshoot at every layer, item doesn't exist
@@ -809,7 +807,10 @@ class SkipList : private Lockable<lock_t> {
       while (greater(item, node)) pred = node, node = node->forward(h);
 
       // check if we have a hit. if not, we need to descend down again
-      if (!less(item, node) && !node->flags.is_marked()) return It(node);
+      if (!less(item, node)) {
+        if (!node->flags.is_marked()) return It(node);
+        return It(nullptr);
+      }
     }
   }