some more cleanup

2 files changed, 6 insertions, 4 deletions

diff --git a/persistence/src/vespa/persistence/dummyimpl/dummypersistence.cpp b/persistence/src/vespa/persistence/dummyimpl/dummypersistence.cpp
index 0ce3cbe8b3d..d3883744229 100644
--- a/persistence/src/vespa/persistence/dummyimpl/dummypersistence.cpp
+++ b/persistence/src/vespa/persistence/dummyimpl/dummypersistence.cpp
@@ -188,7 +188,7 @@ BucketContent::insert(DocEntry::SP e)
                         "Was trying to insert %s.",
                         it->entry->toString().c_str(),
                         e->toString().c_str());
-                    assert(false);
+                    LOG_ABORT("should not reach here");
                 }
             }
         }
@@ -964,7 +964,7 @@ DummyPersistence::acquireBucketWithLock(const Bucket& b) const
     if (!bucketNotInUse) {
         LOG(error, "Attempted to acquire %s, but it was already marked as being in use!",
             b.toString().c_str());
-        assert(false);
+        LOG_ABORT("should not reach here");
     }
 
     return BucketContentGuard::UP(new BucketContentGuard(ncp, *it->second));
diff --git a/persistence/src/vespa/persistence/spi/read_consistency.cpp b/persistence/src/vespa/persistence/spi/read_consistency.cpp
index d6a7abe425b..cad15a5263d 100644
--- a/persistence/src/vespa/persistence/spi/read_consistency.cpp
+++ b/persistence/src/vespa/persistence/spi/read_consistency.cpp
@@ -1,7 +1,9 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include "read_consistency.h"
 #include <iostream>
-#include <cassert>
+
+#include <vespa/log/log.h>
+LOG_SETUP(".persistence.spi.read_consistency");
 
 namespace storage {
 namespace spi {
@@ -17,7 +19,7 @@ operator<<(std::ostream& os, ReadConsistency consistency)
         os << "WEAK";
         break;
     default:
-        assert(false);
+        LOG_ABORT("should not reach here");
     }
     return os;
 }