rename request_codec.rs to codec.rs

iosmanthus · iosmanthus · commit 0a72d3108a20 · 2022-07-01T15:37:11.000+08:00
Signed-off-by: iosmanthus &lt;myosmanthustree@gmail.com&gt;
diff --git a/examples/pessimistic.rs b/examples/pessimistic.rs
@@ -4,7 +4,7 @@ mod common;
 
 use crate::common::parse_args;
 use tikv_client::{
-    request::request_codec::TxnApiV1, Config, Key, TransactionClient as Client, TransactionOptions,
+    request::codec::TxnApiV1, Config, Key, TransactionClient as Client, TransactionOptions,
     Value,
 };
 
diff --git a/examples/raw.rs b/examples/raw.rs
@@ -6,7 +6,7 @@ mod common;
 
 use crate::common::parse_args;
 use tikv_client::{
-    request::request_codec::RawApiV1, Config, IntoOwnedRange, Key, KvPair, RawClient as Client,
+    request::codec::RawApiV1, Config, IntoOwnedRange, Key, KvPair, RawClient as Client,
     Result, Value,
 };
 
diff --git a/examples/transaction.rs b/examples/transaction.rs
@@ -4,7 +4,7 @@ mod common;
 
 use crate::common::parse_args;
 use tikv_client::{
-    request::request_codec::{TxnApiV1, TxnCodec},
+    request::codec::{TxnApiV1, TxnCodec},
     BoundRange, Config, Key, KvPair, TransactionClient as Client, Value,
 };
 
diff --git a/src/mock.rs b/src/mock.rs
@@ -8,7 +8,7 @@
 use crate::{
     pd::{PdClient, PdRpcClient, RetryClient},
     region::{RegionId, RegionWithLeader},
-    request::request_codec::RawApiV1,
+    request::codec::RawApiV1,
     store::RegionStore,
     Config, Error, Key, Result, Timestamp,
 };
diff --git a/src/pd/client.rs b/src/pd/client.rs
@@ -17,7 +17,7 @@ use crate::{
     pd::{retry::RetryClientTrait, RetryClient},
     region::{RegionId, RegionVerId, RegionWithLeader},
     region_cache::RegionCache,
-    request::request_codec::RequestCodec,
+    request::codec::RequestCodec,
     store::RegionStore,
     BoundRange, Config, Key, Result, SecurityManager, Timestamp,
 };
