Skip to content

Commit

Permalink
Update kvproto reference
Browse files Browse the repository at this point in the history
  • Loading branch information
breezewish committed May 17, 2022
1 parent b3cfc6c commit 90f5f17
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
2 changes: 1 addition & 1 deletion contrib/kvproto
Submodule kvproto updated 47 files
+2 −0 .github/workflows/cpp-test.yaml
+2 −0 .github/workflows/golang-test.yaml
+2 −0 .github/workflows/rust-test.yaml
+5 −10 Cargo.toml
+2 −2 go.mod
+29 −7 go.sum
+5,778 −3,182 pkg/brpb/brpb.pb.go
+1,201 −925 pkg/cdcpb/cdcpb.pb.go
+1,125 −801 pkg/configpb/configpb.pb.go
+664 −481 pkg/coprocessor/coprocessor.pb.go
+289 −228 pkg/deadlock/deadlock.pb.go
+1,684 −859 pkg/debugpb/debugpb.pb.go
+393 −298 pkg/diagnosticspb/diagnosticspb.pb.go
+6 −4 pkg/disk_usage/disk_usage.pb.go
+615 −530 pkg/encryptionpb/encryptionpb.pb.go
+597 −493 pkg/enginepb/enginepb.pb.go
+665 −490 pkg/eraftpb/eraftpb.pb.go
+1,009 −545 pkg/errorpb/errorpb.pb.go
+3,572 −0 pkg/gcpb/gcpb.pb.go
+970 −665 pkg/import_kvpb/import_kvpb.pb.go
+5,421 −3,272 pkg/import_sstpb/import_sstpb.pb.go
+15,330 −11,479 pkg/kvrpcpb/kvrpcpb.pb.go
+750 −464 pkg/metapb/metapb.pb.go
+515 −376 pkg/mpp/mpp.pb.go
+8,832 −4,871 pkg/pdpb/pdpb.pb.go
+2,645 −1,749 pkg/raft_cmdpb/raft_cmdpb.pb.go
+829 −613 pkg/raft_serverpb/raft_serverpb.pb.go
+544 −166 pkg/replication_modepb/replication_modepb.pb.go
+259 −249 pkg/resource_usage_agent/resource_usage_agent.pb.go
+2,129 −2,187 pkg/tikvpb/tikvpb.pb.go
+423 −373 pkg/tracepb/tracepb.pb.go
+115 −0 proto/brpb.proto
+14 −0 proto/cdcpb.proto
+4 −0 proto/coprocessor.proto
+11 −0 proto/debugpb.proto
+7 −0 proto/errorpb.proto
+117 −0 proto/gcpb.proto
+93 −1 proto/import_sstpb.proto
+53 −2 proto/kvrpcpb.proto
+14 −1 proto/metapb.proto
+71 −5 proto/pdpb.proto
+13 −2 proto/replication_modepb.proto
+6 −0 proto/tikvpb.proto
+2 −2 scripts/check.sh
+4 −3 scripts/common.sh
+6 −5 scripts/generate_go.sh
+1 −1 tools.json
6 changes: 0 additions & 6 deletions dbms/src/Flash/FlashService.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -434,12 +434,6 @@ ::grpc::Status FlashService::Compact(::grpc::ServerContext * grpc_context, const
return grpc::Status(grpc::PERMISSION_DENIED, tls_err_msg);
}

// auto [context, status] = createDBContext(grpc_context);
// if (!status.ok())
// {
// return status;
// }

return manual_compact_manager->handleRequest(request, response);
}

Expand Down
4 changes: 4 additions & 0 deletions dbms/src/Flash/Management/ManualCompact.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,8 @@ grpc::Status ManualCompactManager::doWork(const ::kvrpcpb::CompactRequest * requ

Stopwatch timer;

LOG_FMT_INFO(log, "Manual compaction begin for table {}, start_key = {}", request->physical_table_id(), start_key.toDebugString());

// Repeatedly merge multiple segments as much as possible.
while (true)
{
Expand Down Expand Up @@ -204,6 +206,8 @@ grpc::Status ManualCompactManager::doWork(const ::kvrpcpb::CompactRequest * requ
throw Exception("Assert failed", ErrorCodes::LOGICAL_ERROR);
}

LOG_FMT_INFO(log, "Manual compaction finished for table {}, compacted_start_key = {}, compacted_end_key = {}, has_remaining = {}, compacted_segments = {}, elapsed_ms = {}", request->physical_table_id(), compacted_start_key ? compacted_start_key->toDebugString() : "(null)", compacted_end_key ? compacted_end_key->toDebugString() : "(null)", has_remaining, compacted_segments, timer.elapsedMilliseconds());

response->clear_error();
response->set_has_remaining(has_remaining);
if (compacted_start_key != std::nullopt)
Expand Down

0 comments on commit 90f5f17

Please sign in to comment.