From c7e1877fd66c6c7e78f7ca8f979c74b596fb1e32 Mon Sep 17 00:00:00 2001 From: jsteemann Date: Mon, 29 May 2017 13:02:22 +0200 Subject: [PATCH] workaround for compile issue --- arangod/RocksDBEngine/RocksDBEngine.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/arangod/RocksDBEngine/RocksDBEngine.cpp b/arangod/RocksDBEngine/RocksDBEngine.cpp index 41f391c961..dc0644c9bb 100644 --- a/arangod/RocksDBEngine/RocksDBEngine.cpp +++ b/arangod/RocksDBEngine/RocksDBEngine.cpp @@ -310,6 +310,7 @@ void RocksDBEngine::start() { // DO NOT FORGET TO DESTROY THE CFs ON CLOSE std::vector cfHandles; + size_t const numberOfColumnFamilies = RocksDBColumnFamily::numberOfColumnFamilies; { rocksdb::Options testOptions; testOptions.create_if_missing = false; @@ -340,10 +341,10 @@ void RocksDBEngine::start() { LOG_TOPIC(DEBUG, arangodb::Logger::STARTUP) << "found existing column families: " << names; - if (existingColumnFamilies.size() < RocksDBColumnFamily::numberOfColumnFamilies) { + if (existingColumnFamilies.size() < numberOfColumnFamilies) { LOG_TOPIC(FATAL, arangodb::Logger::STARTUP) << "unexpected number of column families found in database (" << cfHandles.size() << "). " - << "expecting at least " << RocksDBColumnFamily::numberOfColumnFamilies + << "expecting at least " << numberOfColumnFamilies << ". if you are upgrading from an alpha version of ArangoDB 3.2, " << "it is required to restart with a new database directory and re-import data"; FATAL_ERROR_EXIT(); @@ -365,14 +366,14 @@ void RocksDBEngine::start() { FATAL_ERROR_EXIT(); } - if (cfHandles.size() < RocksDBColumnFamily::numberOfColumnFamilies) { + if (cfHandles.size() < numberOfColumnFamilies) { LOG_TOPIC(FATAL, arangodb::Logger::STARTUP) << "unexpected number of column families found in database. " - << "got " << cfHandles.size() << ", expecting at least " << RocksDBColumnFamily::numberOfColumnFamilies; + << "got " << cfHandles.size() << ", expecting at least " << numberOfColumnFamilies; FATAL_ERROR_EXIT(); } - TRI_ASSERT(cfHandles.size() >= RocksDBColumnFamily::numberOfColumnFamilies); + TRI_ASSERT(cfHandles.size() >= numberOfColumnFamilies); // set our column families RocksDBColumnFamily::_other = cfHandles[0];