Merge branch 'apache:master' into dev-1.7.0

linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/io/Fs.java

@@ -44,6 +44,8 @@ public interface Fs extends Closeable {
 
   boolean canRead(FsPath dest) throws IOException;
 
+  boolean canRead(FsPath dest, String user) throws IOException;
+
   boolean canWrite(FsPath dest) throws IOException;
 
   boolean exists(FsPath dest) throws IOException;

linkis-commons/linkis-storage/src/main/java/org/apache/linkis/storage/fs/impl/HDFSFileSystem.java

@@ -296,6 +296,11 @@ public boolean canRead(FsPath dest) throws IOException {
     return canAccess(dest, FsAction.READ);
   }
 
+  @Override
+  public boolean canRead(FsPath fsPath, String s) throws IOException {
+    return false;
+  }
+
   @Override
   public boolean canWrite(FsPath dest) throws IOException {
     return canAccess(dest, FsAction.WRITE);

linkis-commons/linkis-storage/src/main/java/org/apache/linkis/storage/fs/impl/LocalFileSystem.java

@@ -422,6 +422,11 @@ public boolean canRead(FsPath dest) throws IOException {
         PosixFilePermission.OTHERS_READ);
   }
 
+  @Override
+  public boolean canRead(FsPath fsPath, String s) throws IOException {
+    return false;
+  }
+
   @Override
   public boolean canWrite(FsPath dest) throws IOException {
     return can(

linkis-commons/linkis-storage/src/main/java/org/apache/linkis/storage/fs/impl/OSSFileSystem.java

@@ -286,6 +286,11 @@ public boolean canRead(FsPath dest) throws IOException {
     return true;
   }
 
+  @Override
+  public boolean canRead(FsPath fsPath, String s) throws IOException {
+    return false;
+  }
+
   @Override
   public boolean canWrite(FsPath dest) throws IOException {
     return true;

linkis-commons/linkis-storage/src/main/java/org/apache/linkis/storage/fs/impl/S3FileSystem.java

@@ -357,6 +357,11 @@ public boolean canRead(FsPath dest) {
     return true;
   }
 
+  @Override
+  public boolean canRead(FsPath fsPath, String s) throws IOException {
+    return false;
+  }
+
   @Override
   public boolean canWrite(FsPath dest) {
     return true;

linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/java/org/apache/linkis/manager/common/entity/resource/CPUResource.java

@@ -128,7 +128,7 @@ public int compare(Resource r) {
 
   @Override
   public String toJson() {
-    return String.format(" \"cpu\":%s ", cores);
+    return String.format(" {\"cpu\":%s} ", cores);
   }
 
   @Override

linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/java/org/apache/linkis/manager/common/entity/resource/LoadInstanceResource.java

@@ -170,7 +170,7 @@ public String toJson() {
   public String toString() {
     return String.format(
         "Number of instances(实例数)：%d，(RAM)内存：%s ,cpu: %s",
-        this.getInstances(), this.getMemory(), this.getCores());
+        this.getInstances(), ByteTimeUtils.bytesToString(this.getMemory()), this.getCores());
   }
 
   public long getMemory() {

linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/java/org/apache/linkis/manager/common/entity/resource/LoadResource.java

@@ -125,7 +125,7 @@ public int compare(Resource r) {
   @Override
   public String toJson() {
     return String.format(
-        "{\"memory\":%s,\"cpu\":%d}", ByteTimeUtils.bytesToString(this.memory), this.cores);
+        "{\"memory\":\"%s\",\"cpu\":%d}", ByteTimeUtils.bytesToString(this.memory), this.cores);
   }
 
   @Override

linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/java/org/apache/linkis/manager/common/entity/resource/MemoryResource.java

@@ -112,7 +112,7 @@ public boolean equalsTo(Resource resource) {
 
   @Override
   public String toJson() {
-    return " \"memory\":\"" + ByteTimeUtils.bytesToString(memory) + " ";
+    return " {\"memory\":\"" + ByteTimeUtils.bytesToString(memory) + "\"} ";
   }
 
   @Override

linkis-public-enhancements/linkis-bml/linkis-bml-server/pom.xml → linkis-public-enhancements/linkis-bml-server/pom.xml

@@ -21,7 +21,7 @@
     <groupId>org.apache.linkis</groupId>
     <artifactId>linkis</artifactId>
     <version>${revision}</version>
-    <relativePath>../../../pom.xml</relativePath>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
 
   <artifactId>linkis-bmlserver</artifactId>

linkis-public-enhancements/linkis-context-service/linkis-cs-server/pom.xml → linkis-public-enhancements/linkis-cs-server/pom.xml

@@ -21,7 +21,7 @@
     <groupId>org.apache.linkis</groupId>
     <artifactId>linkis</artifactId>
     <version>${revision}</version>
-    <relativePath>../../../pom.xml</relativePath>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
 
   <artifactId>linkis-cs-server</artifactId>