This is an automated email from the ASF dual-hosted git repository.
monster pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/dev by this push:
new af44ac9d9 [Improve] workspace class Improvement (#1928)
af44ac9d9 is described below
commit af44ac9d9576f562eaf07163c7da58caa149f072
Author: benjobs <[email protected]>
AuthorDate: Mon Oct 31 09:35:49 2022 +0800
[Improve] workspace class Improvement (#1928)
---
.../apache/streampark/common/conf/Workspace.scala | 59 ++++++++++++----------
.../console/core/entity/Application.java | 2 +-
.../streampark/console/core/entity/Project.java | 4 +-
.../console/core/runner/EnvInitializer.java | 4 +-
.../core/service/impl/ProjectServiceImpl.java | 2 +-
.../streampark/flink/packer/maven/MavenTool.scala | 2 +-
6 files changed, 38 insertions(+), 35 deletions(-)
diff --git
a/streampark-common/src/main/scala/org/apache/streampark/common/conf/Workspace.scala
b/streampark-common/src/main/scala/org/apache/streampark/common/conf/Workspace.scala
index d8b918e26..8206a2c6a 100644
---
a/streampark-common/src/main/scala/org/apache/streampark/common/conf/Workspace.scala
+++
b/streampark-common/src/main/scala/org/apache/streampark/common/conf/Workspace.scala
@@ -24,11 +24,39 @@ import java.net.URI
object Workspace {
+ def of(storageType: StorageType): Workspace = Workspace(storageType)
+
lazy val local: Workspace = Workspace.of(StorageType.LFS)
lazy val remote: Workspace = Workspace.of(StorageType.HDFS)
- def of(storageType: StorageType): Workspace = Workspace(storageType)
+
+ private[this] lazy val localWorkspace = local.WORKSPACE
+
+ /**
+ * local build path
+ */
+ lazy val APP_LOCAL_DIST = s"$localWorkspace/dist"
+
+ /**
+ * dirPath of the maven local repository with built-in compilation process
+ */
+ lazy val MAVEN_LOCAL_DIR = s"$localWorkspace/mvnrepo"
+
+ /**
+ * local sourceCode dir.(for git...)
+ */
+ lazy val PROJECT_LOCAL_DIR = s"$localWorkspace/project"
+
+ /**
+ * local log dir.
+ */
+ lazy val LOG_LOCAL_DIR = s"$localWorkspace/logs"
+
+ /**
+ * project build log dir.
+ */
+ lazy val PROJECT_BUILD_LOG_DIR = s"$LOG_LOCAL_DIR/build_logs"
}
@@ -46,7 +74,7 @@ case class Workspace(storageType: StorageType) {
}
}
- lazy val WORKSPACE: String = {
+ private[conf] lazy val WORKSPACE: String = {
storageType match {
case StorageType.LFS =>
val path: String =
getConfigValue[String](CommonConfig.STREAMPARK_WORKSPACE_LOCAL)
@@ -78,7 +106,7 @@ case class Workspace(storageType: StorageType) {
lazy val APP_CLIENT = s"$WORKSPACE/client"
/**
- * store flink multi version jars
+ * store flink multi version support jars
*/
lazy val APP_SHIMS = s"$WORKSPACE/shims"
@@ -90,11 +118,6 @@ case class Workspace(storageType: StorageType) {
lazy val APP_BACKUPS = s"$WORKSPACE/backups"
- /**
- * local build path
- */
- lazy val APP_LOCAL_DIST = s"$WORKSPACE/dist"
-
lazy val APP_SAVEPOINTS = s"$WORKSPACE/savepoints"
/**
@@ -102,25 +125,5 @@ case class Workspace(storageType: StorageType) {
*/
lazy val APP_JARS = s"$WORKSPACE/jars"
- /**
- * dirpath of the maven local repository with built-in compilation process
- */
- lazy val MAVEN_LOCAL_DIR = s"${Workspace.local.WORKSPACE}/mvnrepo"
-
- /**
- * local sourceCode dir.(for git...)
- */
- lazy val PROJECT_LOCAL_DIR = s"${Workspace.local.WORKSPACE}/project"
-
- /**
- * local log dir.
- */
- lazy val LOG_LOCAL_DIR = s"${Workspace.local.WORKSPACE}/logs"
-
- /**
- * project build log dir.
- */
- lazy val PROJECT_BUILD_LOG_DIR = s"$LOG_LOCAL_DIR/build_logs"
-
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Application.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Application.java
index e2fd6ebe3..65683de8b 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Application.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Application.java
@@ -419,7 +419,7 @@ public class Application implements Serializable {
@JsonIgnore
public String getDistHome() {
String path = String.format("%s/%s/%s",
- Workspace.local().APP_LOCAL_DIST(),
+ Workspace.APP_LOCAL_DIST(),
projectId.toString(),
getModule()
);
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Project.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Project.java
index 98c72b55c..99afed078 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Project.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Project.java
@@ -113,7 +113,7 @@ public class Project implements Serializable {
@JsonIgnore
public File getAppSource() {
if (appSource == null) {
- appSource = Workspace.local().PROJECT_LOCAL_DIR();
+ appSource = Workspace.PROJECT_LOCAL_DIR();
}
File sourcePath = new File(appSource);
if (!sourcePath.exists()) {
@@ -131,7 +131,7 @@ public class Project implements Serializable {
@JsonIgnore
public File getDistHome() {
- return new File(Workspace.local().APP_LOCAL_DIST(), id.toString());
+ return new File(Workspace.APP_LOCAL_DIST(), id.toString());
}
@JsonIgnore
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/runner/EnvInitializer.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/runner/EnvInitializer.java
index cf3eef7a0..139da7aed 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/runner/EnvInitializer.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/runner/EnvInitializer.java
@@ -143,7 +143,7 @@ public class EnvInitializer implements ApplicationRunner {
// 1. prepare workspace dir
if (storageType.equals(LFS)) {
- String localDist = workspace.APP_LOCAL_DIST();
+ String localDist = Workspace.APP_LOCAL_DIST();
if (!fsOperator.exists(localDist)) {
log.info(mkdirLog, localDist);
fsOperator.mkdirs(localDist);
@@ -231,7 +231,7 @@ public class EnvInitializer implements ApplicationRunner {
// 2.4) create maven local repository dir
- String localMavenRepo = workspace.MAVEN_LOCAL_DIR();
+ String localMavenRepo = Workspace.MAVEN_LOCAL_DIR();
if (FsOperator.lfs().exists(localMavenRepo)) {
FsOperator.lfs().mkdirs(localMavenRepo);
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ProjectServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ProjectServiceImpl.java
index d1e6f45bb..aa347e44b 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ProjectServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ProjectServiceImpl.java
@@ -322,7 +322,7 @@ public class ProjectServiceImpl extends
ServiceImpl<ProjectMapper, Project>
}
private String getBuildLogPath(Long projectId) {
- return String.format("%s/%s/build.log",
Workspace.local().PROJECT_BUILD_LOG_DIR(), projectId);
+ return String.format("%s/%s/build.log",
Workspace.PROJECT_BUILD_LOG_DIR(), projectId);
}
}
diff --git
a/streampark-flink/streampark-flink-packer/src/main/scala/org/apache/streampark/flink/packer/maven/MavenTool.scala
b/streampark-flink/streampark-flink-packer/src/main/scala/org/apache/streampark/flink/packer/maven/MavenTool.scala
index 6bf910b0d..fc99e98fc 100644
---
a/streampark-flink/streampark-flink-packer/src/main/scala/org/apache/streampark/flink/packer/maven/MavenTool.scala
+++
b/streampark-flink/streampark-flink-packer/src/main/scala/org/apache/streampark/flink/packer/maven/MavenTool.scala
@@ -187,7 +187,7 @@ object MavenTool extends Logger {
/**
* default maven local repository
*/
- lazy val localRepo = new LocalRepository(Workspace.local.MAVEN_LOCAL_DIR)
+ lazy val localRepo = new LocalRepository(Workspace.MAVEN_LOCAL_DIR)
def newRepoSystem(): RepositorySystem = {
