From 55e3e3eaef42bc1e85efe8aacbfe21169c81d7d3 Mon Sep 17 00:00:00 2001
From: "junfei.ljf" <junfei.ljf@alibaba-inc.com>
Date: Tue, 29 Sep 2020 15:35:01 +0800
Subject: [PATCH] update phoenix client version to 5.2.5

---
 hbase20xsqlreader/doc/hbase20xsqlreader.md                    | 4 +++-
 hbase20xsqlreader/pom.xml                                     | 2 +-
 hbase20xsqlwriter/doc/hbase20xsqlwriter.md                    | 4 +++-
 hbase20xsqlwriter/pom.xml                                     | 2 +-
 .../writer/hbase20xsqlwriter/HBase20xSQLWriterTask.java       | 4 ++--
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/hbase20xsqlreader/doc/hbase20xsqlreader.md b/hbase20xsqlreader/doc/hbase20xsqlreader.md
index 9df020cc..43c42bf7 100644
--- a/hbase20xsqlreader/doc/hbase20xsqlreader.md
+++ b/hbase20xsqlreader/doc/hbase20xsqlreader.md
@@ -58,7 +58,9 @@ hbase20xsqlreader插件实现了从Phoenix(HBase SQL)读取数据，对应版本
 * **queryServerAddress**
 
 	* 描述：hbase20xsqlreader需要通过Phoenix轻客户端去连接Phoenix QueryServer，因此这里需要填写对应QueryServer地址。
- 
+           增强版/Lindorm 用户若需透传user, password参数，可以在queryServerAddress后增加对应可选属性.
+           格式参考：http://127.0.0.1:8765;user=root;password=root
+            
 	* 必选：是 <br />
  
 	* 默认值：无 <br />
diff --git a/hbase20xsqlreader/pom.xml b/hbase20xsqlreader/pom.xml
index ec1c3419..818123f3 100644
--- a/hbase20xsqlreader/pom.xml
+++ b/hbase20xsqlreader/pom.xml
@@ -14,7 +14,7 @@
     <packaging>jar</packaging>
 
     <properties>
-        <phoenix.version>5.1.0-HBase-2.0.0.2</phoenix.version>
+        <phoenix.version>5.2.5-HBase-2.x</phoenix.version>
     </properties>
 
     <dependencies>
diff --git a/hbase20xsqlwriter/doc/hbase20xsqlwriter.md b/hbase20xsqlwriter/doc/hbase20xsqlwriter.md
index 2cc8cb41..e1f4e2f1 100644
--- a/hbase20xsqlwriter/doc/hbase20xsqlwriter.md
+++ b/hbase20xsqlwriter/doc/hbase20xsqlwriter.md
@@ -120,7 +120,9 @@ HBase20xsqlwriter实现了向hbase中的SQL表(phoenix)批量导入数据的功
 
 * **queryServerAddress**
 
-   * 描述：Phoenix QueryServer地址，为必填项，格式：http://${hostName}:${ip}，如http://172.16.34.58:8765
+   * 描述：Phoenix QueryServer地址，为必填项，格式：http://${hostName}:${ip}，如http://172.16.34.58:8765。
+          增强版/Lindorm 用户若需透传user, password参数，可以在queryServerAddress后增加对应可选属性.
+              格式参考：http://127.0.0.1:8765;user=root;password=root
    * 必选：是
    * 默认值：无
    
diff --git a/hbase20xsqlwriter/pom.xml b/hbase20xsqlwriter/pom.xml
index 690bc95e..5a2843e1 100644
--- a/hbase20xsqlwriter/pom.xml
+++ b/hbase20xsqlwriter/pom.xml
@@ -14,7 +14,7 @@
     <packaging>jar</packaging>
 
     <properties>
-        <phoenix.version>5.1.0-HBase-2.0.0.2</phoenix.version>
+        <phoenix.version>5.2.5-HBase-2.x</phoenix.version>
         <commons-codec.version>1.8</commons-codec.version>
     </properties>
 
diff --git a/hbase20xsqlwriter/src/main/java/com/alibaba/datax/plugin/writer/hbase20xsqlwriter/HBase20xSQLWriterTask.java b/hbase20xsqlwriter/src/main/java/com/alibaba/datax/plugin/writer/hbase20xsqlwriter/HBase20xSQLWriterTask.java
index 43f710b7..481e07df 100644
--- a/hbase20xsqlwriter/src/main/java/com/alibaba/datax/plugin/writer/hbase20xsqlwriter/HBase20xSQLWriterTask.java
+++ b/hbase20xsqlwriter/src/main/java/com/alibaba/datax/plugin/writer/hbase20xsqlwriter/HBase20xSQLWriterTask.java
@@ -6,12 +6,12 @@ import com.alibaba.datax.common.exception.DataXException;
 import com.alibaba.datax.common.plugin.RecordReceiver;
 import com.alibaba.datax.common.plugin.TaskPluginCollector;
 import com.alibaba.datax.common.util.Configuration;
-import com.google.common.collect.Lists;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.math.BigDecimal;
 import java.sql.*;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -154,7 +154,7 @@ public class HBase20xSQLWriterTask {
      * 从接收器中获取每条记录，写入Phoenix
      */
     private void writeData(RecordReceiver lineReceiver) throws SQLException {
-        List<Record> buffer = Lists.newArrayListWithExpectedSize(batchSize);
+        List<Record> buffer = new ArrayList<Record>(batchSize);
         Record record = null;
         while ((record = lineReceiver.getFromReader()) != null) {
             // 校验列数量是否符合预期