flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From twal...@apache.org
Subject flink git commit: [FLINK-8136] [table] Fix code generation with JodaTime shading
Date Wed, 22 Nov 2017 17:19:36 GMT
Repository: flink
Updated Branches:
  refs/heads/master 775459d1a -> 5017c679c


[FLINK-8136] [table] Fix code generation with JodaTime shading

This closes #5054.


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/5017c679
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/5017c679
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/5017c679

Branch: refs/heads/master
Commit: 5017c679c06de92bec6b094268d61ce5f3109b9e
Parents: 775459d
Author: twalthr <twalthr@apache.org>
Authored: Wed Nov 22 17:43:08 2017 +0100
Committer: twalthr <twalthr@apache.org>
Committed: Wed Nov 22 18:13:21 2017 +0100

----------------------------------------------------------------------
 .../main/scala/org/apache/flink/table/codegen/CodeGenerator.scala | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/5017c679/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/CodeGenerator.scala
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/CodeGenerator.scala
b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/CodeGenerator.scala
index 91fb619..d15c973 100644
--- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/CodeGenerator.scala
+++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/codegen/CodeGenerator.scala
@@ -44,6 +44,7 @@ import org.apache.flink.table.functions.utils.UserDefinedFunctionUtils
 import org.apache.flink.table.typeutils.TimeIndicatorTypeInfo
 import org.apache.flink.table.functions.{FunctionContext, UserDefinedFunction}
 import org.apache.flink.table.typeutils.TypeCheckUtils._
+import org.joda.time.format.DateTimeFormatter
 
 import scala.collection.JavaConversions._
 import scala.collection.mutable
@@ -1467,7 +1468,7 @@ abstract class CodeGenerator(
 
     val field =
       s"""
-         |final org.joda.time.format.DateTimeFormatter $fieldTerm;
+         |final ${classOf[DateTimeFormatter].getCanonicalName} $fieldTerm;
          |""".stripMargin
     reusableMemberStatements.add(field)
 


Mime
View raw message