You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by pe...@apache.org on 2022/07/11 04:34:50 UTC
[incubator-linkis] branch dev-1.2.0 updated: fix(linkis-bml): fix a test bug (#2457)
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.2.0
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.2.0 by this push:
new 4964cddb1 fix(linkis-bml): fix a test bug (#2457)
4964cddb1 is described below
commit 4964cddb1f76082a80eb0f4a58d09397c141d7f8
Author: Jack Xu <xu...@126.com>
AuthorDate: Mon Jul 11 12:34:45 2022 +0800
fix(linkis-bml): fix a test bug (#2457)
---
.../main/java/org/apache/linkis/common/io/FsPath.java | 2 +-
.../apache/linkis/storage/excel/ExcelStorageReader.java | 8 +++++---
.../java/org/apache/linkis/storage/excel/XlsUtils.java | 4 +++-
.../java/org/apache/linkis/storage/excel/XlsxUtils.java | 8 ++++----
.../apache/linkis/storage/fs/impl/LocalFileSystem.java | 2 +-
.../org/apache/linkis/storage/excel/ExcelXlsReader.java | 16 +++++++++++-----
.../linkis/entrance/EntranceWebSocketService.scala | 2 +-
.../apache/linkis/bml/common/VersionServiceImplTest.java | 10 ++++++++--
8 files changed, 34 insertions(+), 18 deletions(-)
diff --git a/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/io/FsPath.java b/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/io/FsPath.java
index 48bf8a6b9..6b29f6f1d 100644
--- a/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/io/FsPath.java
+++ b/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/io/FsPath.java
@@ -17,7 +17,7 @@
package org.apache.linkis.common.io;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import java.io.File;
import java.io.IOException;
diff --git a/linkis-commons/linkis-storage/src/main/java/org/apache/linkis/storage/excel/ExcelStorageReader.java b/linkis-commons/linkis-storage/src/main/java/org/apache/linkis/storage/excel/ExcelStorageReader.java
index fb5b722ed..6a1e8e454 100644
--- a/linkis-commons/linkis-storage/src/main/java/org/apache/linkis/storage/excel/ExcelStorageReader.java
+++ b/linkis-commons/linkis-storage/src/main/java/org/apache/linkis/storage/excel/ExcelStorageReader.java
@@ -30,7 +30,9 @@ public class ExcelStorageReader {
List<List<String>> res;
if (".xls".equalsIgnoreCase(suffix)) {
- if (in == null) in = new FileInputStream(file);
+ if (in == null) {
+ in = new FileInputStream(file);
+ }
res = XlsUtils.getBasicInfo(in);
} else {
res = XlsxUtils.getBasicInfo(in, file);
@@ -38,14 +40,14 @@ public class ExcelStorageReader {
if (res == null && res.size() < 2) {
throw new Exception("There is a problem with the file format(文件格式有问题)");
}
- List<String> headerType = new ArrayList<String>();
+ List<String> headerType = new ArrayList<>();
List<String> header = res.get(1);
if (hasHeader) {
for (int i = 0; i < header.size(); i++) {
headerType.add("string");
}
} else {
- List<String> headerNew = new ArrayList<String>();
+ List<String> headerNew = new ArrayList<>();
for (int i = 0; i < header.size(); i++) {
headerNew.add("col_" + (i + 1));
headerType.add("string");
diff --git a/linkis-commons/linkis-storage/src/main/java/org/apache/linkis/storage/excel/XlsUtils.java b/linkis-commons/linkis-storage/src/main/java/org/apache/linkis/storage/excel/XlsUtils.java
index eeac0d53c..7ae15b42e 100644
--- a/linkis-commons/linkis-storage/src/main/java/org/apache/linkis/storage/excel/XlsUtils.java
+++ b/linkis-commons/linkis-storage/src/main/java/org/apache/linkis/storage/excel/XlsUtils.java
@@ -73,7 +73,9 @@ public class XlsUtils {
LOG.error("Failed to excel to csv", e);
throw e;
} finally {
- if (out != null) out.close();
+ if (out != null) {
+ out.close();
+ }
xlsReader.close();
}
return hdfsPath;
diff --git a/linkis-commons/linkis-storage/src/main/java/org/apache/linkis/storage/excel/XlsxUtils.java b/linkis-commons/linkis-storage/src/main/java/org/apache/linkis/storage/excel/XlsxUtils.java
index 0f6ea7702..7320370c6 100644
--- a/linkis-commons/linkis-storage/src/main/java/org/apache/linkis/storage/excel/XlsxUtils.java
+++ b/linkis-commons/linkis-storage/src/main/java/org/apache/linkis/storage/excel/XlsxUtils.java
@@ -40,14 +40,14 @@ public class XlsxUtils {
if (inputStream != null) {
wb =
StreamingReader.builder()
- .rowCacheSize(
- 2) // number of rows to keep in memory (defaults to 10)
+ // number of rows to keep in memory (defaults to 10)
+ .rowCacheSize(2)
.open(inputStream);
} else {
wb =
StreamingReader.builder()
- .rowCacheSize(
- 2) // number of rows to keep in memory (defaults to 10)
+ // number of rows to keep in memory (defaults to 10)
+ .rowCacheSize(2)
.open(file);
}
List<String> sheetNames = new ArrayList<>();
diff --git a/linkis-commons/linkis-storage/src/main/java/org/apache/linkis/storage/fs/impl/LocalFileSystem.java b/linkis-commons/linkis-storage/src/main/java/org/apache/linkis/storage/fs/impl/LocalFileSystem.java
index a4fc1312e..f2e95503d 100644
--- a/linkis-commons/linkis-storage/src/main/java/org/apache/linkis/storage/fs/impl/LocalFileSystem.java
+++ b/linkis-commons/linkis-storage/src/main/java/org/apache/linkis/storage/fs/impl/LocalFileSystem.java
@@ -185,7 +185,7 @@ public class LocalFileSystem extends FileSystem {
public boolean canMkdir(FsPath destParentDir) throws IOException {
if (!StorageUtils.isIOProxy()) {
- LOG.debug("io not proxy, not check ownerer, just check if hava write permission ");
+ LOG.debug("io not proxy, not check owner, just check if have write permission ");
return this.canWrite(destParentDir);
} else {
LOG.info("io proxy, check owner ");
diff --git a/linkis-commons/linkis-storage/src/main/scala/org/apache/linkis/storage/excel/ExcelXlsReader.java b/linkis-commons/linkis-storage/src/main/scala/org/apache/linkis/storage/excel/ExcelXlsReader.java
index 3480866b8..aac0ff54a 100644
--- a/linkis-commons/linkis-storage/src/main/scala/org/apache/linkis/storage/excel/ExcelXlsReader.java
+++ b/linkis-commons/linkis-storage/src/main/scala/org/apache/linkis/storage/excel/ExcelXlsReader.java
@@ -122,6 +122,7 @@ public class ExcelXlsReader implements HSSFListener {
* HSSFListener listener method, processing Record
* HSSFListener 监听方法，处理 Record
*/
+ @Override
@SuppressWarnings("unchecked")
public void processRecord(Record record) {
int thisRow = -1;
@@ -267,10 +268,12 @@ public class ExcelXlsReader implements HSSFListener {
public void close() {
try {
- if (fs != null)
+ if (fs != null) {
fs.close();
- if (inputStream != null)
+ }
+ if (inputStream != null) {
inputStream.close();
+ }
} catch (Exception e) {
}
@@ -324,6 +327,7 @@ class FirstRowDeal implements IExcelRowDeal {
this.row = row;
}
+ @Override
public void dealRow(BoundSheetRecord[] orderedBSRs, int sheetIndex, int curRow, List<String> rowlist) {
for (BoundSheetRecord record : orderedBSRs) {
sheetNames.add(record.getSheetname());
@@ -347,21 +351,23 @@ class RowToCsvDeal implements IExcelRowDeal {
this.outputStream = outputStream;
}
+ @Override
public void dealRow(BoundSheetRecord[] orderedBSRs, int sheetIndex, int curRow, List<String> rowlist) {
String sheetName = orderedBSRs[sheetIndex].getSheetname();
if (sheetNames == null || sheetNames.isEmpty() || sheetNames.contains(sheetName)) {
if (! (curRow == 0 && hasHeader)) {
try {
- if(fisrtRow){
+ if (fisrtRow) {
fisrtRow = false;
- } else{
+ } else {
outputStream.write("\n".getBytes());
}
int len = rowlist.size();
for (int i = 0; i < len; i ++) {
outputStream.write(rowlist.get(i).replaceAll("\n|\t", " ").getBytes("utf-8"));
- if(i < len -1)
+ if (i < len -1) {
outputStream.write("\t".getBytes());
+ }
}
} catch (IOException e) {
throw new RuntimeException(e);
diff --git a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/EntranceWebSocketService.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/EntranceWebSocketService.scala
index 61860dc7b..496785cad 100644
--- a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/EntranceWebSocketService.scala
+++ b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/EntranceWebSocketService.scala
@@ -42,7 +42,7 @@ import org.apache.linkis.scheduler.queue.{Job, SchedulerEventState}
import org.apache.linkis.server._
import org.apache.linkis.server.conf.ServerConfiguration
import org.apache.linkis.server.socket.controller.{ServerEvent, ServerEventService, SocketServerEvent}
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
class EntranceWebSocketService extends ServerEventService with EntranceEventListener with EntranceLogListener {
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/common/VersionServiceImplTest.java b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/common/VersionServiceImplTest.java
index ce8355a54..51937dcdf 100644
--- a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/common/VersionServiceImplTest.java
+++ b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/common/VersionServiceImplTest.java
@@ -21,9 +21,11 @@ import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import java.io.File;
+import java.text.SimpleDateFormat;
+import java.util.Date;
import java.util.HashMap;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class VersionServiceImplTest {
@@ -31,6 +33,8 @@ public class VersionServiceImplTest {
@DisplayName("testCheckBmlResourceStoragePrefixPathIfChanged")
public void testUpdateVersion() {
String path = "hdfs:///data/linkis/linkis/20220609/b4fd8f59-9492-4a0f-a074-9ac573a69b60";
+ SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd");
+ String dateStr = format.format(new Date());
ResourceHelper hdfsResourceHelper = new HdfsResourceHelper();
String newPath =
hdfsResourceHelper.generatePath(
@@ -39,6 +43,8 @@ public class VersionServiceImplTest {
new HashMap<>());
assertEquals(
newPath,
- "hdfs:///apps-data/linkis/bml/20220710/b4fd8f59-9492-4a0f-a074-9ac573a69b60");
+ "hdfs:///apps-data/linkis/bml/"
+ + dateStr
+ + "/b4fd8f59-9492-4a0f-a074-9ac573a69b60");
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org