Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Delete Remote Compaction Code #280

Merged
merged 1 commit into from
Aug 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -1886,9 +1886,6 @@ ldb_cmd_test: $(OBJ_DIR)/tools/ldb_cmd_test.o $(TOOLS_LIBRARY) $(TEST_LIBRARY) $
ldb: $(OBJ_DIR)/tools/ldb.o $(TOOLS_LIBRARY) $(LIBRARY)
$(AM_LINK)

remote_compaction_test: cloud/remote_compaction_test.o $(TEST_LIBRARY) $(LIBRARY)
$(AM_LINK)

db_cloud_test: cloud/db_cloud_test.o $(TEST_LIBRARY) $(LIBRARY)
$(AM_LINK)

Expand Down
22 changes: 0 additions & 22 deletions cloud/db_cloud_impl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -448,28 +448,6 @@ Status DBCloudImpl::DoCheckpointToCloud(
return st;
}

Status DBCloudImpl::ExecuteRemoteCompactionRequest(
const PluggableCompactionParam& inputParams,
PluggableCompactionResult* result, bool doSanitize) {
auto* cfs =
dynamic_cast<CloudFileSystemImpl*>(GetEnv()->GetFileSystem().get());
assert(cfs);

// run the compaction request on the underlying local database
Status status = GetBaseDB()->ExecuteRemoteCompactionRequest(
inputParams, result, doSanitize);
if (!status.ok()) {
return status;
}

// convert the local pathnames to the cloud pathnames
for (unsigned int i = 0; i < result->output_files.size(); i++) {
OutputFile* outfile = &result->output_files[i];
outfile->pathname = cfs->RemapFilename(outfile->pathname);
}
return Status::OK();
}

Status DBCloud::ListColumnFamilies(const DBOptions& db_options,
const std::string& name,
std::vector<std::string>* column_families) {
Expand Down
4 changes: 0 additions & 4 deletions cloud/db_cloud_impl.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,6 @@ class DBCloudImpl : public DBCloud {
Status CheckpointToCloud(const BucketOptions& destination,
const CheckpointToCloudOptions& options) override;

Status ExecuteRemoteCompactionRequest(
const PluggableCompactionParam& inputParams,
PluggableCompactionResult* result, bool sanitize) override;

protected:
// The CloudFileSystem used by this open instance.
CloudFileSystem* cfs_;
Expand Down
Loading