This is an automated email from the ASF dual-hosted git repository. benjobs pushed a commit to branch improve in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
commit 8e7eb53f48810430aeed62528df31ec81762f960 Author: benjobs <[email protected]> AuthorDate: Sat Jul 8 18:49:53 2023 +0800 minor improvement --- .../scala/org/apache/streampark/common/conf/ConfigConst.scala | 11 +---------- .../scala/org/apache/streampark/common/util/FileUtils.scala | 2 +- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/streampark-common/src/main/scala/org/apache/streampark/common/conf/ConfigConst.scala b/streampark-common/src/main/scala/org/apache/streampark/common/conf/ConfigConst.scala index ac2761de7..6be8accb2 100644 --- a/streampark-common/src/main/scala/org/apache/streampark/common/conf/ConfigConst.scala +++ b/streampark-common/src/main/scala/org/apache/streampark/common/conf/ConfigConst.scala @@ -69,8 +69,6 @@ object ConfigConst { val KEY_SECURITY_KERBEROS_KRB5_CONF = "security.kerberos.login.krb5" - val KEY_JAVA_SECURITY_KRB5_CONF = "java.security.krb5.conf" - // spark val KEY_SPARK_MAIN_CLASS = "spark.main.class" @@ -172,18 +170,11 @@ object ConfigConst { val KEY_HBASE_AUTH_USER = "hbase.auth.user" - val DEFAULT_HBASE_WRITE_SIZE = 1024 * 1024 * 10 + val DEFAULT_HBASE_WRITE_SIZE: Int = 1024 * 1024 * 10 /** about influx */ val INFLUX_PREFIX = "influx." - val KEY_INFLUX_ACTIONS = "actions" - - val KEY_INFLUX_FLUSH_DURATION = "flush.duration" - - /** flink config key */ - val KEY_FLINK_APPLICATION_ARGS = "$internal.application.program-args" - val KEY_FLINK_APPLICATION_MAIN_CLASS = "$internal.application.main" val KEY_FLINK_JM_PROCESS_MEMORY = "jobmanager.memory.process.size" diff --git a/streampark-common/src/main/scala/org/apache/streampark/common/util/FileUtils.scala b/streampark-common/src/main/scala/org/apache/streampark/common/util/FileUtils.scala index b2be8dca2..719715e22 100644 --- a/streampark-common/src/main/scala/org/apache/streampark/common/util/FileUtils.scala +++ b/streampark-common/src/main/scala/org/apache/streampark/common/util/FileUtils.scala @@ -80,7 +80,7 @@ object FileUtils { } def getPathFromEnv(env: String): String = { - val path = System.getenv(env) + val path = Option(System.getenv(env)).getOrElse(System.getProperty(env)) require( Utils.notEmpty(path), s"[StreamPark] FileUtils.getPathFromEnv: $env is not set on system env")
