import quincy beta 17.1.0

[ceph.git] / ceph / src / rocksdb / util / status.cc

diff --git a/ceph/src/rocksdb/util/status.cc b/ceph/src/rocksdb/util/status.cc
index 3b1ffde566b8943f7b705375fb34de42ac7f611d..ad948f017ae970375ca09442d95987aecd2110f3 100644 (file)
--- a/ceph/src/rocksdb/util/status.cc
+++ b/ceph/src/rocksdb/util/status.cc
@@ -52,6 +52,9 @@ static const char* msgs[static_cast<int>(Status::kMaxSubCode)] = {
     "Insufficient capacity for merge operands",
     // kManualCompactionPaused
     "Manual compaction paused",
+    " (overwritten)",    // kOverwritten, subcode of OK
+    "Txn not prepared",  // kTxnNotPrepared
+    "IO fenced off",     // kIOFenced
 };
 
 Status::Status(Code _code, SubCode _subcode, const Slice& msg,
@@ -74,6 +77,9 @@ Status::Status(Code _code, SubCode _subcode, const Slice& msg,
 }
 
 std::string Status::ToString() const {
+#ifdef ROCKSDB_ASSERT_STATUS_CHECKED
+  checked_ = true;
+#endif  // ROCKSDB_ASSERT_STATUS_CHECKED
   char tmp[30];
   const char* type;
   switch (code_) {
@@ -130,7 +136,7 @@ std::string Status::ToString() const {
   std::string result(type);
   if (subcode_ != kNone) {
     uint32_t index = static_cast<int32_t>(subcode_);
-    assert(sizeof(msgs) > index);
+    assert(sizeof(msgs) / sizeof(msgs[0]) > index);
     result.append(msgs[index]);
   }