You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kudu.apache.org by al...@apache.org on 2017/08/21 21:03:51 UTC
[04/14] kudu git commit: [iwyu] first pass
http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/tablet/transactions/write_transaction.h
----------------------------------------------------------------------
diff --git a/src/kudu/tablet/transactions/write_transaction.h b/src/kudu/tablet/transactions/write_transaction.h
index c9aa80f..3912bce 100644
--- a/src/kudu/tablet/transactions/write_transaction.h
+++ b/src/kudu/tablet/transactions/write_transaction.h
@@ -18,32 +18,42 @@
#ifndef KUDU_TABLET_WRITE_TRANSACTION_H_
#define KUDU_TABLET_WRITE_TRANSACTION_H_
+#include <cstddef>
+#include <memory>
#include <mutex>
#include <string>
#include <vector>
-#include "kudu/common/schema.h"
+#include <glog/logging.h>
+
+#include "kudu/consensus/consensus.pb.h"
+#include "kudu/gutil/gscoped_ptr.h"
#include "kudu/gutil/macros.h"
-#include "kudu/tablet/lock_manager.h"
-#include "kudu/tablet/mvcc.h"
+#include "kudu/gutil/port.h"
+#include "kudu/gutil/ref_counted.h"
#include "kudu/tablet/rowset.h"
-#include "kudu/tablet/tablet.pb.h"
#include "kudu/tablet/transactions/transaction.h"
+#include "kudu/tserver/tserver.pb.h"
#include "kudu/util/locks.h"
+#include "kudu/util/monotime.h"
+#include "kudu/util/status.h"
namespace kudu {
+
+class Schema;
+class rw_semaphore;
struct DecodedRowOperation;
-class ConstContiguousRow;
-class RowwiseRowBlockPB;
-namespace tserver {
-class WriteRequestPB;
-class WriteResponsePB;
+namespace rpc {
+class RequestIdPB;
}
namespace tablet {
+
+class ScopedTransaction;
+class TabletReplica;
+class TxResultPB;
struct RowOp;
-class RowSetKeyProbe;
struct TabletComponents;
// A TransactionState for a batch of inserts/mutates. This class holds and
http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/tools/color.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tools/color.cc b/src/kudu/tools/color.cc
index c99d7fe..5cc37ec 100644
--- a/src/kudu/tools/color.cc
+++ b/src/kudu/tools/color.cc
@@ -17,10 +17,14 @@
#include "kudu/tools/color.h"
+#include <unistd.h>
+
+#include <ostream>
+
#include <gflags/gflags.h>
#include <glog/logging.h>
-#include <unistd.h>
+#include "kudu/gutil/macros.h"
#include "kudu/gutil/strings/substitute.h"
#include "kudu/util/flag_tags.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/tools/create-demo-table.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tools/create-demo-table.cc b/src/kudu/tools/create-demo-table.cc
index 4b03462..43a9619 100644
--- a/src/kudu/tools/create-demo-table.cc
+++ b/src/kudu/tools/create-demo-table.cc
@@ -19,29 +19,32 @@
// This will eventually be replaced by a proper shell -- just a quick
// hack for easy demo purposes.
-#include <gflags/gflags.h>
-#include <glog/logging.h>
#include <iostream>
+#include <string>
#include <vector>
+#include <gflags/gflags.h>
+#include <glog/logging.h>
+
#include "kudu/benchmarks/tpch/tpch-schemas.h"
#include "kudu/benchmarks/ycsb-schema.h"
#include "kudu/client/client.h"
+#include "kudu/client/schema.h"
+#include "kudu/client/shared_ptr.h"
+#include "kudu/gutil/gscoped_ptr.h"
#include "kudu/gutil/strings/split.h"
-#include "kudu/tserver/tserver.pb.h"
-#include "kudu/tserver/tserver_service.proxy.h"
#include "kudu/twitter-demo/twitter-schema.h"
#include "kudu/util/env.h"
#include "kudu/util/faststring.h"
#include "kudu/util/flags.h"
#include "kudu/util/logging.h"
+#include "kudu/util/status.h"
using kudu::client::KuduClient;
using kudu::client::KuduClientBuilder;
using kudu::client::KuduSchema;
using kudu::client::KuduTableCreator;
using kudu::client::sp::shared_ptr;
-using kudu::rpc::RpcController;
using std::string;
using std::vector;
http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/tools/data_gen_util.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tools/data_gen_util.cc b/src/kudu/tools/data_gen_util.cc
index f1cceb6..4c10fea 100644
--- a/src/kudu/tools/data_gen_util.cc
+++ b/src/kudu/tools/data_gen_util.cc
@@ -14,12 +14,17 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
+
#include "kudu/tools/data_gen_util.h"
+#include <ostream>
+
+#include <glog/logging.h>
+
#include "kudu/client/schema.h"
#include "kudu/common/partial_row.h"
#include "kudu/gutil/strings/numbers.h"
-#include "kudu/util/random.h"
+#include "kudu/util/random.h" // IWYU pragma: keep
#include "kudu/util/status.h"
namespace kudu {
http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/tools/data_gen_util.h
----------------------------------------------------------------------
diff --git a/src/kudu/tools/data_gen_util.h b/src/kudu/tools/data_gen_util.h
index 8ca3fd1..b13fd25 100644
--- a/src/kudu/tools/data_gen_util.h
+++ b/src/kudu/tools/data_gen_util.h
@@ -24,7 +24,6 @@
namespace kudu {
class KuduPartialRow;
-class Random;
namespace client {
class KuduSchema;
http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/tools/ksck-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tools/ksck-test.cc b/src/kudu/tools/ksck-test.cc
index 987cd8c..22caab5 100644
--- a/src/kudu/tools/ksck-test.cc
+++ b/src/kudu/tools/ksck-test.cc
@@ -15,16 +15,30 @@
// specific language governing permissions and limitations
// under the License.
+#include <map>
#include <memory>
+#include <sstream>
+#include <string>
+#include <type_traits>
#include <unordered_map>
+#include <utility>
+#include <vector>
-#include <gflags/gflags.h>
+#include <gflags/gflags_declare.h>
+#include <glog/logging.h>
#include <gtest/gtest.h>
+#include "kudu/common/schema.h"
+#include "kudu/consensus/metadata.pb.h"
#include "kudu/gutil/map-util.h"
+#include "kudu/gutil/port.h"
#include "kudu/gutil/strings/substitute.h"
+#include "kudu/tablet/metadata.pb.h"
+#include "kudu/tablet/tablet.pb.h"
#include "kudu/tools/ksck.h"
#include "kudu/util/scoped_cleanup.h"
+#include "kudu/util/status.h"
+#include "kudu/util/test_macros.h"
#include "kudu/util/test_util.h"
DECLARE_string(color);
http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/tools/ksck.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tools/ksck.cc b/src/kudu/tools/ksck.cc
index 6b2f8b3..9043b12 100644
--- a/src/kudu/tools/ksck.cc
+++ b/src/kudu/tools/ksck.cc
@@ -18,23 +18,30 @@
#include "kudu/tools/ksck.h"
#include <algorithm>
-#include <glog/logging.h>
+#include <cstdint>
#include <iomanip>
#include <iostream>
+#include <iterator>
#include <map>
#include <mutex>
-#include <sstream>
+
+#include <boost/optional.hpp> // IWYU pragma: keep
+#include <gflags/gflags.h>
+#include <glog/logging.h>
#include "kudu/consensus/quorum_util.h"
+#include "kudu/gutil/gscoped_ptr.h"
#include "kudu/gutil/map-util.h"
#include "kudu/gutil/ref_counted.h"
-#include "kudu/gutil/strings/join.h"
#include "kudu/gutil/strings/human_readable.h"
+#include "kudu/gutil/strings/join.h"
#include "kudu/gutil/strings/substitute.h"
#include "kudu/gutil/strings/util.h"
+#include "kudu/tablet/tablet.pb.h"
#include "kudu/tools/tool_action_common.h"
#include "kudu/util/atomic.h"
#include "kudu/util/blocking_queue.h"
+#include "kudu/util/countdown_latch.h"
#include "kudu/util/locks.h"
#include "kudu/util/monotime.h"
#include "kudu/util/threadpool.h"
@@ -68,7 +75,7 @@ using std::right;
using std::setw;
using std::shared_ptr;
using std::string;
-using std::stringstream;
+using std::ostringstream;
using std::to_string;
using std::unordered_map;
using std::vector;
@@ -139,6 +146,11 @@ Status KsckCluster::RetrieveTabletsList(const shared_ptr<KsckTable>& table) {
return master_->RetrieveTabletsList(table);
}
+Ksck::Ksck(shared_ptr<KsckCluster> cluster, ostream* out)
+ : cluster_(std::move(cluster)),
+ out_(out == nullptr ? &std::cout : out) {
+}
+
Status Ksck::CheckMasterRunning() {
VLOG(1) << "Connecting to the Master";
Status s = cluster_->master()->Connect();
@@ -641,7 +653,7 @@ struct ReplicaInfo {
// Formats the peers known and unknown to 'config' using labels from 'peer_uuid_mapping'.
string format_peers(const map<string, char>& peer_uuid_mapping, const KsckConsensusState& config) {
- stringstream voters;
+ ostringstream voters;
int peer_width = 4;
for (const auto &entry : peer_uuid_mapping) {
if (!ContainsKey(config.peer_uuids, entry.first)) {
http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/tools/ksck.h
----------------------------------------------------------------------
diff --git a/src/kudu/tools/ksck.h b/src/kudu/tools/ksck.h
index ea76c90..8f541bb 100644
--- a/src/kudu/tools/ksck.h
+++ b/src/kudu/tools/ksck.h
@@ -20,27 +20,31 @@
#ifndef KUDU_TOOLS_KSCK_H
#define KUDU_TOOLS_KSCK_H
-#include <boost/optional.hpp>
-#include <gtest/gtest_prod.h>
-#include <iostream>
+#include <cstdint>
#include <map>
#include <memory>
+#include <iosfwd>
#include <set>
#include <string>
#include <unordered_map>
#include <utility>
#include <vector>
+#include <boost/optional/optional.hpp>
+#include <glog/logging.h>
+#include <gtest/gtest_prod.h>
+
#include "kudu/common/schema.h"
-#include "kudu/consensus/consensus.service.h"
-#include "kudu/tablet/tablet.pb.h"
+#include "kudu/consensus/metadata.pb.h"
+#include "kudu/gutil/macros.h"
+#include "kudu/gutil/strings/substitute.h"
+#include "kudu/tablet/metadata.pb.h"
+#include "kudu/tablet/tablet.pb.h" // IWYU pragma: keep
#include "kudu/tools/color.h"
-#include "kudu/util/countdown_latch.h"
-#include "kudu/util/locks.h"
+#include "kudu/util/monotime.h"
#include "kudu/util/status.h"
namespace kudu {
-class MonoDelta;
namespace tools {
class KsckTable;
@@ -227,7 +231,7 @@ class ChecksumProgressCallbacks {
class KsckTabletServer {
public:
// Map from tablet id to tablet replicas.
- typedef std::unordered_map<std::string, tablet::TabletStatusPB > TabletStatusMap;
+ typedef std::unordered_map<std::string, tablet::TabletStatusPB> TabletStatusMap;
// Map from (tserver id, tablet id) to tablet consensus information.
typedef std::map
@@ -379,11 +383,10 @@ class KsckCluster {
// Externally facing class to run checks against the provided cluster.
class Ksck {
public:
- explicit Ksck(std::shared_ptr<KsckCluster> cluster, std::ostream* out = &std::cout)
- : cluster_(std::move(cluster)),
- out_(out) {}
+ explicit Ksck(std::shared_ptr<KsckCluster> cluster,
+ std::ostream* out = nullptr);
- ~Ksck() {}
+ ~Ksck() = default;
// Set whether ksck should verify that each of the tablet's raft configurations
// has the same number of replicas that is specified by the tablet metadata.
@@ -501,7 +504,7 @@ class Ksck {
std::vector<std::string> table_filters_;
std::vector<std::string> tablet_id_filters_;
- std::ostream* out_;
+ std::ostream* const out_;
DISALLOW_COPY_AND_ASSIGN(Ksck);
};
http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/tools/ksck_remote-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tools/ksck_remote-test.cc b/src/kudu/tools/ksck_remote-test.cc
index 7c33940..f413554 100644
--- a/src/kudu/tools/ksck_remote-test.cc
+++ b/src/kudu/tools/ksck_remote-test.cc
@@ -15,19 +15,39 @@
// specific language governing permissions and limitations
// under the License.
+#include <cstdint>
#include <memory>
+#include <sstream>
+#include <string>
+#include <vector>
+#include <boost/core/ref.hpp>
+#include <gflags/gflags_declare.h>
+#include <glog/logging.h>
#include <gtest/gtest.h>
#include "kudu/client/client.h"
+#include "kudu/client/shared_ptr.h"
+#include "kudu/client/schema.h"
+#include "kudu/client/write_op.h"
+#include "kudu/common/partial_row.h"
+#include "kudu/gutil/gscoped_ptr.h"
+#include "kudu/gutil/port.h"
+#include "kudu/gutil/ref_counted.h"
#include "kudu/integration-tests/internal_mini_cluster.h"
#include "kudu/master/mini_master.h"
#include "kudu/tools/data_gen_util.h"
+#include "kudu/tools/ksck.h"
#include "kudu/tools/ksck_remote.h"
+#include "kudu/util/atomic.h"
+#include "kudu/util/countdown_latch.h"
#include "kudu/util/monotime.h"
#include "kudu/util/promise.h"
#include "kudu/util/random.h"
+#include "kudu/util/status.h"
+#include "kudu/util/test_macros.h"
#include "kudu/util/test_util.h"
+#include "kudu/util/thread.h"
DECLARE_int32(heartbeat_interval_ms);
http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/tools/ksck_remote.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tools/ksck_remote.cc b/src/kudu/tools/ksck_remote.cc
index 1e0403a..2268cb0 100644
--- a/src/kudu/tools/ksck_remote.cc
+++ b/src/kudu/tools/ksck_remote.cc
@@ -17,13 +17,39 @@
#include "kudu/tools/ksck_remote.h"
+#include <cstdint>
+#include <ostream>
+#include <unordered_map>
+#include <utility>
+
+#include <boost/bind.hpp> // IWYU pragma: keep
+#include <gflags/gflags.h>
+#include <gflags/gflags_declare.h>
+#include <glog/logging.h>
+
#include "kudu/client/client.h"
+#include "kudu/client/schema.h"
+#include "kudu/common/common.pb.h"
#include "kudu/common/schema.h"
#include "kudu/common/wire_protocol.h"
+#include "kudu/consensus/consensus.pb.h"
+#include "kudu/consensus/consensus.proxy.h"
+#include "kudu/gutil/basictypes.h"
+#include "kudu/gutil/gscoped_ptr.h"
#include "kudu/gutil/map-util.h"
#include "kudu/gutil/stl_util.h"
#include "kudu/gutil/strings/substitute.h"
-#include "kudu/gutil/strings/util.h"
+#include "kudu/rpc/messenger.h"
+#include "kudu/rpc/response_callback.h"
+#include "kudu/rpc/rpc_controller.h"
+#include "kudu/server/server_base.pb.h"
+#include "kudu/server/server_base.proxy.h"
+#include "kudu/tablet/tablet.pb.h"
+#include "kudu/tserver/tablet_server.h"
+#include "kudu/tserver/tserver.pb.h"
+#include "kudu/tserver/tserver_service.pb.h"
+#include "kudu/tserver/tserver_service.proxy.h"
+#include "kudu/util/monotime.h"
#include "kudu/util/net/net_util.h"
#include "kudu/util/net/sockaddr.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/tools/ksck_remote.h
----------------------------------------------------------------------
diff --git a/src/kudu/tools/ksck_remote.h b/src/kudu/tools/ksck_remote.h
index add2a80..fbe3cb4 100644
--- a/src/kudu/tools/ksck_remote.h
+++ b/src/kudu/tools/ksck_remote.h
@@ -18,25 +18,41 @@
#ifndef KUDU_TOOLS_KSCK_REMOTE_H
#define KUDU_TOOLS_KSCK_REMOTE_H
+#include <algorithm>
#include <memory>
#include <string>
-#include <utility>
#include <vector>
-#include "kudu/client/client.h"
-#include "kudu/consensus/consensus.proxy.h"
-#include "kudu/rpc/messenger.h"
-#include "kudu/server/server_base.h"
-#include "kudu/server/server_base.proxy.h"
+#include "kudu/client/shared_ptr.h"
+#include "kudu/gutil/port.h"
#include "kudu/tools/ksck.h"
-#include "kudu/tserver/tablet_server.h"
-#include "kudu/tserver/tserver_service.proxy.h"
-#include "kudu/util/net/sockaddr.h"
+#include "kudu/util/net/net_util.h"
+#include "kudu/util/status.h"
namespace kudu {
class Schema;
+namespace client {
+class KuduClient;
+}
+
+namespace consensus {
+class ConsensusServiceProxy;
+}
+
+namespace rpc {
+class Messenger;
+}
+
+namespace server {
+class GenericServiceProxy;
+}
+
+namespace tserver {
+class TabletServerServiceProxy;
+}
+
namespace tools {
// This implementation connects to a Tablet Server via RPC.
http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/tools/kudu-admin-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tools/kudu-admin-test.cc b/src/kudu/tools/kudu-admin-test.cc
index f141d4f..f2b6e5b 100644
--- a/src/kudu/tools/kudu-admin-test.cc
+++ b/src/kudu/tools/kudu-admin-test.cc
@@ -16,22 +16,50 @@
// under the License.
#include <algorithm>
+#include <cstdint>
+#include <cstdio>
#include <deque>
+#include <iterator>
+#include <ostream>
#include <string>
+#include <unordered_map>
+#include <unordered_set>
+#include <utility>
#include <vector>
+#include <glog/logging.h>
#include <gtest/gtest.h>
+#include "kudu/common/common.pb.h"
+#include "kudu/common/wire_protocol.pb.h"
+#include "kudu/consensus/consensus.pb.h"
+#include "kudu/master/master.pb.h"
+#include "kudu/tablet/metadata.pb.h"
+#include "kudu/util/pb_util.h"
+#include "kudu/client/client-test-util.h"
#include "kudu/client/client.h"
+#include "kudu/client/schema.h"
+#include "kudu/client/shared_ptr.h"
+#include "kudu/consensus/metadata.pb.h"
#include "kudu/consensus/opid.pb.h"
#include "kudu/consensus/quorum_util.h"
+#include "kudu/gutil/gscoped_ptr.h"
+#include "kudu/gutil/integral_types.h"
#include "kudu/gutil/map-util.h"
+#include "kudu/gutil/strings/split.h"
#include "kudu/gutil/strings/substitute.h"
#include "kudu/integration-tests/cluster_itest_util.h"
+#include "kudu/integration-tests/cluster_verifier.h"
+#include "kudu/integration-tests/external_mini_cluster.h"
#include "kudu/integration-tests/test_workload.h"
#include "kudu/integration-tests/ts_itest-base.h"
#include "kudu/tools/tool_test_util.h"
+#include "kudu/tserver/tablet_server-test-base.h"
+#include "kudu/util/monotime.h"
+#include "kudu/util/net/sockaddr.h"
+#include "kudu/util/status.h"
#include "kudu/util/subprocess.h"
+#include "kudu/util/test_macros.h"
#include "kudu/util/test_util.h"
namespace kudu {
http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/tools/kudu-tool-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tools/kudu-tool-test.cc b/src/kudu/tools/kudu-tool-test.cc
index 687d137..661a5ce 100644
--- a/src/kudu/tools/kudu-tool-test.cc
+++ b/src/kudu/tools/kudu-tool-test.cc
@@ -15,29 +15,44 @@
// specific language governing permissions and limitations
// under the License.
+#include <sys/stat.h>
+
#include <algorithm>
+#include <cstdint>
+#include <cstdio>
+#include <cstdlib>
#include <iterator>
#include <memory>
#include <sstream>
#include <string>
+#include <unordered_map>
+#include <utility>
#include <vector>
-#include <gtest/gtest.h>
+#include <gflags/gflags_declare.h>
+#include <glog/logging.h>
#include <glog/stl_logging.h>
+#include <gmock/gmock-matchers.h>
+#include <gtest/gtest.h>
#include "kudu/cfile/cfile-test-base.h"
#include "kudu/cfile/cfile_util.h"
#include "kudu/cfile/cfile_writer.h"
#include "kudu/client/client-test-util.h"
+#include "kudu/client/client.h"
+#include "kudu/client/schema.h"
+#include "kudu/client/shared_ptr.h"
+#include "kudu/common/common.pb.h"
#include "kudu/common/partial_row.h"
#include "kudu/common/partition.h"
#include "kudu/common/schema.h"
-#include "kudu/common/wire_protocol.h"
+#include "kudu/common/types.h"
#include "kudu/common/wire_protocol-test-util.h"
+#include "kudu/common/wire_protocol.h"
+#include "kudu/common/wire_protocol.pb.h"
#include "kudu/consensus/consensus.pb.h"
#include "kudu/consensus/log.h"
#include "kudu/consensus/log_util.h"
-#include "kudu/consensus/metadata.pb.h"
#include "kudu/consensus/opid.pb.h"
#include "kudu/consensus/opid_util.h"
#include "kudu/consensus/ref_counted_replicate.h"
@@ -46,34 +61,48 @@
#include "kudu/fs/fs_manager.h"
#include "kudu/fs/fs_report.h"
#include "kudu/gutil/gscoped_ptr.h"
+#include "kudu/gutil/port.h"
#include "kudu/gutil/ref_counted.h"
+#include "kudu/gutil/stl_util.h"
+#include "kudu/gutil/strings/numbers.h"
#include "kudu/gutil/strings/split.h"
+#include "kudu/gutil/strings/strcat.h"
#include "kudu/gutil/strings/strip.h"
#include "kudu/gutil/strings/substitute.h"
#include "kudu/integration-tests/cluster_itest_util.h"
#include "kudu/integration-tests/external_mini_cluster.h"
#include "kudu/integration-tests/external_mini_cluster_fs_inspector.h"
#include "kudu/integration-tests/internal_mini_cluster.h"
+#include "kudu/integration-tests/mini_cluster.h"
#include "kudu/integration-tests/test_workload.h"
+#include "kudu/rpc/rpc_controller.h"
#include "kudu/tablet/local_tablet_writer.h"
+#include "kudu/tablet/metadata.pb.h"
#include "kudu/tablet/tablet-harness.h"
+#include "kudu/tablet/tablet.h"
+#include "kudu/tablet/tablet.pb.h"
#include "kudu/tablet/tablet_metadata.h"
#include "kudu/tablet/tablet_replica.h"
-#include "kudu/tablet/tablet.h"
-#include "kudu/tools/tool_action_common.h"
#include "kudu/tools/tool_test_util.h"
#include "kudu/tserver/mini_tablet_server.h"
#include "kudu/tserver/tablet_server.h"
+#include "kudu/tserver/tablet_server_options.h"
#include "kudu/tserver/ts_tablet_manager.h"
#include "kudu/tserver/tserver.pb.h"
-#include "kudu/tserver/tserver_service.proxy.h"
+#include "kudu/tserver/tserver_admin.pb.h"
+#include "kudu/tserver/tserver_admin.proxy.h"
#include "kudu/util/async_util.h"
#include "kudu/util/env.h"
+#include "kudu/util/make_shared.h"
#include "kudu/util/metrics.h"
+#include "kudu/util/monotime.h"
+#include "kudu/util/net/net_util.h"
#include "kudu/util/net/sockaddr.h"
#include "kudu/util/oid_generator.h"
#include "kudu/util/path_util.h"
#include "kudu/util/pb_util.h"
+#include "kudu/util/slice.h"
+#include "kudu/util/status.h"
#include "kudu/util/subprocess.h"
#include "kudu/util/test_macros.h"
#include "kudu/util/test_util.h"
@@ -83,6 +112,10 @@ DECLARE_string(block_manager);
namespace kudu {
+namespace tserver {
+class TabletServerServiceProxy;
+}
+
namespace tools {
using cfile::CFileWriter;
http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/tools/kudu-ts-cli-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tools/kudu-ts-cli-test.cc b/src/kudu/tools/kudu-ts-cli-test.cc
index a4ecdc5..7ae58ee 100644
--- a/src/kudu/tools/kudu-ts-cli-test.cc
+++ b/src/kudu/tools/kudu-ts-cli-test.cc
@@ -15,17 +15,27 @@
// specific language governing permissions and limitations
// under the License.
+#include <memory>
+#include <string>
+#include <unordered_map>
+#include <vector>
+
#include <gtest/gtest.h>
-#include "kudu/gutil/map-util.h"
-#include "kudu/gutil/strings/join.h"
#include "kudu/gutil/strings/split.h"
#include "kudu/gutil/strings/substitute.h"
#include "kudu/integration-tests/cluster_itest_util.h"
#include "kudu/integration-tests/external_mini_cluster-itest-base.h"
+#include "kudu/integration-tests/external_mini_cluster.h"
+#include "kudu/integration-tests/external_mini_cluster_fs_inspector.h"
#include "kudu/integration-tests/test_workload.h"
+#include "kudu/tablet/metadata.pb.h"
+#include "kudu/tablet/tablet.pb.h"
#include "kudu/tools/tool_test_util.h"
-#include "kudu/util/path_util.h"
+#include "kudu/tserver/tserver.pb.h"
+#include "kudu/util/monotime.h"
+#include "kudu/util/net/sockaddr.h"
+#include "kudu/util/status.h"
#include "kudu/util/subprocess.h"
#include "kudu/util/test_macros.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/tools/tool_action-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tools/tool_action-test.cc b/src/kudu/tools/tool_action-test.cc
index 76c2255..4b2803f 100644
--- a/src/kudu/tools/tool_action-test.cc
+++ b/src/kudu/tools/tool_action-test.cc
@@ -15,7 +15,9 @@
// specific language governing permissions and limitations
// under the License.
+#include <algorithm>
#include <memory>
+#include <ostream>
#include <string>
#include <vector>
http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/tools/tool_action.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tools/tool_action.cc b/src/kudu/tools/tool_action.cc
index fd824d7..4d87909 100644
--- a/src/kudu/tools/tool_action.cc
+++ b/src/kudu/tools/tool_action.cc
@@ -18,15 +18,19 @@
#include "kudu/tools/tool_action.h"
#include <algorithm>
-#include <iomanip>
#include <memory>
#include <string>
#include <unordered_map>
#include <utility>
#include <vector>
+#include <boost/optional.hpp>
+#include <gflags/gflags.h>
+#include <glog/logging.h>
+
#include "kudu/gutil/strings/join.h"
#include "kudu/gutil/strings/split.h"
+#include "kudu/gutil/strings/stringpiece.h"
#include "kudu/gutil/strings/substitute.h"
#include "kudu/util/url-coding.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/tools/tool_action.h
----------------------------------------------------------------------
diff --git a/src/kudu/tools/tool_action.h b/src/kudu/tools/tool_action.h
index f8c8209..cdb6d79 100644
--- a/src/kudu/tools/tool_action.h
+++ b/src/kudu/tools/tool_action.h
@@ -17,6 +17,7 @@
#pragma once
+#include <functional>
#include <memory>
#include <string>
#include <unordered_map>
http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/tools/tool_action_cluster.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tools/tool_action_cluster.cc b/src/kudu/tools/tool_action_cluster.cc
index 15978d2..e813575 100644
--- a/src/kudu/tools/tool_action_cluster.cc
+++ b/src/kudu/tools/tool_action_cluster.cc
@@ -21,10 +21,13 @@
#include <memory>
#include <string>
#include <utility>
+#include <unordered_map>
+#include <vector>
#include <gflags/gflags.h>
#include "kudu/gutil/map-util.h"
+#include "kudu/gutil/port.h"
#include "kudu/gutil/strings/split.h"
#include "kudu/tools/ksck.h"
#include "kudu/tools/ksck_remote.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/tools/tool_action_common.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tools/tool_action_common.cc b/src/kudu/tools/tool_action_common.cc
index 511d0a6..0a4a037 100644
--- a/src/kudu/tools/tool_action_common.cc
+++ b/src/kudu/tools/tool_action_common.cc
@@ -18,32 +18,36 @@
#include "kudu/tools/tool_action_common.h"
#include <algorithm>
+#include <cstddef>
#include <iomanip>
#include <iostream>
#include <memory>
#include <numeric>
#include <string>
+#include <unordered_map>
#include <vector>
#include <boost/algorithm/string/predicate.hpp>
#include <gflags/gflags.h>
#include <glog/logging.h>
-#include "kudu/client/client-internal.h"
#include "kudu/client/client.h"
+#include "kudu/client/client-internal.h" // IWYU pragma: keep
+#include "kudu/gutil/map-util.h"
#include "kudu/client/shared_ptr.h"
#include "kudu/common/common.pb.h"
#include "kudu/common/row_operations.h"
#include "kudu/common/schema.h"
#include "kudu/common/wire_protocol.h"
#include "kudu/consensus/consensus.pb.h"
-#include "kudu/consensus/consensus.proxy.h"
+#include "kudu/consensus/consensus.proxy.h" // IWYU pragma: keep
#include "kudu/consensus/log.pb.h"
#include "kudu/consensus/log_util.h"
+#include "kudu/consensus/opid.pb.h"
#include "kudu/gutil/ref_counted.h"
#include "kudu/gutil/strings/numbers.h"
#include "kudu/gutil/strings/split.h"
-#include "kudu/master/master.proxy.h"
+#include "kudu/master/master.proxy.h" // IWYU pragma: keep
#include "kudu/rpc/messenger.h"
#include "kudu/rpc/rpc_controller.h"
#include "kudu/rpc/rpc_header.pb.h"
@@ -51,9 +55,10 @@
#include "kudu/server/server_base.proxy.h"
#include "kudu/tools/tool_action.h"
#include "kudu/tserver/tserver.pb.h"
-#include "kudu/tserver/tserver_admin.proxy.h"
-#include "kudu/tserver/tserver_service.proxy.h"
+#include "kudu/tserver/tserver_service.proxy.h" // IWYU pragma: keep
+#include "kudu/tserver/tserver_admin.proxy.h" // IWYU pragma: keep
#include "kudu/util/jsonwriter.h"
+#include "kudu/util/make_shared.h"
#include "kudu/util/memory/arena.h"
#include "kudu/util/monotime.h"
#include "kudu/util/net/net_util.h"
@@ -82,7 +87,20 @@ DEFINE_string(format, "pretty",
"Format to use for printing list output tables.\n"
"Possible values: pretty, space, tsv, csv, and json");
+namespace boost {
+template <typename Signature>
+class function;
+} // namespace boost
+
namespace kudu {
+
+namespace master {
+class ListMastersRequestPB;
+class ListMastersResponsePB;
+class ListTabletServersRequestPB;
+class ListTabletServersResponsePB;
+} // namespace master
+
namespace tools {
using client::KuduClientBuilder;
http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/tools/tool_action_common.h
----------------------------------------------------------------------
diff --git a/src/kudu/tools/tool_action_common.h b/src/kudu/tools/tool_action_common.h
index ac232b8..d9698ed 100644
--- a/src/kudu/tools/tool_action_common.h
+++ b/src/kudu/tools/tool_action_common.h
@@ -17,26 +17,28 @@
#pragma once
+#include <cstdint>
#include <memory>
#include <ostream>
#include <string>
#include <vector>
-#include <boost/function.hpp>
-
#include "kudu/client/shared_ptr.h"
+#include "kudu/gutil/port.h"
#include "kudu/gutil/ref_counted.h"
#include "kudu/util/status.h"
-namespace kudu {
+namespace boost {
+template <typename Signature>
+class function;
+} // namespace boost
-class MonoTime;
+namespace kudu {
namespace client {
class KuduClient;
} // namespace client
-
namespace master {
class MasterServiceProxy;
} // namespace master
http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/tools/tool_action_fs.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tools/tool_action_fs.cc b/src/kudu/tools/tool_action_fs.cc
index 529dd6b..ed97a5e 100644
--- a/src/kudu/tools/tool_action_fs.cc
+++ b/src/kudu/tools/tool_action_fs.cc
@@ -18,29 +18,36 @@
#include "kudu/tools/tool_action.h"
#include <algorithm>
+#include <cstdint>
#include <iostream>
#include <iterator>
#include <memory>
#include <string>
#include <unordered_map>
-#include <utility>
#include <vector>
#include <boost/optional/optional.hpp>
#include <gflags/gflags.h>
+#include <gflags/gflags_declare.h>
+#include <glog/logging.h>
+#include "kudu/cfile/cfile.pb.h"
#include "kudu/cfile/cfile_reader.h"
#include "kudu/cfile/cfile_util.h"
#include "kudu/fs/block_id.h"
+#include "kudu/fs/block_manager.h"
#include "kudu/fs/fs_manager.h"
#include "kudu/fs/fs_report.h"
#include "kudu/gutil/gscoped_ptr.h"
+#include "kudu/gutil/map-util.h"
#include "kudu/gutil/ref_counted.h"
#include "kudu/gutil/strings/numbers.h"
#include "kudu/gutil/strings/substitute.h"
#include "kudu/tablet/tablet_metadata.h"
-#include "kudu/tools/tool_action_common.h"
+#include "kudu/util/env.h"
+#include "kudu/util/faststring.h"
#include "kudu/util/pb_util.h"
+#include "kudu/util/slice.h"
#include "kudu/util/status.h"
DECLARE_bool(print_meta);
http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/tools/tool_action_local_replica.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tools/tool_action_local_replica.cc b/src/kudu/tools/tool_action_local_replica.cc
index 369f969..18d7772 100644
--- a/src/kudu/tools/tool_action_local_replica.cc
+++ b/src/kudu/tools/tool_action_local_replica.cc
@@ -17,50 +17,62 @@
#include "kudu/tools/tool_action.h"
+#include <algorithm>
+#include <cstddef>
#include <iostream>
#include <list>
+#include <map>
#include <memory>
#include <string>
#include <utility>
+#include <vector>
+#include <boost/none.hpp>
+#include <gflags/gflags.h>
+
+#include "kudu/cfile/cfile.pb.h"
#include "kudu/cfile/cfile_reader.h"
#include "kudu/cfile/cfile_util.h"
#include "kudu/common/common.pb.h"
+#include "kudu/common/partition.h"
#include "kudu/common/row_changelist.h"
-#include "kudu/common/row_operations.h"
#include "kudu/common/rowblock.h"
#include "kudu/common/schema.h"
#include "kudu/common/wire_protocol.h"
-#include "kudu/consensus/consensus.pb.h"
#include "kudu/consensus/consensus_meta.h"
#include "kudu/consensus/consensus_meta_manager.h"
#include "kudu/consensus/log_index.h"
#include "kudu/consensus/log_reader.h"
#include "kudu/consensus/log_util.h"
+#include "kudu/consensus/metadata.pb.h"
+#include "kudu/consensus/opid.pb.h"
+#include "kudu/fs/block_id.h"
+#include "kudu/fs/block_manager.h"
#include "kudu/fs/fs_manager.h"
+#include "kudu/gutil/gscoped_ptr.h"
#include "kudu/gutil/map-util.h"
#include "kudu/gutil/ref_counted.h"
#include "kudu/gutil/strings/human_readable.h"
#include "kudu/gutil/strings/join.h"
-#include "kudu/gutil/strings/numbers.h"
#include "kudu/gutil/strings/split.h"
-#include "kudu/gutil/strings/stringpiece.h"
#include "kudu/gutil/strings/substitute.h"
#include "kudu/gutil/strings/util.h"
#include "kudu/master/sys_catalog.h"
#include "kudu/rpc/messenger.h"
#include "kudu/tablet/cfile_set.h"
+#include "kudu/tablet/delta_key.h"
+#include "kudu/tablet/delta_stats.h"
+#include "kudu/tablet/delta_store.h"
#include "kudu/tablet/deltafile.h"
#include "kudu/tablet/metadata.pb.h"
+#include "kudu/tablet/mvcc.h"
#include "kudu/tablet/rowset_metadata.h"
-#include "kudu/tablet/tablet.h"
+#include "kudu/tablet/tablet_metadata.h"
#include "kudu/tools/tool_action_common.h"
#include "kudu/tserver/tablet_copy_client.h"
#include "kudu/tserver/ts_tablet_manager.h"
-#include "kudu/tserver/tserver.pb.h"
#include "kudu/util/env.h"
#include "kudu/util/env_util.h"
-#include "kudu/util/logging.h"
#include "kudu/util/mem_tracker.h"
#include "kudu/util/memory/arena.h"
#include "kudu/util/metrics.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/tools/tool_action_master.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tools/tool_action_master.cc b/src/kudu/tools/tool_action_master.cc
index b6d9c22..064d9e6 100644
--- a/src/kudu/tools/tool_action_master.cc
+++ b/src/kudu/tools/tool_action_master.cc
@@ -23,14 +23,16 @@
#include <utility>
#include <boost/algorithm/string/predicate.hpp>
-#include <gflags/gflags.h>
+#include <gflags/gflags_declare.h>
#include <glog/logging.h>
+#include "kudu/common/wire_protocol.h"
#include "kudu/gutil/map-util.h"
#include "kudu/gutil/strings/join.h"
#include "kudu/gutil/strings/split.h"
#include "kudu/gutil/strings/substitute.h"
#include "kudu/master/master.h"
+#include "kudu/master/master.pb.h"
#include "kudu/master/master.proxy.h"
#include "kudu/tools/tool_action_common.h"
#include "kudu/util/pb_util.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/tools/tool_action_pbc.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tools/tool_action_pbc.cc b/src/kudu/tools/tool_action_pbc.cc
index ceda9b8..a977244 100644
--- a/src/kudu/tools/tool_action_pbc.cc
+++ b/src/kudu/tools/tool_action_pbc.cc
@@ -17,23 +17,33 @@
#include "kudu/tools/tool_action.h"
-#include <gflags/gflags.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/util/json_util.h>
-
-#include <fstream>
+#include <algorithm>
+#include <cstdlib>
+#include <exception>
+#include <fstream> // IWYU pragma: keep
#include <iostream>
#include <memory>
#include <string>
+#include <unordered_map>
+#include <vector>
+
+#include <gflags/gflags.h>
+#include <glog/logging.h>
+#include <google/protobuf/message.h>
+#include <google/protobuf/stubs/status.h>
+#include <google/protobuf/stubs/stringpiece.h>
+#include <google/protobuf/util/json_util.h>
+#include "kudu/gutil/macros.h"
#include "kudu/gutil/map-util.h"
#include "kudu/gutil/strings/substitute.h"
+#include "kudu/gutil/walltime.h"
#include "kudu/util/env.h"
#include "kudu/util/env_util.h"
#include "kudu/util/flag_tags.h"
#include "kudu/util/path_util.h"
#include "kudu/util/pb_util.h"
-#include "kudu/util/scoped_cleanup.h"
+#include "kudu/util/slice.h"
#include "kudu/util/status.h"
#include "kudu/util/subprocess.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/tools/tool_action_perf.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tools/tool_action_perf.cc b/src/kudu/tools/tool_action_perf.cc
index 614aa13..568b0a0 100644
--- a/src/kudu/tools/tool_action_perf.cc
+++ b/src/kudu/tools/tool_action_perf.cc
@@ -86,31 +86,40 @@
#include "kudu/tools/tool_action.h"
+#include <algorithm>
#include <cstdint>
#include <cstdlib>
-#include <ctime>
-
-#include <algorithm>
-#include <chrono>
#include <iomanip>
#include <iostream>
#include <limits>
#include <memory>
#include <mutex>
-#include <sstream>
+#include <numeric>
+#include <string>
#include <thread>
+#include <unordered_map>
#include <vector>
#include <gflags/gflags.h>
#include "kudu/client/client.h"
+#include "kudu/client/row_result.h"
+#include "kudu/client/scan_batch.h"
+#include "kudu/client/schema.h"
+#include "kudu/client/shared_ptr.h"
+#include "kudu/client/write_op.h"
+#include "kudu/common/common.pb.h"
+#include "kudu/common/partial_row.h"
#include "kudu/common/schema.h"
#include "kudu/common/types.h"
+#include "kudu/gutil/map-util.h"
+#include "kudu/gutil/stl_util.h"
#include "kudu/gutil/strings/split.h"
#include "kudu/gutil/strings/substitute.h"
#include "kudu/tools/tool_action_common.h"
#include "kudu/util/oid_generator.h"
#include "kudu/util/random.h"
+#include "kudu/util/status.h"
#include "kudu/util/stopwatch.h"
using kudu::ColumnSchema;
http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/tools/tool_action_remote_replica.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tools/tool_action_remote_replica.cc b/src/kudu/tools/tool_action_remote_replica.cc
index 5447120..77b6e6b 100644
--- a/src/kudu/tools/tool_action_remote_replica.cc
+++ b/src/kudu/tools/tool_action_remote_replica.cc
@@ -17,38 +17,49 @@
#include "kudu/tools/tool_action.h"
+#include <cstdint>
#include <iostream>
+#include <limits>
#include <memory>
#include <string>
#include <utility>
+#include <unordered_map>
#include <vector>
#include <gflags/gflags.h>
+#include <gflags/gflags_declare.h>
+#include <glog/logging.h>
#include "kudu/client/client.h"
#include "kudu/client/row_result.h"
#include "kudu/client/scan_batch.h"
#include "kudu/client/scanner-internal.h"
-#include "kudu/consensus/consensus.pb.h"
-#include "kudu/consensus/consensus.proxy.h"
-#include "kudu/consensus/metadata.pb.h"
+#include "kudu/client/schema.h"
+#include "kudu/common/common.pb.h"
#include "kudu/common/partition.h"
#include "kudu/common/schema.h"
#include "kudu/common/wire_protocol.h"
+#include "kudu/common/wire_protocol.pb.h"
+#include "kudu/consensus/consensus.pb.h"
+#include "kudu/consensus/consensus.proxy.h"
+#include "kudu/consensus/metadata.pb.h"
#include "kudu/gutil/gscoped_ptr.h"
#include "kudu/gutil/map-util.h"
+#include "kudu/gutil/move.h"
#include "kudu/gutil/strings/human_readable.h"
+#include "kudu/gutil/strings/substitute.h"
#include "kudu/rpc/rpc_controller.h"
#include "kudu/server/server_base.pb.h"
+#include "kudu/tablet/metadata.pb.h"
#include "kudu/tablet/tablet.pb.h"
#include "kudu/tools/tool_action_common.h"
#include "kudu/tserver/tablet_server.h"
#include "kudu/tserver/tserver.pb.h"
+#include "kudu/tserver/tserver_admin.pb.h"
#include "kudu/tserver/tserver_admin.proxy.h"
#include "kudu/tserver/tserver_service.proxy.h"
+#include "kudu/util/monotime.h"
#include "kudu/util/pb_util.h"
-#include "kudu/util/net/net_util.h"
-#include "kudu/util/net/sockaddr.h"
#include "kudu/util/status.h"
DEFINE_bool(force_copy, false,
http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/tools/tool_action_table.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tools/tool_action_table.cc b/src/kudu/tools/tool_action_table.cc
index 5296886..95f2d51 100644
--- a/src/kudu/tools/tool_action_table.cc
+++ b/src/kudu/tools/tool_action_table.cc
@@ -21,10 +21,13 @@
#include <iostream>
#include <memory>
#include <string>
-#include <utility>
+#include <unordered_map>
#include <vector>
+#include <gflags/gflags.h>
+
#include "kudu/client/client.h"
+#include "kudu/client/shared_ptr.h"
#include "kudu/gutil/map-util.h"
#include "kudu/gutil/stl_util.h"
#include "kudu/gutil/strings/split.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/tools/tool_action_tablet.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tools/tool_action_tablet.cc b/src/kudu/tools/tool_action_tablet.cc
index 5eba3f6..05be6f5 100644
--- a/src/kudu/tools/tool_action_tablet.cc
+++ b/src/kudu/tools/tool_action_tablet.cc
@@ -18,26 +18,34 @@
#include "kudu/tools/tool_action.h"
#include <algorithm>
-#include <boost/optional.hpp>
-#include <fstream>
+#include <cstdint>
+#include <fstream> // IWYU pragma: keep
#include <iostream>
#include <memory>
#include <string>
+#include <unordered_map>
#include <vector>
+#include <boost/optional/optional.hpp>
+#include <gflags/gflags.h>
+#include <glog/logging.h>
+
#include "kudu/client/client.h"
+#include "kudu/client/shared_ptr.h"
#include "kudu/common/wire_protocol.h"
+#include "kudu/consensus/consensus.pb.h"
#include "kudu/consensus/consensus.proxy.h"
#include "kudu/consensus/metadata.pb.h"
+#include "kudu/consensus/opid.pb.h"
#include "kudu/gutil/map-util.h"
#include "kudu/gutil/stl_util.h"
#include "kudu/gutil/strings/split.h"
#include "kudu/gutil/strings/substitute.h"
#include "kudu/rpc/rpc_controller.h"
-#include "kudu/server/server_base.pb.h"
#include "kudu/tools/ksck.h"
#include "kudu/tools/ksck_remote.h"
#include "kudu/tools/tool_action_common.h"
+#include "kudu/tserver/tserver.pb.h"
#include "kudu/util/monotime.h"
#include "kudu/util/net/net_util.h"
#include "kudu/util/status.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/tools/tool_action_tserver.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tools/tool_action_tserver.cc b/src/kudu/tools/tool_action_tserver.cc
index e396169..7ef2b35 100644
--- a/src/kudu/tools/tool_action_tserver.cc
+++ b/src/kudu/tools/tool_action_tserver.cc
@@ -24,13 +24,15 @@
#include <utility>
#include <boost/algorithm/string/predicate.hpp>
-#include <gflags/gflags.h>
+#include <gflags/gflags_declare.h>
+#include "kudu/common/wire_protocol.h"
#include "kudu/gutil/map-util.h"
#include "kudu/gutil/strings/join.h"
#include "kudu/gutil/strings/split.h"
#include "kudu/gutil/strings/substitute.h"
#include "kudu/master/master.h"
+#include "kudu/master/master.pb.h"
#include "kudu/master/master.proxy.h"
#include "kudu/tools/tool_action_common.h"
#include "kudu/tserver/tablet_server.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/tools/tool_action_wal.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tools/tool_action_wal.cc b/src/kudu/tools/tool_action_wal.cc
index c414320..434f144 100644
--- a/src/kudu/tools/tool_action_wal.cc
+++ b/src/kudu/tools/tool_action_wal.cc
@@ -17,8 +17,10 @@
#include "kudu/tools/tool_action.h"
+#include <algorithm>
#include <memory>
#include <string>
+#include <unordered_map>
#include "kudu/consensus/log_util.h"
#include "kudu/gutil/map-util.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/tools/tool_main.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tools/tool_main.cc b/src/kudu/tools/tool_main.cc
index 0227cd2..31f722e 100644
--- a/src/kudu/tools/tool_main.cc
+++ b/src/kudu/tools/tool_main.cc
@@ -16,6 +16,7 @@
// under the License.
#include <algorithm>
+#include <cstdlib>
#include <deque>
#include <iostream>
#include <memory>
@@ -23,7 +24,9 @@
#include <unordered_map>
#include <vector>
+#include <boost/optional/optional.hpp>
#include <gflags/gflags.h>
+#include <gflags/gflags_declare.h>
#include <glog/logging.h>
#include "kudu/gutil/map-util.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/tools/tool_test_util.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tools/tool_test_util.cc b/src/kudu/tools/tool_test_util.cc
index 0610c9e..a0ac540 100644
--- a/src/kudu/tools/tool_test_util.cc
+++ b/src/kudu/tools/tool_test_util.cc
@@ -19,6 +19,10 @@
#include "kudu/tools/tool_test_util.h"
+#include <ostream>
+
+#include <glog/logging.h>
+
#include "kudu/util/env.h"
#include "kudu/util/path_util.h"
#include "kudu/util/status.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/tserver/heartbeater.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tserver/heartbeater.cc b/src/kudu/tserver/heartbeater.cc
index e466c71..baa81c2 100644
--- a/src/kudu/tserver/heartbeater.cc
+++ b/src/kudu/tserver/heartbeater.cc
@@ -18,29 +18,46 @@
#include "kudu/tserver/heartbeater.h"
#include <atomic>
+#include <cstdint>
#include <memory>
+#include <mutex>
+#include <ostream>
#include <string>
+#include <unordered_map>
#include <utility>
#include <vector>
-#include <boost/optional.hpp>
+#include <boost/optional/optional.hpp>
#include <gflags/gflags.h>
#include <glog/logging.h>
#include "kudu/common/wire_protocol.h"
+#include "kudu/common/wire_protocol.pb.h"
+#include "kudu/gutil/gscoped_ptr.h"
+#include "kudu/gutil/map-util.h"
+#include "kudu/gutil/port.h"
#include "kudu/gutil/ref_counted.h"
#include "kudu/gutil/strings/substitute.h"
+#include "kudu/master/master.pb.h"
#include "kudu/master/master.proxy.h"
+#include "kudu/rpc/rpc_controller.h"
#include "kudu/security/cert.h"
+#include "kudu/security/openssl_util.h"
#include "kudu/security/tls_context.h"
+#include "kudu/security/token.pb.h"
#include "kudu/security/token_verifier.h"
+#include "kudu/server/rpc_server.h"
#include "kudu/server/webserver.h"
#include "kudu/tserver/tablet_server.h"
#include "kudu/tserver/tablet_server_options.h"
#include "kudu/tserver/ts_tablet_manager.h"
+#include "kudu/util/condition_variable.h"
#include "kudu/util/flag_tags.h"
+#include "kudu/util/locks.h"
#include "kudu/util/monotime.h"
+#include "kudu/util/mutex.h"
#include "kudu/util/net/net_util.h"
+#include "kudu/util/net/sockaddr.h"
#include "kudu/util/pb_util.h"
#include "kudu/util/status.h"
#include "kudu/util/thread.h"
@@ -70,6 +87,11 @@ using std::vector;
using strings::Substitute;
namespace kudu {
+
+namespace rpc {
+class Messenger;
+}
+
namespace tserver {
namespace {
http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/tserver/mini_tablet_server-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tserver/mini_tablet_server-test.cc b/src/kudu/tserver/mini_tablet_server-test.cc
index 7405830..34237be 100644
--- a/src/kudu/tserver/mini_tablet_server-test.cc
+++ b/src/kudu/tserver/mini_tablet_server-test.cc
@@ -15,12 +15,18 @@
// specific language governing permissions and limitations
// under the License.
+#include <memory>
+#include <vector>
+
#include <gtest/gtest.h>
#include "kudu/fs/fs_manager.h"
#include "kudu/tserver/mini_tablet_server.h"
#include "kudu/tserver/tablet_server.h"
+#include "kudu/util/net/net_util.h"
#include "kudu/util/path_util.h"
+#include "kudu/util/status.h"
+#include "kudu/util/test_macros.h"
#include "kudu/util/test_util.h"
namespace kudu {
http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/tserver/mini_tablet_server.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tserver/mini_tablet_server.cc b/src/kudu/tserver/mini_tablet_server.cc
index 452281a..607b4db 100644
--- a/src/kudu/tserver/mini_tablet_server.cc
+++ b/src/kudu/tserver/mini_tablet_server.cc
@@ -17,18 +17,30 @@
#include "kudu/tserver/mini_tablet_server.h"
+#include <ostream>
#include <utility>
#include <vector>
#include <gflags/gflags_declare.h>
+#include <glog/logging.h>
+#include "kudu/common/common.pb.h"
+#include "kudu/common/partition.h"
+#include "kudu/common/schema.h"
+#include "kudu/common/wire_protocol.pb.h"
#include "kudu/consensus/metadata.pb.h"
+#include "kudu/fs/fs_manager.h"
+#include "kudu/gutil/ref_counted.h"
#include "kudu/gutil/strings/substitute.h"
-#include "kudu/tablet/tablet-test-util.h"
+#include "kudu/server/rpc_server.h"
+#include "kudu/server/webserver_options.h"
+#include "kudu/tablet/tablet-harness.h"
#include "kudu/tablet/tablet_replica.h"
#include "kudu/tserver/tablet_server.h"
#include "kudu/tserver/ts_tablet_manager.h"
+#include "kudu/util/env.h"
#include "kudu/util/env_util.h"
+#include "kudu/util/net/net_util.h"
#include "kudu/util/net/sockaddr.h"
#include "kudu/util/path_util.h"
#include "kudu/util/status.h"
@@ -36,9 +48,9 @@
DECLARE_bool(enable_minidumps);
DECLARE_bool(rpc_server_allow_ephemeral_ports);
-using kudu::consensus::RaftConfigPB;
-using kudu::consensus::RaftPeerPB;
using kudu::tablet::TabletReplica;
+using kudu::consensus::RaftPeerPB;
+using kudu::consensus::RaftConfigPB;
using std::pair;
using std::string;
using std::unique_ptr;
http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/tserver/mini_tablet_server.h
----------------------------------------------------------------------
diff --git a/src/kudu/tserver/mini_tablet_server.h b/src/kudu/tserver/mini_tablet_server.h
index b60d7e8..329385e 100644
--- a/src/kudu/tserver/mini_tablet_server.h
+++ b/src/kudu/tserver/mini_tablet_server.h
@@ -21,13 +21,12 @@
#include <string>
#include <vector>
-#include "kudu/common/schema.h"
-#include "kudu/gutil/macros.h"
#include "kudu/tserver/tablet_server_options.h"
#include "kudu/util/net/sockaddr.h"
namespace kudu {
-class FsManager;
+class HostPort;
+class Schema;
class Status;
namespace consensus {
http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/tserver/scanner_metrics.h
----------------------------------------------------------------------
diff --git a/src/kudu/tserver/scanner_metrics.h b/src/kudu/tserver/scanner_metrics.h
index 41a67b7..e33b038 100644
--- a/src/kudu/tserver/scanner_metrics.h
+++ b/src/kudu/tserver/scanner_metrics.h
@@ -18,12 +18,10 @@
#define KUDU_TSERVER_SCANNER_METRICS_H
#include "kudu/gutil/ref_counted.h"
+#include "kudu/util/metrics.h"
namespace kudu {
-class MetricEntity;
-class Counter;
-class Histogram;
class MonoTime;
namespace tserver {
http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/tserver/scanners-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tserver/scanners-test.cc b/src/kudu/tserver/scanners-test.cc
index f0b7473..8d8180b 100644
--- a/src/kudu/tserver/scanners-test.cc
+++ b/src/kudu/tserver/scanners-test.cc
@@ -16,14 +16,20 @@
// under the License.
#include "kudu/tserver/scanners.h"
+#include <memory>
#include <vector>
+#include <gflags/gflags_declare.h>
#include <gtest/gtest.h>
+
+#include "kudu/gutil/gscoped_ptr.h"
+#include "kudu/gutil/ref_counted.h"
#include "kudu/tablet/tablet_replica.h"
#include "kudu/tserver/scanner_metrics.h"
#include "kudu/tserver/tserver.pb.h"
+#include "kudu/util/make_shared.h"
#include "kudu/util/metrics.h"
-#include "kudu/util/test_util.h"
+#include "kudu/util/monotime.h"
DECLARE_int32(scanner_ttl_ms);
http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/tserver/scanners.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tserver/scanners.cc b/src/kudu/tserver/scanners.cc
index af35bf0..d0b9c57 100644
--- a/src/kudu/tserver/scanners.cc
+++ b/src/kudu/tserver/scanners.cc
@@ -16,18 +16,26 @@
// under the License.
#include "kudu/tserver/scanners.h"
+#include <cstdint>
#include <mutex>
+#include <ostream>
#include <gflags/gflags.h>
#include "kudu/common/iterator.h"
#include "kudu/common/scan_spec.h"
+#include "kudu/common/schema.h"
+#include "kudu/gutil/bind.h"
+#include "kudu/gutil/bind_helpers.h"
#include "kudu/gutil/hash/string_hash.h"
+#include "kudu/gutil/integral_types.h"
#include "kudu/gutil/map-util.h"
+#include "kudu/gutil/stl_util.h"
#include "kudu/gutil/strings/substitute.h"
#include "kudu/tserver/scanner_metrics.h"
#include "kudu/util/flag_tags.h"
#include "kudu/util/metrics.h"
+#include "kudu/util/status.h"
#include "kudu/util/thread.h"
DEFINE_int32(scanner_ttl_ms, 60000,
http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/tserver/scanners.h
----------------------------------------------------------------------
diff --git a/src/kudu/tserver/scanners.h b/src/kudu/tserver/scanners.h
index 184f5fc..ec045bb 100644
--- a/src/kudu/tserver/scanners.h
+++ b/src/kudu/tserver/scanners.h
@@ -17,6 +17,8 @@
#ifndef KUDU_TSERVER_SCANNERS_H
#define KUDU_TSERVER_SCANNERS_H
+#include <cstddef>
+#include <cstdint>
#include <memory>
#include <mutex>
#include <string>
@@ -24,12 +26,17 @@
#include <utility>
#include <vector>
+#include <glog/logging.h>
+#include <gtest/gtest_prod.h>
+
#include "kudu/common/iterator_stats.h"
#include "kudu/gutil/gscoped_ptr.h"
#include "kudu/gutil/macros.h"
#include "kudu/gutil/ref_counted.h"
#include "kudu/tablet/tablet_replica.h"
#include "kudu/util/auto_release_pool.h"
+#include "kudu/util/condition_variable.h"
+#include "kudu/util/locks.h"
#include "kudu/util/memory/arena.h"
#include "kudu/util/metrics.h"
#include "kudu/util/monotime.h"
@@ -39,15 +46,12 @@
namespace kudu {
-class MetricEntity;
class RowwiseIterator;
class ScanSpec;
class Schema;
class Status;
class Thread;
-struct IteratorStats;
-
namespace tserver {
class Scanner;
http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/tserver/tablet_copy_client-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tserver/tablet_copy_client-test.cc b/src/kudu/tserver/tablet_copy_client-test.cc
index fcde4ec..c6afa49 100644
--- a/src/kudu/tserver/tablet_copy_client-test.cc
+++ b/src/kudu/tserver/tablet_copy_client-test.cc
@@ -16,17 +16,48 @@
// under the License.
#include "kudu/tserver/tablet_copy-test-base.h"
-#include <tuple>
-
+#include <cstdint>
+#include <limits>
+#include <memory>
+#include <ostream>
+#include <string>
+#include <vector>
+
+#include <glog/logging.h>
#include <glog/stl_logging.h>
+#include <gtest/gtest.h>
+#include "kudu/common/wire_protocol.h"
#include "kudu/consensus/consensus_meta_manager.h"
+#include "kudu/consensus/log.h"
+#include "kudu/consensus/log_reader.h"
+#include "kudu/consensus/log_util.h"
+#include "kudu/consensus/metadata.pb.h"
#include "kudu/consensus/quorum_util.h"
+#include "kudu/consensus/raft_consensus.h"
+#include "kudu/fs/block_id.h"
#include "kudu/fs/block_manager.h"
+#include "kudu/fs/fs_manager.h"
+#include "kudu/gutil/gscoped_ptr.h"
+#include "kudu/gutil/port.h"
+#include "kudu/gutil/ref_counted.h"
#include "kudu/gutil/strings/fastmem.h"
-#include "kudu/tablet/tablet_bootstrap.h"
+#include "kudu/gutil/strings/substitute.h"
+#include "kudu/rpc/messenger.h"
+#include "kudu/tablet/metadata.pb.h"
+#include "kudu/tablet/tablet_metadata.h"
+#include "kudu/tablet/tablet_replica.h"
+#include "kudu/tserver/tablet_copy.pb.h"
#include "kudu/tserver/tablet_copy_client.h"
+#include "kudu/util/crc.h"
+#include "kudu/util/env.h"
#include "kudu/util/env_util.h"
+#include "kudu/util/faststring.h"
+#include "kudu/util/monotime.h"
+#include "kudu/util/net/net_util.h"
+#include "kudu/util/slice.h"
+#include "kudu/util/status.h"
+#include "kudu/util/test_macros.h"
using std::shared_ptr;
using std::string;
http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/tserver/tablet_copy_client.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tserver/tablet_copy_client.cc b/src/kudu/tserver/tablet_copy_client.cc
index 22898e9..7418477 100644
--- a/src/kudu/tserver/tablet_copy_client.cc
+++ b/src/kudu/tserver/tablet_copy_client.cc
@@ -17,37 +17,49 @@
#include "kudu/tserver/tablet_copy_client.h"
+#include <algorithm>
+#include <cstdint>
+#include <memory>
+#include <ostream>
+
+#include <boost/optional/optional.hpp>
#include <gflags/gflags.h>
+#include <gflags/gflags_declare.h>
#include <glog/logging.h>
-#include <memory>
+#include "kudu/common/partition.h"
+#include "kudu/common/schema.h"
#include "kudu/common/wire_protocol.h"
#include "kudu/consensus/consensus_meta.h"
#include "kudu/consensus/consensus_meta_manager.h"
#include "kudu/consensus/metadata.pb.h"
+#include "kudu/consensus/opid.pb.h"
#include "kudu/fs/block_id.h"
#include "kudu/fs/block_manager.h"
#include "kudu/fs/data_dirs.h"
+#include "kudu/fs/fs.pb.h"
#include "kudu/fs/fs_manager.h"
+#include "kudu/gutil/port.h"
#include "kudu/gutil/strings/substitute.h"
-#include "kudu/gutil/strings/util.h"
#include "kudu/gutil/walltime.h"
-#include "kudu/rpc/messenger.h"
-#include "kudu/rpc/transfer.h"
-#include "kudu/tablet/tablet.pb.h"
-#include "kudu/tablet/tablet_bootstrap.h"
+#include "kudu/rpc/rpc_controller.h"
+#include "kudu/rpc/rpc_header.pb.h"
+#include "kudu/tablet/metadata.pb.h"
+#include "kudu/tablet/tablet_metadata.h"
#include "kudu/tablet/tablet_replica.h"
#include "kudu/tserver/tablet_copy.pb.h"
#include "kudu/tserver/tablet_copy.proxy.h"
-#include "kudu/tserver/tablet_server.h"
#include "kudu/tserver/ts_tablet_manager.h"
#include "kudu/util/crc.h"
#include "kudu/util/env.h"
#include "kudu/util/env_util.h"
#include "kudu/util/flag_tags.h"
#include "kudu/util/logging.h"
+#include "kudu/util/monotime.h"
#include "kudu/util/net/net_util.h"
#include "kudu/util/pb_util.h"
+#include "kudu/util/net/sockaddr.h"
+#include "kudu/util/path_util.h"
DEFINE_int32(tablet_copy_begin_session_timeout_ms, 3000,
"Tablet server RPC client timeout for BeginTabletCopySession calls. "
http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/tserver/tablet_copy_client.h
----------------------------------------------------------------------
diff --git a/src/kudu/tserver/tablet_copy_client.h b/src/kudu/tserver/tablet_copy_client.h
index 6861188..7262ae5 100644
--- a/src/kudu/tserver/tablet_copy_client.h
+++ b/src/kudu/tserver/tablet_copy_client.h
@@ -17,19 +17,20 @@
#ifndef KUDU_TSERVER_TABLET_COPY_CLIENT_H
#define KUDU_TSERVER_TABLET_COPY_CLIENT_H
+#include <cstdint>
#include <string>
#include <memory>
#include <vector>
#include <gtest/gtest_prod.h>
-#include "kudu/fs/block_id.h"
#include "kudu/gutil/macros.h"
#include "kudu/gutil/ref_counted.h"
#include "kudu/util/status.h"
namespace kudu {
+class BlockId;
class BlockIdPB;
class FsManager;
class HostPort;
@@ -38,12 +39,9 @@ namespace consensus {
class ConsensusMetadata;
class ConsensusMetadataManager;
class ConsensusStatePB;
-class RaftConfigPB;
-class RaftPeerPB;
} // namespace consensus
namespace rpc {
-class ErrorStatusPB;
class Messenger;
class RpcController;
} // namespace rpc
http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/tserver/tablet_copy_service-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tserver/tablet_copy_service-test.cc b/src/kudu/tserver/tablet_copy_service-test.cc
index 6d33731..442210f 100644
--- a/src/kudu/tserver/tablet_copy_service-test.cc
+++ b/src/kudu/tserver/tablet_copy_service-test.cc
@@ -16,26 +16,44 @@
// under the License.
#include "kudu/tserver/tablet_copy-test-base.h"
-#include <gflags/gflags.h>
+#include <cstdint>
#include <limits>
+#include <memory>
+#include <string>
#include <thread>
#include <vector>
+#include <gflags/gflags_declare.h>
+#include <glog/logging.h>
+#include <gtest/gtest.h>
+
+#include "kudu/common/wire_protocol.h"
#include "kudu/consensus/log.h"
-#include "kudu/consensus/log_anchor_registry.h"
+#include "kudu/consensus/log.pb.h"
+#include "kudu/consensus/log_reader.h"
#include "kudu/consensus/log_util.h"
-#include "kudu/consensus/metadata.pb.h"
#include "kudu/consensus/opid_util.h"
+#include "kudu/fs/block_id.h"
+#include "kudu/fs/fs.pb.h"
+#include "kudu/gutil/gscoped_ptr.h"
+#include "kudu/gutil/port.h"
+#include "kudu/gutil/ref_counted.h"
+#include "kudu/rpc/rpc_controller.h"
#include "kudu/rpc/rpc_header.pb.h"
-#include "kudu/rpc/transfer.h"
+#include "kudu/tablet/metadata.pb.h"
+#include "kudu/tablet/tablet_replica.h"
+#include "kudu/tserver/mini_tablet_server.h"
#include "kudu/tserver/tablet_copy.pb.h"
-#include "kudu/tserver/tserver_service.pb.h"
-#include "kudu/tserver/tserver_service.proxy.h"
-#include "kudu/util/crc.h"
+#include "kudu/tserver/tablet_copy.proxy.h"
+#include "kudu/tserver/tablet_server.h"
+#include "kudu/util/env.h"
+#include "kudu/util/faststring.h"
+#include "kudu/util/make_shared.h"
#include "kudu/util/monotime.h"
#include "kudu/util/pb_util.h"
-#include "kudu/util/stopwatch.h"
-#include "kudu/util/test_util.h"
+#include "kudu/util/slice.h"
+#include "kudu/util/status.h"
+#include "kudu/util/test_macros.h"
#define ASSERT_REMOTE_ERROR(status, err, code, str) \
ASSERT_NO_FATAL_FAILURE(AssertRemoteError(status, err, code, str))
http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/tserver/tablet_copy_service.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tserver/tablet_copy_service.cc b/src/kudu/tserver/tablet_copy_service.cc
index 546ce0d..588b7d4 100644
--- a/src/kudu/tserver/tablet_copy_service.cc
+++ b/src/kudu/tserver/tablet_copy_service.cc
@@ -16,25 +16,34 @@
// under the License.
#include "kudu/tserver/tablet_copy_service.h"
-#include <algorithm>
-#include <gflags/gflags.h>
-#include <glog/logging.h>
+#include <cstdint>
+#include <ostream>
#include <string>
+#include <utility>
#include <vector>
+#include <gflags/gflags.h>
+#include <glog/logging.h>
+
#include "kudu/common/wire_protocol.h"
-#include "kudu/consensus/log.h"
+#include "kudu/consensus/log.pb.h"
+#include "kudu/consensus/log_util.h"
+#include "kudu/consensus/metadata.pb.h"
+#include "kudu/fs/block_id.h"
#include "kudu/fs/fs_manager.h"
-#include "kudu/gutil/strings/substitute.h"
+#include "kudu/gutil/macros.h"
#include "kudu/gutil/map-util.h"
+#include "kudu/gutil/strings/substitute.h"
#include "kudu/rpc/rpc_context.h"
#include "kudu/server/server_base.h"
#include "kudu/tserver/tablet_copy_source_session.h"
#include "kudu/tserver/tablet_replica_lookup.h"
+#include "kudu/tablet/metadata.pb.h"
#include "kudu/tablet/tablet_replica.h"
#include "kudu/util/crc.h"
#include "kudu/util/fault_injection.h"
#include "kudu/util/flag_tags.h"
+#include "kudu/util/logging.h"
#include "kudu/util/pb_util.h"
#include "kudu/util/random_util.h"
@@ -72,6 +81,12 @@ using std::string;
using std::vector;
using strings::Substitute;
+namespace google {
+namespace protobuf {
+class Message;
+}
+}
+
namespace kudu {
using crc::Crc32c;
http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/tserver/tablet_copy_service.h
----------------------------------------------------------------------
diff --git a/src/kudu/tserver/tablet_copy_service.h b/src/kudu/tserver/tablet_copy_service.h
index 2eeab40..1292c26 100644
--- a/src/kudu/tserver/tablet_copy_service.h
+++ b/src/kudu/tserver/tablet_copy_service.h
@@ -20,31 +20,38 @@
#include <string>
#include <unordered_map>
-#include "kudu/gutil/gscoped_ptr.h"
+#include "kudu/gutil/port.h"
#include "kudu/gutil/ref_counted.h"
+#include "kudu/tserver/tablet_copy.pb.h"
#include "kudu/tserver/tablet_copy.service.h"
+#include "kudu/tserver/tablet_copy_source_session.h"
#include "kudu/util/countdown_latch.h"
-#include "kudu/util/locks.h"
-#include "kudu/util/metrics.h"
#include "kudu/util/monotime.h"
+#include "kudu/util/mutex.h"
#include "kudu/util/random.h"
#include "kudu/util/status.h"
#include "kudu/util/thread.h"
+namespace google {
+namespace protobuf {
+class Message;
+}
+}
+
namespace kudu {
+
class FsManager;
namespace server {
class ServerBase;
} // namespace server
-namespace log {
-class ReadableLogSegment;
-} // namespace log
+namespace rpc {
+class RpcContext;
+} // namespace rpc
namespace tserver {
-class TabletCopySourceSession;
class TabletReplicaLookupIf;
class TabletCopyServiceImpl : public TabletCopyServiceIf {
http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/tserver/tablet_copy_source_session-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tserver/tablet_copy_source_session-test.cc b/src/kudu/tserver/tablet_copy_source_session-test.cc
index 6204638..05cb6e4 100644
--- a/src/kudu/tserver/tablet_copy_source_session-test.cc
+++ b/src/kudu/tserver/tablet_copy_source_session-test.cc
@@ -16,30 +16,65 @@
// under the License.
#include "kudu/tablet/tablet-test-util.h"
+#include <algorithm>
+#include <cstddef>
+#include <cstdint>
+#include <memory>
+#include <ostream>
+#include <string>
+#include <vector>
+
#include <glog/logging.h>
#include <gtest/gtest.h>
-#include <memory>
+#include "kudu/clock/clock.h"
+#include "kudu/common/common.pb.h"
#include "kudu/common/partial_row.h"
#include "kudu/common/row_operations.h"
#include "kudu/common/schema.h"
+#include "kudu/common/wire_protocol.h"
+#include "kudu/common/wire_protocol.pb.h"
#include "kudu/consensus/consensus_meta.h"
#include "kudu/consensus/consensus_meta_manager.h"
#include "kudu/consensus/log.h"
+#include "kudu/consensus/log_anchor_registry.h"
+#include "kudu/consensus/log_util.h"
#include "kudu/consensus/metadata.pb.h"
#include "kudu/consensus/opid_util.h"
+#include "kudu/consensus/raft_consensus.h"
#include "kudu/fs/block_id.h"
+#include "kudu/fs/block_manager.h"
+#include "kudu/fs/fs_manager.h"
+#include "kudu/gutil/bind.h"
+#include "kudu/gutil/bind_helpers.h"
#include "kudu/gutil/gscoped_ptr.h"
+#include "kudu/gutil/move.h"
+#include "kudu/gutil/port.h"
#include "kudu/gutil/ref_counted.h"
#include "kudu/gutil/strings/fastmem.h"
#include "kudu/gutil/strings/substitute.h"
#include "kudu/rpc/messenger.h"
+#include "kudu/rpc/result_tracker.h"
+#include "kudu/tablet/metadata.pb.h"
+#include "kudu/tablet/tablet.h"
+#include "kudu/tablet/tablet_metadata.h"
#include "kudu/tablet/tablet_replica.h"
+#include "kudu/tablet/transactions/transaction.h"
+#include "kudu/tablet/transactions/write_transaction.h"
+#include "kudu/tserver/tablet_copy.pb.h"
#include "kudu/tserver/tablet_copy_source_session.h"
+#include "kudu/tserver/tserver.pb.h"
+#include "kudu/util/countdown_latch.h"
#include "kudu/util/crc.h"
+#include "kudu/util/env.h"
+#include "kudu/util/faststring.h"
#include "kudu/util/metrics.h"
+#include "kudu/util/monotime.h"
+#include "kudu/util/path_util.h"
#include "kudu/util/pb_util.h"
-#include "kudu/util/test_util.h"
+#include "kudu/util/slice.h"
+#include "kudu/util/status.h"
+#include "kudu/util/test_macros.h"
#include "kudu/util/threadpool.h"
METRIC_DECLARE_entity(tablet);
@@ -50,6 +85,9 @@ using std::unique_ptr;
using std::vector;
namespace kudu {
+
+class BlockIdPB;
+
namespace tserver {
using consensus::ConsensusMetadata;
http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/tserver/tablet_copy_source_session.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tserver/tablet_copy_source_session.cc b/src/kudu/tserver/tablet_copy_source_session.cc
index de3ecbf..8c57cf0 100644
--- a/src/kudu/tserver/tablet_copy_source_session.cc
+++ b/src/kudu/tserver/tablet_copy_source_session.cc
@@ -17,20 +17,35 @@
#include "kudu/tserver/tablet_copy_source_session.h"
#include <algorithm>
-#include <mutex>
+#include <cstdint>
+#include <cstring>
+#include <ostream>
+#include <vector>
+
+#include <gflags/gflags.h>
#include "kudu/consensus/log.h"
+#include "kudu/consensus/log.pb.h"
#include "kudu/consensus/log_reader.h"
#include "kudu/consensus/metadata.pb.h"
+#include "kudu/consensus/opid.pb.h"
+#include "kudu/consensus/opid_util.h"
+#include "kudu/consensus/raft_consensus.h"
#include "kudu/fs/block_manager.h"
+#include "kudu/fs/fs.pb.h"
+#include "kudu/fs/fs_manager.h"
+#include "kudu/gutil/basictypes.h"
#include "kudu/gutil/map-util.h"
+#include "kudu/gutil/port.h"
#include "kudu/gutil/strings/substitute.h"
#include "kudu/gutil/type_traits.h"
#include "kudu/rpc/transfer.h"
+#include "kudu/tablet/tablet_metadata.h"
#include "kudu/tablet/tablet_replica.h"
#include "kudu/util/flag_tags.h"
#include "kudu/util/mutex.h"
#include "kudu/util/pb_util.h"
+#include "kudu/util/slice.h"
#include "kudu/util/stopwatch.h"
#include "kudu/util/trace.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/tserver/tablet_copy_source_session.h
----------------------------------------------------------------------
diff --git a/src/kudu/tserver/tablet_copy_source_session.h b/src/kudu/tserver/tablet_copy_source_session.h
index adeb133..b91fed5 100644
--- a/src/kudu/tserver/tablet_copy_source_session.h
+++ b/src/kudu/tserver/tablet_copy_source_session.h
@@ -17,28 +17,32 @@
#pragma once
+#include <algorithm>
+#include <cstdint>
#include <memory>
#include <string>
#include <unordered_map>
-#include <vector>
+
+#include <glog/logging.h>
#include "kudu/consensus/log_anchor_registry.h"
#include "kudu/consensus/log_util.h"
#include "kudu/consensus/metadata.pb.h"
-#include "kudu/consensus/opid_util.h"
#include "kudu/fs/block_id.h"
#include "kudu/fs/block_manager.h"
#include "kudu/gutil/macros.h"
#include "kudu/gutil/ref_counted.h"
#include "kudu/gutil/stl_util.h"
+#include "kudu/tablet/metadata.pb.h"
#include "kudu/tserver/tablet_copy.pb.h"
-#include "kudu/util/env_util.h"
-#include "kudu/util/locks.h"
+#include "kudu/util/env.h"
+#include "kudu/util/mutex.h"
#include "kudu/util/status.h"
namespace kudu {
class FsManager;
+class Slice;
namespace tablet {
class TabletReplica;
@@ -46,8 +50,6 @@ class TabletReplica;
namespace tserver {
-class TabletReplicaLookupIf;
-
// Caches file size and holds a shared_ptr reference to a RandomAccessFile.
// Assumes that the file underlying the RandomAccessFile is immutable.
struct ImmutableRandomAccessFileInfo {
http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/tserver/tablet_server-stress-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tserver/tablet_server-stress-test.cc b/src/kudu/tserver/tablet_server-stress-test.cc
index 96ab39b..183d298 100644
--- a/src/kudu/tserver/tablet_server-stress-test.cc
+++ b/src/kudu/tserver/tablet_server-stress-test.cc
@@ -16,12 +16,30 @@
// under the License.
#include "kudu/tserver/tablet_server-test-base.h"
+#include <cstdint>
+#include <ostream>
+#include <string>
+#include <vector>
#include <thread>
+#include <gflags/gflags.h>
+#include <gflags/gflags_declare.h>
+#include <glog/logging.h>
+#include <gtest/gtest.h>
+
+#include "kudu/gutil/port.h"
+#include "kudu/gutil/ref_counted.h"
#include "kudu/gutil/strings/substitute.h"
#include "kudu/util/countdown_latch.h"
+#include "kudu/util/jsonwriter.h"
+#include "kudu/util/metrics.h"
+#include "kudu/util/monotime.h"
#include "kudu/util/process_memory.h"
+#include "kudu/util/status.h"
#include "kudu/util/stopwatch.h"
+#include "kudu/util/test_macros.h"
+#include "kudu/util/test_util.h"
+#include "kudu/util/thread.h"
DEFINE_int32(runtime_secs, 10,
"Maximum number of seconds to run. If the threads have not completed "
http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/tserver/tablet_server-test-base.h
----------------------------------------------------------------------
diff --git a/src/kudu/tserver/tablet_server-test-base.h b/src/kudu/tserver/tablet_server-test-base.h
index bd77601..d4bff34 100644
--- a/src/kudu/tserver/tablet_server-test-base.h
+++ b/src/kudu/tserver/tablet_server-test-base.h
@@ -38,6 +38,7 @@
#include "kudu/gutil/stl_util.h"
#include "kudu/gutil/strings/substitute.h"
#include "kudu/rpc/messenger.h"
+#include "kudu/rpc/rpc_controller.h"
#include "kudu/server/server_base.proxy.h"
#include "kudu/tablet/local_tablet_writer.h"
#include "kudu/tablet/tablet.h"
@@ -54,6 +55,7 @@
#include "kudu/util/metrics.h"
#include "kudu/util/pb_util.h"
#include "kudu/util/test_graph.h"
+#include "kudu/util/test_macros.h"
#include "kudu/util/test_util.h"
DEFINE_int32(rpc_timeout, 1000, "Timeout for RPC calls, in seconds");
http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/tserver/tablet_server-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tserver/tablet_server-test.cc b/src/kudu/tserver/tablet_server-test.cc
index 001100f..34a4ab1 100644
--- a/src/kudu/tserver/tablet_server-test.cc
+++ b/src/kudu/tserver/tablet_server-test.cc
@@ -14,37 +14,96 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
+
#include "kudu/tserver/tablet_server-test-base.h"
+#include <unistd.h>
+
+#include <cstdint>
#include <memory>
#include <sstream>
-
+#include <string>
+#include <utility>
+#include <vector>
+
+#include <boost/bind.hpp>
+#include <gflags/gflags.h>
+#include <gflags/gflags_declare.h>
+#include <glog/logging.h>
#include <google/protobuf/util/message_differencer.h>
-#include <zlib.h>
+#include <gtest/gtest.h>
+#include "kudu/clock/clock.h"
#include "kudu/clock/hybrid_clock.h"
+#include "kudu/common/common.pb.h"
+#include "kudu/common/encoded_key.h"
+#include "kudu/common/partial_row.h"
+#include "kudu/common/partition.h"
+#include "kudu/common/row_operations.h"
+#include "kudu/common/schema.h"
+#include "kudu/common/timestamp.h"
+#include "kudu/common/wire_protocol-test-util.h"
+#include "kudu/common/wire_protocol.h"
+#include "kudu/common/wire_protocol.pb.h"
#include "kudu/consensus/log-test-base.h"
+#include "kudu/consensus/log.h"
+#include "kudu/consensus/metadata.pb.h"
+#include "kudu/fs/fs.pb.h"
+#include "kudu/fs/fs_manager.h"
+#include "kudu/gutil/casts.h"
+#include "kudu/gutil/gscoped_ptr.h"
+#include "kudu/gutil/port.h"
+#include "kudu/gutil/ref_counted.h"
+#include "kudu/gutil/stringprintf.h"
#include "kudu/gutil/strings/escaping.h"
#include "kudu/gutil/strings/substitute.h"
-#include "kudu/master/master.pb.h"
+#include "kudu/rpc/messenger.h"
+#include "kudu/rpc/rpc_controller.h"
+#include "kudu/rpc/rpc_header.pb.h"
+#include "kudu/server/rpc_server.h"
#include "kudu/server/server_base.pb.h"
#include "kudu/server/server_base.proxy.h"
-#include "kudu/tablet/tablet_bootstrap.h"
+#include "kudu/tablet/metadata.pb.h"
+#include "kudu/tablet/tablet.h"
+#include "kudu/tablet/tablet_metadata.h"
+#include "kudu/tablet/tablet_replica.h"
#include "kudu/tserver/heartbeater.h"
+#include "kudu/tserver/mini_tablet_server.h"
+#include "kudu/tserver/scanners.h"
+#include "kudu/tserver/tablet_server.h"
+#include "kudu/tserver/tablet_server_test_util.h"
+#include "kudu/tserver/ts_tablet_manager.h"
+#include "kudu/tserver/tserver.pb.h"
+#include "kudu/tserver/tserver_admin.pb.h"
+#include "kudu/tserver/tserver_admin.proxy.h"
+#include "kudu/tserver/tserver_service.pb.h"
+#include "kudu/tserver/tserver_service.proxy.h"
+#include "kudu/util/countdown_latch.h"
#include "kudu/util/crc.h"
#include "kudu/util/curl_util.h"
+#include "kudu/util/env.h"
+#include "kudu/util/faststring.h"
+#include "kudu/util/jsonwriter.h"
+#include "kudu/util/metrics.h"
+#include "kudu/util/monotime.h"
+#include "kudu/util/net/sockaddr.h"
+#include "kudu/util/path_util.h"
#include "kudu/util/pb_util.h"
-#include "kudu/util/url-coding.h"
+#include "kudu/util/slice.h"
+#include "kudu/util/status.h"
+#include "kudu/util/test_macros.h"
+#include "kudu/util/test_util.h"
+#include "kudu/util/thread.h"
#include "kudu/util/zlib.h"
using google::protobuf::util::MessageDifferencer;
-using kudu::rpc::Messenger;
-using kudu::rpc::MessengerBuilder;
-using kudu::rpc::RpcController;
using kudu::clock::Clock;
using kudu::clock::HybridClock;
using kudu::pb_util::SecureDebugString;
using kudu::pb_util::SecureShortDebugString;
+using kudu::rpc::Messenger;
+using kudu::rpc::MessengerBuilder;
+using kudu::rpc::RpcController;
using kudu::tablet::Tablet;
using kudu::tablet::TabletReplica;
using kudu::tablet::TabletSuperBlockPB;
@@ -74,6 +133,11 @@ METRIC_DECLARE_counter(rows_deleted);
METRIC_DECLARE_gauge_uint64(log_block_manager_blocks_under_management);
namespace kudu {
+
+namespace tablet {
+class RowSet;
+}
+
namespace tserver {
class TabletServerTest : public TabletServerTestBase {
http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/tserver/tablet_server.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tserver/tablet_server.cc b/src/kudu/tserver/tablet_server.cc
index f922b5e..bd3cde9 100644
--- a/src/kudu/tserver/tablet_server.cc
+++ b/src/kudu/tserver/tablet_server.cc
@@ -17,14 +17,20 @@
#include "kudu/tserver/tablet_server.h"
+#include <algorithm>
+#include <cstddef>
+#include <ostream>
+#include <type_traits>
+
#include <glog/logging.h>
#include "kudu/cfile/block_cache.h"
#include "kudu/fs/fs_manager.h"
+#include "kudu/gutil/bind.h"
+#include "kudu/gutil/bind_helpers.h"
+#include "kudu/gutil/move.h"
#include "kudu/gutil/strings/substitute.h"
#include "kudu/rpc/service_if.h"
-#include "kudu/server/rpc_server.h"
-#include "kudu/server/webserver.h"
#include "kudu/tserver/heartbeater.h"
#include "kudu/tserver/scanners.h"
#include "kudu/tserver/tablet_copy_service.h"
@@ -33,7 +39,6 @@
#include "kudu/tserver/tserver-path-handlers.h"
#include "kudu/util/maintenance_manager.h"
#include "kudu/util/net/net_util.h"
-#include "kudu/util/net/sockaddr.h"
#include "kudu/util/status.h"
using std::string;
http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/tserver/tablet_server.h
----------------------------------------------------------------------
diff --git a/src/kudu/tserver/tablet_server.h b/src/kudu/tserver/tablet_server.h
index 40a1c39..1dc3f38 100644
--- a/src/kudu/tserver/tablet_server.h
+++ b/src/kudu/tserver/tablet_server.h
@@ -17,18 +17,15 @@
#ifndef KUDU_TSERVER_TABLET_SERVER_H
#define KUDU_TSERVER_TABLET_SERVER_H
+#include <cstdint>
#include <memory>
#include <string>
-#include "kudu/consensus/metadata.pb.h"
#include "kudu/gutil/atomicops.h"
#include "kudu/gutil/gscoped_ptr.h"
#include "kudu/gutil/macros.h"
#include "kudu/kserver/kserver.h"
#include "kudu/tserver/tablet_server_options.h"
-#include "kudu/tserver/tserver.pb.h"
-#include "kudu/util/net/net_util.h"
-#include "kudu/util/net/sockaddr.h"
#include "kudu/util/status.h"
namespace kudu {
http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/tserver/tablet_server_main.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tserver/tablet_server_main.cc b/src/kudu/tserver/tablet_server_main.cc
index 5123f0f..0df91e8 100644
--- a/src/kudu/tserver/tablet_server_main.cc
+++ b/src/kudu/tserver/tablet_server_main.cc
@@ -15,16 +15,24 @@
// specific language governing permissions and limitations
// under the License.
-#include <glog/logging.h>
#include <iostream>
+#include <string>
+
+#include <gflags/gflags.h>
+#include <gflags/gflags_declare.h>
+#include <glog/logging.h>
+#include "kudu/gutil/macros.h"
#include "kudu/gutil/strings/substitute.h"
#include "kudu/tserver/tablet_server.h"
+#include "kudu/tserver/tablet_server_options.h"
#include "kudu/util/fault_injection.h"
#include "kudu/util/flags.h"
#include "kudu/util/flag_tags.h"
#include "kudu/util/init.h"
#include "kudu/util/logging.h"
+#include "kudu/util/monotime.h"
+#include "kudu/util/status.h"
#include "kudu/util/version_info.h"
using kudu::tserver::TabletServer;
http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/tserver/tablet_server_options.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tserver/tablet_server_options.cc b/src/kudu/tserver/tablet_server_options.cc
index 7361c41..c99779a 100644
--- a/src/kudu/tserver/tablet_server_options.cc
+++ b/src/kudu/tserver/tablet_server_options.cc
@@ -17,12 +17,18 @@
#include "kudu/tserver/tablet_server_options.h"
-#include <glog/logging.h>
+#include <ostream>
+#include <string>
+
#include <gflags/gflags.h>
+#include <glog/logging.h>
+#include "kudu/gutil/macros.h"
#include "kudu/master/master.h"
+#include "kudu/server/rpc_server.h"
#include "kudu/tserver/tablet_server.h"
#include "kudu/util/flag_tags.h"
+#include "kudu/util/status.h"
DEFINE_string(tserver_master_addrs, "127.0.0.1:7051",
"Comma separated addresses of the masters which the "
http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/tserver/tablet_server_test_util.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tserver/tablet_server_test_util.cc b/src/kudu/tserver/tablet_server_test_util.cc
index 5caf507..52b3891 100644
--- a/src/kudu/tserver/tablet_server_test_util.cc
+++ b/src/kudu/tserver/tablet_server_test_util.cc
@@ -18,7 +18,6 @@
#include "kudu/tserver/tablet_server_test_util.h"
#include "kudu/consensus/consensus.proxy.h"
-#include "kudu/rpc/messenger.h"
#include "kudu/server/server_base.proxy.h"
#include "kudu/tserver/tserver_admin.proxy.h"
#include "kudu/tserver/tserver_service.proxy.h"
http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/tserver/tablet_service.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tserver/tablet_service.cc b/src/kudu/tserver/tablet_service.cc
index 77e4f95..f4cb01d 100644
--- a/src/kudu/tserver/tablet_service.cc
+++ b/src/kudu/tserver/tablet_service.cc
@@ -18,53 +18,84 @@
#include "kudu/tserver/tablet_service.h"
#include <algorithm>
+#include <cstdint>
+#include <cstring>
#include <functional>
#include <memory>
+#include <ostream>
#include <string>
+#include <type_traits>
#include <unordered_set>
#include <vector>
-#include <boost/optional.hpp>
+#include <boost/optional/optional.hpp>
+#include <gflags/gflags.h>
+#include <gflags/gflags_declare.h>
+#include <glog/logging.h>
-#include "kudu/clock/hybrid_clock.h"
+#include "kudu/clock/clock.h"
+#include "kudu/common/column_predicate.h"
+#include "kudu/common/columnblock.h"
+#include "kudu/common/common.pb.h"
+#include "kudu/common/encoded_key.h"
#include "kudu/common/iterator.h"
+#include "kudu/common/iterator_stats.h"
+#include "kudu/common/partition.h"
+#include "kudu/common/rowblock.h"
#include "kudu/common/scan_spec.h"
#include "kudu/common/schema.h"
+#include "kudu/common/timestamp.h"
+#include "kudu/common/types.h"
#include "kudu/common/wire_protocol.h"
+#include "kudu/common/wire_protocol.pb.h"
+#include "kudu/consensus/consensus.pb.h"
+#include "kudu/consensus/metadata.pb.h"
#include "kudu/consensus/raft_consensus.h"
#include "kudu/consensus/time_manager.h"
-#include "kudu/gutil/bind.h"
#include "kudu/gutil/casts.h"
+#include "kudu/gutil/macros.h"
#include "kudu/gutil/map-util.h"
-#include "kudu/gutil/stl_util.h"
+#include "kudu/gutil/move.h"
+#include "kudu/gutil/ref_counted.h"
#include "kudu/gutil/stringprintf.h"
-#include "kudu/gutil/strings/escaping.h"
+#include "kudu/gutil/strings/substitute.h"
#include "kudu/rpc/rpc_context.h"
+#include "kudu/rpc/rpc_header.pb.h"
#include "kudu/rpc/rpc_sidecar.h"
+#include "kudu/server/server_base.h"
#include "kudu/tablet/compaction.h"
#include "kudu/tablet/metadata.pb.h"
-#include "kudu/tablet/tablet_bootstrap.h"
+#include "kudu/tablet/mvcc.h"
+#include "kudu/tablet/tablet.h"
+#include "kudu/tablet/tablet_metadata.h"
#include "kudu/tablet/tablet_metrics.h"
#include "kudu/tablet/tablet_replica.h"
#include "kudu/tablet/transactions/alter_schema_transaction.h"
+#include "kudu/tablet/transactions/transaction.h"
#include "kudu/tablet/transactions/write_transaction.h"
#include "kudu/tserver/scanners.h"
-#include "kudu/tserver/tablet_copy_service.h"
+#include "kudu/tserver/tablet_replica_lookup.h"
#include "kudu/tserver/tablet_server.h"
#include "kudu/tserver/ts_tablet_manager.h"
#include "kudu/tserver/tserver.pb.h"
+#include "kudu/tserver/tserver_admin.pb.h"
+#include "kudu/tserver/tserver_service.pb.h"
+#include "kudu/util/auto_release_pool.h"
#include "kudu/util/crc.h"
#include "kudu/util/debug/trace_event.h"
#include "kudu/util/faststring.h"
#include "kudu/util/flag_tags.h"
#include "kudu/util/logging.h"
-#include "kudu/util/mem_tracker.h"
+#include "kudu/util/memory/arena.h"
+#include "kudu/util/metrics.h"
#include "kudu/util/monotime.h"
#include "kudu/util/pb_util.h"
#include "kudu/util/process_memory.h"
+#include "kudu/util/slice.h"
#include "kudu/util/status.h"
#include "kudu/util/status_callback.h"
#include "kudu/util/trace.h"
+#include "kudu/util/trace_metrics.h"
DEFINE_int32(scanner_default_batch_size_bytes, 1024 * 1024,
"The default size for batches of scan results");
@@ -112,13 +143,13 @@ using kudu::consensus::GetNodeInstanceRequestPB;
using kudu::consensus::GetNodeInstanceResponsePB;
using kudu::consensus::LeaderStepDownRequestPB;
using kudu::consensus::LeaderStepDownResponsePB;
-using kudu::consensus::UnsafeChangeConfigRequestPB;
-using kudu::consensus::UnsafeChangeConfigResponsePB;
using kudu::consensus::RaftConsensus;
using kudu::consensus::RunLeaderElectionRequestPB;
using kudu::consensus::RunLeaderElectionResponsePB;
using kudu::consensus::StartTabletCopyRequestPB;
using kudu::consensus::StartTabletCopyResponsePB;
+using kudu::consensus::UnsafeChangeConfigRequestPB;
+using kudu::consensus::UnsafeChangeConfigResponsePB;
using kudu::consensus::VoteRequestPB;
using kudu::consensus::VoteResponsePB;
using kudu::pb_util::SecureDebugString;
@@ -129,7 +160,6 @@ using kudu::server::ServerBase;
using kudu::tablet::AlterSchemaTransactionState;
using kudu::tablet::Tablet;
using kudu::tablet::TabletReplica;
-using kudu::tablet::TabletStatusPB;
using kudu::tablet::TransactionCompletionCallback;
using kudu::tablet::WriteTransactionState;
using std::shared_ptr;
@@ -140,13 +170,12 @@ using std::vector;
using strings::Substitute;
namespace kudu {
+
namespace cfile {
extern const char* CFILE_CACHE_MISS_BYTES_METRIC_NAME;
extern const char* CFILE_CACHE_HIT_BYTES_METRIC_NAME;
}
-}
-namespace kudu {
namespace tserver {
namespace {
http://git-wip-us.apache.org/repos/asf/kudu/blob/0f6dcf83/src/kudu/tserver/tablet_service.h
----------------------------------------------------------------------
diff --git a/src/kudu/tserver/tablet_service.h b/src/kudu/tserver/tablet_service.h
index 3368c1b..5f9cc02 100644
--- a/src/kudu/tserver/tablet_service.h
+++ b/src/kudu/tserver/tablet_service.h
@@ -17,16 +17,24 @@
#ifndef KUDU_TSERVER_TABLET_SERVICE_H
#define KUDU_TSERVER_TABLET_SERVICE_H
-#include <memory>
+#include <cstdint>
#include <string>
-#include <vector>
#include "kudu/consensus/consensus.service.h"
-#include "kudu/gutil/ref_counted.h"
+#include "kudu/gutil/gscoped_ptr.h"
+#include "kudu/gutil/port.h"
+#include "kudu/tserver/tserver.pb.h"
#include "kudu/tserver/tserver_admin.service.h"
#include "kudu/tserver/tserver_service.service.h"
+namespace google {
+namespace protobuf {
+class Message;
+}
+}
+
namespace kudu {
+
class RowwiseIterator;
class Schema;
class Status;
@@ -36,14 +44,47 @@ namespace server {
class ServerBase;
} // namespace server
+namespace consensus {
+class ChangeConfigRequestPB;
+class ChangeConfigResponsePB;
+class ConsensusRequestPB;
+class ConsensusResponsePB;
+class GetConsensusStateRequestPB;
+class GetConsensusStateResponsePB;
+class GetLastOpIdRequestPB;
+class GetLastOpIdResponsePB;
+class GetNodeInstanceRequestPB;
+class GetNodeInstanceResponsePB;
+class LeaderStepDownRequestPB;
+class LeaderStepDownResponsePB;
+class RunLeaderElectionRequestPB;
+class RunLeaderElectionResponsePB;
+class StartTabletCopyRequestPB;
+class StartTabletCopyResponsePB;
+class UnsafeChangeConfigRequestPB;
+class UnsafeChangeConfigResponsePB;
+class VoteRequestPB;
+class VoteResponsePB;
+} // namespace consensus
+
+namespace rpc {
+class RpcContext;
+} // namespace rpc
+
namespace tablet {
-class Tablet;
class TabletReplica;
-class TransactionState;
} // namespace tablet
namespace tserver {
+class AlterSchemaRequestPB;
+class AlterSchemaResponsePB;
+class ChecksumRequestPB;
+class ChecksumResponsePB;
+class CreateTabletRequestPB;
+class CreateTabletResponsePB;
+class DeleteTabletRequestPB;
+class DeleteTabletResponsePB;
class ScanResultCollector;
class TabletReplicaLookupIf;
class TabletServer;