【1.1.15】fix decimal test code (#275)

* fix datatype decimal error * update datatype * opmitization code * opmitization code --------- Co-authored-by: huangKai-2323 <[email protected]>
WeDataSphere · Sep 4, 2023 · 21934fa · 21934fa
1 parent d553586
commit 21934fa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/linkis-commons/linkis-storage/src/main/scala/org/apache/linkis/storage/domain/DataType.scala b/linkis-commons/linkis-storage/src/main/scala/org/apache/linkis/storage/domain/DataType.scala
@@ -27,8 +27,7 @@ object DataType extends Logging {
 
   val LOWCASE_NULL_VALUE = "null"
 
-  val DECIMAL_REGEX = "^decimal\\(\\d*\\,\\d*\\)".r.unanchored
-  val DECIMAL_REGEX_BLANK = "^decimal\\(\\s*\\d*\\s*,\\s*\\d*\\s*\\)".r.unanchored
+  val DECIMAL_REGEX = "^decimal\\(\\s*\\d*\\s*,\\s*\\d*\\s*\\)".r.unanchored
 
   val SHORT_REGEX = "^short.*".r.unanchored
   val INT_REGEX = "^int.*".r.unanchored
@@ -63,7 +62,7 @@ object DataType extends Logging {
     case "date" => DateType
     case "timestamp" => TimestampType
     case "binary" => BinaryType
-    case "decimal" | DECIMAL_REGEX() | DECIMAL_REGEX_BLANK() => DecimalType
+    case "decimal" | DECIMAL_REGEX() => DecimalType
     case ARRAY_REGEX() => ArrayType
     case MAP_REGEX() => MapType
     case LIST_REGEX() => ListType

diff --git a/...commons/linkis-storage/src/test/scala/org/apache/linkis/storage/domain/DataTypeTest.scala b/...commons/linkis-storage/src/test/scala/org/apache/linkis/storage/domain/DataTypeTest.scala
@@ -71,9 +71,8 @@ class DataTypeTest {
   @Test
   @DisplayName("decimalTest")
   def decimalTest(): Unit = {
-    val dateType = DataType.toDataType("decimal")
-    val str = DataType.toValue(dateType, "decimal(10,8)")
-    Assertions.assertNotNull(str)
+    val dateType = DataType.toDataType("decimal(10, 8)")
+    Assertions.assertTrue(dateType.typeName.equals("decimal"))
   }
 
 }