Fix after merge conflicts with main.

mbutrovich · mbutrovich · commit 257f163b23a8 · 2025-10-06T17:19:45.000-04:00
diff --git a/spark/src/main/scala/org/apache/comet/CometExecIterator.scala b/spark/src/main/scala/org/apache/comet/CometExecIterator.scala
@@ -143,7 +143,7 @@ class CometExecIterator(
       debug = COMET_DEBUG_ENABLED.get(),
       explain = COMET_EXPLAIN_NATIVE_ENABLED.get(),
       tracingEnabled,
-      maxTempDirectorySize = CometConf.COMET_MAX_TEMP_DIRECTORY_SIZE.get()),
+      maxTempDirectorySize = CometConf.COMET_MAX_TEMP_DIRECTORY_SIZE.get(),
       keyUnwrapper)
   }
 

Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ class CometExecIterator(`
`143`	`143`	`debug = COMET_DEBUG_ENABLED.get(),`
`144`	`144`	`explain = COMET_EXPLAIN_NATIVE_ENABLED.get(),`
`145`	`145`	`tracingEnabled,`
`146`		`- maxTempDirectorySize = CometConf.COMET_MAX_TEMP_DIRECTORY_SIZE.get()),`
	`146`	`+ maxTempDirectorySize = CometConf.COMET_MAX_TEMP_DIRECTORY_SIZE.get(),`
`147`	`147`	`keyUnwrapper)`
`148`	`148`	`}`
`149`	`149`