[CARBONDATA-1295] Optimize test cases,merge three QueryTest class into one This closes #1162
Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/770e42df Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/770e42df Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/770e42df Branch: refs/heads/master Commit: 770e42dfc37e1f02407853d93d8667497e58e4be Parents: 9e4da2a Author: chenliang613 <[email protected]> Authored: Wed Jul 12 10:45:22 2017 +0800 Committer: Ravindra Pesala <[email protected]> Committed: Wed Jul 12 21:50:11 2017 +0530 ---------------------------------------------------------------------- dev/scalastyle-config.xml | 6 - .../aggquery/IntegerDataTypeTestCase.scala | 3 +- .../spark/testsuite/bigdecimal/TestBigInt.scala | 3 +- .../TestDimensionWithDecimalDataType.scala | 3 +- .../complexType/TestComplexTypeQuery.scala | 2 +- .../complexType/TestCreateTableWithDouble.scala | 3 +- .../MultiFilesDataLoagdingTestCase.scala | 2 +- .../dataload/TestLoadDataGeneral.scala | 3 +- .../TestLoadDataWithAutoLoadMerge.scala | 3 +- .../dataload/TestLoadDataWithBlankLine.scala | 2 +- .../TestLoadDataWithEmptyArrayColumns.scala | 3 +- .../dataload/TestLoadDataWithJunkChars.scala | 2 +- .../dataload/TestLoadDataWithMaxMinBigInt.scala | 2 +- .../TestLoadDataWithMaxMinInteger.scala | 2 +- .../dataload/TestLoadDataWithNullMeasures.scala | 2 +- .../dataload/TestLoadDataWithSinglePass.scala | 2 +- .../TestNoInvertedIndexLoadAndQuery.scala | 3 +- .../emptyrow/TestCSVHavingOnlySpaceChar.scala | 3 +- .../testsuite/emptyrow/TestEmptyRows.scala | 3 +- .../primitiveTypes/DoubleDataTypeTestCase.scala | 2 +- .../primitiveTypes/FloatDataTypeTestCase.scala | 2 +- .../AllDataTypesTestCaseAggregate.scala | 3 +- .../aggquery/AverageQueryTestCase.scala | 3 +- .../AllDataTypesTestCaseAggregate.scala | 3 +- .../allqueries/DoubleDataTypeTest.scala | 2 +- .../InsertIntoCarbonTableTestCase.scala | 3 +- .../TestQueryWithOldCarbonDataFile.scala | 3 +- .../allqueries/TestQueryWithoutDataLoad.scala | 2 +- .../allqueries/TestTableNameHasDbName.scala | 2 +- .../badrecordloger/BadRecordEmptyDataTest.scala | 3 +- .../badrecordloger/BadRecordLoggerTest.scala | 3 +- .../testsuite/bigdecimal/TestAvgForBigInt.scala | 2 +- .../testsuite/bigdecimal/TestBigDecimal.scala | 3 +- .../bigdecimal/TestNullAndEmptyFields.scala | 3 +- .../TestNullAndEmptyFieldsUnsafe.scala | 3 +- .../blockprune/BlockPruneQueryTestCase.scala | 3 +- .../CarbonCustomBlockDistributionTest.scala | 3 +- ...tCreateTableWithDatabaseNameCaseChange.scala | 2 +- .../TestCreateTableWithSpaceInColumnName.scala | 2 +- .../testsuite/createTable/TestTableIdTest.scala | 3 +- .../DataCompactionBlockletBoundryTest.scala | 3 +- .../DataCompactionBoundaryConditionsTest.scala | 3 +- .../DataCompactionCardinalityBoundryTest.scala | 3 +- .../datacompaction/DataCompactionLockTest.scala | 3 +- .../MajorCompactionIgnoreInMinorTest.scala | 3 +- .../MajorCompactionStopsAfterCompaction.scala | 3 +- .../dataload/TestBatchSortDataLoad.scala | 3 +- .../TestDataLoadPartitionCoalescer.scala | 2 +- .../TestDataLoadWithColumnsMoreThanSchema.scala | 3 +- .../dataload/TestDataLoadWithFileName.scala | 2 +- .../TestDataWithDicExcludeAndInclude.scala | 3 +- .../dataload/TestGlobalSortDataLoad.scala | 2 +- .../testsuite/dataload/TestLoadDataFrame.scala | 2 +- .../dataload/TestLoadDataUseAllDictionary.scala | 3 +- .../TestLoadDataWithDiffTimestampFormat.scala | 3 +- .../TestLoadDataWithFileHeaderException.scala | 2 +- ...estLoadDataWithHiveSyntaxDefaultFormat.scala | 3 +- .../TestLoadDataWithHiveSyntaxUnsafe.scala | 3 +- .../TestLoadDataWithHiveSyntaxV1Format.scala | 3 +- .../TestLoadDataWithHiveSyntaxV2Format.scala | 3 +- ...ataWithMalformedCarbonCommandException.scala | 3 +- .../dataload/TestLoadDataWithNoMeasure.scala | 2 +- .../TestLoadDataWithNotProperInputFile.scala | 3 +- .../dataload/TestLoadTblNameIsKeyword.scala | 2 +- .../dataload/TestTableLevelBlockSize.scala | 3 +- .../DataRetentionConcurrencyTestCase.scala | 3 +- .../dataretention/DataRetentionTestCase.scala | 3 +- .../spark/testsuite/datetype/DateTypeTest.scala | 3 +- .../deleteTable/TestDeleteTableNewDDL.scala | 2 +- .../describeTable/TestDescribeTable.scala | 2 +- .../detailquery/AllDataTypesTestCase.scala | 2 +- .../detailquery/CastColumnTestCase.scala | 3 +- .../ColumnPropertyValidationTestCase.scala | 2 +- .../ExpressionWithNullTestCase.scala | 2 +- .../HighCardinalityDataTypesTestCase.scala | 3 +- .../detailquery/IntegerDataTypeTestCase.scala | 2 +- .../NoDictionaryColumnTestCase.scala | 2 +- .../RangeFilterAllDataTypesTestCases.scala | 3 +- .../detailquery/RangeFilterTestCase.scala | 3 +- .../SubqueryWithFilterAndSortTestCase.scala | 3 +- .../ValueCompressionDataTypeTestCase.scala | 3 +- .../DateDataTypeDirectDictionaryTest.scala | 3 +- ...TypeDirectDictionaryWithNoDictTestCase.scala | 3 +- .../DateDataTypeNullDataTest.scala | 3 +- ...estampDataTypeDirectDictionaryTestCase.scala | 3 +- ...TypeDirectDictionaryWithNoDictTestCase.scala | 3 +- .../TimestampDataTypeNullDataTest.scala | 3 +- .../filterexpr/AllDataTypesTestCaseFilter.scala | 2 +- .../filterexpr/CountStarTestCase.scala | 3 +- .../filterexpr/FilterProcessorTestCase.scala | 3 +- .../GrtLtFilterProcessorTestCase.scala | 3 +- .../filterexpr/IntegerDataTypeTestCase.scala | 2 +- .../NullMeasureValueTestCaseFilter.scala | 3 +- .../TestAndEqualFilterEmptyOperandValue.scala | 3 +- .../filterexpr/TestBetweenFilter.scala | 2 +- .../filterexpr/TestGrtLessFilter.scala | 3 +- .../filterexpr/TestNotNullFilter.scala | 3 +- .../iud/DeleteCarbonTableTestCase.scala | 2 +- .../iud/HorizontalCompactionTestCase.scala | 3 +- .../iud/UpdateCarbonTableTestCase.scala | 3 +- ...UpdateCarbonTableTestCaseWithBadRecord.scala | 3 +- .../joinquery/AllDataTypesTestCaseJoin.scala | 2 +- .../joinquery/IntegerDataTypeTestCase.scala | 2 +- .../joinquery/JoinWithoutDictionaryColumn.scala | 2 +- .../joinquery/OrderByLimitTestCase.scala | 2 +- .../NullMeasureValueTestCaseAggregate.scala | 3 +- .../TestNullValueSerialization.scala | 3 +- .../TestAllDataTypeForPartitionTable.scala | 2 +- .../TestCompactionForPartitionTable.scala | 2 +- .../partition/TestDDLForPartitionTable.scala | 3 +- .../TestDataLoadingForPartitionTable.scala | 3 +- .../partition/TestQueryForPartitionTable.scala | 3 +- .../partition/TestShowPartitions.scala | 3 +- .../predefdic/TestPreDefDictionary.scala | 3 +- .../testsuite/sortcolumns/TestSortColumns.scala | 3 +- .../sortcolumns/TestSortColumnsWithUnsafe.scala | 3 +- .../sortexpr/AllDataTypesTestCaseSort.scala | 2 +- .../sortexpr/IntegerDataTypeTestCase.scala | 2 +- .../windowsexpr/WindowsExprTestCase.scala | 3 +- .../spark/sql/common/util/CarbonFunSuite.scala | 47 ---- .../apache/spark/sql/common/util/PlanTest.scala | 59 ----- .../spark/sql/common/util/QueryTest.scala | 159 -------------- integration/spark-common/pom.xml | 1 - .../spark/sql/test/util/CarbonFunSuite.scala | 47 ++++ .../apache/spark/sql/test/util/PlanTest.scala | 59 +++++ .../apache/spark/sql/test/util/QueryTest.scala | 160 ++++++++++++++ ...plexPrimitiveTimestampDirectDictionary.scala | 2 +- .../dataload/SparkDatasourceSuite.scala | 2 +- .../TestLoadDataWithSingleQuotechar.scala | 2 +- .../AllDataTypesTestCaseAggregate.scala | 2 +- .../InsertIntoCarbonTableSpark1TestCase.scala | 2 +- .../BadRecordLoggerSharedDictionaryTest.scala | 2 +- .../createtable/TestCreateTableSyntax.scala | 2 +- .../CompactionSystemLockFeatureTest.scala | 2 +- .../DataCompactionMinorThresholdTest.scala | 2 +- .../DataCompactionNoDictionaryTest.scala | 2 +- .../datacompaction/DataCompactionTest.scala | 2 +- .../GrtLtFilterProcessorTestCase.scala | 2 +- .../HadoopFSRelationTestCase.scala | 2 +- .../spark/util/AllDictionaryTestCase.scala | 3 +- .../AutoHighCardinalityIdentifyTestCase.scala | 3 +- .../util/ExternalColumnDictionaryTestCase.scala | 3 +- ...GlobalDictionaryUtilConcurrentTestCase.scala | 4 +- .../util/GlobalDictionaryUtilTestCase.scala | 2 +- .../apache/spark/sql/TestCarbonSqlParser.scala | 2 +- .../spark/sql/common/util/CarbonFunSuite.scala | 47 ---- .../apache/spark/sql/common/util/PlanTest.scala | 59 ----- .../spark/sql/common/util/QueryTest.scala | 158 -------------- .../InsertIntoCarbonTableSpark2TestCase.scala | 4 +- .../spark/util/AllDictionaryTestCase.scala | 6 +- .../util/ExternalColumnDictionaryTestCase.scala | 6 +- .../org/apache/spark/SparkCommandSuite.scala | 4 +- .../BadRecordPathLoadOptionTest.scala | 4 +- .../carbondata/CarbonDataSourceSuite.scala | 4 +- .../DataLoadFailAllTypeSortTest.scala | 4 +- .../bucketing/TableBucketingTestCase.scala | 4 +- .../commands/SetCommandTestCase.scala | 4 +- .../NumericDimensionBadRecordTest.scala | 4 +- .../deletetable/DeleteTableTestCase.scala | 4 +- .../iud/DeleteCarbonTableSubqueryTestCase.scala | 4 +- .../carbondata/query/SubQueryTestSuite.scala | 4 +- .../carbondata/query/TestNotEqualToFilter.scala | 4 +- .../restructure/AlterTableRevertTestCase.scala | 5 +- .../AlterTableValidationTestCase.scala | 4 +- .../rowreader/AddColumnTestCases.scala | 4 +- .../rowreader/ChangeDataTypeTestCases.scala | 4 +- .../rowreader/DropColumnTestCases.scala | 4 +- .../vectorreader/AddColumnTestCases.scala | 4 +- .../vectorreader/ChangeDataTypeTestCases.scala | 4 +- .../vectorreader/DropColumnTestCases.scala | 4 +- .../vectorreader/VectorReaderTestCase.scala | 4 +- .../spark/sql/common/util/CarbonFunSuite.scala | 47 ---- .../apache/spark/sql/common/util/PlanTest.scala | 59 ----- .../spark/sql/common/util/QueryTest.scala | 218 ------------------- .../spark/sql/common/util/Spark2QueryTest.scala | 29 +++ .../apache/spark/util/CarbonCommandSuite.scala | 59 ++++- 176 files changed, 536 insertions(+), 1130 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/carbondata/blob/770e42df/dev/scalastyle-config.xml ---------------------------------------------------------------------- diff --git a/dev/scalastyle-config.xml b/dev/scalastyle-config.xml index 98d8eff..f8808f3 100644 --- a/dev/scalastyle-config.xml +++ b/dev/scalastyle-config.xml @@ -135,12 +135,6 @@ This file is divided into 3 sections: <!-- ??? usually shouldn't be checked into the code base. --> <check level="error" class="org.scalastyle.scalariform.NotImplementedErrorUsage" enabled="true"></check> - <!-- As of SPARK-7558, all tests in Spark should extend o.a.s.SparkFunSuite instead of FunSuite directly --> - <check customId="funsuite" level="error" class="org.scalastyle.scalariform.TokenChecker" enabled="true"> - <parameters><parameter name="regex">^FunSuite[A-Za-z]*$</parameter></parameters> - <customMessage>Tests must extend org.apache.spark.SparkFunSuite instead.</customMessage> - </check> - <!-- As of SPARK-7977 all printlns need to be wrapped in '// scalastyle:off/on println' --> <check customId="println" level="error" class="org.scalastyle.scalariform.TokenChecker" enabled="true"> <parameters><parameter name="regex">^println$</parameter></parameters> http://git-wip-us.apache.org/repos/asf/carbondata/blob/770e42df/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/aggquery/IntegerDataTypeTestCase.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/aggquery/IntegerDataTypeTestCase.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/aggquery/IntegerDataTypeTestCase.scala index f918301..dc4dc3a 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/aggquery/IntegerDataTypeTestCase.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/aggquery/IntegerDataTypeTestCase.scala @@ -19,11 +19,10 @@ package org.apache.carbondata.spark.testsuite.aggquery import org.apache.spark.sql.Row -import org.apache.spark.sql.common.util.QueryTest import org.scalatest.BeforeAndAfterAll - import org.apache.carbondata.core.constants.CarbonCommonConstants import org.apache.carbondata.core.util.CarbonProperties +import org.apache.spark.sql.test.util.QueryTest /** * Test Class for aggregate query on Integer datatypes http://git-wip-us.apache.org/repos/asf/carbondata/blob/770e42df/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/bigdecimal/TestBigInt.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/bigdecimal/TestBigInt.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/bigdecimal/TestBigInt.scala index f738040..ea7fe8f 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/bigdecimal/TestBigInt.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/bigdecimal/TestBigInt.scala @@ -17,11 +17,10 @@ package org.apache.carbondata.spark.testsuite.bigdecimal -import org.apache.spark.sql.common.util.QueryTest import org.scalatest.BeforeAndAfterAll - import org.apache.carbondata.core.constants.CarbonCommonConstants import org.apache.carbondata.core.util.CarbonProperties +import org.apache.spark.sql.test.util.QueryTest /** * Test cases for testing big int functionality http://git-wip-us.apache.org/repos/asf/carbondata/blob/770e42df/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/bigdecimal/TestDimensionWithDecimalDataType.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/bigdecimal/TestDimensionWithDecimalDataType.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/bigdecimal/TestDimensionWithDecimalDataType.scala index e267763..eed2f32 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/bigdecimal/TestDimensionWithDecimalDataType.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/bigdecimal/TestDimensionWithDecimalDataType.scala @@ -17,11 +17,10 @@ package org.apache.carbondata.spark.testsuite.bigdecimal -import org.apache.spark.sql.common.util.QueryTest import org.scalatest.BeforeAndAfterAll - import org.apache.carbondata.core.constants.CarbonCommonConstants import org.apache.carbondata.core.util.CarbonProperties +import org.apache.spark.sql.test.util.QueryTest /** * Test cases for testing big decimal functionality on dimensions http://git-wip-us.apache.org/repos/asf/carbondata/blob/770e42df/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/complexType/TestComplexTypeQuery.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/complexType/TestComplexTypeQuery.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/complexType/TestComplexTypeQuery.scala index 1326889..3cd5354 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/complexType/TestComplexTypeQuery.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/complexType/TestComplexTypeQuery.scala @@ -18,7 +18,7 @@ package org.apache.carbondata.integration.spark.testsuite.complexType import org.apache.spark.sql.Row -import org.apache.spark.sql.common.util.QueryTest +import org.apache.spark.sql.test.util.QueryTest import org.scalatest.BeforeAndAfterAll /** http://git-wip-us.apache.org/repos/asf/carbondata/blob/770e42df/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/complexType/TestCreateTableWithDouble.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/complexType/TestCreateTableWithDouble.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/complexType/TestCreateTableWithDouble.scala index c208b16..fc9d497 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/complexType/TestCreateTableWithDouble.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/complexType/TestCreateTableWithDouble.scala @@ -18,12 +18,11 @@ package org.apache.carbondata.integration.spark.testsuite.complexType import org.apache.spark.sql.Row -import org.apache.spark.sql.common.util.QueryTest import org.scalatest.BeforeAndAfterAll - import org.apache.carbondata.core.metadata.{CarbonMetadata, CarbonTableIdentifier} import org.apache.carbondata.core.metadata.schema.table.column.CarbonDimension import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.spark.sql.test.util.QueryTest /** * Test class of creating and loading for carbon table with double http://git-wip-us.apache.org/repos/asf/carbondata/blob/770e42df/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/dataload/MultiFilesDataLoagdingTestCase.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/dataload/MultiFilesDataLoagdingTestCase.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/dataload/MultiFilesDataLoagdingTestCase.scala index e488f1f..6f55a45 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/dataload/MultiFilesDataLoagdingTestCase.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/dataload/MultiFilesDataLoagdingTestCase.scala @@ -18,7 +18,7 @@ package org.apache.carbondata.spark.testsuite.dataload import org.apache.spark.sql.Row -import org.apache.spark.sql.common.util.QueryTest +import org.apache.spark.sql.test.util.QueryTest import org.scalatest.BeforeAndAfterAll /** http://git-wip-us.apache.org/repos/asf/carbondata/blob/770e42df/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/dataload/TestLoadDataGeneral.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/dataload/TestLoadDataGeneral.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/dataload/TestLoadDataGeneral.scala index 58b49d4..a749f12 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/dataload/TestLoadDataGeneral.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/dataload/TestLoadDataGeneral.scala @@ -22,12 +22,11 @@ import java.math.BigDecimal import scala.collection.mutable.ArrayBuffer import org.apache.spark.sql.Row -import org.apache.spark.sql.common.util.QueryTest import org.scalatest.BeforeAndAfterAll - import org.apache.carbondata.core.util.path.{CarbonStorePath, CarbonTablePath} import org.apache.carbondata.core.datastore.impl.FileFactory import org.apache.carbondata.core.metadata.CarbonMetadata +import org.apache.spark.sql.test.util.QueryTest class TestLoadDataGeneral extends QueryTest with BeforeAndAfterAll { http://git-wip-us.apache.org/repos/asf/carbondata/blob/770e42df/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/dataload/TestLoadDataWithAutoLoadMerge.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/dataload/TestLoadDataWithAutoLoadMerge.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/dataload/TestLoadDataWithAutoLoadMerge.scala index 3267bf1..5211e9e 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/dataload/TestLoadDataWithAutoLoadMerge.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/dataload/TestLoadDataWithAutoLoadMerge.scala @@ -18,11 +18,10 @@ package org.apache.carbondata.integration.spark.testsuite.dataload import org.apache.spark.sql.Row -import org.apache.spark.sql.common.util.QueryTest import org.scalatest.BeforeAndAfterAll - import org.apache.carbondata.core.constants.CarbonCommonConstants import org.apache.carbondata.core.util.CarbonProperties +import org.apache.spark.sql.test.util.QueryTest /** * Test class of creating and loading for carbon table with auto load merge http://git-wip-us.apache.org/repos/asf/carbondata/blob/770e42df/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/dataload/TestLoadDataWithBlankLine.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/dataload/TestLoadDataWithBlankLine.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/dataload/TestLoadDataWithBlankLine.scala index e158ce7..9f9f5e4 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/dataload/TestLoadDataWithBlankLine.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/dataload/TestLoadDataWithBlankLine.scala @@ -18,7 +18,7 @@ package org.apache.carbondata.integration.spark.testsuite.dataload import org.apache.spark.sql.Row -import org.apache.spark.sql.common.util.QueryTest +import org.apache.spark.sql.test.util.QueryTest import org.scalatest.BeforeAndAfterAll /** http://git-wip-us.apache.org/repos/asf/carbondata/blob/770e42df/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/dataload/TestLoadDataWithEmptyArrayColumns.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/dataload/TestLoadDataWithEmptyArrayColumns.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/dataload/TestLoadDataWithEmptyArrayColumns.scala index 83f0a09..67e266c 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/dataload/TestLoadDataWithEmptyArrayColumns.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/dataload/TestLoadDataWithEmptyArrayColumns.scala @@ -17,11 +17,10 @@ package org.apache.carbondata.integration.spark.testsuite.dataload import org.apache.spark.sql.Row -import org.apache.spark.sql.common.util.QueryTest import org.scalatest.BeforeAndAfterAll - import org.apache.carbondata.core.constants.CarbonCommonConstants import org.apache.carbondata.core.util.CarbonProperties +import org.apache.spark.sql.test.util.QueryTest /** * Test Class for data loading when there are null measures in data http://git-wip-us.apache.org/repos/asf/carbondata/blob/770e42df/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/dataload/TestLoadDataWithJunkChars.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/dataload/TestLoadDataWithJunkChars.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/dataload/TestLoadDataWithJunkChars.scala index fb17456..17b7695 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/dataload/TestLoadDataWithJunkChars.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/dataload/TestLoadDataWithJunkChars.scala @@ -20,7 +20,7 @@ import java.io.{BufferedWriter, File, FileWriter} import java.util.Random import org.apache.spark.sql.Row -import org.apache.spark.sql.common.util.QueryTest +import org.apache.spark.sql.test.util.QueryTest import org.scalatest.BeforeAndAfterAll class TestLoadDataWithJunkChars extends QueryTest with BeforeAndAfterAll { http://git-wip-us.apache.org/repos/asf/carbondata/blob/770e42df/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/dataload/TestLoadDataWithMaxMinBigInt.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/dataload/TestLoadDataWithMaxMinBigInt.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/dataload/TestLoadDataWithMaxMinBigInt.scala index 5ad4323..f041087 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/dataload/TestLoadDataWithMaxMinBigInt.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/dataload/TestLoadDataWithMaxMinBigInt.scala @@ -18,7 +18,7 @@ package org.apache.carbondata.integration.spark.testsuite.dataload import org.apache.spark.sql.Row -import org.apache.spark.sql.common.util.QueryTest +import org.apache.spark.sql.test.util.QueryTest import org.scalatest.BeforeAndAfterAll /** * Test Class for data loading when there are min long value in int column http://git-wip-us.apache.org/repos/asf/carbondata/blob/770e42df/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/dataload/TestLoadDataWithMaxMinInteger.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/dataload/TestLoadDataWithMaxMinInteger.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/dataload/TestLoadDataWithMaxMinInteger.scala index 4ac747f..0e3c93b 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/dataload/TestLoadDataWithMaxMinInteger.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/dataload/TestLoadDataWithMaxMinInteger.scala @@ -18,7 +18,7 @@ package org.apache.carbondata.integration.spark.testsuite.dataload import org.apache.spark.sql.Row -import org.apache.spark.sql.common.util.QueryTest +import org.apache.spark.sql.test.util.QueryTest import org.scalatest.BeforeAndAfterAll /** * Test Class for data loading when there are min integer value in int column http://git-wip-us.apache.org/repos/asf/carbondata/blob/770e42df/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/dataload/TestLoadDataWithNullMeasures.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/dataload/TestLoadDataWithNullMeasures.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/dataload/TestLoadDataWithNullMeasures.scala index 1a523c7..ec403d8 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/dataload/TestLoadDataWithNullMeasures.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/dataload/TestLoadDataWithNullMeasures.scala @@ -17,7 +17,7 @@ package org.apache.carbondata.integration.spark.testsuite.dataload -import org.apache.spark.sql.common.util.QueryTest +import org.apache.spark.sql.test.util.QueryTest import org.scalatest.BeforeAndAfterAll /** * Test Class for data loading when there are null measures in data http://git-wip-us.apache.org/repos/asf/carbondata/blob/770e42df/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/dataload/TestLoadDataWithSinglePass.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/dataload/TestLoadDataWithSinglePass.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/dataload/TestLoadDataWithSinglePass.scala index 3bb16f2..f2c540c 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/dataload/TestLoadDataWithSinglePass.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/dataload/TestLoadDataWithSinglePass.scala @@ -18,7 +18,7 @@ package org.apache.carbondata.integration.spark.testsuite.dataload import org.apache.spark.sql.Row -import org.apache.spark.sql.common.util.QueryTest +import org.apache.spark.sql.test.util.QueryTest import org.scalatest.BeforeAndAfterAll /** http://git-wip-us.apache.org/repos/asf/carbondata/blob/770e42df/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/dataload/TestNoInvertedIndexLoadAndQuery.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/dataload/TestNoInvertedIndexLoadAndQuery.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/dataload/TestNoInvertedIndexLoadAndQuery.scala index ebd298a..baf3997 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/dataload/TestNoInvertedIndexLoadAndQuery.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/dataload/TestNoInvertedIndexLoadAndQuery.scala @@ -18,11 +18,10 @@ package org.apache.carbondata.integration.spark.testsuite.dataload import org.apache.spark.sql.Row -import org.apache.spark.sql.common.util.QueryTest import org.scalatest.BeforeAndAfterAll - import org.apache.carbondata.core.constants.CarbonCommonConstants import org.apache.carbondata.core.util.CarbonProperties +import org.apache.spark.sql.test.util.QueryTest /** * Test Class for no inverted index load and query http://git-wip-us.apache.org/repos/asf/carbondata/blob/770e42df/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/emptyrow/TestCSVHavingOnlySpaceChar.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/emptyrow/TestCSVHavingOnlySpaceChar.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/emptyrow/TestCSVHavingOnlySpaceChar.scala index 8a2f6dc..62e3dd7 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/emptyrow/TestCSVHavingOnlySpaceChar.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/emptyrow/TestCSVHavingOnlySpaceChar.scala @@ -17,11 +17,10 @@ package org.apache.carbondata.integration.spark.testsuite.emptyrow -import org.apache.spark.sql.common.util.QueryTest import org.scalatest.BeforeAndAfterAll - import org.apache.carbondata.core.constants.CarbonCommonConstants import org.apache.carbondata.core.util.CarbonProperties +import org.apache.spark.sql.test.util.QueryTest class TestCSVHavingOnlySpaceChar extends QueryTest with BeforeAndAfterAll { http://git-wip-us.apache.org/repos/asf/carbondata/blob/770e42df/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/emptyrow/TestEmptyRows.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/emptyrow/TestEmptyRows.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/emptyrow/TestEmptyRows.scala index 5d6c07a..7563cc2 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/emptyrow/TestEmptyRows.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/emptyrow/TestEmptyRows.scala @@ -17,11 +17,10 @@ package org.apache.carbondata.spark.testsuite.singlevaluerow -import org.apache.spark.sql.common.util.QueryTest import org.scalatest.BeforeAndAfterAll - import org.apache.carbondata.core.constants.CarbonCommonConstants import org.apache.carbondata.core.util.CarbonProperties +import org.apache.spark.sql.test.util.QueryTest class TestEmptyRows extends QueryTest with BeforeAndAfterAll { http://git-wip-us.apache.org/repos/asf/carbondata/blob/770e42df/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/primitiveTypes/DoubleDataTypeTestCase.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/primitiveTypes/DoubleDataTypeTestCase.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/primitiveTypes/DoubleDataTypeTestCase.scala index e72151d..67bbd10 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/primitiveTypes/DoubleDataTypeTestCase.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/primitiveTypes/DoubleDataTypeTestCase.scala @@ -18,8 +18,8 @@ package org.apache.carbondata.integration.spark.testsuite.primitiveTypes import java.util.Random +import org.apache.spark.sql.test.util.QueryTest import org.apache.spark.sql.{DataFrame, Row, SaveMode} -import org.apache.spark.sql.common.util.QueryTest import org.apache.spark.sql.types._ import org.scalatest.BeforeAndAfterAll http://git-wip-us.apache.org/repos/asf/carbondata/blob/770e42df/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/primitiveTypes/FloatDataTypeTestCase.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/primitiveTypes/FloatDataTypeTestCase.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/primitiveTypes/FloatDataTypeTestCase.scala index 8eaf12c..076ef2c 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/primitiveTypes/FloatDataTypeTestCase.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/primitiveTypes/FloatDataTypeTestCase.scala @@ -17,7 +17,7 @@ package org.apache.carbondata.integration.spark.testsuite.primitiveTypes import org.apache.spark.sql.Row -import org.apache.spark.sql.common.util.QueryTest +import org.apache.spark.sql.test.util.QueryTest import org.scalatest.BeforeAndAfterAll /** http://git-wip-us.apache.org/repos/asf/carbondata/blob/770e42df/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/aggquery/AllDataTypesTestCaseAggregate.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/aggquery/AllDataTypesTestCaseAggregate.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/aggquery/AllDataTypesTestCaseAggregate.scala index 419f91b..70698fe 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/aggquery/AllDataTypesTestCaseAggregate.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/aggquery/AllDataTypesTestCaseAggregate.scala @@ -17,11 +17,10 @@ package org.apache.carbondata.spark.testsuite.aggquery -import org.apache.spark.sql.common.util.QueryTest import org.scalatest.BeforeAndAfterAll - import org.apache.carbondata.core.constants.CarbonCommonConstants import org.apache.carbondata.core.util.CarbonProperties +import org.apache.spark.sql.test.util.QueryTest /** * Test Class for aggregate query on multiple datatypes http://git-wip-us.apache.org/repos/asf/carbondata/blob/770e42df/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/aggquery/AverageQueryTestCase.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/aggquery/AverageQueryTestCase.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/aggquery/AverageQueryTestCase.scala index acabfa7..6561df2 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/aggquery/AverageQueryTestCase.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/aggquery/AverageQueryTestCase.scala @@ -17,11 +17,10 @@ package org.apache.carbondata.spark.testsuite.aggquery import org.apache.spark.sql.Row -import org.apache.spark.sql.common.util.QueryTest import org.scalatest.BeforeAndAfterAll - import org.apache.carbondata.core.constants.CarbonCommonConstants import org.apache.carbondata.core.util.CarbonProperties +import org.apache.spark.sql.test.util.QueryTest /** * test cases for aggregate query http://git-wip-us.apache.org/repos/asf/carbondata/blob/770e42df/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/allqueries/AllDataTypesTestCaseAggregate.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/allqueries/AllDataTypesTestCaseAggregate.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/allqueries/AllDataTypesTestCaseAggregate.scala index 931212d..cf6fa4f 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/allqueries/AllDataTypesTestCaseAggregate.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/allqueries/AllDataTypesTestCaseAggregate.scala @@ -17,12 +17,11 @@ package org.apache.carbondata.spark.testsuite.allqueries -import org.apache.spark.sql.common.util.QueryTest import org.apache.spark.sql.{Row, SaveMode} import org.scalatest.BeforeAndAfterAll - import org.apache.carbondata.core.constants.CarbonCommonConstants import org.apache.carbondata.core.util.CarbonProperties +import org.apache.spark.sql.test.util.QueryTest /** * Test Class for all query on multiple datatypes http://git-wip-us.apache.org/repos/asf/carbondata/blob/770e42df/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/allqueries/DoubleDataTypeTest.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/allqueries/DoubleDataTypeTest.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/allqueries/DoubleDataTypeTest.scala index 7df7fcd..d7a96eb 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/allqueries/DoubleDataTypeTest.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/allqueries/DoubleDataTypeTest.scala @@ -17,7 +17,7 @@ package org.apache.carbondata.spark.testsuite.allqueries -import org.apache.spark.sql.common.util.QueryTest +import org.apache.spark.sql.test.util.QueryTest import org.scalatest.BeforeAndAfterAll class DoubleDataTypeTest extends QueryTest with BeforeAndAfterAll { http://git-wip-us.apache.org/repos/asf/carbondata/blob/770e42df/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/allqueries/InsertIntoCarbonTableTestCase.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/allqueries/InsertIntoCarbonTableTestCase.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/allqueries/InsertIntoCarbonTableTestCase.scala index c968672..b9284e9 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/allqueries/InsertIntoCarbonTableTestCase.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/allqueries/InsertIntoCarbonTableTestCase.scala @@ -16,11 +16,10 @@ */ package org.apache.carbondata.spark.testsuite.allqueries -import org.apache.spark.sql.common.util.QueryTest import org.scalatest.BeforeAndAfterAll - import org.apache.carbondata.core.constants.CarbonCommonConstants import org.apache.carbondata.core.util.CarbonProperties +import org.apache.spark.sql.test.util.QueryTest class InsertIntoCarbonTableTestCase extends QueryTest with BeforeAndAfterAll { override def beforeAll { http://git-wip-us.apache.org/repos/asf/carbondata/blob/770e42df/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/allqueries/TestQueryWithOldCarbonDataFile.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/allqueries/TestQueryWithOldCarbonDataFile.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/allqueries/TestQueryWithOldCarbonDataFile.scala index cb6f4c5..54b58fc 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/allqueries/TestQueryWithOldCarbonDataFile.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/allqueries/TestQueryWithOldCarbonDataFile.scala @@ -17,11 +17,10 @@ package org.apache.carbondata.spark.testsuite.allqueries -import org.apache.spark.sql.common.util.QueryTest import org.scalatest.BeforeAndAfterAll - import org.apache.carbondata.core.constants.CarbonCommonConstants import org.apache.carbondata.core.util.CarbonProperties +import org.apache.spark.sql.test.util.QueryTest /* * Test Class for query without data load http://git-wip-us.apache.org/repos/asf/carbondata/blob/770e42df/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/allqueries/TestQueryWithoutDataLoad.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/allqueries/TestQueryWithoutDataLoad.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/allqueries/TestQueryWithoutDataLoad.scala index 8fddf84..3e4f2e5 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/allqueries/TestQueryWithoutDataLoad.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/allqueries/TestQueryWithoutDataLoad.scala @@ -18,7 +18,7 @@ package org.apache.carbondata.spark.testsuite.allqueries import org.apache.spark.sql.Row -import org.apache.spark.sql.common.util.QueryTest +import org.apache.spark.sql.test.util.QueryTest import org.scalatest.BeforeAndAfterAll /* http://git-wip-us.apache.org/repos/asf/carbondata/blob/770e42df/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/allqueries/TestTableNameHasDbName.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/allqueries/TestTableNameHasDbName.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/allqueries/TestTableNameHasDbName.scala index ca04f27..510a2d6 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/allqueries/TestTableNameHasDbName.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/allqueries/TestTableNameHasDbName.scala @@ -17,7 +17,7 @@ package org.apache.carbondata.spark.testsuite.allqueries -import org.apache.spark.sql.common.util.QueryTest +import org.apache.spark.sql.test.util.QueryTest import org.scalatest.BeforeAndAfterAll /* http://git-wip-us.apache.org/repos/asf/carbondata/blob/770e42df/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/badrecordloger/BadRecordEmptyDataTest.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/badrecordloger/BadRecordEmptyDataTest.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/badrecordloger/BadRecordEmptyDataTest.scala index 56f096d..4e5af3d 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/badrecordloger/BadRecordEmptyDataTest.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/badrecordloger/BadRecordEmptyDataTest.scala @@ -20,12 +20,11 @@ package org.apache.carbondata.spark.testsuite.badrecordloger import java.io.File import org.apache.spark.sql.Row -import org.apache.spark.sql.common.util.QueryTest import org.apache.spark.sql.hive.HiveContext import org.scalatest.BeforeAndAfterAll - import org.apache.carbondata.core.constants.CarbonCommonConstants import org.apache.carbondata.core.util.CarbonProperties +import org.apache.spark.sql.test.util.QueryTest /** * Test Class for detailed query on timestamp datatypes http://git-wip-us.apache.org/repos/asf/carbondata/blob/770e42df/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/badrecordloger/BadRecordLoggerTest.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/badrecordloger/BadRecordLoggerTest.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/badrecordloger/BadRecordLoggerTest.scala index 1c624bf..3c7f5e2 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/badrecordloger/BadRecordLoggerTest.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/badrecordloger/BadRecordLoggerTest.scala @@ -20,12 +20,11 @@ package org.apache.carbondata.spark.testsuite.badrecordloger import java.io.File import org.apache.spark.sql.Row -import org.apache.spark.sql.common.util.QueryTest import org.apache.spark.sql.hive.HiveContext import org.scalatest.BeforeAndAfterAll - import org.apache.carbondata.core.constants.CarbonCommonConstants import org.apache.carbondata.core.util.CarbonProperties +import org.apache.spark.sql.test.util.QueryTest /** * Test Class for detailed query on timestamp datatypes http://git-wip-us.apache.org/repos/asf/carbondata/blob/770e42df/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/bigdecimal/TestAvgForBigInt.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/bigdecimal/TestAvgForBigInt.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/bigdecimal/TestAvgForBigInt.scala index 23e521a..2efd334 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/bigdecimal/TestAvgForBigInt.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/bigdecimal/TestAvgForBigInt.scala @@ -17,7 +17,7 @@ package org.apache.carbondata.spark.testsuite.bigdecimal -import org.apache.spark.sql.common.util.QueryTest +import org.apache.spark.sql.test.util.QueryTest import org.scalatest.BeforeAndAfterAll class TestAvgForBigInt extends QueryTest with BeforeAndAfterAll { http://git-wip-us.apache.org/repos/asf/carbondata/blob/770e42df/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/bigdecimal/TestBigDecimal.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/bigdecimal/TestBigDecimal.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/bigdecimal/TestBigDecimal.scala index 722f6eb..39167e2 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/bigdecimal/TestBigDecimal.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/bigdecimal/TestBigDecimal.scala @@ -17,11 +17,10 @@ package org.apache.carbondata.spark.testsuite.bigdecimal -import org.apache.spark.sql.common.util.QueryTest import org.scalatest.BeforeAndAfterAll - import org.apache.carbondata.core.constants.CarbonCommonConstants import org.apache.carbondata.core.util.CarbonProperties +import org.apache.spark.sql.test.util.QueryTest /** * Test cases for testing big decimal functionality http://git-wip-us.apache.org/repos/asf/carbondata/blob/770e42df/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/bigdecimal/TestNullAndEmptyFields.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/bigdecimal/TestNullAndEmptyFields.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/bigdecimal/TestNullAndEmptyFields.scala index b61779d..1946695 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/bigdecimal/TestNullAndEmptyFields.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/bigdecimal/TestNullAndEmptyFields.scala @@ -17,11 +17,10 @@ package org.apache.carbondata.spark.testsuite.bigdecimal -import org.apache.spark.sql.common.util.QueryTest import org.scalatest.BeforeAndAfterAll - import org.apache.carbondata.core.constants.CarbonCommonConstants import org.apache.carbondata.core.util.CarbonProperties +import org.apache.spark.sql.test.util.QueryTest /** * Test cases for testing columns having null value http://git-wip-us.apache.org/repos/asf/carbondata/blob/770e42df/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/bigdecimal/TestNullAndEmptyFieldsUnsafe.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/bigdecimal/TestNullAndEmptyFieldsUnsafe.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/bigdecimal/TestNullAndEmptyFieldsUnsafe.scala index b97fb3d..834ebc8 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/bigdecimal/TestNullAndEmptyFieldsUnsafe.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/bigdecimal/TestNullAndEmptyFieldsUnsafe.scala @@ -17,11 +17,10 @@ package org.apache.carbondata.spark.testsuite.bigdecimal -import org.apache.spark.sql.common.util.QueryTest import org.scalatest.BeforeAndAfterAll - import org.apache.carbondata.core.constants.CarbonCommonConstants import org.apache.carbondata.core.util.CarbonProperties +import org.apache.spark.sql.test.util.QueryTest /** * Test cases for testing columns having null value http://git-wip-us.apache.org/repos/asf/carbondata/blob/770e42df/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/blockprune/BlockPruneQueryTestCase.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/blockprune/BlockPruneQueryTestCase.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/blockprune/BlockPruneQueryTestCase.scala index 44e06a0..21de2ae 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/blockprune/BlockPruneQueryTestCase.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/blockprune/BlockPruneQueryTestCase.scala @@ -19,10 +19,9 @@ package org.apache.carbondata.spark.testsuite.blockprune import java.io.DataOutputStream import org.apache.spark.sql.Row -import org.apache.spark.sql.common.util.QueryTest import org.scalatest.BeforeAndAfterAll - import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.spark.sql.test.util.QueryTest /** * This class contains test cases for block prune query http://git-wip-us.apache.org/repos/asf/carbondata/blob/770e42df/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/blockprune/CarbonCustomBlockDistributionTest.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/blockprune/CarbonCustomBlockDistributionTest.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/blockprune/CarbonCustomBlockDistributionTest.scala index 6a8c23b..3865f08 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/blockprune/CarbonCustomBlockDistributionTest.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/blockprune/CarbonCustomBlockDistributionTest.scala @@ -19,12 +19,11 @@ package org.apache.carbondata.spark.testsuite.blockprune import java.io.DataOutputStream import org.apache.spark.sql.Row -import org.apache.spark.sql.common.util.QueryTest import org.scalatest.BeforeAndAfterAll - import org.apache.carbondata.core.constants.CarbonCommonConstants import org.apache.carbondata.core.datastore.impl.FileFactory import org.apache.carbondata.core.util.CarbonProperties +import org.apache.spark.sql.test.util.QueryTest /** * This class contains test cases for block prune query for carbon custom block distribution http://git-wip-us.apache.org/repos/asf/carbondata/blob/770e42df/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/createTable/TestCreateTableWithDatabaseNameCaseChange.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/createTable/TestCreateTableWithDatabaseNameCaseChange.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/createTable/TestCreateTableWithDatabaseNameCaseChange.scala index 5bf55f9..90a2cb7 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/createTable/TestCreateTableWithDatabaseNameCaseChange.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/createTable/TestCreateTableWithDatabaseNameCaseChange.scala @@ -17,7 +17,7 @@ package org.apache.carbondata.spark.testsuite.createTable -import org.apache.spark.sql.common.util.QueryTest +import org.apache.spark.sql.test.util.QueryTest import org.scalatest.BeforeAndAfterAll /** http://git-wip-us.apache.org/repos/asf/carbondata/blob/770e42df/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/createTable/TestCreateTableWithSpaceInColumnName.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/createTable/TestCreateTableWithSpaceInColumnName.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/createTable/TestCreateTableWithSpaceInColumnName.scala index 13740c7..68c81e8 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/createTable/TestCreateTableWithSpaceInColumnName.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/createTable/TestCreateTableWithSpaceInColumnName.scala @@ -19,7 +19,7 @@ package org.apache.carbondata.spark.testsuite.createTable -import org.apache.spark.sql.common.util.QueryTest +import org.apache.spark.sql.test.util.QueryTest import org.scalatest.BeforeAndAfterAll /** http://git-wip-us.apache.org/repos/asf/carbondata/blob/770e42df/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/createTable/TestTableIdTest.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/createTable/TestTableIdTest.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/createTable/TestTableIdTest.scala index 3ccd2e3..a6790c8 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/createTable/TestTableIdTest.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/createTable/TestTableIdTest.scala @@ -20,13 +20,12 @@ package org.apache.carbondata.spark.testsuite.createTable import org.apache.hadoop.conf.Configuration import org.apache.hadoop.mapred.JobConf import org.apache.hadoop.mapreduce.Job -import org.apache.spark.sql.common.util.QueryTest import org.junit.Assert import org.scalatest.BeforeAndAfterAll - import org.apache.carbondata.core.metadata.AbsoluteTableIdentifier import org.apache.carbondata.core.metadata.schema.table.CarbonTable import org.apache.carbondata.hadoop.CarbonInputFormat +import org.apache.spark.sql.test.util.QueryTest /** * test functionality related the case change for database name http://git-wip-us.apache.org/repos/asf/carbondata/blob/770e42df/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/datacompaction/DataCompactionBlockletBoundryTest.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/datacompaction/DataCompactionBlockletBoundryTest.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/datacompaction/DataCompactionBlockletBoundryTest.scala index a5078e7..38367c9 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/datacompaction/DataCompactionBlockletBoundryTest.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/datacompaction/DataCompactionBlockletBoundryTest.scala @@ -16,11 +16,10 @@ */ package org.apache.carbondata.spark.testsuite.datacompaction -import org.apache.spark.sql.common.util.QueryTest import org.scalatest.BeforeAndAfterAll - import org.apache.carbondata.core.constants.CarbonCommonConstants import org.apache.carbondata.core.util.CarbonProperties +import org.apache.spark.sql.test.util.QueryTest /** * FT for data compaction scenario. http://git-wip-us.apache.org/repos/asf/carbondata/blob/770e42df/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/datacompaction/DataCompactionBoundaryConditionsTest.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/datacompaction/DataCompactionBoundaryConditionsTest.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/datacompaction/DataCompactionBoundaryConditionsTest.scala index cceef6b..5fadfb7 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/datacompaction/DataCompactionBoundaryConditionsTest.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/datacompaction/DataCompactionBoundaryConditionsTest.scala @@ -16,12 +16,11 @@ */ package org.apache.carbondata.spark.testsuite.datacompaction -import org.apache.spark.sql.common.util.QueryTest import org.scalatest.BeforeAndAfterAll - import org.apache.carbondata.core.metadata.CarbonTableIdentifier import org.apache.carbondata.core.constants.CarbonCommonConstants import org.apache.carbondata.core.util.CarbonProperties +import org.apache.spark.sql.test.util.QueryTest /** * FT for data compaction Boundary condition verification. http://git-wip-us.apache.org/repos/asf/carbondata/blob/770e42df/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/datacompaction/DataCompactionCardinalityBoundryTest.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/datacompaction/DataCompactionCardinalityBoundryTest.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/datacompaction/DataCompactionCardinalityBoundryTest.scala index 311c53f..e53df6c 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/datacompaction/DataCompactionCardinalityBoundryTest.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/datacompaction/DataCompactionCardinalityBoundryTest.scala @@ -19,13 +19,12 @@ package org.apache.carbondata.spark.testsuite.datacompaction import scala.collection.JavaConverters._ import org.apache.spark.sql.Row -import org.apache.spark.sql.common.util.QueryTest import org.scalatest.BeforeAndAfterAll - import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, CarbonTableIdentifier} import org.apache.carbondata.core.constants.CarbonCommonConstants import org.apache.carbondata.core.statusmanager.SegmentStatusManager import org.apache.carbondata.core.util.CarbonProperties +import org.apache.spark.sql.test.util.QueryTest /** * FT for data compaction scenario. http://git-wip-us.apache.org/repos/asf/carbondata/blob/770e42df/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/datacompaction/DataCompactionLockTest.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/datacompaction/DataCompactionLockTest.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/datacompaction/DataCompactionLockTest.scala index 2266fc0..29f3492 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/datacompaction/DataCompactionLockTest.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/datacompaction/DataCompactionLockTest.scala @@ -20,15 +20,14 @@ package org.apache.carbondata.spark.testsuite.datacompaction import scala.collection.JavaConverters._ -import org.apache.spark.sql.common.util.QueryTest import org.scalatest.BeforeAndAfterAll - import org.apache.carbondata.core.util.path.{CarbonStorePath, CarbonTablePath} import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, CarbonTableIdentifier} import org.apache.carbondata.core.constants.CarbonCommonConstants import org.apache.carbondata.core.statusmanager.SegmentStatusManager import org.apache.carbondata.core.util.CarbonProperties import org.apache.carbondata.core.locks.{CarbonLockFactory, ICarbonLock, LockUsage} +import org.apache.spark.sql.test.util.QueryTest /** http://git-wip-us.apache.org/repos/asf/carbondata/blob/770e42df/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/datacompaction/MajorCompactionIgnoreInMinorTest.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/datacompaction/MajorCompactionIgnoreInMinorTest.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/datacompaction/MajorCompactionIgnoreInMinorTest.scala index b66e37b..b07c82a 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/datacompaction/MajorCompactionIgnoreInMinorTest.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/datacompaction/MajorCompactionIgnoreInMinorTest.scala @@ -18,9 +18,7 @@ package org.apache.carbondata.spark.testsuite.datacompaction import scala.collection.JavaConverters._ -import org.apache.spark.sql.common.util.QueryTest import org.scalatest.BeforeAndAfterAll - import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, CarbonTableIdentifier} import org.apache.carbondata.core.datastore.TableSegmentUniqueIdentifier import org.apache.carbondata.core.datastore.block.SegmentTaskIndexWrapper @@ -29,6 +27,7 @@ import org.apache.carbondata.core.constants.CarbonCommonConstants import org.apache.carbondata.core.statusmanager.SegmentStatusManager import org.apache.carbondata.core.util.CarbonProperties import org.apache.carbondata.hadoop.CacheClient +import org.apache.spark.sql.test.util.QueryTest /** * FT for compaction scenario where major segment should not be included in minor. http://git-wip-us.apache.org/repos/asf/carbondata/blob/770e42df/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/datacompaction/MajorCompactionStopsAfterCompaction.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/datacompaction/MajorCompactionStopsAfterCompaction.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/datacompaction/MajorCompactionStopsAfterCompaction.scala index 6d05f61..4976c24 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/datacompaction/MajorCompactionStopsAfterCompaction.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/datacompaction/MajorCompactionStopsAfterCompaction.scala @@ -18,13 +18,12 @@ package org.apache.carbondata.spark.testsuite.datacompaction import scala.collection.JavaConverters._ -import org.apache.spark.sql.common.util.QueryTest import org.scalatest.BeforeAndAfterAll - import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, CarbonTableIdentifier} import org.apache.carbondata.core.constants.CarbonCommonConstants import org.apache.carbondata.core.statusmanager.SegmentStatusManager import org.apache.carbondata.core.util.CarbonProperties +import org.apache.spark.sql.test.util.QueryTest /** * FT for compaction scenario where major compaction will only compact the segments which are http://git-wip-us.apache.org/repos/asf/carbondata/blob/770e42df/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestBatchSortDataLoad.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestBatchSortDataLoad.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestBatchSortDataLoad.scala index d53b5e5..0ac689b 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestBatchSortDataLoad.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestBatchSortDataLoad.scala @@ -19,12 +19,11 @@ package org.apache.carbondata.spark.testsuite.dataload import java.io.{BufferedWriter, File, FileWriter, FilenameFilter} -import org.apache.spark.sql.common.util.QueryTest import org.apache.spark.sql.Row import org.scalatest.BeforeAndAfterAll - import org.apache.carbondata.core.constants.CarbonCommonConstants import org.apache.carbondata.core.util.CarbonProperties +import org.apache.spark.sql.test.util.QueryTest class TestBatchSortDataLoad extends QueryTest with BeforeAndAfterAll { var filePath: String = _ http://git-wip-us.apache.org/repos/asf/carbondata/blob/770e42df/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestDataLoadPartitionCoalescer.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestDataLoadPartitionCoalescer.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestDataLoadPartitionCoalescer.scala index 046bb37..d82a235 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestDataLoadPartitionCoalescer.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestDataLoadPartitionCoalescer.scala @@ -21,7 +21,7 @@ import org.apache.hadoop.mapreduce.lib.input.FileSplit import org.apache.spark.rdd.{DataLoadPartitionCoalescer, RDD} import org.apache.spark.sql.Row import org.apache.spark.sql.catalyst.expressions.GenericRow -import org.apache.spark.sql.common.util.QueryTest +import org.apache.spark.sql.test.util.QueryTest import org.apache.spark.{Partition, SerializableWritable, SparkContext, TaskContext} import org.scalatest.BeforeAndAfterAll http://git-wip-us.apache.org/repos/asf/carbondata/blob/770e42df/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestDataLoadWithColumnsMoreThanSchema.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestDataLoadWithColumnsMoreThanSchema.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestDataLoadWithColumnsMoreThanSchema.scala index c25e520..adbc1b1 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestDataLoadWithColumnsMoreThanSchema.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestDataLoadWithColumnsMoreThanSchema.scala @@ -17,10 +17,9 @@ package org.apache.carbondata.spark.testsuite.dataload -import org.apache.spark.sql.common.util.QueryTest import org.scalatest.BeforeAndAfterAll - import org.apache.carbondata.spark.exception.MalformedCarbonCommandException +import org.apache.spark.sql.test.util.QueryTest /** * This class will test data load in which number of columns in data are more than http://git-wip-us.apache.org/repos/asf/carbondata/blob/770e42df/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestDataLoadWithFileName.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestDataLoadWithFileName.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestDataLoadWithFileName.scala index 20f2cd8..243e453 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestDataLoadWithFileName.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestDataLoadWithFileName.scala @@ -23,7 +23,7 @@ import org.apache.carbondata.core.constants.CarbonCommonConstants import org.apache.carbondata.core.reader.CarbonIndexFileReader import org.apache.carbondata.core.util.CarbonProperties import org.apache.carbondata.core.util.path.CarbonTablePath -import org.apache.spark.sql.common.util.QueryTest +import org.apache.spark.sql.test.util.QueryTest import org.scalatest.BeforeAndAfterAll class TestDataLoadWithFileName extends QueryTest with BeforeAndAfterAll { http://git-wip-us.apache.org/repos/asf/carbondata/blob/770e42df/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestDataWithDicExcludeAndInclude.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestDataWithDicExcludeAndInclude.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestDataWithDicExcludeAndInclude.scala index 01012a7..ed3ff24 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestDataWithDicExcludeAndInclude.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestDataWithDicExcludeAndInclude.scala @@ -17,11 +17,10 @@ package org.apache.carbondata.spark.testsuite.dataload -import org.apache.spark.sql.common.util.QueryTest import org.scalatest.BeforeAndAfterAll - import org.apache.carbondata.core.constants.CarbonCommonConstants import org.apache.carbondata.core.util.CarbonProperties +import org.apache.spark.sql.test.util.QueryTest class TestLoadDataWithDictionaryExcludeAndInclude extends QueryTest with BeforeAndAfterAll { var filePath: String = _ http://git-wip-us.apache.org/repos/asf/carbondata/blob/770e42df/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestGlobalSortDataLoad.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestGlobalSortDataLoad.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestGlobalSortDataLoad.scala index 3f5be84..64ea6dd 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestGlobalSortDataLoad.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestGlobalSortDataLoad.scala @@ -23,8 +23,8 @@ import org.apache.carbondata.core.constants.CarbonCommonConstants import org.apache.carbondata.core.util.CarbonProperties import org.apache.carbondata.spark.exception.MalformedCarbonCommandException import org.apache.spark.sql.Row -import org.apache.spark.sql.common.util.QueryTest import org.apache.spark.sql.test.TestQueryExecutor.projectPath +import org.apache.spark.sql.test.util.QueryTest import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach} class TestGlobalSortDataLoad extends QueryTest with BeforeAndAfterEach with BeforeAndAfterAll { http://git-wip-us.apache.org/repos/asf/carbondata/blob/770e42df/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestLoadDataFrame.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestLoadDataFrame.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestLoadDataFrame.scala index 994acf6..f2ea45e 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestLoadDataFrame.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestLoadDataFrame.scala @@ -19,7 +19,7 @@ package org.apache.carbondata.spark.testsuite.dataload import java.math.BigDecimal -import org.apache.spark.sql.common.util.QueryTest +import org.apache.spark.sql.test.util.QueryTest import org.apache.spark.sql.types.{DecimalType, DoubleType, StringType, StructField, StructType} import org.apache.spark.sql.{DataFrame, Row, SaveMode} import org.scalatest.BeforeAndAfterAll http://git-wip-us.apache.org/repos/asf/carbondata/blob/770e42df/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestLoadDataUseAllDictionary.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestLoadDataUseAllDictionary.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestLoadDataUseAllDictionary.scala index d6deb89..c8d47e9 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestLoadDataUseAllDictionary.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestLoadDataUseAllDictionary.scala @@ -17,10 +17,9 @@ package org.apache.carbondata.spark.testsuite.dataload -import org.apache.spark.sql.common.util.QueryTest import org.scalatest.BeforeAndAfterAll - import org.apache.carbondata.processing.etl.DataLoadingException +import org.apache.spark.sql.test.util.QueryTest class TestLoadDataUseAllDictionary extends QueryTest with BeforeAndAfterAll{ override def beforeAll { http://git-wip-us.apache.org/repos/asf/carbondata/blob/770e42df/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestLoadDataWithDiffTimestampFormat.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestLoadDataWithDiffTimestampFormat.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestLoadDataWithDiffTimestampFormat.scala index 4ccd49e..71d6466 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestLoadDataWithDiffTimestampFormat.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestLoadDataWithDiffTimestampFormat.scala @@ -20,12 +20,11 @@ package org.apache.carbondata.spark.testsuite.dataload import java.sql.Timestamp import org.apache.spark.sql.Row -import org.apache.spark.sql.common.util.QueryTest import org.scalatest.BeforeAndAfterAll - import org.apache.carbondata.core.constants.CarbonCommonConstants import org.apache.carbondata.core.util.CarbonProperties import org.apache.carbondata.spark.exception.MalformedCarbonCommandException +import org.apache.spark.sql.test.util.QueryTest class TestLoadDataWithDiffTimestampFormat extends QueryTest with BeforeAndAfterAll { override def beforeAll { http://git-wip-us.apache.org/repos/asf/carbondata/blob/770e42df/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestLoadDataWithFileHeaderException.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestLoadDataWithFileHeaderException.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestLoadDataWithFileHeaderException.scala index dbde455..04ccc87 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestLoadDataWithFileHeaderException.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestLoadDataWithFileHeaderException.scala @@ -17,7 +17,7 @@ package org.apache.carbondata.spark.testsuite.dataload -import org.apache.spark.sql.common.util.QueryTest +import org.apache.spark.sql.test.util.QueryTest import org.scalatest.BeforeAndAfterAll class TestLoadDataWithFileHeaderException extends QueryTest with BeforeAndAfterAll{ http://git-wip-us.apache.org/repos/asf/carbondata/blob/770e42df/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestLoadDataWithHiveSyntaxDefaultFormat.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestLoadDataWithHiveSyntaxDefaultFormat.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestLoadDataWithHiveSyntaxDefaultFormat.scala index b8713e5..9416d47 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestLoadDataWithHiveSyntaxDefaultFormat.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestLoadDataWithHiveSyntaxDefaultFormat.scala @@ -20,11 +20,10 @@ package org.apache.carbondata.spark.testsuite.dataload import java.io.File import org.apache.spark.sql.Row -import org.apache.spark.sql.common.util.QueryTest import org.scalatest.BeforeAndAfterAll - import org.apache.carbondata.core.constants.CarbonCommonConstants import org.apache.carbondata.core.util.CarbonProperties +import org.apache.spark.sql.test.util.QueryTest /** * Test Class for data loading with hive syntax and old syntax http://git-wip-us.apache.org/repos/asf/carbondata/blob/770e42df/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestLoadDataWithHiveSyntaxUnsafe.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestLoadDataWithHiveSyntaxUnsafe.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestLoadDataWithHiveSyntaxUnsafe.scala index c713865..24637a6 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestLoadDataWithHiveSyntaxUnsafe.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestLoadDataWithHiveSyntaxUnsafe.scala @@ -20,11 +20,10 @@ package org.apache.carbondata.spark.testsuite.dataload import java.io.File import org.apache.spark.sql.Row -import org.apache.spark.sql.common.util.QueryTest import org.scalatest.BeforeAndAfterAll - import org.apache.carbondata.core.constants.CarbonCommonConstants import org.apache.carbondata.core.util.CarbonProperties +import org.apache.spark.sql.test.util.QueryTest /** * Test Class for data loading with Unsafe ColumnPage http://git-wip-us.apache.org/repos/asf/carbondata/blob/770e42df/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestLoadDataWithHiveSyntaxV1Format.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestLoadDataWithHiveSyntaxV1Format.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestLoadDataWithHiveSyntaxV1Format.scala index 8bf99bc..f884205 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestLoadDataWithHiveSyntaxV1Format.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestLoadDataWithHiveSyntaxV1Format.scala @@ -20,11 +20,10 @@ package org.apache.carbondata.spark.testsuite.dataload import java.io.File import org.apache.spark.sql.Row -import org.apache.spark.sql.common.util.QueryTest import org.scalatest.BeforeAndAfterAll - import org.apache.carbondata.core.constants.CarbonCommonConstants import org.apache.carbondata.core.util.CarbonProperties +import org.apache.spark.sql.test.util.QueryTest /** * Test Class for data loading with hive syntax and old syntax http://git-wip-us.apache.org/repos/asf/carbondata/blob/770e42df/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestLoadDataWithHiveSyntaxV2Format.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestLoadDataWithHiveSyntaxV2Format.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestLoadDataWithHiveSyntaxV2Format.scala index a3193c3..953e9a5 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestLoadDataWithHiveSyntaxV2Format.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestLoadDataWithHiveSyntaxV2Format.scala @@ -18,11 +18,10 @@ package org.apache.carbondata.spark.testsuite.dataload import org.apache.spark.sql.Row -import org.apache.spark.sql.common.util.QueryTest import org.scalatest.BeforeAndAfterAll - import org.apache.carbondata.core.constants.CarbonCommonConstants import org.apache.carbondata.core.util.CarbonProperties +import org.apache.spark.sql.test.util.QueryTest /** * Test Class for data loading with hive syntax and old syntax http://git-wip-us.apache.org/repos/asf/carbondata/blob/770e42df/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestLoadDataWithMalformedCarbonCommandException.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestLoadDataWithMalformedCarbonCommandException.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestLoadDataWithMalformedCarbonCommandException.scala index ae86fad..3462a07 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestLoadDataWithMalformedCarbonCommandException.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestLoadDataWithMalformedCarbonCommandException.scala @@ -17,10 +17,9 @@ package org.apache.carbondata.spark.testsuite.dataload -import org.apache.spark.sql.common.util.QueryTest import org.scalatest.BeforeAndAfterAll - import org.apache.carbondata.spark.exception.MalformedCarbonCommandException +import org.apache.spark.sql.test.util.QueryTest class TestLoadDataWithMalformedCarbonCommandException extends QueryTest with BeforeAndAfterAll {
