You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kudu.apache.org by to...@apache.org on 2016/05/16 20:37:46 UTC
[3/3] incubator-kudu git commit: Remove kudu/server/metadata.h and
use the proper include
Remove kudu/server/metadata.h and use the proper include
There was a long standing TODO to remove this file since it just redirected
the include to kudu/consensus/metadata.pb.h. This patch removes it and
corrects the includes where necessary.
Change-Id: Ibfb7ef78da10d042428deb11f932956d1aa08e48
Reviewed-on: http://gerrit.cloudera.org:8080/3086
Tested-by: Kudu Jenkins
Reviewed-by: Todd Lipcon <to...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kudu/commit/7cf64cdc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kudu/tree/7cf64cdc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kudu/diff/7cf64cdc
Branch: refs/heads/master
Commit: 7cf64cdcd28ec0d4528c0336ca4b853ca8f87375
Parents: e70a060
Author: David Alves <da...@cloudera.com>
Authored: Mon May 16 10:26:48 2016 -0700
Committer: Todd Lipcon <to...@apache.org>
Committed: Mon May 16 19:06:23 2016 +0000
----------------------------------------------------------------------
src/kudu/consensus/local_consensus.cc | 2 +-
src/kudu/consensus/log-test-base.h | 2 +-
src/kudu/consensus/raft_consensus.cc | 2 +-
.../consensus/raft_consensus_quorum-test.cc | 2 +-
src/kudu/master/sys_catalog.h | 2 +-
src/kudu/server/metadata.h | 26 --------------------
src/kudu/tablet/delta_tracker.h | 2 +-
src/kudu/tablet/tablet-harness.h | 2 +-
src/kudu/tablet/tablet_bootstrap-test.cc | 4 +--
src/kudu/tablet/tablet_bootstrap.cc | 2 +-
src/kudu/tablet/tablet_metadata.cc | 2 +-
src/kudu/tserver/mini_tablet_server.cc | 12 ++++-----
src/kudu/tserver/remote_bootstrap_session.cc | 2 +-
13 files changed, 18 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kudu/blob/7cf64cdc/src/kudu/consensus/local_consensus.cc
----------------------------------------------------------------------
diff --git a/src/kudu/consensus/local_consensus.cc b/src/kudu/consensus/local_consensus.cc
index e6d7b7d..104ebcb 100644
--- a/src/kudu/consensus/local_consensus.cc
+++ b/src/kudu/consensus/local_consensus.cc
@@ -21,9 +21,9 @@
#include <iostream>
#include "kudu/consensus/log.h"
+#include "kudu/consensus/metadata.pb.h"
#include "kudu/consensus/quorum_util.h"
#include "kudu/gutil/strings/substitute.h"
-#include "kudu/server/metadata.h"
#include "kudu/server/clock.h"
#include "kudu/util/debug/trace_event.h"
#include "kudu/util/logging.h"
http://git-wip-us.apache.org/repos/asf/incubator-kudu/blob/7cf64cdc/src/kudu/consensus/log-test-base.h
----------------------------------------------------------------------
diff --git a/src/kudu/consensus/log-test-base.h b/src/kudu/consensus/log-test-base.h
index 89c5ddf..e6c569c 100644
--- a/src/kudu/consensus/log-test-base.h
+++ b/src/kudu/consensus/log-test-base.h
@@ -30,6 +30,7 @@
#include "kudu/common/wire_protocol-test-util.h"
#include "kudu/consensus/log_anchor_registry.h"
#include "kudu/consensus/log_reader.h"
+#include "kudu/consensus/metadata.pb.h"
#include "kudu/fs/fs_manager.h"
#include "kudu/gutil/gscoped_ptr.h"
#include "kudu/gutil/stl_util.h"
@@ -38,7 +39,6 @@
#include "kudu/gutil/strings/util.h"
#include "kudu/server/clock.h"
#include "kudu/server/hybrid_clock.h"
-#include "kudu/server/metadata.h"
#include "kudu/tserver/tserver.pb.h"
#include "kudu/util/env_util.h"
#include "kudu/util/metrics.h"
http://git-wip-us.apache.org/repos/asf/incubator-kudu/blob/7cf64cdc/src/kudu/consensus/raft_consensus.cc
----------------------------------------------------------------------
diff --git a/src/kudu/consensus/raft_consensus.cc b/src/kudu/consensus/raft_consensus.cc
index 7c5383a..b23087a 100644
--- a/src/kudu/consensus/raft_consensus.cc
+++ b/src/kudu/consensus/raft_consensus.cc
@@ -27,6 +27,7 @@
#include "kudu/consensus/consensus_peers.h"
#include "kudu/consensus/leader_election.h"
#include "kudu/consensus/log.h"
+#include "kudu/consensus/metadata.pb.h"
#include "kudu/consensus/peer_manager.h"
#include "kudu/consensus/quorum_util.h"
#include "kudu/consensus/raft_consensus_state.h"
@@ -34,7 +35,6 @@
#include "kudu/gutil/stl_util.h"
#include "kudu/gutil/stringprintf.h"
#include "kudu/server/clock.h"
-#include "kudu/server/metadata.h"
#include "kudu/util/debug/trace_event.h"
#include "kudu/util/flag_tags.h"
#include "kudu/util/logging.h"
http://git-wip-us.apache.org/repos/asf/incubator-kudu/blob/7cf64cdc/src/kudu/consensus/raft_consensus_quorum-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/consensus/raft_consensus_quorum-test.cc b/src/kudu/consensus/raft_consensus_quorum-test.cc
index c224a8d..4e6c665 100644
--- a/src/kudu/consensus/raft_consensus_quorum-test.cc
+++ b/src/kudu/consensus/raft_consensus_quorum-test.cc
@@ -25,6 +25,7 @@
#include "kudu/consensus/log.h"
#include "kudu/consensus/log_index.h"
#include "kudu/consensus/log_util.h"
+#include "kudu/consensus/metadata.pb.h"
#include "kudu/consensus/opid_util.h"
#include "kudu/consensus/peer_manager.h"
#include "kudu/consensus/quorum_util.h"
@@ -36,7 +37,6 @@
#include "kudu/consensus/log_reader.h"
#include "kudu/rpc/messenger.h"
#include "kudu/rpc/rpc_context.h"
-#include "kudu/server/metadata.h"
#include "kudu/server/logical_clock.h"
#include "kudu/util/auto_release_pool.h"
#include "kudu/util/mem_tracker.h"
http://git-wip-us.apache.org/repos/asf/incubator-kudu/blob/7cf64cdc/src/kudu/master/sys_catalog.h
----------------------------------------------------------------------
diff --git a/src/kudu/master/sys_catalog.h b/src/kudu/master/sys_catalog.h
index 7a4878b..f096875 100644
--- a/src/kudu/master/sys_catalog.h
+++ b/src/kudu/master/sys_catalog.h
@@ -20,8 +20,8 @@
#include <string>
#include <vector>
+#include "kudu/consensus/metadata.pb.h"
#include "kudu/master/master.pb.h"
-#include "kudu/server/metadata.h"
#include "kudu/tablet/tablet_peer.h"
#include "kudu/util/status.h"
http://git-wip-us.apache.org/repos/asf/incubator-kudu/blob/7cf64cdc/src/kudu/server/metadata.h
----------------------------------------------------------------------
diff --git a/src/kudu/server/metadata.h b/src/kudu/server/metadata.h
deleted file mode 100644
index 73ff98c..0000000
--- a/src/kudu/server/metadata.h
+++ /dev/null
@@ -1,26 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-#ifndef KUDU_TABLET_METADATA_H
-#define KUDU_TABLET_METADATA_H
-
-// This header left around temporarily to make people's lives
-// easier after a refactor. We should clean this up and change
-// include sites.
-
-#include "kudu/consensus/metadata.pb.h"
-
-#endif
http://git-wip-us.apache.org/repos/asf/incubator-kudu/blob/7cf64cdc/src/kudu/tablet/delta_tracker.h
----------------------------------------------------------------------
diff --git a/src/kudu/tablet/delta_tracker.h b/src/kudu/tablet/delta_tracker.h
index 7609738..de22d1d 100644
--- a/src/kudu/tablet/delta_tracker.h
+++ b/src/kudu/tablet/delta_tracker.h
@@ -24,8 +24,8 @@
#include "kudu/common/iterator.h"
#include "kudu/common/rowid.h"
+#include "kudu/consensus/metadata.pb.h"
#include "kudu/gutil/macros.h"
-#include "kudu/server/metadata.h"
#include "kudu/tablet/delta_store.h"
#include "kudu/tablet/cfile_set.h"
#include "kudu/util/atomic.h"
http://git-wip-us.apache.org/repos/asf/incubator-kudu/blob/7cf64cdc/src/kudu/tablet/tablet-harness.h
----------------------------------------------------------------------
diff --git a/src/kudu/tablet/tablet-harness.h b/src/kudu/tablet/tablet-harness.h
index cb81fae..61149a4 100644
--- a/src/kudu/tablet/tablet-harness.h
+++ b/src/kudu/tablet/tablet-harness.h
@@ -24,8 +24,8 @@
#include "kudu/common/schema.h"
#include "kudu/consensus/log_anchor_registry.h"
+#include "kudu/consensus/metadata.pb.h"
#include "kudu/server/logical_clock.h"
-#include "kudu/server/metadata.h"
#include "kudu/tablet/tablet.h"
#include "kudu/util/env.h"
#include "kudu/util/mem_tracker.h"
http://git-wip-us.apache.org/repos/asf/incubator-kudu/blob/7cf64cdc/src/kudu/tablet/tablet_bootstrap-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tablet/tablet_bootstrap-test.cc b/src/kudu/tablet/tablet_bootstrap-test.cc
index 7495d69..717f8dc 100644
--- a/src/kudu/tablet/tablet_bootstrap-test.cc
+++ b/src/kudu/tablet/tablet_bootstrap-test.cc
@@ -21,12 +21,12 @@
#include "kudu/common/iterator.h"
#include "kudu/consensus/consensus_meta.h"
+#include "kudu/consensus/consensus-test-util.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/consensus-test-util.h"
#include "kudu/server/logical_clock.h"
-#include "kudu/server/metadata.h"
#include "kudu/tablet/tablet_bootstrap.h"
#include "kudu/tablet/tablet-test-util.h"
#include "kudu/tablet/tablet_metadata.h"
http://git-wip-us.apache.org/repos/asf/incubator-kudu/blob/7cf64cdc/src/kudu/tablet/tablet_bootstrap.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tablet/tablet_bootstrap.cc b/src/kudu/tablet/tablet_bootstrap.cc
index a2008c4..7e05b62 100644
--- a/src/kudu/tablet/tablet_bootstrap.cc
+++ b/src/kudu/tablet/tablet_bootstrap.cc
@@ -32,6 +32,7 @@
#include "kudu/consensus/log_anchor_registry.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/fs_manager.h"
#include "kudu/gutil/ref_counted.h"
@@ -42,7 +43,6 @@
#include "kudu/gutil/walltime.h"
#include "kudu/server/clock.h"
#include "kudu/server/hybrid_clock.h"
-#include "kudu/server/metadata.h"
#include "kudu/tablet/lock_manager.h"
#include "kudu/tablet/row_op.h"
#include "kudu/tablet/tablet.h"
http://git-wip-us.apache.org/repos/asf/incubator-kudu/blob/7cf64cdc/src/kudu/tablet/tablet_metadata.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tablet/tablet_metadata.cc b/src/kudu/tablet/tablet_metadata.cc
index 062a33a..f5401d7 100644
--- a/src/kudu/tablet/tablet_metadata.cc
+++ b/src/kudu/tablet/tablet_metadata.cc
@@ -24,6 +24,7 @@
#include <string>
#include "kudu/common/wire_protocol.h"
+#include "kudu/consensus/metadata.pb.h"
#include "kudu/consensus/opid.pb.h"
#include "kudu/consensus/opid_util.h"
#include "kudu/gutil/atomicops.h"
@@ -32,7 +33,6 @@
#include "kudu/gutil/map-util.h"
#include "kudu/gutil/stl_util.h"
#include "kudu/gutil/strings/substitute.h"
-#include "kudu/server/metadata.h"
#include "kudu/tablet/rowset_metadata.h"
#include "kudu/util/debug/trace_event.h"
#include "kudu/util/logging.h"
http://git-wip-us.apache.org/repos/asf/incubator-kudu/blob/7cf64cdc/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 7c042bd..8104ba9 100644
--- a/src/kudu/tserver/mini_tablet_server.cc
+++ b/src/kudu/tserver/mini_tablet_server.cc
@@ -22,9 +22,14 @@
#include <glog/logging.h>
#include "kudu/common/schema.h"
+#include "kudu/consensus/consensus.h"
+#include "kudu/consensus/consensus.pb.h"
+#include "kudu/consensus/local_consensus.h"
+#include "kudu/consensus/log.h"
+#include "kudu/consensus/log.pb.h"
+#include "kudu/consensus/metadata.pb.h"
#include "kudu/gutil/macros.h"
#include "kudu/gutil/strings/substitute.h"
-#include "kudu/server/metadata.h"
#include "kudu/server/rpc_server.h"
#include "kudu/server/webserver.h"
#include "kudu/tablet/maintenance_manager.h"
@@ -33,11 +38,6 @@
#include "kudu/tablet/tablet-test-util.h"
#include "kudu/tserver/tablet_server.h"
#include "kudu/tserver/ts_tablet_manager.h"
-#include "kudu/consensus/log.h"
-#include "kudu/consensus/log.pb.h"
-#include "kudu/consensus/consensus.h"
-#include "kudu/consensus/consensus.pb.h"
-#include "kudu/consensus/local_consensus.h"
#include "kudu/util/net/sockaddr.h"
#include "kudu/util/status.h"
http://git-wip-us.apache.org/repos/asf/incubator-kudu/blob/7cf64cdc/src/kudu/tserver/remote_bootstrap_session.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tserver/remote_bootstrap_session.cc b/src/kudu/tserver/remote_bootstrap_session.cc
index 23626b6..be4ae2e 100644
--- a/src/kudu/tserver/remote_bootstrap_session.cc
+++ b/src/kudu/tserver/remote_bootstrap_session.cc
@@ -21,12 +21,12 @@
#include "kudu/consensus/log.h"
#include "kudu/consensus/log_reader.h"
+#include "kudu/consensus/metadata.pb.h"
#include "kudu/fs/block_manager.h"
#include "kudu/gutil/map-util.h"
#include "kudu/gutil/strings/substitute.h"
#include "kudu/gutil/type_traits.h"
#include "kudu/rpc/transfer.h"
-#include "kudu/server/metadata.h"
#include "kudu/tablet/tablet_peer.h"
#include "kudu/util/flag_tags.h"
#include "kudu/util/mutex.h"