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/06/03 14:08:52 UTC
[2/3] incubator-kudu git commit: Don't default 'request' to null in
WriteTransactionState's ctor
Don't default 'request' to null in WriteTransactionState's ctor
There is no case in which we start a WriteTransactionState without
a request, so there is no point in defaulting it to null.
Change-Id: I2b6d4e36f392e233e8afb66beb0221b914687486
Reviewed-on: http://gerrit.cloudera.org:8080/3290
Tested-by: Kudu Jenkins
Reviewed-by: Adar Dembo <ad...@cloudera.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kudu/commit/6034b855
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kudu/tree/6034b855
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kudu/diff/6034b855
Branch: refs/heads/master
Commit: 6034b8557387ad45aa12f332d6bed784569efb13
Parents: 776f6e0
Author: David Alves <da...@cloudera.com>
Authored: Fri May 27 14:37:57 2016 -0700
Committer: David Ribeiro Alves <da...@cloudera.com>
Committed: Fri Jun 3 01:40:28 2016 +0000
----------------------------------------------------------------------
src/kudu/tablet/transactions/write_transaction.cc | 9 ++-------
src/kudu/tablet/transactions/write_transaction.h | 4 ++--
2 files changed, 4 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kudu/blob/6034b855/src/kudu/tablet/transactions/write_transaction.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tablet/transactions/write_transaction.cc b/src/kudu/tablet/transactions/write_transaction.cc
index 289e15c..06f2ca7 100644
--- a/src/kudu/tablet/transactions/write_transaction.cc
+++ b/src/kudu/tablet/transactions/write_transaction.cc
@@ -203,18 +203,13 @@ WriteTransactionState::WriteTransactionState(TabletPeer* tablet_peer,
const tserver::WriteRequestPB *request,
tserver::WriteResponsePB *response)
: TransactionState(tablet_peer),
- request_(request),
+ request_(DCHECK_NOTNULL(request)),
response_(response),
mvcc_tx_(nullptr),
schema_at_decode_time_(nullptr) {
- if (request) {
- external_consistency_mode_ = request->external_consistency_mode();
- } else {
- external_consistency_mode_ = CLIENT_PROPAGATED;
- }
+ external_consistency_mode_ = request_->external_consistency_mode();
}
-
void WriteTransactionState::SetMvccTxAndTimestamp(gscoped_ptr<ScopedTransaction> mvcc_tx) {
DCHECK(!mvcc_tx_) << "Mvcc transaction already started/set.";
if (has_timestamp()) {
http://git-wip-us.apache.org/repos/asf/incubator-kudu/blob/6034b855/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 0328ae0..162d6b4 100644
--- a/src/kudu/tablet/transactions/write_transaction.h
+++ b/src/kudu/tablet/transactions/write_transaction.h
@@ -72,8 +72,8 @@ struct TabletComponents;
// NOTE: this class isn't thread safe.
class WriteTransactionState : public TransactionState {
public:
- WriteTransactionState(TabletPeer* tablet_peer = NULL,
- const tserver::WriteRequestPB *request = NULL,
+ WriteTransactionState(TabletPeer* tablet_peer,
+ const tserver::WriteRequestPB *request,
tserver::WriteResponsePB *response = NULL);
virtual ~WriteTransactionState();