Fix error message (#6264)

Summary:
Fix an error message when CURRENT is not found.

Test plan (dev server)
```
make check
```
Pull Request resolved: https://github.com/facebook/rocksdb/pull/6264

Differential Revision: D19300699

Pulled By: riversand963

fbshipit-source-id: 303fa206386a125960ecca1dbdeff07422690caf
main
Yanqin Jin 5 years ago committed by Facebook Github Bot
parent 3e26a94ba1
commit bce5189f4d
  1. 16
      db/c.cc
  2. 3
      db/c_test.c
  3. 13
      db/db_impl/db_impl_open.cc
  4. 5
      include/rocksdb/c.h

@ -852,15 +852,15 @@ void rocksdb_delete_cf(
Slice(key, keylen))); Slice(key, keylen)));
} }
void rocksdb_delete_range_cf( void rocksdb_delete_range_cf(rocksdb_t* db,
rocksdb_t* db, const rocksdb_writeoptions_t* options,
const rocksdb_writeoptions_t* options, rocksdb_column_family_handle_t* column_family,
rocksdb_column_family_handle_t* column_family, const char* start_key, size_t start_key_len,
const char* start_key, size_t start_key_len, const char* end_key, size_t end_key_len,
const char* end_key, size_t end_key_len, char** errptr) {
char** errptr) {
SaveError(errptr, db->rep->DeleteRange(options->rep, column_family->rep, SaveError(errptr, db->rep->DeleteRange(options->rep, column_family->rep,
Slice(start_key, start_key_len), Slice(end_key, end_key_len))); Slice(start_key, start_key_len),
Slice(end_key, end_key_len)));
} }
void rocksdb_merge( void rocksdb_merge(

@ -1265,7 +1265,8 @@ int main(int argc, char** argv) {
rocksdb_delete_cf(db, woptions, handles[1], "foo", 3, &err); rocksdb_delete_cf(db, woptions, handles[1], "foo", 3, &err);
CheckNoError(err); CheckNoError(err);
rocksdb_delete_range_cf(db, woptions, handles[1], "foobar2", 7, "foobar4", 7, &err); rocksdb_delete_range_cf(db, woptions, handles[1], "foobar2", 7, "foobar4",
7, &err);
CheckNoError(err); CheckNoError(err);
CheckGetCF(db, roptions, handles[1], "foo", NULL); CheckGetCF(db, roptions, handles[1], "foo", NULL);

@ -363,7 +363,8 @@ Status DBImpl::Recover(
return s; return s;
} }
s = env_->FileExists(CurrentFileName(dbname_)); std::string current_fname = CurrentFileName(dbname_);
s = env_->FileExists(current_fname);
if (s.IsNotFound()) { if (s.IsNotFound()) {
if (immutable_db_options_.create_if_missing) { if (immutable_db_options_.create_if_missing) {
// Has to be called only after Identity File creation is successful // Has to be called only after Identity File creation is successful
@ -376,7 +377,7 @@ Status DBImpl::Recover(
} }
} else { } else {
return Status::InvalidArgument( return Status::InvalidArgument(
dbname_, "does not exist (create_if_missing is false)"); current_fname, "does not exist (create_if_missing is false)");
} }
} else if (s.ok()) { } else if (s.ok()) {
if (immutable_db_options_.error_if_exists) { if (immutable_db_options_.error_if_exists) {
@ -394,14 +395,14 @@ Status DBImpl::Recover(
FileOptions customized_fs(file_options_); FileOptions customized_fs(file_options_);
customized_fs.use_direct_reads |= customized_fs.use_direct_reads |=
immutable_db_options_.use_direct_io_for_flush_and_compaction; immutable_db_options_.use_direct_io_for_flush_and_compaction;
s = fs_->NewRandomAccessFile(CurrentFileName(dbname_), customized_fs, s = fs_->NewRandomAccessFile(current_fname, customized_fs, &idfile,
&idfile, nullptr); nullptr);
if (!s.ok()) { if (!s.ok()) {
std::string error_str = s.ToString(); std::string error_str = s.ToString();
// Check if unsupported Direct I/O is the root cause // Check if unsupported Direct I/O is the root cause
customized_fs.use_direct_reads = false; customized_fs.use_direct_reads = false;
s = fs_->NewRandomAccessFile(CurrentFileName(dbname_), customized_fs, s = fs_->NewRandomAccessFile(current_fname, customized_fs, &idfile,
&idfile, nullptr); nullptr);
if (s.ok()) { if (s.ok()) {
return Status::InvalidArgument( return Status::InvalidArgument(
"Direct I/O is not supported by the specified DB."); "Direct I/O is not supported by the specified DB.");

@ -269,9 +269,8 @@ extern ROCKSDB_LIBRARY_API void rocksdb_delete_cf(
extern ROCKSDB_LIBRARY_API void rocksdb_delete_range_cf( extern ROCKSDB_LIBRARY_API void rocksdb_delete_range_cf(
rocksdb_t* db, const rocksdb_writeoptions_t* options, rocksdb_t* db, const rocksdb_writeoptions_t* options,
rocksdb_column_family_handle_t* column_family, rocksdb_column_family_handle_t* column_family, const char* start_key,
const char* start_key, size_t start_key_len, size_t start_key_len, const char* end_key, size_t end_key_len,
const char* end_key, size_t end_key_len,
char** errptr); char** errptr);
extern ROCKSDB_LIBRARY_API void rocksdb_merge( extern ROCKSDB_LIBRARY_API void rocksdb_merge(

Loading…
Cancel
Save