Skip to content

Commit 112d771

Browse files
authored
Delete Remote Compaction Code (#280)
Summary: There is now an upstream implementation of remote compaction, so we don't need our own anymore: https://github.com/facebook/rocksdb/wiki/Remote-Compaction-(Experimental) Test Plan: Buildkite Reviewers:
1 parent 5d7fbb7 commit 112d771

File tree

14 files changed

+2
-1241
lines changed

14 files changed

+2
-1241
lines changed

Makefile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1886,9 +1886,6 @@ ldb_cmd_test: $(OBJ_DIR)/tools/ldb_cmd_test.o $(TOOLS_LIBRARY) $(TEST_LIBRARY) $
18861886
ldb: $(OBJ_DIR)/tools/ldb.o $(TOOLS_LIBRARY) $(LIBRARY)
18871887
$(AM_LINK)
18881888

1889-
remote_compaction_test: cloud/remote_compaction_test.o $(TEST_LIBRARY) $(LIBRARY)
1890-
$(AM_LINK)
1891-
18921889
db_cloud_test: cloud/db_cloud_test.o $(TEST_LIBRARY) $(LIBRARY)
18931890
$(AM_LINK)
18941891

cloud/db_cloud_impl.cc

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -448,28 +448,6 @@ Status DBCloudImpl::DoCheckpointToCloud(
448448
return st;
449449
}
450450

451-
Status DBCloudImpl::ExecuteRemoteCompactionRequest(
452-
const PluggableCompactionParam& inputParams,
453-
PluggableCompactionResult* result, bool doSanitize) {
454-
auto* cfs =
455-
dynamic_cast<CloudFileSystemImpl*>(GetEnv()->GetFileSystem().get());
456-
assert(cfs);
457-
458-
// run the compaction request on the underlying local database
459-
Status status = GetBaseDB()->ExecuteRemoteCompactionRequest(
460-
inputParams, result, doSanitize);
461-
if (!status.ok()) {
462-
return status;
463-
}
464-
465-
// convert the local pathnames to the cloud pathnames
466-
for (unsigned int i = 0; i < result->output_files.size(); i++) {
467-
OutputFile* outfile = &result->output_files[i];
468-
outfile->pathname = cfs->RemapFilename(outfile->pathname);
469-
}
470-
return Status::OK();
471-
}
472-
473451
Status DBCloud::ListColumnFamilies(const DBOptions& db_options,
474452
const std::string& name,
475453
std::vector<std::string>* column_families) {

cloud/db_cloud_impl.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,6 @@ class DBCloudImpl : public DBCloud {
2929
Status CheckpointToCloud(const BucketOptions& destination,
3030
const CheckpointToCloudOptions& options) override;
3131

32-
Status ExecuteRemoteCompactionRequest(
33-
const PluggableCompactionParam& inputParams,
34-
PluggableCompactionResult* result, bool sanitize) override;
35-
3632
protected:
3733
// The CloudFileSystem used by this open instance.
3834
CloudFileSystem* cfs_;

0 commit comments

Comments
 (0)