From bd0fc0ffb029a3f0eae9a318b1fafa59efcf633a Mon Sep 17 00:00:00 2001
From: Dylan Chen <zilin@singularity-data.com>
Date: Fri, 10 Mar 2023 20:51:02 +0800
Subject: [PATCH] resolve conflict

---
 src/stream/src/from_proto/temporal_join.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/stream/src/from_proto/temporal_join.rs b/src/stream/src/from_proto/temporal_join.rs
index 3caca5cd872ee..43404b9eb129f 100644
--- a/src/stream/src/from_proto/temporal_join.rs
+++ b/src/stream/src/from_proto/temporal_join.rs
@@ -47,7 +47,7 @@ impl ExecutorBuilder for TemporalJoinExecutorBuilder {
             let order_types = table_desc
                 .pk
                 .iter()
-                .map(|desc| OrderType::from_protobuf(&desc.get_order_type().unwrap().direction()))
+                .map(|desc| OrderType::from_protobuf(desc.get_order_type().unwrap()))
                 .collect_vec();
 
             let column_descs = table_desc