diff --git a/src/raw/client.rs b/src/raw/client.rs
@@ -14,7 +14,7 @@ use crate::{
     pd::{PdClient, PdRpcClient},
     raw::lowering::*,
     request::{
-        request_codec::{RawCodec, RequestCodec},
+        codec::{RawCodec, RequestCodec},
         Collect, CollectSingle, Plan,
     },
     Backoff, BoundRange, ColumnFamily, Key, KvPair, Result, Value,
@@ -792,7 +792,7 @@ mod tests {
 
     use crate::{
         mock::{MockKvClient, MockPdClient},
-        request::request_codec::RawApiV1,
+        request::codec::RawApiV1,
         Result,
     };
 
diff --git a/src/raw/requests.rs b/src/raw/requests.rs
@@ -14,7 +14,7 @@ use crate::{
     pd::PdClient,
     plain_request, plain_response,
     request::{
-        plan::ResponseWithShard, request_codec::RequestCodec, Collect, CollectSingle,
+        plan::ResponseWithShard, codec::RequestCodec, Collect, CollectSingle,
         DefaultProcessor, KvRequest, Merge, Process, Shardable, SingleKey,
     },
     store::{store_stream_for_keys, store_stream_for_ranges, RegionStore},
diff --git a/src/region_cache.rs b/src/region_cache.rs
@@ -14,7 +14,7 @@ use tikv_client_proto::metapb::{self, Store};
 use crate::{
     pd::{RetryClient, RetryClientTrait},
     region::{RegionId, RegionVerId, RegionWithLeader, StoreId},
-    request::request_codec::RequestCodec,
+    request::codec::RequestCodec,
     Key, Result,
 };
 
@@ -263,7 +263,7 @@ mod test {
     use crate::{
         pd::RetryClientTrait,
         region::{RegionId, RegionWithLeader},
-        request::request_codec::{RawApiV1, RequestCodec},
+        request::codec::{RawApiV1, RequestCodec},
         Key, Result,
     };
 
diff --git a/src/request/codec.rs b/src/request/codec.rs
diff --git a/src/request/mod.rs b/src/request/mod.rs
@@ -26,7 +26,7 @@ pub mod plan;
 mod plan_builder;
 #[macro_use]
 mod shard;
-pub mod request_codec;
+pub mod codec;
 
 /// Abstracts any request sent to a TiKV server.
 #[async_trait]
@@ -87,7 +87,7 @@ mod test {
 
     use crate::{
         mock::{MockKvClient, MockPdClient},
-        request::{request_codec::RequestCodec, KvRequest},
+        request::{codec::RequestCodec, KvRequest},
         store::store_stream_for_keys,
         transaction::lowering::new_commit_request,
         Error, Key, Result,
diff --git a/src/request/plan.rs b/src/request/plan.rs
@@ -13,7 +13,7 @@ use tikv_client_store::{HasKeyErrors, HasRegionError, HasRegionErrors, KvClient}
 use crate::{
     backoff::Backoff,
     pd::PdClient,
-    request::{request_codec::RequestCodec, KvRequest, Shardable},
+    request::{codec::RequestCodec, KvRequest, Shardable},
     stats::tikv_stats,
     store::RegionStore,
     transaction::{resolve_locks, HasLocks},
diff --git a/src/request/plan_builder.rs b/src/request/plan_builder.rs
@@ -8,7 +8,7 @@ use crate::{
     backoff::Backoff,
     pd::PdClient,
     request::{
-        request_codec::RequestCodec, DefaultProcessor, Dispatch, ExtractError, KvRequest, Merge,
+        codec::RequestCodec, DefaultProcessor, Dispatch, ExtractError, KvRequest, Merge,
         MergeResponse, Plan, Process, ProcessResponse, ResolveLock, RetryableMultiRegion,
         Shardable,
     },
diff --git a/src/transaction/client.rs b/src/transaction/client.rs
@@ -10,7 +10,7 @@ use crate::{
     backoff::{DEFAULT_REGION_BACKOFF, OPTIMISTIC_BACKOFF},
     config::Config,
     pd::{PdClient, PdRpcClient},
-    request::{request_codec::TxnCodec, Plan},
+    request::{codec::TxnCodec, Plan},
     timestamp::TimestampExt,
     transaction::{Snapshot, Transaction, TransactionOptions},
     Result,
diff --git a/src/transaction/requests.rs b/src/transaction/requests.rs
@@ -15,7 +15,7 @@ use crate::{
     pd::PdClient,
     plain_request, plain_response,
     request::{
-        request_codec::RequestCodec, Collect, CollectSingle, CollectWithShard, DefaultProcessor,
+        codec::RequestCodec, Collect, CollectSingle, CollectWithShard, DefaultProcessor,
         KvRequest, Merge, Process, ResponseWithShard, Shardable, SingleKey,
     },
     store::{store_stream_for_keys, store_stream_for_range_by_start_key, RegionStore},
diff --git a/tests/common/mod.rs b/tests/common/mod.rs
@@ -4,7 +4,7 @@ use futures_timer::Delay;
 use log::{info, warn};
 use std::{env, time::Duration};
 use tikv_client::{
-    request::request_codec::{RawApiV1, TxnApiV1},
+    request::codec::{RawApiV1, TxnApiV1},
     ColumnFamily, Key, RawClient, Result, TransactionClient,
 };
 
diff --git a/tests/failpoint_tests.rs b/tests/failpoint_tests.rs
@@ -6,7 +6,7 @@ use fail::FailScenario;
 use serial_test::serial;
 use std::time::Duration;
 use tikv_client::{
-    request::request_codec::TxnApiV1, transaction::HeartbeatOption, Result, TransactionClient,
+    request::codec::TxnApiV1, transaction::HeartbeatOption, Result, TransactionClient,
     TransactionOptions,
 };
 
diff --git a/tests/integration_tests.rs b/tests/integration_tests.rs
@@ -22,7 +22,7 @@ use std::{
     iter,
 };
 use tikv_client::{
-    request::request_codec::{RawApiV1, RawCodec, TxnApiV1},
+    request::codec::{RawApiV1, RawCodec, TxnApiV1},
     transaction::HeartbeatOption,
     Error, Key, KvPair, PdClient, RawClient, Result, Transaction, TransactionClient,
     TransactionOptions, Value,
diff --git a/tests/mock_tikv_tests.rs b/tests/mock_tikv_tests.rs
@@ -4,7 +4,7 @@ mod test {
     use log::debug;
     use mock_tikv::{start_mock_pd_server, start_mock_tikv_server, MOCK_PD_PORT};
     use simple_logger::SimpleLogger;
-    use tikv_client::{request::request_codec::RawApiV1, KvPair, RawClient};
+    use tikv_client::{request::codec::RawApiV1, KvPair, RawClient};
 
     #[tokio::test]
     #[ignore]
