Merge remote-tracking branch 'refs/remotes/origin/main'

db/db_impl.cc

@@ -270,9 +270,6 @@ void DBImpl::RemoveObsoleteFiles() {
         case kTableFile:
           keep = (live.find(number) != live.end());
           break;
-        case kVTableFile:
-          keep = (live.find(number) != live.end());
-          break;
         case kTempFile:
           // Any temp files that are currently being written to must
           // be recorded in pending_outputs_, which is inserted into "live"
@@ -281,6 +278,7 @@ void DBImpl::RemoveObsoleteFiles() {
         case kCurrentFile:
         case kDBLockFile:
         case kInfoLogFile:
+        case kVTableFile:
         case kVTableManagerFile:
           keep = true;
           break;

db/filename.cc

@@ -124,7 +124,7 @@ bool ParseFileName(const std::string& filename, uint64_t* number,
       *type = kTableFile;
     } else if (suffix == Slice(".dbtmp")) {
       *type = kTempFile;
-    } else if (suffix == Slice(".vrb")) {
+    } else if (suffix == Slice(".vtb")) {
       *type = kVTableFile;
     } else {
       return false;