Skip to content
This repository was archived by the owner on Sep 27, 2019. It is now read-only.

Commit d1b64cd

Browse files
committed
Merge branch 'tianyu-protocol-refactor-structure' of https://github.com/tli2/peloton into tianyu-protocol-refactor-structure
2 parents 0ba72d4 + 75b2a55 commit d1b64cd

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

src/include/network/network_io_utils.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,12 +83,6 @@ class Buffer {
8383
size_ = unprocessed_len;
8484
offset_ = 0;
8585
}
86-
//
87-
// void PrintBuffer(int offset, int len) {
88-
// for (int i = offset; i < offset + len; i++)
89-
// printf("%02X ", buf_[i]);
90-
// printf("\n");
91-
// }
9286

9387
protected:
9488
size_t size_ = 0, offset_ = 0, capacity_;

src/include/traffic_cop/tcop.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ struct ClientProcessState {
4343
// flag of single statement txn
4444
std::vector<ResultValue> result_;
4545
std::stack<TcopTxnState> tcop_txn_state_;
46-
NetworkTransactionStateType txn_state_ = NetworkTransactionStateType::INVALID;
46+
NetworkTransactionStateType txn_state_ = NetworkTransactionStateType::IDLE;
4747
bool skipped_stmt_ = false;
4848
std::string skipped_query_string_;
4949
QueryType skipped_query_type_ = QueryType::QUERY_INVALID;
@@ -74,7 +74,7 @@ struct ClientProcessState {
7474
result_format_.clear();
7575
result_.clear();
7676
tcop_txn_state_ = std::stack<TcopTxnState>();
77-
txn_state_ = NetworkTransactionStateType::INVALID;
77+
txn_state_ = NetworkTransactionStateType::IDLE;
7878
skipped_stmt_ = false;
7979
skipped_query_string_ = "";
8080
skipped_query_type_ = QueryType::QUERY_INVALID;

0 commit comments

Comments
 (0)