fix compile

Author: richardc-db

kernel/kernel-api/src/main/java/io/delta/kernel/Scan.java

@@ -200,7 +200,7 @@ public FilteredColumnarBatch next() {
                 // Transform physical variant columns (struct of binaries) into logical variant
                 // columns.
                 nextDataBatch = VariantUtils.withVariantColumns(
-                    tableClient.getExpressionHandler(),
+                    engine.getExpressionHandler(),
                     nextDataBatch
                 );
 

kernel/kernel-api/src/main/java/io/delta/kernel/internal/util/VariantUtils.java

@@ -18,9 +18,9 @@
 
 import java.util.Arrays;
 
-import io.delta.kernel.client.ExpressionHandler;
 import io.delta.kernel.data.ColumnVector;
 import io.delta.kernel.data.ColumnarBatch;
+import io.delta.kernel.engine.ExpressionHandler;
 import io.delta.kernel.expressions.*;
 import io.delta.kernel.types.*;
 

kernel/kernel-defaults/src/main/java/io/delta/kernel/defaults/internal/expressions/DefaultExpressionEvaluator.java

@@ -294,6 +294,7 @@ ExpressionTransformResult visitLike(final Predicate like) {
                         children.stream().map(e -> e.outputType).collect(toList()));
 
             return new ExpressionTransformResult(transformedExpression, BooleanType.BOOLEAN);
+        }
 
         ExpressionTransformResult visitVariantCoalesce(ScalarExpression variantCoalesce) {
             checkArgument(

kernel/kernel-defaults/src/test/scala/io/delta/kernel/defaults/DeltaTableWritesSuite.scala

@@ -508,7 +508,7 @@ class DeltaTableWritesSuite extends DeltaTableWriteSuiteBase with ParquetSuiteBa
       val parquetAllTypes = goldenTablePath("parquet-all-types")
       val schema = removeUnsupportedTypes(tableSchema(parquetAllTypes))
 
-      val data = readTableUsingKernel(engine, parquetAllTypes, schema).to[Seq]
+      val data = readTableUsingKernel(engine, parquetAllTypes, schema).toSeq
       val dataWithPartInfo = Seq(Map.empty[String, Literal] -> data)
 
       appendData(engine, tblPath, isNewTable = true, schema, Seq.empty, dataWithPartInfo)
@@ -551,7 +551,7 @@ class DeltaTableWritesSuite extends DeltaTableWriteSuiteBase with ParquetSuiteBa
         "timestampType"
       )
       val casePreservingPartCols =
-        casePreservingPartitionColNames(schema, partCols.asJava).asScala.to[Seq]
+        casePreservingPartitionColNames(schema, partCols.asJava).asScala.toSeq
 
       // get the partition values from the data batch at the given rowId
       def getPartitionValues(batch: ColumnarBatch, rowId: Int): Map[String, Literal] = {
@@ -584,7 +584,7 @@ class DeltaTableWritesSuite extends DeltaTableWriteSuiteBase with ParquetSuiteBa
         }.toMap
       }
 
-      val data = readTableUsingKernel(engine, parquetAllTypes, schema).to[Seq]
+      val data = readTableUsingKernel(engine, parquetAllTypes, schema).toSeq
 
       // From the above table read data, convert each row as a new batch with partition info
       // Take the values of the partitionCols from the data and create a new batch with the

kernel/kernel-defaults/src/test/scala/io/delta/kernel/defaults/ScanSuite.scala

@@ -35,7 +35,7 @@ import org.scalatest.funsuite.AnyFunSuite
 import io.delta.kernel.Scan
 import io.delta.kernel.data.{ColumnarBatch, ColumnVector, FilteredColumnarBatch, Row}
 import io.delta.kernel.defaults.utils.TestRow
-import io.delta.kernel.engine.{JsonHandler, ParquetHandler, TableClient}
+import io.delta.kernel.engine.{Engine, JsonHandler, ParquetHandler}
 import io.delta.kernel.expressions.{AlwaysFalse, AlwaysTrue, And, Column, Or, Predicate, ScalarExpression}
 import io.delta.kernel.expressions.Literal._
 import io.delta.kernel.types.StructType
@@ -1611,11 +1611,11 @@ class ScanSuite extends AnyFunSuite with TestUtils with ExpressionTestUtils with
         val kernelSchema = tableSchema(path)
 
         val snapshot = latestSnapshot(path)
-        val scan = snapshot.getScanBuilder(defaultTableClient).build()
-        val scanState = scan.getScanState(defaultTableClient)
+        val scan = snapshot.getScanBuilder(defaultEngine).build()
+        val scanState = scan.getScanState(defaultEngine)
         val physicalReadSchema =
-          ScanStateRow.getPhysicalDataReadSchema(defaultTableClient, scanState)
-        val scanFilesIter = scan.getScanFiles(defaultTableClient)
+          ScanStateRow.getPhysicalDataReadSchema(defaultEngine, scanState)
+        val scanFilesIter = scan.getScanFiles(defaultEngine)
 
         val readRows = ArrayBuffer[Row]()
         while (scanFilesIter.hasNext()) {
@@ -1625,13 +1625,13 @@ class ScanSuite extends AnyFunSuite with TestUtils with ExpressionTestUtils with
             val scanFileRow = scanFileRows.next()
             val fileStatus = InternalScanFileUtils.getAddFileStatus(scanFileRow)
 
-            val physicalDataIter = defaultTableClient.getParquetHandler.readParquetFiles(
+            val physicalDataIter = defaultEngine.getParquetHandler.readParquetFiles(
               singletonCloseableIterator(fileStatus),
               physicalReadSchema,
               Optional.empty())
 
             val transformedRowsIter = Scan.transformPhysicalData(
-              defaultTableClient,
+              defaultEngine,
               scanState,
               scanFileRow,
               physicalDataIter