Merge pull request running-elephant#174 from scottsut/master

chore: alpha.2 release

Author: tianlu-root

.gitignore

@@ -0,0 +1,6 @@
+.idea
+
+/static
+
+*.iml
+*.zip

Dockerfile

@@ -4,6 +4,8 @@ RUN mkdir /datart
 COPY ./bin/* /datart/bin/
 COPY ./config/* /datart/config/
 COPY ./lib/* /datart/lib/
+COPY static /datart/static
+ENV TZ=Asia/Shanghai
 EXPOSE 58080
 WORKDIR /datart
 ENTRYPOINT java -cp "lib/*" datart.DatartServerApplication

bin/migrations/source.1.0.0-alpha.2.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `source`
+DROP INDEX `prj_name`;

config/jdbc-driver-ext.yml

@@ -9,7 +9,7 @@
 IMPALA:
   db-type: "impala"
   name: "impala"
-  driver-class: "com.mysql.cj.jdbc.Driver"
+  driver-class: "com.cloudera.impala.jdbc41.Driver"
   literal-quote: "'"
   identifier-quote: "`"
   adapter-class: "datart.data.provider.jdbc.adapters.ImpalaDataProviderAdapter"

core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>datart-parent</artifactId>
         <groupId>datart</groupId>
-        <version>1.0.0-alpha.1</version>
+        <version>1.0.0-alpha.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

core/src/main/java/datart/core/base/PageInfo.java

@@ -32,6 +32,8 @@ public class PageInfo implements Serializable {
 
     private long total;
 
+    private boolean countTotal;
+
     @Override
     public String toString() {
         return "PageInfo{" +

core/src/main/java/datart/core/base/consts/ValueType.java

@@ -16,4 +16,5 @@ public enum ValueType {
 
     SNIPPET, //will be parse to sql node
 
+    KEYWORD,
 }

core/src/main/java/datart/core/common/CSVParser.java

@@ -21,6 +21,7 @@
 import datart.core.base.consts.ValueType;
 import datart.core.base.exception.BaseException;
 import lombok.Data;
+import org.apache.commons.lang.math.NumberUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.util.CollectionUtils;
 
@@ -95,11 +96,9 @@ private ValueType[] inferDataType(String line) {
         String[] split = line.split(CSV_SPLIT);
         ValueType[] valueTypes = new ValueType[split.length];
         for (int i = 0; i < split.length; i++) {
-            try {
-                Double.parseDouble(split[i]);
+            if (NumberUtils.isNumber(split[i])) {
                 valueTypes[i] = ValueType.NUMERIC;
                 continue;
-            } catch (Exception ignore) {
             }
             try {
                 simpleDateFormat.parse(split[i]);
@@ -115,7 +114,7 @@ private ValueType[] inferDataType(String line) {
     private List<Object> extractValues(String line) {
         try {
             if (StringUtils.isEmpty(line)) {
-                return Collections.EMPTY_LIST;
+                return Collections.emptyList();
             }
             LinkedList<Object> values = new LinkedList<>();
             String[] split = line.split(CSV_SPLIT);
@@ -142,7 +141,11 @@ private Object parseValue(String val, ValueType valueType) throws ParseException
             case DATE:
                 return simpleDateFormat.parse(val);
             case NUMERIC:
-                return Double.parseDouble(val);
+                if (NumberUtils.isDigits(val)) {
+                    return Long.parseLong(val);
+                } else {
+                    return Double.parseDouble(val);
+                }
             default:
                 return val;
         }

core/src/main/java/datart/core/common/FileUtils.java

@@ -21,10 +21,8 @@
 import org.apache.commons.lang3.StringUtils;
 
 import java.io.File;
-import java.io.FileFilter;
 import java.util.Collections;
 import java.util.LinkedHashSet;
-import java.util.LinkedList;
 import java.util.Set;
 
 public class FileUtils {
@@ -92,6 +90,4 @@ public static Set<String> walkDir(File file, String extension, boolean recursion
             return names;
         }
     }
-
-
 }

core/src/main/java/datart/core/common/POIUtils.java

@@ -108,20 +108,26 @@ public static List<List<Object>> loadExcel(String path) throws IOException {
             // 只处理第一个sheet
             Sheet sheet = workbook.getSheetAt(0);
             Iterator<Row> rowIterator = sheet.rowIterator();
+            Row row0 = sheet.getRow(0);
+            if (row0 == null) {
+                throw new RuntimeException("excel is empty");
+            }
+            int columns = row0.getPhysicalNumberOfCells();
             while (rowIterator.hasNext()) {
                 Row row = rowIterator.next();
-                Iterator<Cell> iterator = row.iterator();
                 LinkedList<Object> cellValues = new LinkedList<>();
+                for (int i = 0; i < columns; i++)
+                    cellValues.add(readCellValue(row.getCell(i)));
                 rows.add(cellValues);
-                while (iterator.hasNext()) {
-                    cellValues.add(readCellValue(iterator.next()));
-                }
             }
         }
         return rows;
     }
 
     private static Object readCellValue(Cell cell) {
+        if (cell == null) {
+            return null;
+        }
         switch (cell.getCellType()) {
             case NUMERIC:
                 return cell.getNumericCellValue();
@@ -132,5 +138,4 @@ private static Object readCellValue(Cell cell) {
         }
     }
 
-
 }