Skip to content

Commit 7668c37

Browse files
iosmanthusiosmanthus
committed
fix integration tests for API v1
Signed-off-by: iosmanthus <[email protected]>
1 parent 9164cf0 commit 7668c37

File tree

5 files changed

+93
-50
lines changed

5 files changed

+93
-50
lines changed

‎src/lib.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,8 @@ pub use crate::backoff::Backoff;
128128
#[doc(inline)]
129129
pub use crate::kv::{BoundRange, IntoOwnedRange, Key, KvPair, Value};
130130
#[doc(inline)]
131+
pub use crate::pd::PdClient;
132+
#[doc(inline)]
131133
pub use crate::raw::{lowering as raw_lowering, Client as RawClient, ColumnFamily};
132134
#[doc(inline)]
133135
pub use crate::request::RetryOptions;

‎src/raw/requests.rs

Lines changed: 41 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ use super::RawRpcRequest;
1212
use crate::{
1313
collect_first,
1414
pd::PdClient,
15+
plain_request, plain_response,
1516
request::{
1617
plan::ResponseWithShard, request_codec::RequestCodec, Collect, CollectSingle,
1718
DefaultProcessor, KvRequest, Merge, Process, Shardable, SingleKey,
@@ -39,11 +40,13 @@ where
3940
impl<C: RequestCodec> KvRequest<C> for kvrpcpb::RawGetRequest {
4041
type Response = kvrpcpb::RawGetResponse;
4142

42-
fn encode_request(&self, _codec: &C) -> Cow<Self> {
43+
fn encode_request(&self, codec: &C) -> Cow<Self> {
44+
plain_request!(self, codec);
4345
todo!()
4446
}
4547

46-
fn decode_response(&self, _codec: &C, _resp: Self::Response) -> Result<Self::Response> {
48+
fn decode_response(&self, codec: &C, resp: Self::Response) -> Result<Self::Response> {
49+
plain_response!(resp, codec);
4750
todo!()
4851
}
4952
}
@@ -87,11 +90,13 @@ where
8790
impl<C: RequestCodec> KvRequest<C> for kvrpcpb::RawBatchGetRequest {
8891
type Response = kvrpcpb::RawBatchGetResponse;
8992

90-
fn encode_request(&self, _codec: &C) -> Cow<Self> {
93+
fn encode_request(&self, codec: &C) -> Cow<Self> {
94+
plain_request!(self, codec);
9195
todo!()
9296
}
9397

94-
fn decode_response(&self, _codec: &C, _resp: Self::Response) -> Result<Self::Response> {
98+
fn decode_response(&self, codec: &C, resp: Self::Response) -> Result<Self::Response> {
99+
plain_response!(resp, codec);
95100
todo!()
96101
}
97102
}
@@ -130,11 +135,13 @@ where
130135
impl<C: RequestCodec> KvRequest<C> for kvrpcpb::RawPutRequest {
131136
type Response = kvrpcpb::RawPutResponse;
132137

133-
fn encode_request(&self, _codec: &C) -> Cow<Self> {
138+
fn encode_request(&self, codec: &C) -> Cow<Self> {
139+
plain_request!(self, codec);
134140
todo!()
135141
}
136142

137-
fn decode_response(&self, _codec: &C, _resp: Self::Response) -> Result<Self::Response> {
143+
fn decode_response(&self, codec: &C, resp: Self::Response) -> Result<Self::Response> {
144+
plain_response!(resp, codec);
138145
todo!()
139146
}
140147
}
@@ -166,11 +173,13 @@ where
166173
impl<C: RequestCodec> KvRequest<C> for kvrpcpb::RawBatchPutRequest {
167174
type Response = kvrpcpb::RawBatchPutResponse;
168175

169-
fn encode_request(&self, _codec: &C) -> Cow<Self> {
176+
fn encode_request(&self, codec: &C) -> Cow<Self> {
177+
plain_request!(self, codec);
170178
todo!()
171179
}
172180

173-
fn decode_response(&self, _codec: &C, _resp: Self::Response) -> Result<Self::Response> {
181+
fn decode_response(&self, codec: &C, resp: Self::Response) -> Result<Self::Response> {
182+
plain_response!(resp, codec);
174183
todo!()
175184
}
176185
}
@@ -216,11 +225,13 @@ where
216225
impl<C: RequestCodec> KvRequest<C> for kvrpcpb::RawDeleteRequest {
217226
type Response = kvrpcpb::RawDeleteResponse;
218227

219-
fn encode_request(&self, _codec: &C) -> Cow<Self> {
228+
fn encode_request(&self, codec: &C) -> Cow<Self> {
229+
plain_request!(self, codec);
220230
todo!()
221231
}
222232

223-
fn decode_response(&self, _codec: &C, _resp: Self::Response) -> Result<Self::Response> {
233+
fn decode_response(&self, codec: &C, resp: Self::Response) -> Result<Self::Response> {
234+
plain_response!(resp, codec);
224235
todo!()
225236
}
226237
}
@@ -250,11 +261,13 @@ where
250261
impl<C: RequestCodec> KvRequest<C> for kvrpcpb::RawBatchDeleteRequest {
251262
type Response = kvrpcpb::RawBatchDeleteResponse;
252263

253-
fn encode_request(&self, _codec: &C) -> Cow<Self> {
264+
fn encode_request(&self, codec: &C) -> Cow<Self> {
265+
plain_request!(self, codec);
254266
todo!()
255267
}
256268

257-
fn decode_response(&self, _codec: &C, _resp: Self::Response) -> Result<Self::Response> {
269+
fn decode_response(&self, codec: &C, resp: Self::Response) -> Result<Self::Response> {
270+
plain_response!(resp, codec);
258271
todo!()
259272
}
260273
}
@@ -280,11 +293,13 @@ where
280293
impl<C: RequestCodec> KvRequest<C> for kvrpcpb::RawDeleteRangeRequest {
281294
type Response = kvrpcpb::RawDeleteRangeResponse;
282295

283-
fn encode_request(&self, _codec: &C) -> Cow<Self> {
296+
fn encode_request(&self, codec: &C) -> Cow<Self> {
297+
plain_request!(self, codec);
284298
todo!()
285299
}
286300

287-
fn decode_response(&self, _codec: &C, _resp: Self::Response) -> Result<Self::Response> {
301+
fn decode_response(&self, codec: &C, resp: Self::Response) -> Result<Self::Response> {
302+
plain_response!(resp, codec);
288303
todo!()
289304
}
290305
}
@@ -314,11 +329,13 @@ where
314329
impl<C: RequestCodec> KvRequest<C> for kvrpcpb::RawScanRequest {
315330
type Response = kvrpcpb::RawScanResponse;
316331

317-
fn encode_request(&self, _codec: &C) -> Cow<Self> {
332+
fn encode_request(&self, codec: &C) -> Cow<Self> {
333+
plain_request!(self, codec);
318334
todo!()
319335
}
320336

321-
fn decode_response(&self, _codec: &C, _resp: Self::Response) -> Result<Self::Response> {
337+
fn decode_response(&self, codec: &C, resp: Self::Response) -> Result<Self::Response> {
338+
plain_response!(resp, codec);
322339
todo!()
323340
}
324341
}
@@ -357,11 +374,13 @@ where
357374
impl<C: RequestCodec> KvRequest<C> for kvrpcpb::RawBatchScanRequest {
358375
type Response = kvrpcpb::RawBatchScanResponse;
359376

360-
fn encode_request(&self, _codec: &C) -> Cow<Self> {
377+
fn encode_request(&self, codec: &C) -> Cow<Self> {
378+
plain_request!(self, codec);
361379
todo!()
362380
}
363381

364-
fn decode_response(&self, _codec: &C, _resp: Self::Response) -> Result<Self::Response> {
382+
fn decode_response(&self, codec: &C, resp: Self::Response) -> Result<Self::Response> {
383+
plain_response!(resp, codec);
365384
todo!()
366385
}
367386
}
@@ -417,11 +436,13 @@ where
417436
impl<C: RequestCodec> KvRequest<C> for kvrpcpb::RawCasRequest {
418437
type Response = kvrpcpb::RawCasResponse;
419438

420-
fn encode_request(&self, _codec: &C) -> Cow<Self> {
439+
fn encode_request(&self, codec: &C) -> Cow<Self> {
440+
plain_request!(self, codec);
421441
todo!()
422442
}
423443

424-
fn decode_response(&self, _codec: &C, _resp: Self::Response) -> Result<Self::Response> {
444+
fn decode_response(&self, codec: &C, resp: Self::Response) -> Result<Self::Response> {
445+
plain_response!(resp, codec);
425446
todo!()
426447
}
427448
}

‎tests/common/mod.rs

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@ mod ctl;
33
use futures_timer::Delay;
44
use log::{info, warn};
55
use std::{env, time::Duration};
6-
use tikv_client::{ColumnFamily, Key, RawClient, Result, TransactionClient};
6+
use tikv_client::{
7+
request::request_codec::{RawApiV1, TxnApiV1},
8+
ColumnFamily, Key, RawClient, Result, TransactionClient,
9+
};
710

811
const ENV_PD_ADDRS: &str = "PD_ADDRS";
912
const ENV_ENABLE_MULIT_REGION: &str = "MULTI_REGION";
@@ -19,7 +22,10 @@ pub async fn clear_tikv() {
1922
// DEFAULT_REGION_BACKOFF is not long enough for CI environment. So set a longer backoff.
2023
let backoff = tikv_client::Backoff::no_jitter_backoff(100, 10000, 10);
2124
for cf in cfs {
22-
let raw_client = RawClient::new(pd_addrs(), None).await.unwrap().with_cf(cf);
25+
let raw_client = RawClient::new(pd_addrs(), RawApiV1, None)
26+
.await
27+
.unwrap()
28+
.with_cf(cf);
2329
raw_client
2430
.delete_range_opt(vec![].., backoff.clone())
2531
.await
@@ -60,7 +66,7 @@ async fn ensure_region_split(
6066
// 1. write plenty transactional keys
6167
// 2. wait until regions split
6268

63-
let client = TransactionClient::new(pd_addrs(), None).await?;
69+
let client = TransactionClient::new(pd_addrs(), TxnApiV1, None).await?;
6470
let mut txn = client.begin_optimistic().await?;
6571
for key in keys.into_iter() {
6672
txn.put(key.into(), vec![0, 0, 0, 0]).await?;

‎tests/failpoint_tests.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@ use common::{init, pd_addrs};
55
use fail::FailScenario;
66
use serial_test::serial;
77
use std::time::Duration;
8-
use tikv_client::{transaction::HeartbeatOption, Result, TransactionClient, TransactionOptions};
8+
use tikv_client::{
9+
request::request_codec::TxnApiV1, transaction::HeartbeatOption, Result, TransactionClient,
10+
TransactionOptions,
11+
};
912

1013
#[tokio::test]
1114
#[serial]
@@ -16,7 +19,7 @@ async fn txn_optimistic_heartbeat() -> Result<()> {
1619

1720
let key1 = "key1".to_owned();
1821
let key2 = "key2".to_owned();
19-
let client = TransactionClient::new(pd_addrs(), None).await?;
22+
let client = TransactionClient::new(pd_addrs(), TxnApiV1, None).await?;
2023

2124
let mut heartbeat_txn = client
2225
.begin_with_options(

0 commit comments

Comments
 (0)