[incubator-doris] branch master updated: [Load] Fix broker load's file format npe bug (#2689)

[morningman]

This is an automated email from the ASF dual-hosted git repository.

morningman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git


The following commit(s) were added to refs/heads/master by this push:
     new 72fd745  [Load] Fix broker load's file format npe bug (#2689)
72fd745 is described below

commit 72fd74508607aab85be5f390579de4d7300383c8
Author: kangpinghuang <kphu...@163.com>
AuthorDate: Tue Jan 7 16:50:02 2020 +0800

    [Load] Fix broker load's file format npe bug (#2689)
---
 fe/src/main/java/org/apache/doris/planner/BrokerScanNode.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/fe/src/main/java/org/apache/doris/planner/BrokerScanNode.java 
b/fe/src/main/java/org/apache/doris/planner/BrokerScanNode.java
index ef7986d..710e535 100644
--- a/fe/src/main/java/org/apache/doris/planner/BrokerScanNode.java
+++ b/fe/src/main/java/org/apache/doris/planner/BrokerScanNode.java
@@ -400,10 +400,12 @@ public class BrokerScanNode extends LoadScanNode {
     }
 
     private TFileFormatType formatType(String fileFormat, String path) {
-        if (fileFormat != null && fileFormat.toLowerCase().equals("parquet")) {
-            return TFileFormatType.FORMAT_PARQUET;
-        } else if (fileFormat.toLowerCase().equals("orc")) {
-            return TFileFormatType.FORMAT_ORC;                  
+        if (fileFormat != null) {
+            if (fileFormat.toLowerCase().equals("parquet")) {
+                return TFileFormatType.FORMAT_PARQUET;
+            } else if (fileFormat.toLowerCase().equals("orc")) {
+                return TFileFormatType.FORMAT_ORC;
+            }
         }
 
         String lowerCasePath = path.toLowerCase();


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org