Rewrite in Scala

flink-extended · Jun 30, 2024 · ae48527 · ae48527
1 parent 17a5d6d
commit ae48527
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/...a/org/apache/flink/streaming/util/typeutils/DefaultScalaProductFieldAccessorFactory.scala b/...a/org/apache/flink/streaming/util/typeutils/DefaultScalaProductFieldAccessorFactory.scala
@@ -35,11 +35,7 @@ class DefaultScalaProductFieldAccessorFactory extends ScalaProductFieldAccessorF
 
     if (pos < 0 || pos >= arity)
       throw new CompositeType.InvalidFieldReferenceException(
-<<<<<<< HEAD
-        s"Tried to select $pos. field on \"$typeInfo\", which is an invalid index."
-=======
         s"""Tried to select $pos. field on "$typeInfo", which is an invalid index."""
->>>>>>> d5aec93 (Rewrite in Scala)
       )
 
     fieldType = typeInfo.asInstanceOf[TupleTypeInfoBase[T]].getTypeAt(pos)