Repository: carbondata Updated Branches: refs/heads/master a86c54b3e -> 15f04c35c
[CARBONDATA-1752] Remove unused import Remove unused import This closes #1691 Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/15f04c35 Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/15f04c35 Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/15f04c35 Branch: refs/heads/master Commit: 15f04c35c24628f339b3e5917ef7b0e9d3751c22 Parents: a86c54b Author: xubo245 <[email protected]> Authored: Wed Dec 20 17:00:55 2017 +0800 Committer: Jacky Li <[email protected]> Committed: Wed Dec 20 17:56:31 2017 +0800 ---------------------------------------------------------------------- .../carbondata/core/CarbonPropertiesValidationTest.java | 1 - .../apache/carbondata/core/cache/CacheProviderTest.java | 2 -- .../cache/dictionary/DictionaryCacheLoaderImplTest.java | 1 - .../core/cache/dictionary/ForwardDictionaryCacheTest.java | 1 - .../core/dictionary/client/DictionaryClientTest.java | 1 - .../generator/ServerDictionaryGeneratorTest.java | 1 - .../generator/TableDictionaryGeneratorTest.java | 1 - .../mdkey/MultiDimKeyVarLengthGeneratorUnitTest.java | 1 - .../core/reader/CarbonDictionaryReaderImplTest.java | 1 - .../CarbonDictionarySortIndexReaderImplTest.java | 1 - .../expression/conditional/ListExpressionUnitTest.java | 1 - .../core/scan/filter/FilterExpressionProcessorTest.java | 2 -- .../carbondata/core/util/CarbonMetadataUtilTest.java | 1 - .../carbondata/core/util/DataFileFooterConverterTest.java | 1 - .../org/apache/carbondata/core/util/DataTypeUtilTest.java | 1 - .../CarbonDictionarySortIndexWriterImplTest.java | 1 - .../carbondata/presto/readers/ObjectStreamReader.java | 1 - .../carbondata/presto/readers/SliceStreamReader.java | 8 -------- .../testsuite/allqueries/MeasureOnlyTableTestCases.scala | 7 ++++--- .../CompactionSupportGlobalSortFunctionTest.scala | 3 --- .../DataCompactionBlockletBoundryTest.scala | 4 +++- .../testsuite/datacompaction/DataCompactionLockTest.scala | 3 ++- .../datacompaction/MajorCompactionIgnoreInMinorTest.scala | 10 ++++------ .../MajorCompactionStopsAfterCompaction.scala | 7 +++---- .../apache/carbondata/lcm/locks/LocalFileLockTest.java | 1 - .../apache/carbondata/lcm/locks/ZooKeeperLockingTest.java | 4 ---- 26 files changed, 16 insertions(+), 50 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/carbondata/blob/15f04c35/core/src/test/java/org/apache/carbondata/core/CarbonPropertiesValidationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/carbondata/core/CarbonPropertiesValidationTest.java b/core/src/test/java/org/apache/carbondata/core/CarbonPropertiesValidationTest.java index 1e4569d..27a9a6d 100644 --- a/core/src/test/java/org/apache/carbondata/core/CarbonPropertiesValidationTest.java +++ b/core/src/test/java/org/apache/carbondata/core/CarbonPropertiesValidationTest.java @@ -22,7 +22,6 @@ import java.lang.reflect.Method; import org.apache.carbondata.core.constants.CarbonCommonConstants; import org.apache.carbondata.core.util.CarbonProperties; -import org.apache.carbondata.core.util.CarbonProperty; import junit.framework.TestCase; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/carbondata/blob/15f04c35/core/src/test/java/org/apache/carbondata/core/cache/CacheProviderTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/carbondata/core/cache/CacheProviderTest.java b/core/src/test/java/org/apache/carbondata/core/cache/CacheProviderTest.java index 38f5a7b..0617af3 100644 --- a/core/src/test/java/org/apache/carbondata/core/cache/CacheProviderTest.java +++ b/core/src/test/java/org/apache/carbondata/core/cache/CacheProviderTest.java @@ -28,11 +28,9 @@ import org.apache.carbondata.core.constants.CarbonCommonConstants; import org.apache.carbondata.core.datastore.BlockIndexStore; import org.apache.carbondata.core.datastore.SegmentTaskIndexStore; import org.apache.carbondata.core.datastore.TableSegmentUniqueIdentifier; -import org.apache.carbondata.core.datastore.block.SegmentTaskIndexWrapper; import org.apache.carbondata.core.datastore.block.TableBlockUniqueIdentifier; import org.apache.carbondata.core.util.CarbonProperties; -import org.apache.avro.Schema; import org.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/carbondata/blob/15f04c35/core/src/test/java/org/apache/carbondata/core/cache/dictionary/DictionaryCacheLoaderImplTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/carbondata/core/cache/dictionary/DictionaryCacheLoaderImplTest.java b/core/src/test/java/org/apache/carbondata/core/cache/dictionary/DictionaryCacheLoaderImplTest.java index 83e9217..8bf8a07 100644 --- a/core/src/test/java/org/apache/carbondata/core/cache/dictionary/DictionaryCacheLoaderImplTest.java +++ b/core/src/test/java/org/apache/carbondata/core/cache/dictionary/DictionaryCacheLoaderImplTest.java @@ -30,7 +30,6 @@ import org.apache.carbondata.core.metadata.ColumnIdentifier; import org.apache.carbondata.core.metadata.datatype.DataTypes; import org.apache.carbondata.core.reader.CarbonDictionaryReaderImpl; import org.apache.carbondata.core.reader.sortindex.CarbonDictionarySortIndexReaderImpl; -import org.apache.carbondata.core.util.path.CarbonStorePath; import org.apache.carbondata.format.ColumnDictionaryChunk; import mockit.Mock; http://git-wip-us.apache.org/repos/asf/carbondata/blob/15f04c35/core/src/test/java/org/apache/carbondata/core/cache/dictionary/ForwardDictionaryCacheTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/carbondata/core/cache/dictionary/ForwardDictionaryCacheTest.java b/core/src/test/java/org/apache/carbondata/core/cache/dictionary/ForwardDictionaryCacheTest.java index 89fbf2d..d0aedd4 100644 --- a/core/src/test/java/org/apache/carbondata/core/cache/dictionary/ForwardDictionaryCacheTest.java +++ b/core/src/test/java/org/apache/carbondata/core/cache/dictionary/ForwardDictionaryCacheTest.java @@ -33,7 +33,6 @@ import org.apache.carbondata.core.metadata.AbsoluteTableIdentifier; import org.apache.carbondata.core.metadata.CarbonTableIdentifier; import org.apache.carbondata.core.metadata.ColumnIdentifier; import org.apache.carbondata.core.util.CarbonProperties; -import org.apache.carbondata.core.util.path.CarbonStorePath; import org.apache.carbondata.core.writer.sortindex.CarbonDictionarySortIndexWriter; import org.apache.carbondata.core.writer.sortindex.CarbonDictionarySortIndexWriterImpl; http://git-wip-us.apache.org/repos/asf/carbondata/blob/15f04c35/core/src/test/java/org/apache/carbondata/core/dictionary/client/DictionaryClientTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/carbondata/core/dictionary/client/DictionaryClientTest.java b/core/src/test/java/org/apache/carbondata/core/dictionary/client/DictionaryClientTest.java index 2fd69f8..dbd29e5 100644 --- a/core/src/test/java/org/apache/carbondata/core/dictionary/client/DictionaryClientTest.java +++ b/core/src/test/java/org/apache/carbondata/core/dictionary/client/DictionaryClientTest.java @@ -40,7 +40,6 @@ import mockit.Mock; import mockit.MockUp; import org.junit.After; import org.junit.Assert; -import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/carbondata/blob/15f04c35/core/src/test/java/org/apache/carbondata/core/dictionary/generator/ServerDictionaryGeneratorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/carbondata/core/dictionary/generator/ServerDictionaryGeneratorTest.java b/core/src/test/java/org/apache/carbondata/core/dictionary/generator/ServerDictionaryGeneratorTest.java index 57bd3c0..95d73a9 100644 --- a/core/src/test/java/org/apache/carbondata/core/dictionary/generator/ServerDictionaryGeneratorTest.java +++ b/core/src/test/java/org/apache/carbondata/core/dictionary/generator/ServerDictionaryGeneratorTest.java @@ -32,7 +32,6 @@ import org.apache.carbondata.core.metadata.schema.table.column.ColumnSchema; import org.apache.carbondata.core.util.CarbonProperties; import org.junit.After; -import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/carbondata/blob/15f04c35/core/src/test/java/org/apache/carbondata/core/dictionary/generator/TableDictionaryGeneratorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/carbondata/core/dictionary/generator/TableDictionaryGeneratorTest.java b/core/src/test/java/org/apache/carbondata/core/dictionary/generator/TableDictionaryGeneratorTest.java index f535a59..1ea77f8 100644 --- a/core/src/test/java/org/apache/carbondata/core/dictionary/generator/TableDictionaryGeneratorTest.java +++ b/core/src/test/java/org/apache/carbondata/core/dictionary/generator/TableDictionaryGeneratorTest.java @@ -22,7 +22,6 @@ import java.util.Arrays; import org.apache.carbondata.core.constants.CarbonCommonConstants; import org.apache.carbondata.core.dictionary.generator.key.DictionaryMessage; -import org.apache.carbondata.core.dictionary.generator.key.DictionaryMessageType; import org.apache.carbondata.core.metadata.CarbonMetadata; import org.apache.carbondata.core.metadata.encoder.Encoding; import org.apache.carbondata.core.metadata.schema.table.CarbonTable; http://git-wip-us.apache.org/repos/asf/carbondata/blob/15f04c35/core/src/test/java/org/apache/carbondata/core/keygenerator/mdkey/MultiDimKeyVarLengthGeneratorUnitTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/carbondata/core/keygenerator/mdkey/MultiDimKeyVarLengthGeneratorUnitTest.java b/core/src/test/java/org/apache/carbondata/core/keygenerator/mdkey/MultiDimKeyVarLengthGeneratorUnitTest.java index bc35093..31eb2a7 100644 --- a/core/src/test/java/org/apache/carbondata/core/keygenerator/mdkey/MultiDimKeyVarLengthGeneratorUnitTest.java +++ b/core/src/test/java/org/apache/carbondata/core/keygenerator/mdkey/MultiDimKeyVarLengthGeneratorUnitTest.java @@ -21,7 +21,6 @@ import org.junit.Before; import org.junit.Test; import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertNull; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; http://git-wip-us.apache.org/repos/asf/carbondata/blob/15f04c35/core/src/test/java/org/apache/carbondata/core/reader/CarbonDictionaryReaderImplTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/carbondata/core/reader/CarbonDictionaryReaderImplTest.java b/core/src/test/java/org/apache/carbondata/core/reader/CarbonDictionaryReaderImplTest.java index 70f1740..d3c3bc3 100644 --- a/core/src/test/java/org/apache/carbondata/core/reader/CarbonDictionaryReaderImplTest.java +++ b/core/src/test/java/org/apache/carbondata/core/reader/CarbonDictionaryReaderImplTest.java @@ -30,7 +30,6 @@ import org.apache.carbondata.core.metadata.ColumnIdentifier; import org.apache.carbondata.core.service.CarbonCommonFactory; import org.apache.carbondata.core.service.PathService; import org.apache.carbondata.core.service.impl.PathFactory; -import org.apache.carbondata.core.util.path.CarbonStorePath; import mockit.Mock; import mockit.MockUp; http://git-wip-us.apache.org/repos/asf/carbondata/blob/15f04c35/core/src/test/java/org/apache/carbondata/core/reader/sortindex/CarbonDictionarySortIndexReaderImplTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/carbondata/core/reader/sortindex/CarbonDictionarySortIndexReaderImplTest.java b/core/src/test/java/org/apache/carbondata/core/reader/sortindex/CarbonDictionarySortIndexReaderImplTest.java index 68d34cf..f6fcff9 100644 --- a/core/src/test/java/org/apache/carbondata/core/reader/sortindex/CarbonDictionarySortIndexReaderImplTest.java +++ b/core/src/test/java/org/apache/carbondata/core/reader/sortindex/CarbonDictionarySortIndexReaderImplTest.java @@ -29,7 +29,6 @@ import org.apache.carbondata.core.metadata.AbsoluteTableIdentifier; import org.apache.carbondata.core.metadata.CarbonTableIdentifier; import org.apache.carbondata.core.metadata.ColumnIdentifier; import org.apache.carbondata.core.util.CarbonUtil; -import org.apache.carbondata.core.util.path.CarbonStorePath; import org.apache.carbondata.core.writer.CarbonDictionaryWriter; import org.apache.carbondata.core.writer.CarbonDictionaryWriterImpl; import org.apache.carbondata.core.writer.sortindex.CarbonDictionarySortIndexWriter; http://git-wip-us.apache.org/repos/asf/carbondata/blob/15f04c35/core/src/test/java/org/apache/carbondata/core/scan/expression/conditional/ListExpressionUnitTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/carbondata/core/scan/expression/conditional/ListExpressionUnitTest.java b/core/src/test/java/org/apache/carbondata/core/scan/expression/conditional/ListExpressionUnitTest.java index f826851..b885fc8 100644 --- a/core/src/test/java/org/apache/carbondata/core/scan/expression/conditional/ListExpressionUnitTest.java +++ b/core/src/test/java/org/apache/carbondata/core/scan/expression/conditional/ListExpressionUnitTest.java @@ -33,7 +33,6 @@ import java.util.ArrayList; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsEqual.equalTo; import static org.junit.Assert.assertThat; -import static org.junit.Assert.assertTrue; public class ListExpressionUnitTest { http://git-wip-us.apache.org/repos/asf/carbondata/blob/15f04c35/core/src/test/java/org/apache/carbondata/core/scan/filter/FilterExpressionProcessorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/carbondata/core/scan/filter/FilterExpressionProcessorTest.java b/core/src/test/java/org/apache/carbondata/core/scan/filter/FilterExpressionProcessorTest.java index 1f244a3..14d4c1f 100644 --- a/core/src/test/java/org/apache/carbondata/core/scan/filter/FilterExpressionProcessorTest.java +++ b/core/src/test/java/org/apache/carbondata/core/scan/filter/FilterExpressionProcessorTest.java @@ -16,10 +16,8 @@ import org.apache.carbondata.core.metadata.schema.table.column.ColumnSchema; import org.apache.carbondata.core.scan.expression.ColumnExpression; import org.apache.carbondata.core.scan.expression.Expression; import org.apache.carbondata.core.scan.expression.LiteralExpression; -import org.apache.carbondata.core.scan.expression.conditional.EqualToExpression; import org.apache.carbondata.core.scan.expression.conditional.InExpression; import org.apache.carbondata.core.scan.filter.intf.ExpressionType; -import org.apache.carbondata.core.scan.filter.resolver.RowLevelFilterResolverImpl; import org.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/carbondata/blob/15f04c35/core/src/test/java/org/apache/carbondata/core/util/CarbonMetadataUtilTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/carbondata/core/util/CarbonMetadataUtilTest.java b/core/src/test/java/org/apache/carbondata/core/util/CarbonMetadataUtilTest.java index 28cfcf2..40463a6 100644 --- a/core/src/test/java/org/apache/carbondata/core/util/CarbonMetadataUtilTest.java +++ b/core/src/test/java/org/apache/carbondata/core/util/CarbonMetadataUtilTest.java @@ -23,7 +23,6 @@ import java.util.List; import org.apache.carbondata.core.datastore.block.SegmentProperties; import org.apache.carbondata.core.datastore.page.EncodedTablePage; -import org.apache.carbondata.core.datastore.page.encoding.ColumnPageEncoderMeta; import org.apache.carbondata.core.datastore.page.encoding.EncodedColumnPage; import org.apache.carbondata.core.datastore.page.key.TablePageKey; import org.apache.carbondata.core.datastore.page.statistics.PrimitivePageStatsCollector; http://git-wip-us.apache.org/repos/asf/carbondata/blob/15f04c35/core/src/test/java/org/apache/carbondata/core/util/DataFileFooterConverterTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/carbondata/core/util/DataFileFooterConverterTest.java b/core/src/test/java/org/apache/carbondata/core/util/DataFileFooterConverterTest.java index 30b3247..de64c0a 100644 --- a/core/src/test/java/org/apache/carbondata/core/util/DataFileFooterConverterTest.java +++ b/core/src/test/java/org/apache/carbondata/core/util/DataFileFooterConverterTest.java @@ -32,7 +32,6 @@ import org.apache.carbondata.core.datastore.impl.FileHolderImpl; import org.apache.carbondata.core.metadata.ColumnarFormatVersion; import org.apache.carbondata.core.metadata.blocklet.DataFileFooter; import org.apache.carbondata.core.metadata.blocklet.SegmentInfo; -import org.apache.carbondata.core.metadata.datatype.DataTypes; import org.apache.carbondata.core.reader.CarbonFooterReader; import org.apache.carbondata.core.reader.CarbonIndexFileReader; import org.apache.carbondata.core.reader.ThriftReader; http://git-wip-us.apache.org/repos/asf/carbondata/blob/15f04c35/core/src/test/java/org/apache/carbondata/core/util/DataTypeUtilTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/carbondata/core/util/DataTypeUtilTest.java b/core/src/test/java/org/apache/carbondata/core/util/DataTypeUtilTest.java index bb528b9..1975d7a 100644 --- a/core/src/test/java/org/apache/carbondata/core/util/DataTypeUtilTest.java +++ b/core/src/test/java/org/apache/carbondata/core/util/DataTypeUtilTest.java @@ -21,7 +21,6 @@ import java.math.BigDecimal; import java.math.BigInteger; import org.apache.carbondata.core.metadata.datatype.DataTypes; -import org.apache.carbondata.core.metadata.datatype.DecimalType; import org.apache.carbondata.core.metadata.schema.table.column.CarbonMeasure; import org.apache.carbondata.core.metadata.schema.table.column.ColumnSchema; http://git-wip-us.apache.org/repos/asf/carbondata/blob/15f04c35/core/src/test/java/org/apache/carbondata/core/writer/sortindex/CarbonDictionarySortIndexWriterImplTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/carbondata/core/writer/sortindex/CarbonDictionarySortIndexWriterImplTest.java b/core/src/test/java/org/apache/carbondata/core/writer/sortindex/CarbonDictionarySortIndexWriterImplTest.java index f74a254..7ab202f 100644 --- a/core/src/test/java/org/apache/carbondata/core/writer/sortindex/CarbonDictionarySortIndexWriterImplTest.java +++ b/core/src/test/java/org/apache/carbondata/core/writer/sortindex/CarbonDictionarySortIndexWriterImplTest.java @@ -29,7 +29,6 @@ import org.apache.carbondata.core.metadata.ColumnIdentifier; import org.apache.carbondata.core.reader.sortindex.CarbonDictionarySortIndexReader; import org.apache.carbondata.core.reader.sortindex.CarbonDictionarySortIndexReaderImpl; import org.apache.carbondata.core.util.CarbonUtil; -import org.apache.carbondata.core.util.path.CarbonStorePath; import org.apache.carbondata.core.writer.CarbonDictionaryWriter; import org.apache.carbondata.core.writer.CarbonDictionaryWriterImpl; http://git-wip-us.apache.org/repos/asf/carbondata/blob/15f04c35/integration/presto/src/main/java/org/apache/carbondata/presto/readers/ObjectStreamReader.java ---------------------------------------------------------------------- diff --git a/integration/presto/src/main/java/org/apache/carbondata/presto/readers/ObjectStreamReader.java b/integration/presto/src/main/java/org/apache/carbondata/presto/readers/ObjectStreamReader.java index d642e41..82d62ad 100644 --- a/integration/presto/src/main/java/org/apache/carbondata/presto/readers/ObjectStreamReader.java +++ b/integration/presto/src/main/java/org/apache/carbondata/presto/readers/ObjectStreamReader.java @@ -23,7 +23,6 @@ import com.facebook.presto.spi.block.Block; import com.facebook.presto.spi.block.BlockBuilder; import com.facebook.presto.spi.block.BlockBuilderStatus; import com.facebook.presto.spi.type.Type; -import io.airlift.slice.Slice; /** * Class to read the Object Stream http://git-wip-us.apache.org/repos/asf/carbondata/blob/15f04c35/integration/presto/src/main/java/org/apache/carbondata/presto/readers/SliceStreamReader.java ---------------------------------------------------------------------- diff --git a/integration/presto/src/main/java/org/apache/carbondata/presto/readers/SliceStreamReader.java b/integration/presto/src/main/java/org/apache/carbondata/presto/readers/SliceStreamReader.java index 36be07e..f307331 100644 --- a/integration/presto/src/main/java/org/apache/carbondata/presto/readers/SliceStreamReader.java +++ b/integration/presto/src/main/java/org/apache/carbondata/presto/readers/SliceStreamReader.java @@ -18,12 +18,6 @@ package org.apache.carbondata.presto.readers; import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import org.apache.carbondata.core.cache.dictionary.Dictionary; -import org.apache.carbondata.core.cache.dictionary.DictionaryChunksWrapper; import com.facebook.presto.spi.block.Block; import com.facebook.presto.spi.block.BlockBuilder; @@ -31,8 +25,6 @@ import com.facebook.presto.spi.block.BlockBuilderStatus; import com.facebook.presto.spi.block.DictionaryBlock; import com.facebook.presto.spi.block.SliceArrayBlock; import com.facebook.presto.spi.type.Type; -import io.airlift.slice.Slice; -import io.airlift.slice.Slices; import static io.airlift.slice.Slices.utf8Slice; import static io.airlift.slice.Slices.wrappedBuffer; http://git-wip-us.apache.org/repos/asf/carbondata/blob/15f04c35/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/allqueries/MeasureOnlyTableTestCases.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/allqueries/MeasureOnlyTableTestCases.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/allqueries/MeasureOnlyTableTestCases.scala index 4bc4bac..0a3869c 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/allqueries/MeasureOnlyTableTestCases.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/allqueries/MeasureOnlyTableTestCases.scala @@ -18,13 +18,14 @@ package org.apache.carbondata.spark.testsuite.allqueries import java.io.File -import java.math.{BigDecimal, RoundingMode} -import org.apache.spark.sql.{Row, SaveMode} import org.scalatest.BeforeAndAfterAll + +import org.apache.spark.sql.SaveMode +import org.apache.spark.sql.test.util.QueryTest + 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/15f04c35/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/datacompaction/CompactionSupportGlobalSortFunctionTest.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/datacompaction/CompactionSupportGlobalSortFunctionTest.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/datacompaction/CompactionSupportGlobalSortFunctionTest.scala index 9014edb..8f891ce 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/datacompaction/CompactionSupportGlobalSortFunctionTest.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/datacompaction/CompactionSupportGlobalSortFunctionTest.scala @@ -17,8 +17,6 @@ package org.apache.carbondata.spark.testsuite.datacompaction -import java.io.{File, FilenameFilter} - import org.apache.spark.sql.Row import org.apache.spark.sql.test.util.QueryTest import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach} @@ -26,7 +24,6 @@ import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach} import org.apache.carbondata.core.constants.CarbonCommonConstants import org.apache.carbondata.core.indexstore.blockletindex.SegmentIndexFileStore import org.apache.carbondata.core.metadata.CarbonMetadata -import org.apache.carbondata.core.metadata.schema.table.CarbonTable import org.apache.carbondata.core.util.CarbonProperties class CompactionSupportGlobalSortFunctionTest extends QueryTest with BeforeAndAfterEach with BeforeAndAfterAll { http://git-wip-us.apache.org/repos/asf/carbondata/blob/15f04c35/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 38367c9..11b6b93 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 @@ -17,9 +17,11 @@ package org.apache.carbondata.spark.testsuite.datacompaction import org.scalatest.BeforeAndAfterAll + +import org.apache.spark.sql.test.util.QueryTest + 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/15f04c35/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 20a779d..2ef88a4 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 @@ -22,13 +22,14 @@ import scala.collection.JavaConverters._ import org.scalatest.BeforeAndAfterAll +import org.apache.spark.sql.test.util.QueryTest + 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/15f04c35/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 61de615..6155d7c 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 @@ -20,18 +20,16 @@ import scala.collection.JavaConverters._ import org.scalatest.BeforeAndAfterAll -import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, CarbonMetadata, CarbonTableIdentifier} -import org.apache.carbondata.core.datastore.TableSegmentUniqueIdentifier -import org.apache.carbondata.core.datastore.block.SegmentTaskIndexWrapper -import org.apache.carbondata.core.util.path.CarbonStorePath import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.block.SegmentTaskIndexWrapper +import org.apache.carbondata.core.datastore.TableSegmentUniqueIdentifier +import org.apache.carbondata.core.metadata.CarbonMetadata import org.apache.carbondata.core.statusmanager.{SegmentStatus, SegmentStatusManager} import org.apache.carbondata.core.util.CarbonProperties +import org.apache.carbondata.core.util.path.CarbonStorePath import org.apache.carbondata.hadoop.CacheClient import org.apache.spark.sql.test.util.QueryTest -import org.apache.carbondata.core.metadata.schema.table.CarbonTable - /** * FT for compaction scenario where major segment should not be included in minor. */ http://git-wip-us.apache.org/repos/asf/carbondata/blob/15f04c35/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 7363838..bb1f829 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 @@ -20,13 +20,12 @@ import scala.collection.JavaConverters._ import org.scalatest.BeforeAndAfterAll -import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, CarbonMetadata, CarbonTableIdentifier} +import org.apache.spark.sql.test.util.QueryTest + import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.metadata.CarbonMetadata import org.apache.carbondata.core.statusmanager.SegmentStatusManager import org.apache.carbondata.core.util.CarbonProperties -import org.apache.spark.sql.test.util.QueryTest - -import org.apache.carbondata.core.metadata.schema.table.CarbonTable /** * FT for compaction scenario where major compaction will only compact the segments which are http://git-wip-us.apache.org/repos/asf/carbondata/blob/15f04c35/processing/src/test/java/org/apache/carbondata/lcm/locks/LocalFileLockTest.java ---------------------------------------------------------------------- diff --git a/processing/src/test/java/org/apache/carbondata/lcm/locks/LocalFileLockTest.java b/processing/src/test/java/org/apache/carbondata/lcm/locks/LocalFileLockTest.java index ba77f29..812db5c 100644 --- a/processing/src/test/java/org/apache/carbondata/lcm/locks/LocalFileLockTest.java +++ b/processing/src/test/java/org/apache/carbondata/lcm/locks/LocalFileLockTest.java @@ -19,7 +19,6 @@ package org.apache.carbondata.lcm.locks; import java.io.File; import org.apache.carbondata.core.metadata.AbsoluteTableIdentifier; -import org.apache.carbondata.core.metadata.CarbonTableIdentifier; import org.apache.carbondata.core.locks.LocalFileLock; import org.apache.carbondata.core.locks.LockUsage; import org.apache.carbondata.core.util.CarbonProperties; http://git-wip-us.apache.org/repos/asf/carbondata/blob/15f04c35/processing/src/test/java/org/apache/carbondata/lcm/locks/ZooKeeperLockingTest.java ---------------------------------------------------------------------- diff --git a/processing/src/test/java/org/apache/carbondata/lcm/locks/ZooKeeperLockingTest.java b/processing/src/test/java/org/apache/carbondata/lcm/locks/ZooKeeperLockingTest.java index e0b6d66..e7a0602 100644 --- a/processing/src/test/java/org/apache/carbondata/lcm/locks/ZooKeeperLockingTest.java +++ b/processing/src/test/java/org/apache/carbondata/lcm/locks/ZooKeeperLockingTest.java @@ -16,11 +16,8 @@ */ package org.apache.carbondata.lcm.locks; -import mockit.NonStrictExpectations; - import org.apache.carbondata.core.constants.CarbonCommonConstants; import org.apache.carbondata.core.metadata.AbsoluteTableIdentifier; -import org.apache.carbondata.core.metadata.CarbonTableIdentifier; import org.apache.carbondata.core.util.CarbonProperties; import org.apache.carbondata.core.locks.LockUsage; import org.apache.carbondata.core.locks.ZooKeeperLocking; @@ -32,7 +29,6 @@ import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Ignore; -import org.junit.Test; import java.io.File; import java.io.IOException;
