This is an automated email from the ASF dual-hosted git repository. peacewong pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/linkis.git
commit 7ec5ca74ca16a31d4cd66c1393573683008b4f8b Author: peacewong <[email protected]> AuthorDate: Tue Mar 19 21:56:19 2024 +0800 add run_last_mon variable --- .../src/main/scala/org/apache/linkis/common/utils/Utils.scala | 4 +++- .../scala/org/apache/linkis/common/utils/VariableUtils.scala | 4 ++++ .../linkis-common/src/test/resources/linkis.properties | 4 +++- .../org/apache/linkis/common/conf/ConfigurationTest.scala | 7 +++++++ .../org/apache/linkis/common/utils/VariableUtilsTest.scala | 10 ++++++++++ 5 files changed, 27 insertions(+), 2 deletions(-) diff --git a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/utils/Utils.scala b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/utils/Utils.scala index 80e3ff7e5e..deac2f2464 100644 --- a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/utils/Utils.scala +++ b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/utils/Utils.scala @@ -43,6 +43,8 @@ import org.slf4j.Logger object Utils extends Logging { + val DEFAULE_SCHEDULER_THREAD_NAME_PREFIX = "Linkis-Default-Scheduler-Thread-" + def tryQuietly[T](tryOp: => T): T = tryQuietly(tryOp, _ => ()) def tryCatch[T](tryOp: => T)(catchOp: Throwable => T): T = { @@ -199,7 +201,7 @@ object Utils extends Logging { val defaultScheduler: ScheduledThreadPoolExecutor = { val scheduler = - new ScheduledThreadPoolExecutor(20, threadFactory("Linkis-Default-Scheduler-Thread-", true)) + new ScheduledThreadPoolExecutor(20, threadFactory(DEFAULE_SCHEDULER_THREAD_NAME_PREFIX, true)) scheduler.setMaximumPoolSize(20) scheduler.setKeepAliveTime(5, TimeUnit.MINUTES) scheduler diff --git a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/utils/VariableUtils.scala b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/utils/VariableUtils.scala index 6c5bd7cf3c..c79a169b4b 100644 --- a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/utils/VariableUtils.scala +++ b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/utils/VariableUtils.scala @@ -265,6 +265,10 @@ object VariableUtils extends Logging { nameAndType("run_today_h_std") = HourType( new CustomHourType(nameAndType(RUN_TODAY_H).asInstanceOf[HourType].getValue, true) ) + // calculate run_last_mon base on run_today + val run_roday_mon = new CustomMonType(getMonthDay(false, run_today.getDate), false) + nameAndType("run_last_mon_now") = MonType(new CustomMonType(run_roday_mon - 1, false, false)) + nameAndType("run_last_mon_now_std") = MonType(new CustomMonType(run_roday_mon - 1, true, false)) } /** diff --git a/linkis-commons/linkis-common/src/test/resources/linkis.properties b/linkis-commons/linkis-common/src/test/resources/linkis.properties index 230ad85a4e..d6e47523f2 100644 --- a/linkis-commons/linkis-common/src/test/resources/linkis.properties +++ b/linkis-commons/linkis-common/src/test/resources/linkis.properties @@ -13,4 +13,6 @@ # limitations under the License. # -linkis.jobhistory.error.msg.tip=properties支持中文 \ No newline at end of file +linkis.jobhistory.error.msg.tip=properties支持中文 +linkis.test.error.conf=123 +linkis.test.error.conf2= 456 \ No newline at end of file diff --git a/linkis-commons/linkis-common/src/test/scala/org/apache/linkis/common/conf/ConfigurationTest.scala b/linkis-commons/linkis-common/src/test/scala/org/apache/linkis/common/conf/ConfigurationTest.scala index ee1102c91c..33c8229a4b 100644 --- a/linkis-commons/linkis-common/src/test/scala/org/apache/linkis/common/conf/ConfigurationTest.scala +++ b/linkis-commons/linkis-common/src/test/scala/org/apache/linkis/common/conf/ConfigurationTest.scala @@ -27,4 +27,11 @@ class ConfigurationTest { Assertions.assertFalse(Configuration.isAdmin("HaDooop")) } + @Test private[conf] def testFormatValue(): Unit = { + val confvalue = CommonVars[Int]("linkis.test.error.conf", 456).getValue + val confvalue2 = CommonVars[Int]("linkis.test.error.conf2", 789).getValue + Assertions.assertTrue(123 == confvalue) + Assertions.assertTrue(456 == confvalue2) + } + } diff --git a/linkis-commons/linkis-common/src/test/scala/org/apache/linkis/common/utils/VariableUtilsTest.scala b/linkis-commons/linkis-common/src/test/scala/org/apache/linkis/common/utils/VariableUtilsTest.scala index e7a105497c..892731e0d5 100644 --- a/linkis-commons/linkis-common/src/test/scala/org/apache/linkis/common/utils/VariableUtilsTest.scala +++ b/linkis-commons/linkis-common/src/test/scala/org/apache/linkis/common/utils/VariableUtilsTest.scala @@ -42,6 +42,10 @@ class VariableUtilsTest { |'${run_half_year_begin-1}' as run_half_year_begin_sub1, |'${run_half_year_begin_std}' as run_half_year_begin_std, |'${run_half_year_end}' as run_half_year_end, + |'${run_last_mon_now}' as run_last_mon_now, + |'${run_last_mon_now_std}' as run_last_mon_now_std, + |'${submit_user}' as submit_user, + |'${execute_user}' as execute_user, |'${run_today_h+12}' as run_today_h_add1""".stripMargin val run_date = new CustomDateType(run_date_str, false) val dateType = DateType(run_date) @@ -59,9 +63,15 @@ class VariableUtilsTest { |'20190701' as run_half_year_begin_sub1, |'2020-01-01' as run_half_year_begin_std, |'20200630' as run_half_year_end, + |'202001' as run_last_mon_now, + |'2020-01' as run_last_mon_now_std, + |'hadoop' as submit_user, + |'hadoop' as execute_user, |'${hourTypeRes}' as run_today_h_add1""".stripMargin val varMap = new util.HashMap[String, String]() varMap.put("run_date", run_date_str) + varMap.put("execute_user", "hadoop") + varMap.put("submit_user", "hadoop") assertEquals(VariableUtils.replace(sql, "sql", varMap), resSql) } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
