From 1df5ded433eced3bbb66137bc741e616beab9a70 Mon Sep 17 00:00:00 2001 From: Sivabalan Narayanan Date: Wed, 4 Aug 2021 19:08:50 -0400 Subject: [PATCH] [HUDI-2273] Migrating some long running tests to functional test profile (#3398) --- .../cli/integ/ITTestBootstrapCommand.java | 2 +- .../SparkClientFunctionalTestSuite.java | 32 +++++++++++++++++++ .../functional}/TestHoodieBackedMetadata.java | 15 +++++++-- .../TestHoodieClientOnCopyOnWriteStorage.java | 13 ++++++-- .../functional}/TestHoodieIndex.java | 5 ++- hudi-spark-datasource/hudi-spark/pom.xml | 12 +++++++ .../HoodieSparkFunctionalTestSuite.java | 30 +++++++++++++++++ .../{client => functional}/TestBootstrap.java | 5 ++- .../TestHoodieDatasetBulkInsertHelper.java | 7 +++- .../HoodieSparkSqlWriterSuite.scala | 16 +++++----- .../hudi/functional/TestCOWDataSource.scala | 2 -- .../TestDataSourceForBootstrap.scala | 1 - 12 files changed, 119 insertions(+), 21 deletions(-) create mode 100644 hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/client/functional/SparkClientFunctionalTestSuite.java rename hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/{metadata => client/functional}/TestHoodieBackedMetadata.java (98%) rename hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/client/{ => functional}/TestHoodieClientOnCopyOnWriteStorage.java (99%) rename hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/{index => client/functional}/TestHoodieIndex.java (99%) create mode 100644 hudi-spark-datasource/hudi-spark/src/test/java/org/apache/hudi/functional/HoodieSparkFunctionalTestSuite.java rename hudi-spark-datasource/hudi-spark/src/test/java/org/apache/hudi/{client => functional}/TestBootstrap.java (99%) rename hudi-spark-datasource/hudi-spark/src/test/java/org/apache/hudi/{ => functional}/TestHoodieDatasetBulkInsertHelper.java (98%) rename hudi-spark-datasource/hudi-spark/src/test/scala/org/apache/hudi/{functional => }/HoodieSparkSqlWriterSuite.scala (99%) diff --git a/hudi-cli/src/test/java/org/apache/hudi/cli/integ/ITTestBootstrapCommand.java b/hudi-cli/src/test/java/org/apache/hudi/cli/integ/ITTestBootstrapCommand.java index 0cb278e63..c9ddd741a 100644 --- a/hudi-cli/src/test/java/org/apache/hudi/cli/integ/ITTestBootstrapCommand.java +++ b/hudi-cli/src/test/java/org/apache/hudi/cli/integ/ITTestBootstrapCommand.java @@ -22,7 +22,7 @@ import org.apache.hudi.cli.HoodieCLI; import org.apache.hudi.cli.HoodiePrintHelper; import org.apache.hudi.cli.commands.TableCommand; import org.apache.hudi.cli.testutils.AbstractShellIntegrationTest; -import org.apache.hudi.client.TestBootstrap; +import org.apache.hudi.functional.TestBootstrap; import org.apache.hudi.common.model.HoodieTableType; import org.apache.hudi.common.table.timeline.versioning.TimelineLayoutVersion; diff --git a/hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/client/functional/SparkClientFunctionalTestSuite.java b/hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/client/functional/SparkClientFunctionalTestSuite.java new file mode 100644 index 000000000..03baff441 --- /dev/null +++ b/hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/client/functional/SparkClientFunctionalTestSuite.java @@ -0,0 +1,32 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.hudi.client.functional; + +import org.junit.platform.runner.JUnitPlatform; +import org.junit.platform.suite.api.IncludeTags; +import org.junit.platform.suite.api.SelectPackages; +import org.junit.runner.RunWith; + +@RunWith(JUnitPlatform.class) +@SelectPackages("org.apache.hudi.client.functional") +@IncludeTags("functional") +public class SparkClientFunctionalTestSuite { + +} diff --git a/hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/metadata/TestHoodieBackedMetadata.java b/hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/client/functional/TestHoodieBackedMetadata.java similarity index 98% rename from hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/metadata/TestHoodieBackedMetadata.java rename to hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/client/functional/TestHoodieBackedMetadata.java index dd274a599..513bac14b 100644 --- a/hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/metadata/TestHoodieBackedMetadata.java +++ b/hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/client/functional/TestHoodieBackedMetadata.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hudi.metadata; +package org.apache.hudi.client.functional; import org.apache.hudi.client.HoodieWriteResult; import org.apache.hudi.client.SparkRDDWriteClient; @@ -50,6 +50,12 @@ import org.apache.hudi.config.HoodieStorageConfig; import org.apache.hudi.config.HoodieWriteConfig; import org.apache.hudi.exception.TableNotFoundException; import org.apache.hudi.index.HoodieIndex; +import org.apache.hudi.metadata.FileSystemBackedTableMetadata; +import org.apache.hudi.metadata.HoodieBackedTableMetadataWriter; +import org.apache.hudi.metadata.HoodieMetadataMetrics; +import org.apache.hudi.metadata.HoodieTableMetadata; +import org.apache.hudi.metadata.MetadataPartitionType; +import org.apache.hudi.metadata.SparkHoodieBackedTableMetadataWriter; import org.apache.hudi.table.HoodieSparkTable; import org.apache.hudi.table.HoodieTable; import org.apache.hudi.testutils.HoodieClientTestHarness; @@ -60,7 +66,9 @@ import org.apache.log4j.LogManager; import org.apache.log4j.Logger; import org.apache.spark.api.java.JavaRDD; import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; import org.junit.jupiter.params.ParameterizedTest; @@ -82,6 +90,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; +@Tag("functional") public class TestHoodieBackedMetadata extends HoodieClientTestHarness { private static final Logger LOG = LogManager.getLogger(TestHoodieBackedMetadata.class); @@ -597,7 +606,7 @@ public class TestHoodieBackedMetadata extends HoodieClientTestHarness { // Table should sync only before the inflightActionTimestamp HoodieBackedTableMetadataWriter writer = - (HoodieBackedTableMetadataWriter)SparkHoodieBackedTableMetadataWriter.create(hadoopConf, client.getConfig(), context); + (HoodieBackedTableMetadataWriter) SparkHoodieBackedTableMetadataWriter.create(hadoopConf, client.getConfig(), context); assertEquals(writer.getLatestSyncedInstantTime().get(), beforeInflightActionTimestamp); // Reader should sync to all the completed instants @@ -985,7 +994,7 @@ public class TestHoodieBackedMetadata extends HoodieClientTestHarness { // in the .hoodie folder. List metadataTablePartitions = FSUtils.getAllPartitionPaths(engineContext, HoodieTableMetadata.getMetadataTableBasePath(basePath), false, false, false); - assertEquals(MetadataPartitionType.values().length, metadataTablePartitions.size()); + Assertions.assertEquals(MetadataPartitionType.values().length, metadataTablePartitions.size()); // Metadata table should automatically compact and clean // versions are +1 as autoclean / compaction happens end of commits diff --git a/hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/client/TestHoodieClientOnCopyOnWriteStorage.java b/hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/client/functional/TestHoodieClientOnCopyOnWriteStorage.java similarity index 99% rename from hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/client/TestHoodieClientOnCopyOnWriteStorage.java rename to hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/client/functional/TestHoodieClientOnCopyOnWriteStorage.java index def41f9d1..a53b83e43 100644 --- a/hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/client/TestHoodieClientOnCopyOnWriteStorage.java +++ b/hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/client/functional/TestHoodieClientOnCopyOnWriteStorage.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hudi.client; +package org.apache.hudi.client.functional; import org.apache.avro.generic.GenericRecord; import org.apache.hadoop.fs.FSDataInputStream; @@ -24,6 +24,11 @@ import org.apache.hadoop.fs.Path; import org.apache.hudi.avro.model.HoodieClusteringPlan; import org.apache.hudi.avro.model.HoodieRequestedReplaceMetadata; import org.apache.hudi.avro.model.HoodieCleanMetadata; +import org.apache.hudi.client.AbstractHoodieWriteClient; +import org.apache.hudi.client.HoodieWriteResult; +import org.apache.hudi.client.SparkRDDWriteClient; +import org.apache.hudi.client.SparkTaskContextSupplier; +import org.apache.hudi.client.WriteStatus; import org.apache.hudi.common.config.TypedProperties; import org.apache.hudi.client.validator.SparkPreCommitValidator; import org.apache.hudi.client.validator.SqlQueryEqualityPreCommitValidator; @@ -94,6 +99,7 @@ import org.apache.spark.api.java.JavaRDD; import org.apache.spark.sql.Dataset; import org.apache.spark.sql.Row; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; @@ -141,6 +147,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @SuppressWarnings("unchecked") +@Tag("functional") public class TestHoodieClientOnCopyOnWriteStorage extends HoodieClientTestBase { private static final Logger LOG = LogManager.getLogger(TestHoodieClientOnCopyOnWriteStorage.class); @@ -1575,7 +1582,7 @@ public class TestHoodieClientOnCopyOnWriteStorage extends HoodieClientTestBase { List statuses = client.upsert(insertRecordsRDD1, commitTime1).collect(); assertNoWriteErrors(statuses); Set batchBuckets = statuses.stream().map(s -> s.getFileId()).collect(Collectors.toSet()); - verifyRecordsWritten(commitTime1, true, inserts1, statuses, client.config); + verifyRecordsWritten(commitTime1, true, inserts1, statuses, client.getConfig()); return batchBuckets; } @@ -1687,7 +1694,7 @@ public class TestHoodieClientOnCopyOnWriteStorage extends HoodieClientTestBase { JavaRDD insertRecordsRDD1 = jsc.parallelize(inserts, 2); List statuses = client.upsert(insertRecordsRDD1, commitTime).collect(); assertNoWriteErrors(statuses); - verifyRecordsWritten(commitTime, populateMetaFields, inserts, statuses, client.config); + verifyRecordsWritten(commitTime, populateMetaFields, inserts, statuses, client.getConfig()); return statuses; } diff --git a/hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/index/TestHoodieIndex.java b/hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/client/functional/TestHoodieIndex.java similarity index 99% rename from hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/index/TestHoodieIndex.java rename to hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/client/functional/TestHoodieIndex.java index d792f088f..9c4059a51 100644 --- a/hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/index/TestHoodieIndex.java +++ b/hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/client/functional/TestHoodieIndex.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hudi.index; +package org.apache.hudi.client.functional; import org.apache.hudi.client.WriteStatus; import org.apache.hudi.common.fs.ConsistencyGuardConfig; @@ -36,6 +36,7 @@ import org.apache.hudi.config.HoodieCompactionConfig; import org.apache.hudi.config.HoodieIndexConfig; import org.apache.hudi.config.HoodieStorageConfig; import org.apache.hudi.config.HoodieWriteConfig; +import org.apache.hudi.index.HoodieIndex; import org.apache.hudi.index.HoodieIndex.IndexType; import org.apache.hudi.table.HoodieSparkTable; import org.apache.hudi.table.HoodieTable; @@ -49,6 +50,7 @@ import org.apache.hadoop.fs.Path; import org.apache.spark.api.java.JavaPairRDD; import org.apache.spark.api.java.JavaRDD; import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; @@ -73,6 +75,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; +@Tag("functional") public class TestHoodieIndex extends HoodieClientTestHarness { private static Stream indexTypeParams() { diff --git a/hudi-spark-datasource/hudi-spark/pom.xml b/hudi-spark-datasource/hudi-spark/pom.xml index 4b3edcc74..e6067ed24 100644 --- a/hudi-spark-datasource/hudi-spark/pom.xml +++ b/hudi-spark-datasource/hudi-spark/pom.xml @@ -474,5 +474,17 @@ test + + org.junit.platform + junit-platform-runner + test + + + + org.junit.platform + junit-platform-suite-api + test + + diff --git a/hudi-spark-datasource/hudi-spark/src/test/java/org/apache/hudi/functional/HoodieSparkFunctionalTestSuite.java b/hudi-spark-datasource/hudi-spark/src/test/java/org/apache/hudi/functional/HoodieSparkFunctionalTestSuite.java new file mode 100644 index 000000000..993c10d1e --- /dev/null +++ b/hudi-spark-datasource/hudi-spark/src/test/java/org/apache/hudi/functional/HoodieSparkFunctionalTestSuite.java @@ -0,0 +1,30 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hudi.functional; + +import org.junit.platform.runner.JUnitPlatform; +import org.junit.platform.suite.api.IncludeTags; +import org.junit.platform.suite.api.SelectPackages; +import org.junit.runner.RunWith; + +@RunWith(JUnitPlatform.class) +@SelectPackages("org.apache.hudi.hive.functional") +@IncludeTags("functional") +public class HoodieSparkFunctionalTestSuite { + +} \ No newline at end of file diff --git a/hudi-spark-datasource/hudi-spark/src/test/java/org/apache/hudi/client/TestBootstrap.java b/hudi-spark-datasource/hudi-spark/src/test/java/org/apache/hudi/functional/TestBootstrap.java similarity index 99% rename from hudi-spark-datasource/hudi-spark/src/test/java/org/apache/hudi/client/TestBootstrap.java rename to hudi-spark-datasource/hudi-spark/src/test/java/org/apache/hudi/functional/TestBootstrap.java index df18bc1b3..9ae6a05c7 100644 --- a/hudi-spark-datasource/hudi-spark/src/test/java/org/apache/hudi/client/TestBootstrap.java +++ b/hudi-spark-datasource/hudi-spark/src/test/java/org/apache/hudi/functional/TestBootstrap.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hudi.client; +package org.apache.hudi.functional; import org.apache.avro.Schema; import org.apache.avro.generic.GenericRecord; @@ -26,6 +26,7 @@ import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.mapred.JobConf; import org.apache.hudi.DataSourceWriteOptions; import org.apache.hudi.avro.model.HoodieFileStatus; +import org.apache.hudi.client.SparkRDDWriteClient; import org.apache.hudi.client.bootstrap.BootstrapMode; import org.apache.hudi.client.bootstrap.FullRecordBootstrapDataProvider; import org.apache.hudi.client.bootstrap.selector.BootstrapModeSelector; @@ -79,6 +80,7 @@ import org.apache.spark.sql.api.java.UDF1; import org.apache.spark.sql.types.DataTypes; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; @@ -108,6 +110,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; /** * Tests Bootstrap Client functionality. */ +@Tag("functional") public class TestBootstrap extends HoodieClientTestBase { public static final String TRIP_HIVE_COLUMN_TYPES = "bigint,string,string,string,string,double,double,double,double," diff --git a/hudi-spark-datasource/hudi-spark/src/test/java/org/apache/hudi/TestHoodieDatasetBulkInsertHelper.java b/hudi-spark-datasource/hudi-spark/src/test/java/org/apache/hudi/functional/TestHoodieDatasetBulkInsertHelper.java similarity index 98% rename from hudi-spark-datasource/hudi-spark/src/test/java/org/apache/hudi/TestHoodieDatasetBulkInsertHelper.java rename to hudi-spark-datasource/hudi-spark/src/test/java/org/apache/hudi/functional/TestHoodieDatasetBulkInsertHelper.java index 2e5bb53c9..69836c70a 100644 --- a/hudi-spark-datasource/hudi-spark/src/test/java/org/apache/hudi/TestHoodieDatasetBulkInsertHelper.java +++ b/hudi-spark-datasource/hudi-spark/src/test/java/org/apache/hudi/functional/TestHoodieDatasetBulkInsertHelper.java @@ -15,8 +15,11 @@ * limitations under the License. */ -package org.apache.hudi; +package org.apache.hudi.functional; +import org.apache.hudi.AvroConversionUtils; +import org.apache.hudi.DataSourceWriteOptions; +import org.apache.hudi.HoodieDatasetBulkInsertHelper; import org.apache.hudi.common.model.HoodieRecord; import org.apache.hudi.common.util.FileIOUtils; import org.apache.hudi.config.HoodieWriteConfig; @@ -35,6 +38,7 @@ import org.apache.spark.sql.catalyst.encoders.ExpressionEncoder; import org.apache.spark.sql.catalyst.encoders.RowEncoder; import org.apache.spark.sql.catalyst.expressions.Attribute; import org.apache.spark.sql.types.StructType; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; @@ -59,6 +63,7 @@ import static org.junit.jupiter.api.Assertions.fail; /** * Tests {@link HoodieDatasetBulkInsertHelper}. */ +@Tag("functional") public class TestHoodieDatasetBulkInsertHelper extends HoodieClientTestBase { private String schemaStr; diff --git a/hudi-spark-datasource/hudi-spark/src/test/scala/org/apache/hudi/functional/HoodieSparkSqlWriterSuite.scala b/hudi-spark-datasource/hudi-spark/src/test/scala/org/apache/hudi/HoodieSparkSqlWriterSuite.scala similarity index 99% rename from hudi-spark-datasource/hudi-spark/src/test/scala/org/apache/hudi/functional/HoodieSparkSqlWriterSuite.scala rename to hudi-spark-datasource/hudi-spark/src/test/scala/org/apache/hudi/HoodieSparkSqlWriterSuite.scala index 422af2086..bee776aee 100644 --- a/hudi-spark-datasource/hudi-spark/src/test/scala/org/apache/hudi/functional/HoodieSparkSqlWriterSuite.scala +++ b/hudi-spark-datasource/hudi-spark/src/test/scala/org/apache/hudi/HoodieSparkSqlWriterSuite.scala @@ -15,15 +15,12 @@ * limitations under the License. */ -package org.apache.hudi.functional +package org.apache.hudi -import java.time.Instant -import java.util -import java.util.{Collections, Date, UUID} import org.apache.commons.io.FileUtils import org.apache.hadoop.fs.Path import org.apache.hudi.DataSourceWriteOptions._ -import org.apache.hudi.client.{SparkRDDWriteClient, TestBootstrap} +import org.apache.hudi.client.SparkRDDWriteClient import org.apache.hudi.common.config.HoodieConfig import org.apache.hudi.common.model.{HoodieFileFormat, HoodieRecord, HoodieRecordPayload} import org.apache.hudi.common.table.HoodieTableConfig @@ -31,21 +28,24 @@ import org.apache.hudi.common.testutils.HoodieTestDataGenerator import org.apache.hudi.config.{HoodieBootstrapConfig, HoodieWriteConfig} import org.apache.hudi.exception.HoodieException import org.apache.hudi.execution.bulkinsert.BulkInsertSortMode -import org.apache.hudi.keygen.{NonpartitionedKeyGenerator, SimpleKeyGenerator} +import org.apache.hudi.functional.TestBootstrap import org.apache.hudi.hive.HiveSyncConfig +import org.apache.hudi.keygen.{NonpartitionedKeyGenerator, SimpleKeyGenerator} import org.apache.hudi.testutils.DataSourceTestUtils -import org.apache.hudi.{AvroConversionUtils, DataSourceReadOptions, DataSourceUtils, DataSourceWriteOptions, HoodieSparkSqlWriter, HoodieWriterUtils} import org.apache.spark.SparkContext import org.apache.spark.api.java.JavaSparkContext import org.apache.spark.sql.functions.{expr, lit} import org.apache.spark.sql.internal.{SQLConf, StaticSQLConf} import org.apache.spark.sql.{DataFrame, Row, SQLContext, SaveMode, SparkSession} +import org.junit.jupiter.api.Assertions.{assertEquals, assertFalse, assertTrue} import org.mockito.ArgumentMatchers.any import org.mockito.Mockito.{spy, times, verify} import org.scalatest.{FunSuite, Matchers} +import java.time.Instant +import java.util +import java.util.{Collections, Date, UUID} import scala.collection.JavaConversions._ -import org.junit.jupiter.api.Assertions.{assertEquals, assertFalse, assertTrue} class HoodieSparkSqlWriterSuite extends FunSuite with Matchers { diff --git a/hudi-spark-datasource/hudi-spark/src/test/scala/org/apache/hudi/functional/TestCOWDataSource.scala b/hudi-spark-datasource/hudi-spark/src/test/scala/org/apache/hudi/functional/TestCOWDataSource.scala index ee3aba677..c10bb8b04 100644 --- a/hudi-spark-datasource/hudi-spark/src/test/scala/org/apache/hudi/functional/TestCOWDataSource.scala +++ b/hudi-spark-datasource/hudi-spark/src/test/scala/org/apache/hudi/functional/TestCOWDataSource.scala @@ -18,7 +18,6 @@ package org.apache.hudi.functional import java.sql.{Date, Timestamp} - import scala.collection.JavaConversions._ import scala.collection.JavaConverters._ import org.apache.hudi.common.config.HoodieMetadataConfig @@ -47,7 +46,6 @@ import org.junit.jupiter.params.provider.{CsvSource, ValueSource} /** * Basic tests on the spark datasource for COW table. */ - class TestCOWDataSource extends HoodieClientTestBase { var spark: SparkSession = null val commonOpts = Map( diff --git a/hudi-spark-datasource/hudi-spark/src/test/scala/org/apache/hudi/functional/TestDataSourceForBootstrap.scala b/hudi-spark-datasource/hudi-spark/src/test/scala/org/apache/hudi/functional/TestDataSourceForBootstrap.scala index 983b4b114..5da87b124 100644 --- a/hudi-spark-datasource/hudi-spark/src/test/scala/org/apache/hudi/functional/TestDataSourceForBootstrap.scala +++ b/hudi-spark-datasource/hudi-spark/src/test/scala/org/apache/hudi/functional/TestDataSourceForBootstrap.scala @@ -20,7 +20,6 @@ package org.apache.hudi.functional import collection.JavaConverters._ import org.apache.hadoop.fs.FileSystem import org.apache.hudi.bootstrap.SparkParquetBootstrapDataProvider -import org.apache.hudi.client.TestBootstrap import org.apache.hudi.client.bootstrap.selector.FullRecordBootstrapModeSelector import org.apache.hudi.{DataSourceReadOptions, DataSourceWriteOptions, HoodieDataSourceHelpers} import org.apache.hudi.common.fs.FSUtils