You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kudu.apache.org by aw...@apache.org on 2020/05/13 03:29:29 UTC
[kudu] branch master updated: tablet: rename transaction-related
files to use "op"
This is an automated email from the ASF dual-hosted git repository.
awong pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kudu.git
The following commit(s) were added to refs/heads/master by this push:
new 3286c78 tablet: rename transaction-related files to use "op"
3286c78 is described below
commit 3286c7856931e204ee90ccee62c37bbedda8b665
Author: Andrew Wong <aw...@cloudera.com>
AuthorDate: Tue May 12 17:23:12 2020 -0700
tablet: rename transaction-related files to use "op"
No functional changes, but also fixes a couple comments.
Change-Id: I30abe8fb12cda5950c0a9c52088b62478e6d169b
Reviewed-on: http://gerrit.cloudera.org:8080/15907
Tested-by: Kudu Jenkins
Reviewed-by: Bankim Bhavsar <ba...@cloudera.com>
---
src/kudu/integration-tests/ts_authz-itest.cc | 2 +-
src/kudu/master/catalog_manager.cc | 2 +-
src/kudu/master/sys_catalog.cc | 4 ++--
src/kudu/tablet/CMakeLists.txt | 14 +++++++-------
src/kudu/tablet/compaction.h | 8 ++++----
src/kudu/tablet/local_tablet_writer.h | 2 +-
...{transaction_order_verifier.cc => op_order_verifier.cc} | 2 +-
.../{transaction_order_verifier.h => op_order_verifier.h} | 0
.../alter_schema_transaction.cc => ops/alter_schema_op.cc} | 2 +-
.../alter_schema_transaction.h => ops/alter_schema_op.h} | 2 +-
src/kudu/tablet/{transactions/transaction.cc => ops/op.cc} | 2 +-
src/kudu/tablet/{transactions/transaction.h => ops/op.h} | 2 +-
.../transaction_driver.cc => ops/op_driver.cc} | 8 ++++----
.../{transactions/transaction_driver.h => ops/op_driver.h} | 2 +-
.../transaction_tracker-test.cc => ops/op_tracker-test.cc} | 6 +++---
.../transaction_tracker.cc => ops/op_tracker.cc} | 6 +++---
.../transaction_tracker.h => ops/op_tracker.h} | 2 +-
.../{transactions/write_transaction.cc => ops/write_op.cc} | 2 +-
.../{transactions/write_transaction.h => ops/write_op.h} | 2 +-
src/kudu/tablet/tablet-test-util.h | 2 +-
src/kudu/tablet/tablet.cc | 4 ++--
src/kudu/tablet/tablet_bootstrap.cc | 6 +++---
src/kudu/tablet/tablet_replica-test.cc | 10 +++++-----
src/kudu/tablet/tablet_replica.cc | 6 +++---
src/kudu/tablet/tablet_replica.h | 6 +++---
src/kudu/tserver/tablet_copy_source_session-test.cc | 4 ++--
src/kudu/tserver/tablet_server_authorization-test.cc | 2 +-
src/kudu/tserver/tablet_service.cc | 6 +++---
src/kudu/tserver/tserver_path_handlers.cc | 2 +-
29 files changed, 59 insertions(+), 59 deletions(-)
diff --git a/src/kudu/integration-tests/ts_authz-itest.cc b/src/kudu/integration-tests/ts_authz-itest.cc
index d325ce0..3b6b96d 100644
--- a/src/kudu/integration-tests/ts_authz-itest.cc
+++ b/src/kudu/integration-tests/ts_authz-itest.cc
@@ -45,7 +45,7 @@
#include "kudu/ranger/mini_ranger.h"
#include "kudu/ranger/ranger.pb.h"
#include "kudu/security/test/mini_kdc.h"
-#include "kudu/tablet/transactions/write_transaction.h"
+#include "kudu/tablet/ops/write_op.h"
#include "kudu/util/barrier.h"
#include "kudu/util/monotime.h"
#include "kudu/util/random.h"
diff --git a/src/kudu/master/catalog_manager.cc b/src/kudu/master/catalog_manager.cc
index 4c42ea4..67d863c 100644
--- a/src/kudu/master/catalog_manager.cc
+++ b/src/kudu/master/catalog_manager.cc
@@ -120,8 +120,8 @@
#include "kudu/security/token_verifier.h"
#include "kudu/server/monitored_task.h"
#include "kudu/tablet/metadata.pb.h"
+#include "kudu/tablet/ops/op_tracker.h"
#include "kudu/tablet/tablet_replica.h"
-#include "kudu/tablet/transactions/transaction_tracker.h"
#include "kudu/tserver/tserver_admin.pb.h"
#include "kudu/tserver/tserver_admin.proxy.h"
#include "kudu/util/condition_variable.h"
diff --git a/src/kudu/master/sys_catalog.cc b/src/kudu/master/sys_catalog.cc
index 09c2f3e..e32d6c3 100644
--- a/src/kudu/master/sys_catalog.cc
+++ b/src/kudu/master/sys_catalog.cc
@@ -64,11 +64,11 @@
#include "kudu/rpc/result_tracker.h"
#include "kudu/security/token.pb.h"
#include "kudu/tablet/metadata.pb.h"
+#include "kudu/tablet/ops/op.h"
+#include "kudu/tablet/ops/write_op.h"
#include "kudu/tablet/tablet.h"
#include "kudu/tablet/tablet_bootstrap.h"
#include "kudu/tablet/tablet_metadata.h"
-#include "kudu/tablet/transactions/transaction.h"
-#include "kudu/tablet/transactions/write_transaction.h"
#include "kudu/tserver/tserver.pb.h"
#include "kudu/util/countdown_latch.h"
#include "kudu/util/cow_object.h"
diff --git a/src/kudu/tablet/CMakeLists.txt b/src/kudu/tablet/CMakeLists.txt
index ce5fc0b..e4f3229 100644
--- a/src/kudu/tablet/CMakeLists.txt
+++ b/src/kudu/tablet/CMakeLists.txt
@@ -22,12 +22,12 @@ set(TABLET_SRCS
tablet_mm_ops.cc
tablet_replica_mm_ops.cc
tablet_replica.cc
- transactions/transaction.cc
- transactions/alter_schema_transaction.cc
- transactions/transaction_driver.cc
- transactions/transaction_tracker.cc
- transactions/write_transaction.cc
- transaction_order_verifier.cc
+ ops/op.cc
+ ops/alter_schema_op.cc
+ ops/op_driver.cc
+ ops/op_tracker.cc
+ ops/write_op.cc
+ op_order_verifier.cc
cfile_set.cc
compaction.cc
compaction_policy.cc
@@ -109,6 +109,7 @@ ADD_KUDU_TEST(mt-diskrowset-test RUN_SERIAL true)
ADD_KUDU_TEST(mt-rowset_delta_compaction-test PROCESSORS 2)
ADD_KUDU_TEST(mt-tablet-test RUN_SERIAL true NUM_SHARDS 4)
ADD_KUDU_TEST(mvcc-test)
+ADD_KUDU_TEST(ops/op_tracker-test)
ADD_KUDU_TEST(rowset_tree-test NUM_SHARDS 6)
ADD_KUDU_TEST(tablet-decoder-eval-test)
ADD_KUDU_TEST(tablet-pushdown-test)
@@ -121,7 +122,6 @@ ADD_KUDU_TEST(tablet_mm_ops-test)
ADD_KUDU_TEST(tablet_random_access-test)
ADD_KUDU_TEST(tablet_replica-test)
ADD_KUDU_TEST(tablet_throttle-test)
-ADD_KUDU_TEST(transactions/transaction_tracker-test)
# Some tests don't have dependencies on other tablet stuff
SET_KUDU_TEST_LINK_LIBS(kudu_util gutil)
diff --git a/src/kudu/tablet/compaction.h b/src/kudu/tablet/compaction.h
index 0c101c1..466bef5 100644
--- a/src/kudu/tablet/compaction.h
+++ b/src/kudu/tablet/compaction.h
@@ -231,10 +231,10 @@ Status FlushCompactionInput(CompactionInput *input,
const HistoryGcOpts& history_gc_opts,
RollingDiskRowSetWriter *out);
-// Iterate through this compaction input, finding any mutations which came between
-// snap_to_exclude and snap_to_include (ie those transactions that were not yet
-// committed in 'snap_to_exclude' but _are_ committed in 'snap_to_include'). For
-// each such mutation, propagate it into the compaction's output rowsets.
+// Iterate through this compaction input, finding any mutations which came
+// between snap_to_exclude and snap_to_include (ie those ops that were not yet
+// committed in 'snap_to_exclude' but _are_ committed in 'snap_to_include').
+// For each such mutation, propagate it into the compaction's output rowsets.
//
// The output rowsets passed in must be non-overlapping and in ascending key order:
// typically they are the resulting rowsets from a RollingDiskRowSetWriter.
diff --git a/src/kudu/tablet/local_tablet_writer.h b/src/kudu/tablet/local_tablet_writer.h
index 490e094..38c2223 100644
--- a/src/kudu/tablet/local_tablet_writer.h
+++ b/src/kudu/tablet/local_tablet_writer.h
@@ -24,11 +24,11 @@
#include "kudu/consensus/log_anchor_registry.h"
#include "kudu/consensus/opid_util.h"
#include "kudu/gutil/macros.h"
+#include "kudu/tablet/ops/write_op.h"
#include "kudu/tablet/row_op.h"
#include "kudu/tablet/tablet.h"
#include "kudu/tablet/tablet_metrics.h"
#include "kudu/tablet/tablet_replica.h"
-#include "kudu/tablet/transactions/write_transaction.h"
namespace kudu {
namespace tablet {
diff --git a/src/kudu/tablet/transaction_order_verifier.cc b/src/kudu/tablet/op_order_verifier.cc
similarity index 97%
rename from src/kudu/tablet/transaction_order_verifier.cc
rename to src/kudu/tablet/op_order_verifier.cc
index d3216eb..a5f41c6 100644
--- a/src/kudu/tablet/transaction_order_verifier.cc
+++ b/src/kudu/tablet/op_order_verifier.cc
@@ -19,7 +19,7 @@
#include <glog/logging.h>
-#include "kudu/tablet/transaction_order_verifier.h"
+#include "kudu/tablet/op_order_verifier.h"
namespace kudu {
namespace tablet {
diff --git a/src/kudu/tablet/transaction_order_verifier.h b/src/kudu/tablet/op_order_verifier.h
similarity index 100%
rename from src/kudu/tablet/transaction_order_verifier.h
rename to src/kudu/tablet/op_order_verifier.h
diff --git a/src/kudu/tablet/transactions/alter_schema_transaction.cc b/src/kudu/tablet/ops/alter_schema_op.cc
similarity index 98%
rename from src/kudu/tablet/transactions/alter_schema_transaction.cc
rename to src/kudu/tablet/ops/alter_schema_op.cc
index 5d26098..e1de230 100644
--- a/src/kudu/tablet/transactions/alter_schema_transaction.cc
+++ b/src/kudu/tablet/ops/alter_schema_op.cc
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-#include "kudu/tablet/transactions/alter_schema_transaction.h"
+#include "kudu/tablet/ops/alter_schema_op.h"
#include <memory>
#include <ostream>
diff --git a/src/kudu/tablet/transactions/alter_schema_transaction.h b/src/kudu/tablet/ops/alter_schema_op.h
similarity index 98%
rename from src/kudu/tablet/transactions/alter_schema_transaction.h
rename to src/kudu/tablet/ops/alter_schema_op.h
index d31bb52..778e06f 100644
--- a/src/kudu/tablet/transactions/alter_schema_transaction.h
+++ b/src/kudu/tablet/ops/alter_schema_op.h
@@ -27,7 +27,7 @@
#include "kudu/consensus/consensus.pb.h"
#include "kudu/gutil/macros.h"
#include "kudu/tablet/tablet.pb.h"
-#include "kudu/tablet/transactions/transaction.h"
+#include "kudu/tablet/ops/op.h"
#include "kudu/tserver/tserver_admin.pb.h"
#include "kudu/util/status.h"
diff --git a/src/kudu/tablet/transactions/transaction.cc b/src/kudu/tablet/ops/op.cc
similarity index 97%
rename from src/kudu/tablet/transactions/transaction.cc
rename to src/kudu/tablet/ops/op.cc
index 63a45cc..212da44 100644
--- a/src/kudu/tablet/transactions/transaction.cc
+++ b/src/kudu/tablet/ops/op.cc
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-#include "kudu/tablet/transactions/transaction.h"
+#include "kudu/tablet/ops/op.h"
#include "kudu/rpc/result_tracker.h"
diff --git a/src/kudu/tablet/transactions/transaction.h b/src/kudu/tablet/ops/op.h
similarity index 99%
rename from src/kudu/tablet/transactions/transaction.h
rename to src/kudu/tablet/ops/op.h
index 0cad28d..f6aa439 100644
--- a/src/kudu/tablet/transactions/transaction.h
+++ b/src/kudu/tablet/ops/op.h
@@ -184,7 +184,7 @@ class OpState {
return tablet_replica_;
}
- // Return metrics related to this transaction.
+ // Return metrics related to this op.
const OpMetrics& metrics() const {
return op_metrics_;
}
diff --git a/src/kudu/tablet/transactions/transaction_driver.cc b/src/kudu/tablet/ops/op_driver.cc
similarity index 98%
rename from src/kudu/tablet/transactions/transaction_driver.cc
rename to src/kudu/tablet/ops/op_driver.cc
index 7251c9d..be707e5 100644
--- a/src/kudu/tablet/transactions/transaction_driver.cc
+++ b/src/kudu/tablet/ops/op_driver.cc
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-#include "kudu/tablet/transactions/transaction_driver.h"
+#include "kudu/tablet/ops/op_driver.h"
#include <functional>
#include <memory>
@@ -41,8 +41,8 @@
#include "kudu/tablet/mvcc.h"
#include "kudu/tablet/tablet.h"
#include "kudu/tablet/tablet_replica.h"
-#include "kudu/tablet/transaction_order_verifier.h"
-#include "kudu/tablet/transactions/transaction_tracker.h"
+#include "kudu/tablet/op_order_verifier.h"
+#include "kudu/tablet/ops/op_tracker.h"
#include "kudu/util/debug/trace_event.h"
#include "kudu/util/logging.h"
#include "kudu/util/pb_util.h"
@@ -243,7 +243,7 @@ void OpDriver::PrepareTask() {
}
void OpDriver::RegisterFollowerOpOnResultTracker() {
- // If this is a transaction being executed by a follower and its result is being
+ // If this is an op being executed by a follower and its result is being
// tracked, make sure that we're the driver of the op.
if (!state()->are_results_tracked()) return;
diff --git a/src/kudu/tablet/transactions/transaction_driver.h b/src/kudu/tablet/ops/op_driver.h
similarity index 99%
rename from src/kudu/tablet/transactions/transaction_driver.h
rename to src/kudu/tablet/ops/op_driver.h
index be007f5..ac98787 100644
--- a/src/kudu/tablet/transactions/transaction_driver.h
+++ b/src/kudu/tablet/ops/op_driver.h
@@ -26,7 +26,7 @@
#include "kudu/gutil/macros.h"
#include "kudu/gutil/ref_counted.h"
#include "kudu/gutil/walltime.h"
-#include "kudu/tablet/transactions/transaction.h"
+#include "kudu/tablet/ops/op.h"
#include "kudu/util/locks.h"
#include "kudu/util/monotime.h"
#include "kudu/util/status.h"
diff --git a/src/kudu/tablet/transactions/transaction_tracker-test.cc b/src/kudu/tablet/ops/op_tracker-test.cc
similarity index 98%
rename from src/kudu/tablet/transactions/transaction_tracker-test.cc
rename to src/kudu/tablet/ops/op_tracker-test.cc
index ad24cc8..885c5bf 100644
--- a/src/kudu/tablet/transactions/transaction_tracker-test.cc
+++ b/src/kudu/tablet/ops/op_tracker-test.cc
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-#include "kudu/tablet/transactions/transaction_tracker.h"
+#include "kudu/tablet/ops/op_tracker.h"
#include <cstdint>
#include <memory>
@@ -33,8 +33,8 @@
#include "kudu/consensus/consensus.pb.h"
#include "kudu/gutil/casts.h"
#include "kudu/gutil/ref_counted.h"
-#include "kudu/tablet/transactions/transaction.h"
-#include "kudu/tablet/transactions/transaction_driver.h"
+#include "kudu/tablet/ops/op.h"
+#include "kudu/tablet/ops/op_driver.h"
#include "kudu/util/countdown_latch.h"
#include "kudu/util/mem_tracker.h"
#include "kudu/util/metrics.h"
diff --git a/src/kudu/tablet/transactions/transaction_tracker.cc b/src/kudu/tablet/ops/op_tracker.cc
similarity index 98%
rename from src/kudu/tablet/transactions/transaction_tracker.cc
rename to src/kudu/tablet/ops/op_tracker.cc
index be8b0da..eab0d28 100644
--- a/src/kudu/tablet/transactions/transaction_tracker.cc
+++ b/src/kudu/tablet/ops/op_tracker.cc
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-#include "kudu/tablet/transactions/transaction_tracker.h"
+#include "kudu/tablet/ops/op_tracker.h"
#include <algorithm>
#include <cstddef>
@@ -32,10 +32,10 @@
#include "kudu/gutil/map-util.h"
#include "kudu/gutil/port.h"
#include "kudu/gutil/strings/substitute.h"
+#include "kudu/tablet/ops/op.h"
+#include "kudu/tablet/ops/op_driver.h"
#include "kudu/tablet/tablet.h"
#include "kudu/tablet/tablet_replica.h"
-#include "kudu/tablet/transactions/transaction.h"
-#include "kudu/tablet/transactions/transaction_driver.h"
#include "kudu/util/flag_tags.h"
#include "kudu/util/flag_validators.h"
#include "kudu/util/logging.h"
diff --git a/src/kudu/tablet/transactions/transaction_tracker.h b/src/kudu/tablet/ops/op_tracker.h
similarity index 98%
rename from src/kudu/tablet/transactions/transaction_tracker.h
rename to src/kudu/tablet/ops/op_tracker.h
index a8d3291..96b05cd 100644
--- a/src/kudu/tablet/transactions/transaction_tracker.h
+++ b/src/kudu/tablet/ops/op_tracker.h
@@ -23,7 +23,7 @@
#include "kudu/gutil/macros.h"
#include "kudu/gutil/ref_counted.h"
-#include "kudu/tablet/transactions/transaction_driver.h"
+#include "kudu/tablet/ops/op_driver.h"
#include "kudu/util/locks.h"
#include "kudu/util/metrics.h"
#include "kudu/util/status.h"
diff --git a/src/kudu/tablet/transactions/write_transaction.cc b/src/kudu/tablet/ops/write_op.cc
similarity index 99%
rename from src/kudu/tablet/transactions/write_transaction.cc
rename to src/kudu/tablet/ops/write_op.cc
index 5aae106..07a48e6 100644
--- a/src/kudu/tablet/transactions/write_transaction.cc
+++ b/src/kudu/tablet/ops/write_op.cc
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-#include "kudu/tablet/transactions/write_transaction.h"
+#include "kudu/tablet/ops/write_op.h"
#include <algorithm>
#include <cstdint>
diff --git a/src/kudu/tablet/transactions/write_transaction.h b/src/kudu/tablet/ops/write_op.h
similarity index 99%
rename from src/kudu/tablet/transactions/write_transaction.h
rename to src/kudu/tablet/ops/write_op.h
index 9f339af..dbabd69 100644
--- a/src/kudu/tablet/transactions/write_transaction.h
+++ b/src/kudu/tablet/ops/write_op.h
@@ -31,8 +31,8 @@
#include "kudu/consensus/consensus.pb.h"
#include "kudu/gutil/macros.h"
#include "kudu/gutil/ref_counted.h"
+#include "kudu/tablet/ops/op.h"
#include "kudu/tablet/rowset.h"
-#include "kudu/tablet/transactions/transaction.h"
#include "kudu/tserver/tserver.pb.h"
#include "kudu/util/bitset.h"
#include "kudu/util/locks.h"
diff --git a/src/kudu/tablet/tablet-test-util.h b/src/kudu/tablet/tablet-test-util.h
index ca8529b..bf92857 100644
--- a/src/kudu/tablet/tablet-test-util.h
+++ b/src/kudu/tablet/tablet-test-util.h
@@ -64,11 +64,11 @@
#include "kudu/tablet/deltamemstore.h"
#include "kudu/tablet/mutation.h"
#include "kudu/tablet/mvcc.h"
+#include "kudu/tablet/ops/alter_schema_op.h"
#include "kudu/tablet/rowset.h"
#include "kudu/tablet/tablet-harness.h"
#include "kudu/tablet/tablet.h"
#include "kudu/tablet/tablet_metadata.h"
-#include "kudu/tablet/transactions/alter_schema_transaction.h"
#include "kudu/tserver/tserver_admin.pb.h"
#include "kudu/util/faststring.h"
#include "kudu/util/mem_tracker.h"
diff --git a/src/kudu/tablet/tablet.cc b/src/kudu/tablet/tablet.cc
index 20ae3ae..cd57dcc 100644
--- a/src/kudu/tablet/tablet.cc
+++ b/src/kudu/tablet/tablet.cc
@@ -61,6 +61,8 @@
#include "kudu/tablet/delta_tracker.h"
#include "kudu/tablet/diskrowset.h"
#include "kudu/tablet/memrowset.h"
+#include "kudu/tablet/ops/alter_schema_op.h"
+#include "kudu/tablet/ops/write_op.h"
#include "kudu/tablet/row_op.h"
#include "kudu/tablet/rowset_info.h"
#include "kudu/tablet/rowset_metadata.h"
@@ -69,8 +71,6 @@
#include "kudu/tablet/tablet.pb.h"
#include "kudu/tablet/tablet_metrics.h"
#include "kudu/tablet/tablet_mm_ops.h"
-#include "kudu/tablet/transactions/alter_schema_transaction.h"
-#include "kudu/tablet/transactions/write_transaction.h"
#include "kudu/tserver/tserver.pb.h"
#include "kudu/util/bitmap.h"
#include "kudu/util/bloom_filter.h"
diff --git a/src/kudu/tablet/tablet_bootstrap.cc b/src/kudu/tablet/tablet_bootstrap.cc
index 966ed93..cd8eafa 100644
--- a/src/kudu/tablet/tablet_bootstrap.cc
+++ b/src/kudu/tablet/tablet_bootstrap.cc
@@ -65,6 +65,9 @@
#include "kudu/rpc/rpc_header.pb.h"
#include "kudu/tablet/metadata.pb.h"
#include "kudu/tablet/mvcc.h"
+#include "kudu/tablet/ops/alter_schema_op.h"
+#include "kudu/tablet/ops/op.h"
+#include "kudu/tablet/ops/write_op.h"
#include "kudu/tablet/row_op.h"
#include "kudu/tablet/rowset.h"
#include "kudu/tablet/rowset_metadata.h"
@@ -72,9 +75,6 @@
#include "kudu/tablet/tablet.pb.h"
#include "kudu/tablet/tablet_metadata.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/tserver.pb.h"
#include "kudu/tserver/tserver_admin.pb.h"
#include "kudu/util/debug/trace_event.h"
diff --git a/src/kudu/tablet/tablet_replica-test.cc b/src/kudu/tablet/tablet_replica-test.cc
index bdfc966..371eba0 100644
--- a/src/kudu/tablet/tablet_replica-test.cc
+++ b/src/kudu/tablet/tablet_replica-test.cc
@@ -51,17 +51,17 @@
#include "kudu/gutil/ref_counted.h"
#include "kudu/rpc/messenger.h"
#include "kudu/rpc/result_tracker.h"
+#include "kudu/tablet/ops/alter_schema_op.h"
+#include "kudu/tablet/ops/op.h"
+#include "kudu/tablet/ops/op_driver.h"
+#include "kudu/tablet/ops/op_tracker.h"
+#include "kudu/tablet/ops/write_op.h"
#include "kudu/tablet/tablet-harness.h"
#include "kudu/tablet/tablet-test-util.h"
#include "kudu/tablet/tablet.h"
#include "kudu/tablet/tablet_bootstrap.h"
#include "kudu/tablet/tablet_metadata.h"
#include "kudu/tablet/tablet_replica_mm_ops.h"
-#include "kudu/tablet/transactions/alter_schema_transaction.h"
-#include "kudu/tablet/transactions/transaction.h"
-#include "kudu/tablet/transactions/transaction_driver.h"
-#include "kudu/tablet/transactions/transaction_tracker.h"
-#include "kudu/tablet/transactions/write_transaction.h"
#include "kudu/tserver/tserver.pb.h"
#include "kudu/tserver/tserver_admin.pb.h"
#include "kudu/util/countdown_latch.h"
diff --git a/src/kudu/tablet/tablet_replica.cc b/src/kudu/tablet/tablet_replica.cc
index a51e0dd..4e9279b 100644
--- a/src/kudu/tablet/tablet_replica.cc
+++ b/src/kudu/tablet/tablet_replica.cc
@@ -44,11 +44,11 @@
#include "kudu/gutil/strings/substitute.h"
#include "kudu/rpc/result_tracker.h"
#include "kudu/tablet/mvcc.h"
+#include "kudu/tablet/ops/alter_schema_op.h"
+#include "kudu/tablet/ops/op_driver.h"
+#include "kudu/tablet/ops/write_op.h"
#include "kudu/tablet/tablet.pb.h"
#include "kudu/tablet/tablet_replica_mm_ops.h"
-#include "kudu/tablet/transactions/alter_schema_transaction.h"
-#include "kudu/tablet/transactions/transaction_driver.h"
-#include "kudu/tablet/transactions/write_transaction.h"
#include "kudu/util/logging.h"
#include "kudu/util/maintenance_manager.h"
#include "kudu/util/metrics.h"
diff --git a/src/kudu/tablet/tablet_replica.h b/src/kudu/tablet/tablet_replica.h
index bdb8991..67bbd5b 100644
--- a/src/kudu/tablet/tablet_replica.h
+++ b/src/kudu/tablet/tablet_replica.h
@@ -33,11 +33,11 @@
#include "kudu/gutil/macros.h"
#include "kudu/gutil/ref_counted.h"
#include "kudu/tablet/metadata.pb.h"
+#include "kudu/tablet/op_order_verifier.h"
+#include "kudu/tablet/ops/op.h"
+#include "kudu/tablet/ops/op_tracker.h"
#include "kudu/tablet/tablet.h"
#include "kudu/tablet/tablet_metadata.h"
-#include "kudu/tablet/transaction_order_verifier.h"
-#include "kudu/tablet/transactions/transaction.h"
-#include "kudu/tablet/transactions/transaction_tracker.h"
#include "kudu/util/locks.h"
#include "kudu/util/metrics.h"
#include "kudu/util/status.h"
diff --git a/src/kudu/tserver/tablet_copy_source_session-test.cc b/src/kudu/tserver/tablet_copy_source_session-test.cc
index dc66e02..82f271a 100644
--- a/src/kudu/tserver/tablet_copy_source_session-test.cc
+++ b/src/kudu/tserver/tablet_copy_source_session-test.cc
@@ -50,12 +50,12 @@
#include "kudu/rpc/messenger.h"
#include "kudu/rpc/result_tracker.h"
#include "kudu/tablet/metadata.pb.h"
+#include "kudu/tablet/ops/op.h"
+#include "kudu/tablet/ops/write_op.h"
#include "kudu/tablet/tablet-test-util.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/tserver.pb.h"
#include "kudu/util/countdown_latch.h"
diff --git a/src/kudu/tserver/tablet_server_authorization-test.cc b/src/kudu/tserver/tablet_server_authorization-test.cc
index 3e775ac..c4178c4 100644
--- a/src/kudu/tserver/tablet_server_authorization-test.cc
+++ b/src/kudu/tserver/tablet_server_authorization-test.cc
@@ -56,8 +56,8 @@
#include "kudu/security/token.pb.h"
#include "kudu/security/token_signer.h"
#include "kudu/security/token_verifier.h"
+#include "kudu/tablet/ops/write_op.h"
#include "kudu/tablet/tablet_replica.h"
-#include "kudu/tablet/transactions/write_transaction.h"
#include "kudu/tserver/mini_tablet_server.h"
#include "kudu/tserver/tablet_server-test-base.h"
#include "kudu/tserver/tablet_server.h"
diff --git a/src/kudu/tserver/tablet_service.cc b/src/kudu/tserver/tablet_service.cc
index 6d58d4f..91e3477 100644
--- a/src/kudu/tserver/tablet_service.cc
+++ b/src/kudu/tserver/tablet_service.cc
@@ -75,14 +75,14 @@
#include "kudu/tablet/compaction.h"
#include "kudu/tablet/metadata.pb.h"
#include "kudu/tablet/mvcc.h"
+#include "kudu/tablet/ops/alter_schema_op.h"
+#include "kudu/tablet/ops/op.h"
+#include "kudu/tablet/ops/write_op.h"
#include "kudu/tablet/rowset.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_replica_lookup.h"
#include "kudu/tserver/tablet_server.h"
diff --git a/src/kudu/tserver/tserver_path_handlers.cc b/src/kudu/tserver/tserver_path_handlers.cc
index 3da22c2..0551337 100644
--- a/src/kudu/tserver/tserver_path_handlers.cc
+++ b/src/kudu/tserver/tserver_path_handlers.cc
@@ -51,11 +51,11 @@
#include "kudu/rpc/remote_user.h"
#include "kudu/server/webui_util.h"
#include "kudu/tablet/metadata.pb.h"
+#include "kudu/tablet/ops/op.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/transactions/transaction.h"
#include "kudu/tserver/scanners.h"
#include "kudu/tserver/tablet_server.h"
#include "kudu/tserver/ts_tablet_manager.h"