From a0b2a119d6b5843bde33f9937b0f1bed3e80e0c8 Mon Sep 17 00:00:00 2001
From: Bugen Zhao <i@bugenzhao.com>
Date: Sat, 22 Oct 2022 23:05:04 -0400
Subject: [PATCH] fix

---
 Cargo.lock                                 | 4 ++--
 src/batch/src/execution/grpc_exchange.rs   | 2 +-
 src/batch/src/execution/local_exchange.rs  | 2 +-
 src/batch/src/executor/test_utils.rs       | 2 +-
 src/batch/src/task/broadcast_channel.rs    | 4 ++--
 src/batch/src/task/fifo_channel.rs         | 4 ++--
 src/batch/src/task/hash_shuffle_channel.rs | 4 ++--
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9a1d58d0acc0..64469c1fc776 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3865,9 +3865,9 @@ dependencies = [
 
 [[package]]
 name = "pg_interval"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47354dbd658c57a5ee1cc97a79937345170234d4c817768de80ea6d2e9f5b98a"
+checksum = "fe46640b465e284b048ef065cbed8ef17a622878d310c724578396b4cfd00df2"
 dependencies = [
  "bytes",
  "chrono",
diff --git a/src/batch/src/execution/grpc_exchange.rs b/src/batch/src/execution/grpc_exchange.rs
index eb85a2f3253a..8abed4c8fb11 100644
--- a/src/batch/src/execution/grpc_exchange.rs
+++ b/src/batch/src/execution/grpc_exchange.rs
@@ -72,7 +72,7 @@ impl Debug for GrpcExchangeSource {
 }
 
 impl ExchangeSource for GrpcExchangeSource {
-    type TakeDataFuture<'a> = impl Future<Output = Result<Option<DataChunk>>>;
+    type TakeDataFuture<'a> = impl Future<Output = Result<Option<DataChunk>>> + 'a;
 
     fn take_data(&mut self) -> Self::TakeDataFuture<'_> {
         async {
diff --git a/src/batch/src/execution/local_exchange.rs b/src/batch/src/execution/local_exchange.rs
index 259f8550601a..f098e6d21978 100644
--- a/src/batch/src/execution/local_exchange.rs
+++ b/src/batch/src/execution/local_exchange.rs
@@ -52,7 +52,7 @@ impl Debug for LocalExchangeSource {
 }
 
 impl ExchangeSource for LocalExchangeSource {
-    type TakeDataFuture<'a> = impl Future<Output = Result<Option<DataChunk>>>;
+    type TakeDataFuture<'a> = impl Future<Output = Result<Option<DataChunk>>> + 'a;
 
     fn take_data(&mut self) -> Self::TakeDataFuture<'_> {
         async {
diff --git a/src/batch/src/executor/test_utils.rs b/src/batch/src/executor/test_utils.rs
index f81073ecf927..dcd1178443fb 100644
--- a/src/batch/src/executor/test_utils.rs
+++ b/src/batch/src/executor/test_utils.rs
@@ -251,7 +251,7 @@ impl FakeExchangeSource {
 }
 
 impl ExchangeSource for FakeExchangeSource {
-    type TakeDataFuture<'a> = impl Future<Output = Result<Option<DataChunk>>>;
+    type TakeDataFuture<'a> = impl Future<Output = Result<Option<DataChunk>>> + 'a;
 
     fn take_data(&mut self) -> Self::TakeDataFuture<'_> {
         async {
diff --git a/src/batch/src/task/broadcast_channel.rs b/src/batch/src/task/broadcast_channel.rs
index 55f3d9ef0e86..4ff9c8506b12 100644
--- a/src/batch/src/task/broadcast_channel.rs
+++ b/src/batch/src/task/broadcast_channel.rs
@@ -42,7 +42,7 @@ impl Debug for BroadcastSender {
 }
 
 impl ChanSender for BroadcastSender {
-    type SendFuture<'a> = impl Future<Output = BatchResult<()>>;
+    type SendFuture<'a> = impl Future<Output = BatchResult<()>> + 'a;
 
     fn send(&mut self, chunk: Option<DataChunk>) -> Self::SendFuture<'_> {
         async move {
@@ -65,7 +65,7 @@ pub struct BroadcastReceiver {
 }
 
 impl ChanReceiver for BroadcastReceiver {
-    type RecvFuture<'a> = impl Future<Output = Result<Option<DataChunkInChannel>>>;
+    type RecvFuture<'a> = impl Future<Output = Result<Option<DataChunkInChannel>>> + 'a;
 
     fn recv(&mut self) -> Self::RecvFuture<'_> {
         async move {
diff --git a/src/batch/src/task/fifo_channel.rs b/src/batch/src/task/fifo_channel.rs
index a5cd02dd8fe6..03502295666e 100644
--- a/src/batch/src/task/fifo_channel.rs
+++ b/src/batch/src/task/fifo_channel.rs
@@ -39,7 +39,7 @@ pub struct FifoReceiver {
 }
 
 impl ChanSender for FifoSender {
-    type SendFuture<'a> = impl Future<Output = BatchResult<()>>;
+    type SendFuture<'a> = impl Future<Output = BatchResult<()>> + 'a;
 
     fn send(&mut self, chunk: Option<DataChunk>) -> Self::SendFuture<'_> {
         async {
@@ -52,7 +52,7 @@ impl ChanSender for FifoSender {
 }
 
 impl ChanReceiver for FifoReceiver {
-    type RecvFuture<'a> = impl Future<Output = Result<Option<DataChunkInChannel>>>;
+    type RecvFuture<'a> = impl Future<Output = Result<Option<DataChunkInChannel>>> + 'a;
 
     fn recv(&mut self) -> Self::RecvFuture<'_> {
         async move {
diff --git a/src/batch/src/task/hash_shuffle_channel.rs b/src/batch/src/task/hash_shuffle_channel.rs
index 65b6d80d6a29..26c4dd4bc918 100644
--- a/src/batch/src/task/hash_shuffle_channel.rs
+++ b/src/batch/src/task/hash_shuffle_channel.rs
@@ -105,7 +105,7 @@ fn generate_new_data_chunks(
 }
 
 impl ChanSender for HashShuffleSender {
-    type SendFuture<'a> = impl Future<Output = BatchResult<()>>;
+    type SendFuture<'a> = impl Future<Output = BatchResult<()>> + 'a;
 
     fn send(&mut self, chunk: Option<DataChunk>) -> Self::SendFuture<'_> {
         async move {
@@ -150,7 +150,7 @@ impl HashShuffleSender {
 }
 
 impl ChanReceiver for HashShuffleReceiver {
-    type RecvFuture<'a> = impl Future<Output = Result<Option<DataChunkInChannel>>>;
+    type RecvFuture<'a> = impl Future<Output = Result<Option<DataChunkInChannel>>> + 'a;
 
     fn recv(&mut self) -> Self::RecvFuture<'_> {
         async move {