Skip to content

Commit 0fa237f

Browse files
committed
fix: update regexp UDFs to new CometUDF.evaluate(inputs, numRows) signature
PR #4306 added a numRows parameter to CometUDF.evaluate; merging main into this branch brought in the trait change but the six regexp UDF implementations still used the old single-argument signature, breaking comet-common compilation across all Spark profiles.
1 parent b55adb0 commit 0fa237f

6 files changed

Lines changed: 6 additions & 6 deletions

File tree

common/src/main/scala/org/apache/comet/udf/RegExpExtractAllUDF.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class RegExpExtractAllUDF extends CometUDF {
4646

4747
private val patternCache = new ConcurrentHashMap[String, Pattern]()
4848

49-
override def evaluate(inputs: Array[ValueVector]): ValueVector = {
49+
override def evaluate(inputs: Array[ValueVector], numRows: Int): ValueVector = {
5050
require(inputs.length == 3, s"RegExpExtractAllUDF expects 3 inputs, got ${inputs.length}")
5151
val subject = inputs(0).asInstanceOf[VarCharVector]
5252
val patternVec = inputs(1).asInstanceOf[VarCharVector]

common/src/main/scala/org/apache/comet/udf/RegExpExtractUDF.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class RegExpExtractUDF extends CometUDF {
4444

4545
private val patternCache = new ConcurrentHashMap[String, Pattern]()
4646

47-
override def evaluate(inputs: Array[ValueVector]): ValueVector = {
47+
override def evaluate(inputs: Array[ValueVector], numRows: Int): ValueVector = {
4848
require(inputs.length == 3, s"RegExpExtractUDF expects 3 inputs, got ${inputs.length}")
4949
val subject = inputs(0).asInstanceOf[VarCharVector]
5050
val patternVec = inputs(1).asInstanceOf[VarCharVector]

common/src/main/scala/org/apache/comet/udf/RegExpInStrUDF.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class RegExpInStrUDF extends CometUDF {
4444

4545
private val patternCache = new ConcurrentHashMap[String, Pattern]()
4646

47-
override def evaluate(inputs: Array[ValueVector]): ValueVector = {
47+
override def evaluate(inputs: Array[ValueVector], numRows: Int): ValueVector = {
4848
require(inputs.length == 3, s"RegExpInStrUDF expects 3 inputs, got ${inputs.length}")
4949
val subject = inputs(0).asInstanceOf[VarCharVector]
5050
val patternVec = inputs(1).asInstanceOf[VarCharVector]

common/src/main/scala/org/apache/comet/udf/RegExpLikeUDF.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class RegExpLikeUDF extends CometUDF {
4040

4141
private val patternCache = new ConcurrentHashMap[String, Pattern]()
4242

43-
override def evaluate(inputs: Array[ValueVector]): ValueVector = {
43+
override def evaluate(inputs: Array[ValueVector], numRows: Int): ValueVector = {
4444
require(inputs.length == 2, s"RegExpLikeUDF expects 2 inputs, got ${inputs.length}")
4545
val subject = inputs(0).asInstanceOf[VarCharVector]
4646
val patternVec = inputs(1).asInstanceOf[VarCharVector]

common/src/main/scala/org/apache/comet/udf/RegExpReplaceUDF.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class RegExpReplaceUDF extends CometUDF {
4343

4444
private val patternCache = new ConcurrentHashMap[String, Pattern]()
4545

46-
override def evaluate(inputs: Array[ValueVector]): ValueVector = {
46+
override def evaluate(inputs: Array[ValueVector], numRows: Int): ValueVector = {
4747
require(inputs.length == 3, s"RegExpReplaceUDF expects 3 inputs, got ${inputs.length}")
4848
val subject = inputs(0).asInstanceOf[VarCharVector]
4949
val patternVec = inputs(1).asInstanceOf[VarCharVector]

common/src/main/scala/org/apache/comet/udf/StringSplitUDF.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class StringSplitUDF extends CometUDF {
4646

4747
private val patternCache = new ConcurrentHashMap[String, Pattern]()
4848

49-
override def evaluate(inputs: Array[ValueVector]): ValueVector = {
49+
override def evaluate(inputs: Array[ValueVector], numRows: Int): ValueVector = {
5050
require(inputs.length == 3, s"StringSplitUDF expects 3 inputs, got ${inputs.length}")
5151
val subject = inputs(0).asInstanceOf[VarCharVector]
5252
val patternVec = inputs(1).asInstanceOf[VarCharVector]

0 commit comments

Comments
 (0)