From e61d41a168af5807eec07f5e43bb643957edc573 Mon Sep 17 00:00:00 2001
From: xieqi <qi.xie@intel.com>
Date: Wed, 9 Jun 2021 09:12:05 +0800
Subject: [PATCH] [SQL-DS-CACHE-139][POAE7-1165] Update Arrow dependency to
 4.0.0 (#140)

* [SQL-DS-CACHE-139][POAE7-1165] Update Arrow dependency to 4.0.0

* fix for comments
---
 HCFS-based-cache/pom.xml      | 2 +-
 Plasma-based-cache/pom.xml    | 4 ++++
 sbin/install_plasma_server.sh | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/HCFS-based-cache/pom.xml b/HCFS-based-cache/pom.xml
index ff60eb583..bab5811c8 100644
--- a/HCFS-based-cache/pom.xml
+++ b/HCFS-based-cache/pom.xml
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>org.apache.arrow</groupId>
       <artifactId>arrow-plasma</artifactId>
-      <version>3.0.0</version>
+      <version>4.0.0</version>
     </dependency>
     <dependency>
       <groupId>redis.clients</groupId>
diff --git a/Plasma-based-cache/pom.xml b/Plasma-based-cache/pom.xml
index 13c6e5930..db3ead385 100644
--- a/Plasma-based-cache/pom.xml
+++ b/Plasma-based-cache/pom.xml
@@ -281,6 +281,10 @@
     <dependency>
       <groupId>com.intel.arrow</groupId>
       <artifactId>arrow-plasma</artifactId>
+      <!--
+        We still use 0.17.0 here just for easy build
+        Please follow develop guid to install intel arrow-plasma-4.0.0.jar at runtime
+      -->
       <version>0.17.0</version>
     </dependency>
     <dependency>
diff --git a/sbin/install_plasma_server.sh b/sbin/install_plasma_server.sh
index c8d9f8d21..fa83ef690 100755
--- a/sbin/install_plasma_server.sh
+++ b/sbin/install_plasma_server.sh
@@ -14,9 +14,9 @@ sudo make install
 
 cd ..
 git config --global http.sslVerify false
-git clone https://github.com/Intel-bigdata/arrow.git arrow
+git clone https://github.com/oap-project/arrow.git arrow
 cd arrow
-git checkout branch-0.17.0-oap-0.9
+git checkout arrow-4.0.0-oap-1.1.1
 
 cd cpp
 mkdir build