You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by ja...@apache.org on 2020/02/24 15:54:28 UTC
[carbondata] 01/02: [Re-factory] Re-factory modules
This is an automated email from the ASF dual-hosted git repository.
jackylk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/carbondata.git
commit 85d333c9f20bee03cdcc81d3f9e95836a476ddbf
Author: QiangCai <qi...@qq.com>
AuthorDate: Mon Feb 24 17:19:38 2020 +0800
[Re-factory] Re-factory modules
Why is this PR needed?
There are too many spark-related modules.
What changes were proposed in this PR?
1. move carbondata/store to carbondata/sdk
2. move examples/spark2 to examples/spark
3. move secondary_index to index/secondary-index
4. move datamap/mv to mv
5. move datamap to index
Does this PR introduce any user interface change?
No
Is any new testcase added?
No
---
examples/{spark2 => spark}/pom.xml | 4 +--
.../examples/sdk/CarbonReaderExample.java | 0
.../carbondata/examples/sdk/SDKS3Example.java | 0
.../carbondata/examples/sdk/SDKS3ReadExample.java | 0
.../examples/sdk/SDKS3SchemaReadExample.java | 0
.../examples/sql/JavaCarbonSessionExample.java | 2 +-
.../src/main/resources/Test_Data1.csv | 0
.../src/main/resources/complexdata.csv | 0
.../{spark2 => spark}/src/main/resources/data.csv | 0
.../{spark2 => spark}/src/main/resources/data1.csv | 0
.../src/main/resources/dataSample.csv | 0
.../src/main/resources/dimSample.csv | 0
.../src/main/resources/factSample.csv | 0
.../src/main/resources/log4j.properties | 0
.../src/main/resources/sample.csv | 0
.../src/main/resources/streamSample.csv | 0
.../benchmark/ConcurrentQueryBenchmark.scala | 2 +-
.../org/apache/carbondata/benchmark/Query.scala | 0
.../carbondata/benchmark/SCDType2Benchmark.scala | 2 +-
.../benchmark/SimpleQueryBenchmark.scala | 2 +-
.../carbondata/examples/AlluxioExample.scala | 0
.../carbondata/examples/AlterTableExample.scala | 0
.../examples/CarbonDataFrameExample.scala | 0
.../carbondata/examples/CarbonSessionExample.scala | 6 ++--
.../examples/CarbonSortColumnsExample.scala | 2 +-
.../examples/CaseClassDataFrameAPIExample.scala | 0
.../examples/CustomCompactionExample.scala | 2 +-
.../examples/DataFrameComplexTypeExample.scala | 0
.../examples/DataManagementExample.scala | 2 +-
.../examples/DataUpdateDeleteExample.scala | 0
.../carbondata/examples/DirectSQLExample.scala | 2 +-
.../carbondata/examples/ExternalTableExample.scala | 2 +-
.../carbondata/examples/HadoopFileExample.scala | 2 +-
.../apache/carbondata/examples/HiveExample.scala | 22 ++++++-------
.../carbondata/examples/LuceneDataMapExample.scala | 0
.../org/apache/carbondata/examples/MVExample.scala | 0
.../carbondata/examples/QuerySegmentExample.scala | 2 +-
.../apache/carbondata/examples/S3CsvExample.scala | 4 +--
.../org/apache/carbondata/examples/S3Example.scala | 2 +-
.../carbondata/examples/S3UsingSDkExample.scala | 0
.../carbondata/examples/SparkSessionExample.scala | 2 +-
.../examples/SparkStreamingExample.scala | 4 +--
.../examples/StandardPartitionExample.scala | 2 +-
.../carbondata/examples/StreamSQLExample.scala | 0
.../examples/StreamingUsingBatchLoadExample.scala | 4 +--
.../examples/StreamingWithRowParserExample.scala | 2 +-
.../examples/StructuredStreamingExample.scala | 2 +-
.../TableLevelCompactionOptionExample.scala | 2 +-
.../carbondata/examples/util/ExampleUtils.scala | 8 ++---
.../apache/carbondata/examplesCI/RunExamples.scala | 2 +-
{datamap => index}/bloom/pom.xml | 2 +-
.../datamap/bloom/AbstractBloomDataMapWriter.java | 0
.../datamap/bloom/BloomCacheKeyValue.java | 0
.../datamap/bloom/BloomCoarseGrainDataMap.java | 0
.../bloom/BloomCoarseGrainDataMapFactory.java | 0
.../datamap/bloom/BloomDataMapBuilder.java | 0
.../datamap/bloom/BloomDataMapCache.java | 0
.../datamap/bloom/BloomDataMapDistributable.java | 0
.../datamap/bloom/BloomDataMapModel.java | 0
.../datamap/bloom/BloomDataMapWriter.java | 0
.../datamap/bloom/BloomIndexFileStore.java | 0
.../carbondata/datamap/bloom/DataConvertUtil.java | 0
.../hadoop/util/bloom/CarbonBloomFilter.java | 0
{datamap => index}/examples/pom.xml | 6 ++--
.../datamap/examples/BlockletMinMax.java | 0
.../datamap/examples/MinMaxDataWriter.java | 0
.../datamap/examples/MinMaxIndexBlockDetails.java | 0
.../datamap/examples/MinMaxIndexDataMap.java | 0
.../examples/MinMaxIndexDataMapFactory.java | 0
.../datamap/examples/MinMaxDataMapSuite.scala | 0
{datamap => index}/lucene/pom.xml | 2 +-
.../datamap/lucene/LuceneDataMapBuilder.java | 0
.../datamap/lucene/LuceneDataMapDistributable.java | 0
.../datamap/lucene/LuceneDataMapFactoryBase.java | 0
.../datamap/lucene/LuceneDataMapWriter.java | 0
.../datamap/lucene/LuceneFineGrainDataMap.java | 0
.../lucene/LuceneFineGrainDataMapFactory.java | 0
{secondary_index => index/secondary-index}/pom.xml | 12 ++++----
.../CarbonDataFileMergeTestCaseOnSI.scala | 0
.../CarbonIndexFileMergeTestCaseWithSI.scala | 0
.../testsuite/secondaryindex/DropTableTest.scala | 0
.../InsertIntoCarbonTableTestCase.scala | 0
...tAlterTableColumnRenameWithSecondaryIndex.scala | 0
.../TestBroadCastSIFilterPushJoinWithUDF.scala | 0
.../TestCTASWithSecondaryIndex.scala | 0
.../secondaryindex/TestCacheOperationsForSI.scala | 0
.../testsuite/secondaryindex/TestCarbonJoin.scala | 0
.../TestCreateIndexForCleanAndDeleteSegment.scala | 0
.../secondaryindex/TestCreateIndexTable.scala | 0
.../TestCreateIndexWithLoadAndCompaction.scala | 6 ++--
.../TestLikeQueryWithSecondaryIndex.scala | 0
.../TestNIQueryWithSecondaryIndex.scala | 0
.../TestRegisterIndexCarbonTable.scala | 0
.../secondaryindex/TestSIWithAddSegment.scala | 0
.../secondaryindex/TestSIWithSecondryIndex.scala | 0
.../TestSecondaryIndexForORFilterPushDown.scala | 0
.../TestSecondaryIndexWithAggQueries.scala | 0
.../secondaryindex/TestSecondaryIndexWithIUD.scala | 0
...IndexWithIndexOnFirstColumnAndSortColumns.scala | 0
.../TestSecondaryIndexWithLocalDictionary.scala | 0
.../TestSecondaryIndexWithUnsafeColumnPage.scala | 0
.../apache/spark/util/TestCarbonSegmentUtil.scala | 34 ++++++++++-----------
{datamap/mv => mv}/core/pom.xml | 6 ++--
.../carbondata/mv/extension/MVAnalyzerRule.scala | 0
.../mv/extension/MVDataMapProvider.scala | 0
.../carbondata/mv/extension/MVExtension.scala | 0
.../mv/extension/MVExtensionSqlParser.scala | 0
.../apache/carbondata/mv/extension/MVHelper.scala | 0
.../apache/carbondata/mv/extension/MVParser.scala | 0
.../apache/carbondata/mv/extension/MVUtil.scala | 0
.../command/CreateMaterializedViewCommand.scala | 0
.../command/DropMaterializedViewCommand.scala | 0
.../command/RefreshMaterializedViewCommand.scala | 0
.../command/ShowMaterializedViewCommand.scala | 0
.../carbondata/mv/rewrite/DefaultMatchMaker.scala | 0
.../org/apache/carbondata/mv/rewrite/MVUdf.scala | 0
.../apache/carbondata/mv/rewrite/MatchMaker.scala | 0
.../apache/carbondata/mv/rewrite/Navigator.scala | 0
.../carbondata/mv/rewrite/QueryRewrite.scala | 0
.../mv/rewrite/SummaryDatasetCatalog.scala | 0
.../org/apache/carbondata/mv/rewrite/Utils.scala | 0
.../apache/carbondata/mv/session/MVSession.scala | 0
.../mv/session/internal/SessionState.scala | 0
.../carbondata/mv/timeseries/Granularity.java | 0
.../mv/timeseries/TimeSeriesFunction.scala | 0
.../carbondata/mv/timeseries/TimeSeriesUtil.scala | 0
.../carbondata/mv/extension/MVOptimizer.scala | 0
.../carbondata/mv/extension/MVOptimizer.scala | 0
.../mv/plans/ExtractJoinConditionsSuite.scala | 0
.../apache/carbondata/mv/plans/IsSPJGHSuite.scala | 0
.../mv/plans/LogicalToModularPlanSuite.scala | 0
.../carbondata/mv/plans/ModularToSQLSuite.scala | 1 -
.../carbondata/mv/plans/SignatureSuite.scala | 1 -
.../mv/plans/Tpcds_1_4_BenchmarkSuite.scala | 0
.../carbondata/mv/rewrite/MVCoalesceTestCase.scala | 0
.../mv/rewrite/MVCountAndCaseTestCase.scala | 0
.../carbondata/mv/rewrite/MVCreateTestCase.scala | 4 +--
.../mv/rewrite/MVExceptionTestCase.scala | 0
.../mv/rewrite/MVFilterAndJoinTest.scala | 1 +
.../mv/rewrite/MVIncrementalLoadingTestcase.scala | 16 +++++++---
.../carbondata/mv/rewrite/MVInvalidTestCase.scala | 0
.../mv/rewrite/MVMultiJoinTestCase.scala | 0
.../carbondata/mv/rewrite/MVRewriteTestCase.scala | 0
.../carbondata/mv/rewrite/MVSampleTestCase.scala | 4 +--
.../carbondata/mv/rewrite/MVTPCDSTestCase.scala | 4 +--
.../carbondata/mv/rewrite/MVTpchTestCase.scala | 4 +--
.../mv/rewrite/SelectAllColumnsSuite.scala | 0
.../rewrite/SelectSelectExactChildrenSuite.scala | 0
.../mv/rewrite/TestAllOperationsOnMV.scala | 14 ++++++---
.../mv/rewrite/TestPartitionWithMV.scala | 1 +
.../carbondata/mv/rewrite/TestSQLSuite.scala | 3 +-
.../carbondata/mv/rewrite/Tpcds_1_4_Suite.scala | 1 -
.../mv/rewrite/matching/TestSQLBatch.scala | 0
.../mv/rewrite/matching/TestTPCDS_1_4_Batch.scala | 0
.../carbondata/mv/testutil/ModularPlanTest.scala | 0
.../carbondata/mv/testutil/TestSQLBatch.scala | 0
.../carbondata/mv/testutil/TestSQLBatch2.scala | 0
.../mv/testutil/Tpcds_1_4_QueryBatch.scala | 0
.../carbondata/mv/testutil/Tpcds_1_4_Tables.scala | 0
.../TestMVTimeSeriesCreateDataMapCommand.scala | 0
.../timeseries/TestMVTimeSeriesLoadAndQuery.scala | 0
.../timeseries/TestMVTimeSeriesQueryRollUp.scala | 0
{datamap/mv => mv}/plan/pom.xml | 6 ++--
.../org/apache/carbondata/mv/dsl/package.scala | 0
.../mv/expressions/modular/subquery.scala | 0
.../mv/plans/modular/AggregatePushDown.scala | 0
.../apache/carbondata/mv/plans/modular/Flags.scala | 0
.../carbondata/mv/plans/modular/Harmonizer.scala | 0
.../mv/plans/modular/ModularPatterns.scala | 0
.../carbondata/mv/plans/modular/ModularPlan.scala | 0
.../modular/ModularPlanSignatureGenerator.scala | 0
.../mv/plans/modular/ModularRelation.scala | 0
.../carbondata/mv/plans/modular/Modularizer.scala | 0
.../mv/plans/modular/basicOperators.scala | 0
.../carbondata/mv/plans/modular/queryGraph.scala | 0
.../org/apache/carbondata/mv/plans/package.scala | 0
.../mv/plans/util/BirdcageOptimizer.scala | 0
.../mv/plans/util/Logical2ModularExtractions.scala | 0
.../plans/util/LogicalPlanSignatureGenerator.scala | 0
.../apache/carbondata/mv/plans/util/Printers.scala | 0
.../apache/carbondata/mv/plans/util/SQLBuild.scala | 0
.../carbondata/mv/plans/util/SQLBuildDSL.scala | 0
.../carbondata/mv/plans/util/SQLBuilder.scala | 0
.../carbondata/mv/plans/util/Signature.scala | 0
.../carbondata/mv/plans/util/TableCluster.scala | 0
{store => sdk}/CSDK/CMakeLists.txt | 0
{store => sdk}/CSDK/src/CarbonProperties.cpp | 0
{store => sdk}/CSDK/src/CarbonProperties.h | 0
{store => sdk}/CSDK/src/CarbonReader.cpp | 0
{store => sdk}/CSDK/src/CarbonReader.h | 0
{store => sdk}/CSDK/src/CarbonRow.cpp | 0
{store => sdk}/CSDK/src/CarbonRow.h | 0
{store => sdk}/CSDK/src/CarbonSchemaReader.cpp | 0
{store => sdk}/CSDK/src/CarbonSchemaReader.h | 0
{store => sdk}/CSDK/src/CarbonWriter.cpp | 0
{store => sdk}/CSDK/src/CarbonWriter.h | 0
{store => sdk}/CSDK/src/Configuration.cpp | 0
{store => sdk}/CSDK/src/Configuration.h | 0
{store => sdk}/CSDK/src/Schema.cpp | 0
{store => sdk}/CSDK/src/Schema.h | 0
{store => sdk}/CSDK/test/main.cpp | 2 +-
{store => sdk}/sdk/pom.xml | 4 +--
.../carbondata/sdk/file/ArrowCarbonReader.java | 0
.../carbondata/sdk/file/AvroCarbonWriter.java | 0
.../carbondata/sdk/file/CSVCarbonWriter.java | 0
.../apache/carbondata/sdk/file/CarbonReader.java | 0
.../carbondata/sdk/file/CarbonReaderBuilder.java | 0
.../carbondata/sdk/file/CarbonSchemaReader.java | 0
.../apache/carbondata/sdk/file/CarbonWriter.java | 0
.../carbondata/sdk/file/CarbonWriterBuilder.java | 0
.../java/org/apache/carbondata/sdk/file/Field.java | 0
.../carbondata/sdk/file/JsonCarbonWriter.java | 0
.../org/apache/carbondata/sdk/file/RowUtil.java | 0
.../org/apache/carbondata/sdk/file/Schema.java | 0
.../org/apache/carbondata/sdk/file/TestUtil.java | 0
.../carbondata/sdk/file/arrow/ArrowConverter.java | 0
.../sdk/file/arrow/ArrowFieldWriter.java | 0
.../carbondata/sdk/file/arrow/ArrowUtils.java | 0
.../carbondata/sdk/file/arrow/ArrowWriter.java | 0
.../apache/carbondata/sdk/file/utils/SDKUtil.java | 0
.../carbondata/store/CarbonRowReadSupport.java | 0
.../org/apache/carbondata/store/CarbonStore.java | 0
.../apache/carbondata/store/LocalCarbonStore.java | 0
.../carbondata/store/MetaCachedCarbonStore.java | 0
.../sdk/src/main/resources/log4j.properties | 0
.../carbondata/sdk/file/ArrowCarbonReaderTest.java | 0
.../carbondata/sdk/file/AvroCarbonWriterTest.java | 0
.../carbondata/sdk/file/CSVCarbonWriterTest.java | 0
.../carbondata/sdk/file/CarbonReaderTest.java | 0
.../sdk/file/CarbonSchemaReaderTest.java | 0
.../sdk/file/ConcurrentAvroSdkWriterTest.java | 0
.../sdk/file/ConcurrentSdkReaderTest.java | 0
.../sdk/file/ConcurrentSdkWriterTest.java | 0
.../org/apache/carbondata/sdk/file/ImageTest.java | 0
.../org/apache/carbondata/sdk/file/MinMaxTest.java | 0
.../sdk/file/MultithreadSDKBlockletReaderTest.java | 0
.../carbondata/store/LocalCarbonStoreTest.java | 0
.../org/apache/carbondata/util/BinaryUtil.java | 0
.../src/test/resources/image/carbondatalogo.jpg | Bin
.../image/flowers/10686568196_b1915544a8.jpg | Bin
.../image/flowers/10686568196_b1915544a8.txt | 0
.../image/flowers/10712722853_5632165b04.jpg | Bin
.../image/flowers/10712722853_5632165b04.txt | 0
.../flowers/subfolder/10841136265_af473efc60.jpg | Bin
.../flowers/subfolder/10841136265_af473efc60.txt | 0
.../src/test/resources/image/voc/2007_000027.jpg | Bin
.../src/test/resources/image/voc/2007_000027.xml | 0
.../src/test/resources/image/voc}/2007_000032.jpg | Bin
.../src/test/resources/image/voc/2007_000032.xml | 0
.../src/test/resources/image/voc}/2007_000033.jpg | Bin
.../src/test/resources/image/voc/2007_000033.xml | 0
.../src/test/resources/image/voc/2007_000039.jpg | Bin
.../src/test/resources/image/voc/2007_000039.xml | 0
.../src/test/resources/image/voc/2009_001444.jpg | Bin
.../src/test/resources/image/voc/2009_001444.xml | 0
.../image/vocForSegmentationClass}/2007_000032.jpg | Bin
.../image/vocForSegmentationClass/2007_000032.png | Bin
.../image/vocForSegmentationClass}/2007_000033.jpg | Bin
.../image/vocForSegmentationClass/2007_000033.png | Bin
.../image/vocForSegmentationClass/2007_000042.jpg | Bin
.../image/vocForSegmentationClass/2007_000042.png | Bin
261 files changed, 117 insertions(+), 105 deletions(-)
diff --git a/examples/spark2/pom.xml b/examples/spark/pom.xml
similarity index 98%
rename from examples/spark2/pom.xml
rename to examples/spark/pom.xml
index b08ea7a..0be57aa 100644
--- a/examples/spark2/pom.xml
+++ b/examples/spark/pom.xml
@@ -41,7 +41,7 @@
</dependency>
<dependency>
<groupId>org.apache.carbondata</groupId>
- <artifactId>carbondata-spark2</artifactId>
+ <artifactId>carbondata-spark</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -51,7 +51,7 @@
</dependency>
<dependency>
<groupId>org.apache.carbondata</groupId>
- <artifactId>carbondata-store-sdk</artifactId>
+ <artifactId>carbondata-sdk</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/examples/spark2/src/main/java/org/apache/carbondata/examples/sdk/CarbonReaderExample.java b/examples/spark/src/main/java/org/apache/carbondata/examples/sdk/CarbonReaderExample.java
similarity index 100%
rename from examples/spark2/src/main/java/org/apache/carbondata/examples/sdk/CarbonReaderExample.java
rename to examples/spark/src/main/java/org/apache/carbondata/examples/sdk/CarbonReaderExample.java
diff --git a/examples/spark2/src/main/java/org/apache/carbondata/examples/sdk/SDKS3Example.java b/examples/spark/src/main/java/org/apache/carbondata/examples/sdk/SDKS3Example.java
similarity index 100%
rename from examples/spark2/src/main/java/org/apache/carbondata/examples/sdk/SDKS3Example.java
rename to examples/spark/src/main/java/org/apache/carbondata/examples/sdk/SDKS3Example.java
diff --git a/examples/spark2/src/main/java/org/apache/carbondata/examples/sdk/SDKS3ReadExample.java b/examples/spark/src/main/java/org/apache/carbondata/examples/sdk/SDKS3ReadExample.java
similarity index 100%
rename from examples/spark2/src/main/java/org/apache/carbondata/examples/sdk/SDKS3ReadExample.java
rename to examples/spark/src/main/java/org/apache/carbondata/examples/sdk/SDKS3ReadExample.java
diff --git a/examples/spark2/src/main/java/org/apache/carbondata/examples/sdk/SDKS3SchemaReadExample.java b/examples/spark/src/main/java/org/apache/carbondata/examples/sdk/SDKS3SchemaReadExample.java
similarity index 100%
rename from examples/spark2/src/main/java/org/apache/carbondata/examples/sdk/SDKS3SchemaReadExample.java
rename to examples/spark/src/main/java/org/apache/carbondata/examples/sdk/SDKS3SchemaReadExample.java
diff --git a/examples/spark2/src/main/java/org/apache/carbondata/examples/sql/JavaCarbonSessionExample.java b/examples/spark/src/main/java/org/apache/carbondata/examples/sql/JavaCarbonSessionExample.java
similarity index 97%
rename from examples/spark2/src/main/java/org/apache/carbondata/examples/sql/JavaCarbonSessionExample.java
rename to examples/spark/src/main/java/org/apache/carbondata/examples/sql/JavaCarbonSessionExample.java
index 6bee158..458263f 100644
--- a/examples/spark2/src/main/java/org/apache/carbondata/examples/sql/JavaCarbonSessionExample.java
+++ b/examples/spark/src/main/java/org/apache/carbondata/examples/sql/JavaCarbonSessionExample.java
@@ -59,7 +59,7 @@ public class JavaCarbonSessionExample {
String rootPath =
new File(JavaCarbonSessionExample.class.getResource("/").getPath() + "../../../..")
.getCanonicalPath();
- String path = rootPath + "/examples/spark2/src/main/resources/data.csv";
+ String path = rootPath + "/examples/spark/src/main/resources/data.csv";
carbon.sql("LOAD DATA LOCAL INPATH " + "\'" + path + "\' " + "INTO TABLE source "
+ "OPTIONS('HEADER'='true', 'COMPLEX_DELIMITER_LEVEL_1'='#')");
diff --git a/examples/spark2/src/main/resources/Test_Data1.csv b/examples/spark/src/main/resources/Test_Data1.csv
similarity index 100%
rename from examples/spark2/src/main/resources/Test_Data1.csv
rename to examples/spark/src/main/resources/Test_Data1.csv
diff --git a/examples/spark2/src/main/resources/complexdata.csv b/examples/spark/src/main/resources/complexdata.csv
similarity index 100%
rename from examples/spark2/src/main/resources/complexdata.csv
rename to examples/spark/src/main/resources/complexdata.csv
diff --git a/examples/spark2/src/main/resources/data.csv b/examples/spark/src/main/resources/data.csv
similarity index 100%
rename from examples/spark2/src/main/resources/data.csv
rename to examples/spark/src/main/resources/data.csv
diff --git a/examples/spark2/src/main/resources/data1.csv b/examples/spark/src/main/resources/data1.csv
similarity index 100%
rename from examples/spark2/src/main/resources/data1.csv
rename to examples/spark/src/main/resources/data1.csv
diff --git a/examples/spark2/src/main/resources/dataSample.csv b/examples/spark/src/main/resources/dataSample.csv
similarity index 100%
rename from examples/spark2/src/main/resources/dataSample.csv
rename to examples/spark/src/main/resources/dataSample.csv
diff --git a/examples/spark2/src/main/resources/dimSample.csv b/examples/spark/src/main/resources/dimSample.csv
similarity index 100%
rename from examples/spark2/src/main/resources/dimSample.csv
rename to examples/spark/src/main/resources/dimSample.csv
diff --git a/examples/spark2/src/main/resources/factSample.csv b/examples/spark/src/main/resources/factSample.csv
similarity index 100%
rename from examples/spark2/src/main/resources/factSample.csv
rename to examples/spark/src/main/resources/factSample.csv
diff --git a/examples/spark2/src/main/resources/log4j.properties b/examples/spark/src/main/resources/log4j.properties
similarity index 100%
rename from examples/spark2/src/main/resources/log4j.properties
rename to examples/spark/src/main/resources/log4j.properties
diff --git a/examples/spark2/src/main/resources/sample.csv b/examples/spark/src/main/resources/sample.csv
similarity index 100%
rename from examples/spark2/src/main/resources/sample.csv
rename to examples/spark/src/main/resources/sample.csv
diff --git a/examples/spark2/src/main/resources/streamSample.csv b/examples/spark/src/main/resources/streamSample.csv
similarity index 100%
rename from examples/spark2/src/main/resources/streamSample.csv
rename to examples/spark/src/main/resources/streamSample.csv
diff --git a/examples/spark2/src/main/scala/org/apache/carbondata/benchmark/ConcurrentQueryBenchmark.scala b/examples/spark/src/main/scala/org/apache/carbondata/benchmark/ConcurrentQueryBenchmark.scala
similarity index 99%
rename from examples/spark2/src/main/scala/org/apache/carbondata/benchmark/ConcurrentQueryBenchmark.scala
rename to examples/spark/src/main/scala/org/apache/carbondata/benchmark/ConcurrentQueryBenchmark.scala
index 17012c4..d1ca452 100644
--- a/examples/spark2/src/main/scala/org/apache/carbondata/benchmark/ConcurrentQueryBenchmark.scala
+++ b/examples/spark/src/main/scala/org/apache/carbondata/benchmark/ConcurrentQueryBenchmark.scala
@@ -470,7 +470,7 @@ object ConcurrentQueryBenchmark {
runInLocal = if (arr(5).equalsIgnoreCase("true")) {
val rootPath = new File(this.getClass.getResource("/").getPath
+ "../../../..").getCanonicalPath
- storeLocation = s"$rootPath/examples/spark2/target/store"
+ storeLocation = s"$rootPath/examples/spark/target/store"
true
} else if (arr(5).equalsIgnoreCase("false")) {
false
diff --git a/examples/spark2/src/main/scala/org/apache/carbondata/benchmark/Query.scala b/examples/spark/src/main/scala/org/apache/carbondata/benchmark/Query.scala
similarity index 100%
rename from examples/spark2/src/main/scala/org/apache/carbondata/benchmark/Query.scala
rename to examples/spark/src/main/scala/org/apache/carbondata/benchmark/Query.scala
diff --git a/examples/spark2/src/main/scala/org/apache/carbondata/benchmark/SCDType2Benchmark.scala b/examples/spark/src/main/scala/org/apache/carbondata/benchmark/SCDType2Benchmark.scala
similarity index 99%
rename from examples/spark2/src/main/scala/org/apache/carbondata/benchmark/SCDType2Benchmark.scala
rename to examples/spark/src/main/scala/org/apache/carbondata/benchmark/SCDType2Benchmark.scala
index a2e1b6e..823c071 100644
--- a/examples/spark2/src/main/scala/org/apache/carbondata/benchmark/SCDType2Benchmark.scala
+++ b/examples/spark/src/main/scala/org/apache/carbondata/benchmark/SCDType2Benchmark.scala
@@ -138,7 +138,7 @@ object SCDType2Benchmark {
.builder()
.master("local[8]")
.enableHiveSupport()
- .config("spark.sql.warehouse.dir", s"$rootPath/examples/spark2/target/warehouse")
+ .config("spark.sql.warehouse.dir", s"$rootPath/examples/spark/target/warehouse")
.getOrCreateCarbonSession()
spark.sparkContext.setLogLevel("error")
diff --git a/examples/spark2/src/main/scala/org/apache/carbondata/benchmark/SimpleQueryBenchmark.scala b/examples/spark/src/main/scala/org/apache/carbondata/benchmark/SimpleQueryBenchmark.scala
similarity index 99%
rename from examples/spark2/src/main/scala/org/apache/carbondata/benchmark/SimpleQueryBenchmark.scala
rename to examples/spark/src/main/scala/org/apache/carbondata/benchmark/SimpleQueryBenchmark.scala
index 4e69c5a..694acde 100644
--- a/examples/spark2/src/main/scala/org/apache/carbondata/benchmark/SimpleQueryBenchmark.scala
+++ b/examples/spark/src/main/scala/org/apache/carbondata/benchmark/SimpleQueryBenchmark.scala
@@ -312,7 +312,7 @@ object SimpleQueryBenchmark {
import org.apache.spark.sql.CarbonSession._
val rootPath = new File(this.getClass.getResource("/").getPath
+ "../../../..").getCanonicalPath
- val storeLocation = s"$rootPath/examples/spark2/target/store"
+ val storeLocation = s"$rootPath/examples/spark/target/store"
val master = Option(System.getProperty("spark.master"))
.orElse(sys.env.get("MASTER"))
.orElse(Option("local[8]"))
diff --git a/examples/spark2/src/main/scala/org/apache/carbondata/examples/AlluxioExample.scala b/examples/spark/src/main/scala/org/apache/carbondata/examples/AlluxioExample.scala
similarity index 100%
rename from examples/spark2/src/main/scala/org/apache/carbondata/examples/AlluxioExample.scala
rename to examples/spark/src/main/scala/org/apache/carbondata/examples/AlluxioExample.scala
diff --git a/examples/spark2/src/main/scala/org/apache/carbondata/examples/AlterTableExample.scala b/examples/spark/src/main/scala/org/apache/carbondata/examples/AlterTableExample.scala
similarity index 100%
rename from examples/spark2/src/main/scala/org/apache/carbondata/examples/AlterTableExample.scala
rename to examples/spark/src/main/scala/org/apache/carbondata/examples/AlterTableExample.scala
diff --git a/examples/spark2/src/main/scala/org/apache/carbondata/examples/CarbonDataFrameExample.scala b/examples/spark/src/main/scala/org/apache/carbondata/examples/CarbonDataFrameExample.scala
similarity index 100%
rename from examples/spark2/src/main/scala/org/apache/carbondata/examples/CarbonDataFrameExample.scala
rename to examples/spark/src/main/scala/org/apache/carbondata/examples/CarbonDataFrameExample.scala
diff --git a/examples/spark2/src/main/scala/org/apache/carbondata/examples/CarbonSessionExample.scala b/examples/spark/src/main/scala/org/apache/carbondata/examples/CarbonSessionExample.scala
similarity index 96%
rename from examples/spark2/src/main/scala/org/apache/carbondata/examples/CarbonSessionExample.scala
rename to examples/spark/src/main/scala/org/apache/carbondata/examples/CarbonSessionExample.scala
index e3411aa..4f9a9bd 100644
--- a/examples/spark2/src/main/scala/org/apache/carbondata/examples/CarbonSessionExample.scala
+++ b/examples/spark/src/main/scala/org/apache/carbondata/examples/CarbonSessionExample.scala
@@ -31,10 +31,10 @@ object CarbonSessionExample {
def main(args: Array[String]) {
val rootPath = new File(this.getClass.getResource("/").getPath
+ "../../../..").getCanonicalPath
- System.setProperty("path.target", s"$rootPath/examples/spark2/target")
+ System.setProperty("path.target", s"$rootPath/examples/spark/target")
// print profiler log to a separated file: target/profiler.log
PropertyConfigurator.configure(
- s"$rootPath/examples/spark2/src/main/resources/log4j.properties")
+ s"$rootPath/examples/spark/src/main/resources/log4j.properties")
CarbonProperties.getInstance()
.addProperty(CarbonCommonConstants.ENABLE_QUERY_STATISTICS, "false")
@@ -76,7 +76,7 @@ object CarbonSessionExample {
| $formatSyntax
""".stripMargin)
- val path = s"$rootPath/examples/spark2/src/main/resources/data.csv"
+ val path = s"$rootPath/examples/spark/src/main/resources/data.csv"
// scalastyle:off
spark.sql(
diff --git a/examples/spark2/src/main/scala/org/apache/carbondata/examples/CarbonSortColumnsExample.scala b/examples/spark/src/main/scala/org/apache/carbondata/examples/CarbonSortColumnsExample.scala
similarity index 98%
rename from examples/spark2/src/main/scala/org/apache/carbondata/examples/CarbonSortColumnsExample.scala
rename to examples/spark/src/main/scala/org/apache/carbondata/examples/CarbonSortColumnsExample.scala
index a521bdc..8ccaa0f 100644
--- a/examples/spark2/src/main/scala/org/apache/carbondata/examples/CarbonSortColumnsExample.scala
+++ b/examples/spark/src/main/scala/org/apache/carbondata/examples/CarbonSortColumnsExample.scala
@@ -85,7 +85,7 @@ object CarbonSortColumnsExample {
| TBLPROPERTIES('SORT_COLUMNS'='intField, stringField, charField')
""".stripMargin)
- val path = s"$rootPath/examples/spark2/src/main/resources/data.csv"
+ val path = s"$rootPath/examples/spark/src/main/resources/data.csv"
// scalastyle:off
spark.sql(
diff --git a/examples/spark2/src/main/scala/org/apache/carbondata/examples/CaseClassDataFrameAPIExample.scala b/examples/spark/src/main/scala/org/apache/carbondata/examples/CaseClassDataFrameAPIExample.scala
similarity index 100%
rename from examples/spark2/src/main/scala/org/apache/carbondata/examples/CaseClassDataFrameAPIExample.scala
rename to examples/spark/src/main/scala/org/apache/carbondata/examples/CaseClassDataFrameAPIExample.scala
diff --git a/examples/spark2/src/main/scala/org/apache/carbondata/examples/CustomCompactionExample.scala b/examples/spark/src/main/scala/org/apache/carbondata/examples/CustomCompactionExample.scala
similarity index 97%
rename from examples/spark2/src/main/scala/org/apache/carbondata/examples/CustomCompactionExample.scala
rename to examples/spark/src/main/scala/org/apache/carbondata/examples/CustomCompactionExample.scala
index cfa2766..e7a6a10 100644
--- a/examples/spark2/src/main/scala/org/apache/carbondata/examples/CustomCompactionExample.scala
+++ b/examples/spark/src/main/scala/org/apache/carbondata/examples/CustomCompactionExample.scala
@@ -61,7 +61,7 @@ object CustomCompactionExample {
val rootPath = new File(this.getClass.getResource("/").getPath
+ "../../../..").getCanonicalPath
- val path = s"$rootPath/examples/spark2/src/main/resources/dataSample.csv"
+ val path = s"$rootPath/examples/spark/src/main/resources/dataSample.csv"
// load 4 segments
// scalastyle:off
diff --git a/examples/spark2/src/main/scala/org/apache/carbondata/examples/DataFrameComplexTypeExample.scala b/examples/spark/src/main/scala/org/apache/carbondata/examples/DataFrameComplexTypeExample.scala
similarity index 100%
rename from examples/spark2/src/main/scala/org/apache/carbondata/examples/DataFrameComplexTypeExample.scala
rename to examples/spark/src/main/scala/org/apache/carbondata/examples/DataFrameComplexTypeExample.scala
diff --git a/examples/spark2/src/main/scala/org/apache/carbondata/examples/DataManagementExample.scala b/examples/spark/src/main/scala/org/apache/carbondata/examples/DataManagementExample.scala
similarity index 98%
rename from examples/spark2/src/main/scala/org/apache/carbondata/examples/DataManagementExample.scala
rename to examples/spark/src/main/scala/org/apache/carbondata/examples/DataManagementExample.scala
index 814a553..d267d71 100644
--- a/examples/spark2/src/main/scala/org/apache/carbondata/examples/DataManagementExample.scala
+++ b/examples/spark/src/main/scala/org/apache/carbondata/examples/DataManagementExample.scala
@@ -53,7 +53,7 @@ object DataManagementExample {
val rootPath = new File(this.getClass.getResource("/").getPath
+ "../../../..").getCanonicalPath
- val path = s"$rootPath/examples/spark2/src/main/resources/dataSample.csv"
+ val path = s"$rootPath/examples/spark/src/main/resources/dataSample.csv"
// load data 5 times, each load of data is called a segment in CarbonData
// scalastyle:off
diff --git a/examples/spark2/src/main/scala/org/apache/carbondata/examples/DataUpdateDeleteExample.scala b/examples/spark/src/main/scala/org/apache/carbondata/examples/DataUpdateDeleteExample.scala
similarity index 100%
rename from examples/spark2/src/main/scala/org/apache/carbondata/examples/DataUpdateDeleteExample.scala
rename to examples/spark/src/main/scala/org/apache/carbondata/examples/DataUpdateDeleteExample.scala
diff --git a/examples/spark2/src/main/scala/org/apache/carbondata/examples/DirectSQLExample.scala b/examples/spark/src/main/scala/org/apache/carbondata/examples/DirectSQLExample.scala
similarity index 98%
rename from examples/spark2/src/main/scala/org/apache/carbondata/examples/DirectSQLExample.scala
rename to examples/spark/src/main/scala/org/apache/carbondata/examples/DirectSQLExample.scala
index 1b0145a..14b249c 100644
--- a/examples/spark2/src/main/scala/org/apache/carbondata/examples/DirectSQLExample.scala
+++ b/examples/spark/src/main/scala/org/apache/carbondata/examples/DirectSQLExample.scala
@@ -44,7 +44,7 @@ object DirectSQLExample {
val rootPath = new File(this.getClass.getResource("/").getPath
+ "../../../..").getCanonicalPath
- val path = s"$rootPath/examples/spark2/target/carbonFile/"
+ val path = s"$rootPath/examples/spark/target/carbonFile/"
import carbonSession._
// 1. generate data file
diff --git a/examples/spark2/src/main/scala/org/apache/carbondata/examples/ExternalTableExample.scala b/examples/spark/src/main/scala/org/apache/carbondata/examples/ExternalTableExample.scala
similarity index 97%
rename from examples/spark2/src/main/scala/org/apache/carbondata/examples/ExternalTableExample.scala
rename to examples/spark/src/main/scala/org/apache/carbondata/examples/ExternalTableExample.scala
index 2fb62b3..1b1f77c 100644
--- a/examples/spark2/src/main/scala/org/apache/carbondata/examples/ExternalTableExample.scala
+++ b/examples/spark/src/main/scala/org/apache/carbondata/examples/ExternalTableExample.scala
@@ -64,7 +64,7 @@ object ExternalTableExample {
val rootPath = new File(this.getClass.getResource("/").getPath
+ "../../../..").getCanonicalPath
- val path = s"$rootPath/examples/spark2/src/main/resources/data.csv"
+ val path = s"$rootPath/examples/spark/src/main/resources/data.csv"
// load 4 times, each load has 10 rows data
// scalastyle:off
diff --git a/examples/spark2/src/main/scala/org/apache/carbondata/examples/HadoopFileExample.scala b/examples/spark/src/main/scala/org/apache/carbondata/examples/HadoopFileExample.scala
similarity index 97%
rename from examples/spark2/src/main/scala/org/apache/carbondata/examples/HadoopFileExample.scala
rename to examples/spark/src/main/scala/org/apache/carbondata/examples/HadoopFileExample.scala
index 5b2332c..bddc8ae 100644
--- a/examples/spark2/src/main/scala/org/apache/carbondata/examples/HadoopFileExample.scala
+++ b/examples/spark/src/main/scala/org/apache/carbondata/examples/HadoopFileExample.scala
@@ -33,7 +33,7 @@ object HadoopFileExample {
val spark = ExampleUtils.createSparkSession("HadoopFileExample")
val rootPath = new File(this.getClass.getResource("/").getPath
+ "../../../..").getCanonicalPath
- val storeLocation: String = rootPath + "/examples/spark2/target/store/default"
+ val storeLocation: String = rootPath + "/examples/spark/target/store/default"
exampleBody(spark, storeLocation)
spark.close()
}
diff --git a/examples/spark2/src/main/scala/org/apache/carbondata/examples/HiveExample.scala b/examples/spark/src/main/scala/org/apache/carbondata/examples/HiveExample.scala
similarity index 94%
rename from examples/spark2/src/main/scala/org/apache/carbondata/examples/HiveExample.scala
rename to examples/spark/src/main/scala/org/apache/carbondata/examples/HiveExample.scala
index 7f0a23b..0e827e6 100644
--- a/examples/spark2/src/main/scala/org/apache/carbondata/examples/HiveExample.scala
+++ b/examples/spark/src/main/scala/org/apache/carbondata/examples/HiveExample.scala
@@ -34,10 +34,10 @@ object HiveExample {
private val driverName: String = "org.apache.hive.jdbc.HiveDriver"
val rootPath = new File(this.getClass.getResource("/").getPath
+ "../../../..").getCanonicalPath
- val targetLoc = s"$rootPath/examples/spark2/target"
- System.setProperty("derby.system.home", s"$targetLoc")
- val metaStoreLoc = s"$targetLoc/metastore_db"
- val logger = LogServiceFactory.getLogService(this.getClass.getCanonicalName)
+ val projectLoc = s"$rootPath/examples/spark"
+ System.setProperty("derby.system.home", s"$projectLoc")
+ val metaStoreLoc = s"$projectLoc/metastore_db"
+ val LOGGER = LogServiceFactory.getLogService(this.getClass.getCanonicalName)
def main(args: Array[String]) {
val sparkSession = ExampleUtils.createSparkSession("HiveExample")
@@ -58,7 +58,7 @@ object HiveExample {
""".stripMargin)
var inputPath = FileFactory
- .getUpdatedFilePath(s"$rootPath/examples/spark2/src/main/resources/sample.csv")
+ .getUpdatedFilePath(s"$rootPath/examples/spark/src/main/resources/sample.csv")
sparkSession.sql(
s"""
@@ -83,7 +83,7 @@ object HiveExample {
|STORED AS carbondata""".stripMargin)
inputPath = FileFactory
- .getUpdatedFilePath(s"$rootPath/examples/spark2/src/main/resources/Test_Data1.csv")
+ .getUpdatedFilePath(s"$rootPath/examples/spark/src/main/resources/Test_Data1.csv")
sparkSession
.sql(
@@ -127,17 +127,17 @@ object HiveExample {
}
// make HDFS writable
- val path = new Path(targetLoc)
+ val path = new Path(projectLoc)
val fileSys = path.getFileSystem(FileFactory.getConfiguration)
fileSys.setPermission(path, new FsPermission(FsAction.ALL, FsAction.ALL, FsAction.ALL))
val hiveEmbeddedServer2 = new HiveEmbeddedServer2()
- hiveEmbeddedServer2.start(targetLoc)
+ hiveEmbeddedServer2.start(projectLoc)
val port = hiveEmbeddedServer2.getFreePort
val connection = DriverManager.getConnection(s"jdbc:hive2://localhost:$port/default", "", "")
val statement: Statement = connection.createStatement
- logger.info(s"============HIVE CLI IS STARTED ON PORT $port ==============")
+ LOGGER.info(s"============HIVE CLI IS STARTED ON PORT $port ==============")
val resultSet: ResultSet = statement.executeQuery("SELECT * FROM HIVE_CARBON_EXAMPLE")
@@ -173,7 +173,7 @@ object HiveExample {
println(s"******Total Number Of Rows Fetched ****** $rowsFetched")
assert(rowsFetched == 4)
- logger.info("Fetching the Individual Columns ")
+ LOGGER.info("Fetching the Individual Columns ")
// fetching the separate columns
var individualColRowsFetched = 0
@@ -204,7 +204,7 @@ object HiveExample {
s"$individualColRowsFetched")
assert(individualColRowsFetched == 4)
- logger.info("Fetching the Out Of Order Columns ")
+ LOGGER.info("Fetching the Out Of Order Columns ")
val resultOutOfOrderCol = statement
.executeQuery("SELECT SALARY,ID,NAME FROM HIVE_CARBON_EXAMPLE")
diff --git a/examples/spark2/src/main/scala/org/apache/carbondata/examples/LuceneDataMapExample.scala b/examples/spark/src/main/scala/org/apache/carbondata/examples/LuceneDataMapExample.scala
similarity index 100%
rename from examples/spark2/src/main/scala/org/apache/carbondata/examples/LuceneDataMapExample.scala
rename to examples/spark/src/main/scala/org/apache/carbondata/examples/LuceneDataMapExample.scala
diff --git a/examples/spark2/src/main/scala/org/apache/carbondata/examples/MVExample.scala b/examples/spark/src/main/scala/org/apache/carbondata/examples/MVExample.scala
similarity index 100%
rename from examples/spark2/src/main/scala/org/apache/carbondata/examples/MVExample.scala
rename to examples/spark/src/main/scala/org/apache/carbondata/examples/MVExample.scala
diff --git a/examples/spark2/src/main/scala/org/apache/carbondata/examples/QuerySegmentExample.scala b/examples/spark/src/main/scala/org/apache/carbondata/examples/QuerySegmentExample.scala
similarity index 98%
rename from examples/spark2/src/main/scala/org/apache/carbondata/examples/QuerySegmentExample.scala
rename to examples/spark/src/main/scala/org/apache/carbondata/examples/QuerySegmentExample.scala
index fdcd029..3a8e630 100644
--- a/examples/spark2/src/main/scala/org/apache/carbondata/examples/QuerySegmentExample.scala
+++ b/examples/spark/src/main/scala/org/apache/carbondata/examples/QuerySegmentExample.scala
@@ -63,7 +63,7 @@ object QuerySegmentExample {
val rootPath = new File(this.getClass.getResource("/").getPath
+ "../../../..").getCanonicalPath
- val path = s"$rootPath/examples/spark2/src/main/resources/data.csv"
+ val path = s"$rootPath/examples/spark/src/main/resources/data.csv"
// load 4 segments, each load has 10 rows data
// scalastyle:off
diff --git a/examples/spark2/src/main/scala/org/apache/carbondata/examples/S3CsvExample.scala b/examples/spark/src/main/scala/org/apache/carbondata/examples/S3CsvExample.scala
similarity index 96%
rename from examples/spark2/src/main/scala/org/apache/carbondata/examples/S3CsvExample.scala
rename to examples/spark/src/main/scala/org/apache/carbondata/examples/S3CsvExample.scala
index 64a836e..f9a5b90 100644
--- a/examples/spark2/src/main/scala/org/apache/carbondata/examples/S3CsvExample.scala
+++ b/examples/spark/src/main/scala/org/apache/carbondata/examples/S3CsvExample.scala
@@ -52,7 +52,7 @@ object S3CsvExample {
.config("spark.sql.extensions", "org.apache.spark.sql.CarbonExtensions")
.getOrCreate()
- spark.sparkContext.setLogLevel("INFO")
+ spark.sparkContext.setLogLevel("ERROR")
spark.sql(
s"""
@@ -69,7 +69,7 @@ object S3CsvExample {
| floatField FLOAT
| )
| STORED AS carbondata
- | LOCATION '$rootPath/examples/spark2/target/store'
+ | LOCATION '$rootPath/examples/spark/target/store'
""".stripMargin)
spark.sql(
diff --git a/examples/spark2/src/main/scala/org/apache/carbondata/examples/S3Example.scala b/examples/spark/src/main/scala/org/apache/carbondata/examples/S3Example.scala
similarity index 98%
rename from examples/spark2/src/main/scala/org/apache/carbondata/examples/S3Example.scala
rename to examples/spark/src/main/scala/org/apache/carbondata/examples/S3Example.scala
index 1ae1dec..aa2a39e 100644
--- a/examples/spark2/src/main/scala/org/apache/carbondata/examples/S3Example.scala
+++ b/examples/spark/src/main/scala/org/apache/carbondata/examples/S3Example.scala
@@ -38,7 +38,7 @@ object S3Example {
def main(args: Array[String]) {
val rootPath = new File(this.getClass.getResource("/").getPath
+ "../../../..").getCanonicalPath
- val path = s"$rootPath/examples/spark2/src/main/resources/data1.csv"
+ val path = s"$rootPath/examples/spark/src/main/resources/data1.csv"
val logger: Logger = LoggerFactory.getLogger(this.getClass)
if (args.length < 3 || args.length > 5) {
diff --git a/examples/spark2/src/main/scala/org/apache/carbondata/examples/S3UsingSDkExample.scala b/examples/spark/src/main/scala/org/apache/carbondata/examples/S3UsingSDkExample.scala
similarity index 100%
rename from examples/spark2/src/main/scala/org/apache/carbondata/examples/S3UsingSDkExample.scala
rename to examples/spark/src/main/scala/org/apache/carbondata/examples/S3UsingSDkExample.scala
diff --git a/examples/spark2/src/main/scala/org/apache/carbondata/examples/SparkSessionExample.scala b/examples/spark/src/main/scala/org/apache/carbondata/examples/SparkSessionExample.scala
similarity index 98%
rename from examples/spark2/src/main/scala/org/apache/carbondata/examples/SparkSessionExample.scala
rename to examples/spark/src/main/scala/org/apache/carbondata/examples/SparkSessionExample.scala
index 9651471..cee83bc 100644
--- a/examples/spark2/src/main/scala/org/apache/carbondata/examples/SparkSessionExample.scala
+++ b/examples/spark/src/main/scala/org/apache/carbondata/examples/SparkSessionExample.scala
@@ -35,7 +35,7 @@ object SparkSessionExample {
+ "../../../..").getCanonicalPath
def main(args: Array[String]): Unit = {
val sparkSession = ExampleUtils.createSparkSession("SparkSessionExample")
- val path = s"$rootPath/examples/spark2/src/main/resources/data.csv"
+ val path = s"$rootPath/examples/spark/src/main/resources/data.csv"
sparkSession.sql("DROP TABLE IF EXISTS csv_table")
sparkSession.sql(
s"""
diff --git a/examples/spark2/src/main/scala/org/apache/carbondata/examples/SparkStreamingExample.scala b/examples/spark/src/main/scala/org/apache/carbondata/examples/SparkStreamingExample.scala
similarity index 98%
rename from examples/spark2/src/main/scala/org/apache/carbondata/examples/SparkStreamingExample.scala
rename to examples/spark/src/main/scala/org/apache/carbondata/examples/SparkStreamingExample.scala
index 29b05cd..67bcdae 100644
--- a/examples/spark2/src/main/scala/org/apache/carbondata/examples/SparkStreamingExample.scala
+++ b/examples/spark/src/main/scala/org/apache/carbondata/examples/SparkStreamingExample.scala
@@ -46,7 +46,7 @@ object SparkStreamingExample {
val rootPath = new File(this.getClass.getResource("/").getPath
+ "../../../..").getCanonicalPath
val checkpointPath =
- s"$rootPath/examples/spark2/target/spark_streaming_cp_" +
+ s"$rootPath/examples/spark/target/spark_streaming_cp_" +
System.currentTimeMillis().toString()
val streamTableName = s"dstream_stream_table"
@@ -73,7 +73,7 @@ object SparkStreamingExample {
| """.stripMargin)
val carbonTable = CarbonEnv.getCarbonTable(Some("default"), streamTableName)(spark)
// batch load
- val path = s"$rootPath/examples/spark2/src/main/resources/streamSample.csv"
+ val path = s"$rootPath/examples/spark/src/main/resources/streamSample.csv"
spark.sql(
s"""
| LOAD DATA LOCAL INPATH '$path'
diff --git a/examples/spark2/src/main/scala/org/apache/carbondata/examples/StandardPartitionExample.scala b/examples/spark/src/main/scala/org/apache/carbondata/examples/StandardPartitionExample.scala
similarity index 98%
rename from examples/spark2/src/main/scala/org/apache/carbondata/examples/StandardPartitionExample.scala
rename to examples/spark/src/main/scala/org/apache/carbondata/examples/StandardPartitionExample.scala
index c6c1e0a..c9c27f8 100644
--- a/examples/spark2/src/main/scala/org/apache/carbondata/examples/StandardPartitionExample.scala
+++ b/examples/spark/src/main/scala/org/apache/carbondata/examples/StandardPartitionExample.scala
@@ -42,7 +42,7 @@ object StandardPartitionExample {
.addProperty(CarbonCommonConstants.CARBON_DATE_FORMAT, "yyyy/MM/dd")
val rootPath = new File(this.getClass.getResource("/").getPath
+ "../../../..").getCanonicalPath
- val testData = s"$rootPath/integration/spark-common-test/src/test/resources/" +
+ val testData = s"$rootPath/integration/spark/src/test/resources/" +
s"partition_data_example.csv"
/**
* 1. Partition basic usages
diff --git a/examples/spark2/src/main/scala/org/apache/carbondata/examples/StreamSQLExample.scala b/examples/spark/src/main/scala/org/apache/carbondata/examples/StreamSQLExample.scala
similarity index 100%
rename from examples/spark2/src/main/scala/org/apache/carbondata/examples/StreamSQLExample.scala
rename to examples/spark/src/main/scala/org/apache/carbondata/examples/StreamSQLExample.scala
diff --git a/examples/spark2/src/main/scala/org/apache/carbondata/examples/StreamingUsingBatchLoadExample.scala b/examples/spark/src/main/scala/org/apache/carbondata/examples/StreamingUsingBatchLoadExample.scala
similarity index 97%
rename from examples/spark2/src/main/scala/org/apache/carbondata/examples/StreamingUsingBatchLoadExample.scala
rename to examples/spark/src/main/scala/org/apache/carbondata/examples/StreamingUsingBatchLoadExample.scala
index 9d5346b..6a42d79 100644
--- a/examples/spark2/src/main/scala/org/apache/carbondata/examples/StreamingUsingBatchLoadExample.scala
+++ b/examples/spark/src/main/scala/org/apache/carbondata/examples/StreamingUsingBatchLoadExample.scala
@@ -42,7 +42,7 @@ object StreamingUsingBatchLoadExample {
val rootPath = new File(this.getClass.getResource("/").getPath
+ "../../../..").getCanonicalPath
val checkpointPath =
- s"$rootPath/examples/spark2/target/spark_streaming_cp_" +
+ s"$rootPath/examples/spark/target/spark_streaming_cp_" +
System.currentTimeMillis().toString()
val streamTableName = s"dstream_batch_table"
@@ -72,7 +72,7 @@ object StreamingUsingBatchLoadExample {
val carbonTable = CarbonEnv.getCarbonTable(Some("default"), streamTableName)(spark)
// batch load
- val path = s"$rootPath/examples/spark2/src/main/resources/streamSample.csv"
+ val path = s"$rootPath/examples/spark/src/main/resources/streamSample.csv"
spark.sql(
s"""
| LOAD DATA LOCAL INPATH '$path'
diff --git a/examples/spark2/src/main/scala/org/apache/carbondata/examples/StreamingWithRowParserExample.scala b/examples/spark/src/main/scala/org/apache/carbondata/examples/StreamingWithRowParserExample.scala
similarity index 98%
rename from examples/spark2/src/main/scala/org/apache/carbondata/examples/StreamingWithRowParserExample.scala
rename to examples/spark/src/main/scala/org/apache/carbondata/examples/StreamingWithRowParserExample.scala
index cd206b6..ae877d1 100644
--- a/examples/spark2/src/main/scala/org/apache/carbondata/examples/StreamingWithRowParserExample.scala
+++ b/examples/spark/src/main/scala/org/apache/carbondata/examples/StreamingWithRowParserExample.scala
@@ -78,7 +78,7 @@ object StreamingWithRowParserExample {
val carbonTable = CarbonEnv.getCarbonTable(Some("default"), streamTableName)(spark)
// batch load
- val path = s"$rootPath/examples/spark2/src/main/resources/streamSample.csv"
+ val path = s"$rootPath/examples/spark/src/main/resources/streamSample.csv"
spark.sql(
s"""
| LOAD DATA LOCAL INPATH '$path'
diff --git a/examples/spark2/src/main/scala/org/apache/carbondata/examples/StructuredStreamingExample.scala b/examples/spark/src/main/scala/org/apache/carbondata/examples/StructuredStreamingExample.scala
similarity index 98%
rename from examples/spark2/src/main/scala/org/apache/carbondata/examples/StructuredStreamingExample.scala
rename to examples/spark/src/main/scala/org/apache/carbondata/examples/StructuredStreamingExample.scala
index 0f7dc44..c6b032f 100644
--- a/examples/spark2/src/main/scala/org/apache/carbondata/examples/StructuredStreamingExample.scala
+++ b/examples/spark/src/main/scala/org/apache/carbondata/examples/StructuredStreamingExample.scala
@@ -75,7 +75,7 @@ object StructuredStreamingExample {
val carbonTable = CarbonEnv.getCarbonTable(Some("default"), streamTableName)(spark)
// batch load
- val path = s"$rootPath/examples/spark2/src/main/resources/streamSample.csv"
+ val path = s"$rootPath/examples/spark/src/main/resources/streamSample.csv"
spark.sql(
s"""
| LOAD DATA LOCAL INPATH '$path'
diff --git a/examples/spark2/src/main/scala/org/apache/carbondata/examples/TableLevelCompactionOptionExample.scala b/examples/spark/src/main/scala/org/apache/carbondata/examples/TableLevelCompactionOptionExample.scala
similarity index 98%
rename from examples/spark2/src/main/scala/org/apache/carbondata/examples/TableLevelCompactionOptionExample.scala
rename to examples/spark/src/main/scala/org/apache/carbondata/examples/TableLevelCompactionOptionExample.scala
index f2fbbfb..18f7d7e 100644
--- a/examples/spark2/src/main/scala/org/apache/carbondata/examples/TableLevelCompactionOptionExample.scala
+++ b/examples/spark/src/main/scala/org/apache/carbondata/examples/TableLevelCompactionOptionExample.scala
@@ -66,7 +66,7 @@ object TableLevelCompactionOptionExample {
val rootPath = new File(this.getClass.getResource("/").getPath
+ "../../../..").getCanonicalPath
- val path = s"$rootPath/examples/spark2/src/main/resources/dataSample.csv"
+ val path = s"$rootPath/examples/spark/src/main/resources/dataSample.csv"
// load 6 segments
// scalastyle:off
diff --git a/examples/spark2/src/main/scala/org/apache/carbondata/examples/util/ExampleUtils.scala b/examples/spark/src/main/scala/org/apache/carbondata/examples/util/ExampleUtils.scala
similarity index 95%
rename from examples/spark2/src/main/scala/org/apache/carbondata/examples/util/ExampleUtils.scala
rename to examples/spark/src/main/scala/org/apache/carbondata/examples/util/ExampleUtils.scala
index 070d709..191dd82 100644
--- a/examples/spark2/src/main/scala/org/apache/carbondata/examples/util/ExampleUtils.scala
+++ b/examples/spark/src/main/scala/org/apache/carbondata/examples/util/ExampleUtils.scala
@@ -35,13 +35,13 @@ object ExampleUtils {
val rootPath = new File(this.getClass.getResource("/").getPath
+ "../../../..").getCanonicalPath
- val warehouse = s"$rootPath/examples/spark2/target/warehouse"
- val metaStoreDB = s"$rootPath/examples/spark2/target"
+ val warehouse = s"$rootPath/examples/spark/target/warehouse"
+ val metaStoreDB = s"$rootPath/examples/spark/target"
val storeLocation = if (null != storePath) {
storePath
} else {
- s"$rootPath/examples/spark2/target/store"
+ s"$rootPath/examples/spark/target/store"
}
CarbonProperties.getInstance()
@@ -74,7 +74,7 @@ object ExampleUtils {
def createSparkSession(appName: String, workThreadNum: Int = 1): SparkSession = {
val rootPath = new File(this.getClass.getResource("/").getPath
+ "../../../..").getCanonicalPath
- val warehouse = s"$rootPath/examples/spark2/target/warehouse"
+ val warehouse = s"$rootPath/examples/spark/target/warehouse"
CarbonProperties.getInstance()
.addProperty(CarbonCommonConstants.CARBON_TIMESTAMP_FORMAT, "yyyy/MM/dd HH:mm:ss")
.addProperty(CarbonCommonConstants.CARBON_DATE_FORMAT, "yyyy/MM/dd")
diff --git a/examples/spark2/src/test/scala/org/apache/carbondata/examplesCI/RunExamples.scala b/examples/spark/src/test/scala/org/apache/carbondata/examplesCI/RunExamples.scala
similarity index 98%
rename from examples/spark2/src/test/scala/org/apache/carbondata/examplesCI/RunExamples.scala
rename to examples/spark/src/test/scala/org/apache/carbondata/examplesCI/RunExamples.scala
index 95822db..7d737dd 100644
--- a/examples/spark2/src/test/scala/org/apache/carbondata/examplesCI/RunExamples.scala
+++ b/examples/spark/src/test/scala/org/apache/carbondata/examplesCI/RunExamples.scala
@@ -41,7 +41,7 @@ class RunExamples extends QueryTest with BeforeAndAfterAll {
override def beforeAll: Unit = {
val rootPath = new File(this.getClass.getResource("/").getPath
+ "../../../..").getCanonicalPath
- val targetLoc = s"$rootPath/examples/spark2/target"
+ val targetLoc = s"$rootPath/examples/spark/target"
System.setProperty("derby.system.home", s"$targetLoc")
CarbonProperties.getInstance().addProperty(
diff --git a/datamap/bloom/pom.xml b/index/bloom/pom.xml
similarity index 97%
rename from datamap/bloom/pom.xml
rename to index/bloom/pom.xml
index 6ec4d0e..0b391a3 100644
--- a/datamap/bloom/pom.xml
+++ b/index/bloom/pom.xml
@@ -11,7 +11,7 @@
</parent>
<artifactId>carbondata-bloom</artifactId>
- <name>Apache CarbonData :: Bloom Index DataMap</name>
+ <name>Apache CarbonData :: Bloom Index</name>
<properties>
<dev.path>${basedir}/../../dev</dev.path>
diff --git a/datamap/bloom/src/main/java/org/apache/carbondata/datamap/bloom/AbstractBloomDataMapWriter.java b/index/bloom/src/main/java/org/apache/carbondata/datamap/bloom/AbstractBloomDataMapWriter.java
similarity index 100%
rename from datamap/bloom/src/main/java/org/apache/carbondata/datamap/bloom/AbstractBloomDataMapWriter.java
rename to index/bloom/src/main/java/org/apache/carbondata/datamap/bloom/AbstractBloomDataMapWriter.java
diff --git a/datamap/bloom/src/main/java/org/apache/carbondata/datamap/bloom/BloomCacheKeyValue.java b/index/bloom/src/main/java/org/apache/carbondata/datamap/bloom/BloomCacheKeyValue.java
similarity index 100%
rename from datamap/bloom/src/main/java/org/apache/carbondata/datamap/bloom/BloomCacheKeyValue.java
rename to index/bloom/src/main/java/org/apache/carbondata/datamap/bloom/BloomCacheKeyValue.java
diff --git a/datamap/bloom/src/main/java/org/apache/carbondata/datamap/bloom/BloomCoarseGrainDataMap.java b/index/bloom/src/main/java/org/apache/carbondata/datamap/bloom/BloomCoarseGrainDataMap.java
similarity index 100%
rename from datamap/bloom/src/main/java/org/apache/carbondata/datamap/bloom/BloomCoarseGrainDataMap.java
rename to index/bloom/src/main/java/org/apache/carbondata/datamap/bloom/BloomCoarseGrainDataMap.java
diff --git a/datamap/bloom/src/main/java/org/apache/carbondata/datamap/bloom/BloomCoarseGrainDataMapFactory.java b/index/bloom/src/main/java/org/apache/carbondata/datamap/bloom/BloomCoarseGrainDataMapFactory.java
similarity index 100%
rename from datamap/bloom/src/main/java/org/apache/carbondata/datamap/bloom/BloomCoarseGrainDataMapFactory.java
rename to index/bloom/src/main/java/org/apache/carbondata/datamap/bloom/BloomCoarseGrainDataMapFactory.java
diff --git a/datamap/bloom/src/main/java/org/apache/carbondata/datamap/bloom/BloomDataMapBuilder.java b/index/bloom/src/main/java/org/apache/carbondata/datamap/bloom/BloomDataMapBuilder.java
similarity index 100%
rename from datamap/bloom/src/main/java/org/apache/carbondata/datamap/bloom/BloomDataMapBuilder.java
rename to index/bloom/src/main/java/org/apache/carbondata/datamap/bloom/BloomDataMapBuilder.java
diff --git a/datamap/bloom/src/main/java/org/apache/carbondata/datamap/bloom/BloomDataMapCache.java b/index/bloom/src/main/java/org/apache/carbondata/datamap/bloom/BloomDataMapCache.java
similarity index 100%
rename from datamap/bloom/src/main/java/org/apache/carbondata/datamap/bloom/BloomDataMapCache.java
rename to index/bloom/src/main/java/org/apache/carbondata/datamap/bloom/BloomDataMapCache.java
diff --git a/datamap/bloom/src/main/java/org/apache/carbondata/datamap/bloom/BloomDataMapDistributable.java b/index/bloom/src/main/java/org/apache/carbondata/datamap/bloom/BloomDataMapDistributable.java
similarity index 100%
rename from datamap/bloom/src/main/java/org/apache/carbondata/datamap/bloom/BloomDataMapDistributable.java
rename to index/bloom/src/main/java/org/apache/carbondata/datamap/bloom/BloomDataMapDistributable.java
diff --git a/datamap/bloom/src/main/java/org/apache/carbondata/datamap/bloom/BloomDataMapModel.java b/index/bloom/src/main/java/org/apache/carbondata/datamap/bloom/BloomDataMapModel.java
similarity index 100%
rename from datamap/bloom/src/main/java/org/apache/carbondata/datamap/bloom/BloomDataMapModel.java
rename to index/bloom/src/main/java/org/apache/carbondata/datamap/bloom/BloomDataMapModel.java
diff --git a/datamap/bloom/src/main/java/org/apache/carbondata/datamap/bloom/BloomDataMapWriter.java b/index/bloom/src/main/java/org/apache/carbondata/datamap/bloom/BloomDataMapWriter.java
similarity index 100%
rename from datamap/bloom/src/main/java/org/apache/carbondata/datamap/bloom/BloomDataMapWriter.java
rename to index/bloom/src/main/java/org/apache/carbondata/datamap/bloom/BloomDataMapWriter.java
diff --git a/datamap/bloom/src/main/java/org/apache/carbondata/datamap/bloom/BloomIndexFileStore.java b/index/bloom/src/main/java/org/apache/carbondata/datamap/bloom/BloomIndexFileStore.java
similarity index 100%
rename from datamap/bloom/src/main/java/org/apache/carbondata/datamap/bloom/BloomIndexFileStore.java
rename to index/bloom/src/main/java/org/apache/carbondata/datamap/bloom/BloomIndexFileStore.java
diff --git a/datamap/bloom/src/main/java/org/apache/carbondata/datamap/bloom/DataConvertUtil.java b/index/bloom/src/main/java/org/apache/carbondata/datamap/bloom/DataConvertUtil.java
similarity index 100%
rename from datamap/bloom/src/main/java/org/apache/carbondata/datamap/bloom/DataConvertUtil.java
rename to index/bloom/src/main/java/org/apache/carbondata/datamap/bloom/DataConvertUtil.java
diff --git a/datamap/bloom/src/main/java/org/apache/hadoop/util/bloom/CarbonBloomFilter.java b/index/bloom/src/main/java/org/apache/hadoop/util/bloom/CarbonBloomFilter.java
similarity index 100%
rename from datamap/bloom/src/main/java/org/apache/hadoop/util/bloom/CarbonBloomFilter.java
rename to index/bloom/src/main/java/org/apache/hadoop/util/bloom/CarbonBloomFilter.java
diff --git a/datamap/examples/pom.xml b/index/examples/pom.xml
similarity index 93%
rename from datamap/examples/pom.xml
rename to index/examples/pom.xml
index 7e32888..3fa440b 100644
--- a/datamap/examples/pom.xml
+++ b/index/examples/pom.xml
@@ -28,8 +28,8 @@
<relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>carbondata-datamap-examples</artifactId>
- <name>Apache CarbonData :: DataMap Examples</name>
+ <artifactId>carbondata-index-examples</artifactId>
+ <name>Apache CarbonData :: Index Examples</name>
<properties>
<dev.path>${basedir}/../../dev</dev.path>
@@ -38,7 +38,7 @@
<dependencies>
<dependency>
<groupId>org.apache.carbondata</groupId>
- <artifactId>carbondata-spark2</artifactId>
+ <artifactId>carbondata-spark</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/datamap/examples/src/minmaxdatamap/main/java/org/apache/carbondata/datamap/examples/BlockletMinMax.java b/index/examples/src/minmaxdatamap/main/java/org/apache/carbondata/datamap/examples/BlockletMinMax.java
similarity index 100%
rename from datamap/examples/src/minmaxdatamap/main/java/org/apache/carbondata/datamap/examples/BlockletMinMax.java
rename to index/examples/src/minmaxdatamap/main/java/org/apache/carbondata/datamap/examples/BlockletMinMax.java
diff --git a/datamap/examples/src/minmaxdatamap/main/java/org/apache/carbondata/datamap/examples/MinMaxDataWriter.java b/index/examples/src/minmaxdatamap/main/java/org/apache/carbondata/datamap/examples/MinMaxDataWriter.java
similarity index 100%
rename from datamap/examples/src/minmaxdatamap/main/java/org/apache/carbondata/datamap/examples/MinMaxDataWriter.java
rename to index/examples/src/minmaxdatamap/main/java/org/apache/carbondata/datamap/examples/MinMaxDataWriter.java
diff --git a/datamap/examples/src/minmaxdatamap/main/java/org/apache/carbondata/datamap/examples/MinMaxIndexBlockDetails.java b/index/examples/src/minmaxdatamap/main/java/org/apache/carbondata/datamap/examples/MinMaxIndexBlockDetails.java
similarity index 100%
rename from datamap/examples/src/minmaxdatamap/main/java/org/apache/carbondata/datamap/examples/MinMaxIndexBlockDetails.java
rename to index/examples/src/minmaxdatamap/main/java/org/apache/carbondata/datamap/examples/MinMaxIndexBlockDetails.java
diff --git a/datamap/examples/src/minmaxdatamap/main/java/org/apache/carbondata/datamap/examples/MinMaxIndexDataMap.java b/index/examples/src/minmaxdatamap/main/java/org/apache/carbondata/datamap/examples/MinMaxIndexDataMap.java
similarity index 100%
rename from datamap/examples/src/minmaxdatamap/main/java/org/apache/carbondata/datamap/examples/MinMaxIndexDataMap.java
rename to index/examples/src/minmaxdatamap/main/java/org/apache/carbondata/datamap/examples/MinMaxIndexDataMap.java
diff --git a/datamap/examples/src/minmaxdatamap/main/java/org/apache/carbondata/datamap/examples/MinMaxIndexDataMapFactory.java b/index/examples/src/minmaxdatamap/main/java/org/apache/carbondata/datamap/examples/MinMaxIndexDataMapFactory.java
similarity index 100%
rename from datamap/examples/src/minmaxdatamap/main/java/org/apache/carbondata/datamap/examples/MinMaxIndexDataMapFactory.java
rename to index/examples/src/minmaxdatamap/main/java/org/apache/carbondata/datamap/examples/MinMaxIndexDataMapFactory.java
diff --git a/datamap/examples/src/minmaxdatamap/test/scala/org/apache/carbondata/datamap/examples/MinMaxDataMapSuite.scala b/index/examples/src/minmaxdatamap/test/scala/org/apache/carbondata/datamap/examples/MinMaxDataMapSuite.scala
similarity index 100%
rename from datamap/examples/src/minmaxdatamap/test/scala/org/apache/carbondata/datamap/examples/MinMaxDataMapSuite.scala
rename to index/examples/src/minmaxdatamap/test/scala/org/apache/carbondata/datamap/examples/MinMaxDataMapSuite.scala
diff --git a/datamap/lucene/pom.xml b/index/lucene/pom.xml
similarity index 98%
rename from datamap/lucene/pom.xml
rename to index/lucene/pom.xml
index cc7deb8..bb5f8d5 100644
--- a/datamap/lucene/pom.xml
+++ b/index/lucene/pom.xml
@@ -11,7 +11,7 @@
</parent>
<artifactId>carbondata-lucene</artifactId>
- <name>Apache CarbonData :: Lucene Index DataMap</name>
+ <name>Apache CarbonData :: Lucene Index</name>
<properties>
<dev.path>${basedir}/../../dev</dev.path>
diff --git a/datamap/lucene/src/main/java/org/apache/carbondata/datamap/lucene/LuceneDataMapBuilder.java b/index/lucene/src/main/java/org/apache/carbondata/datamap/lucene/LuceneDataMapBuilder.java
similarity index 100%
rename from datamap/lucene/src/main/java/org/apache/carbondata/datamap/lucene/LuceneDataMapBuilder.java
rename to index/lucene/src/main/java/org/apache/carbondata/datamap/lucene/LuceneDataMapBuilder.java
diff --git a/datamap/lucene/src/main/java/org/apache/carbondata/datamap/lucene/LuceneDataMapDistributable.java b/index/lucene/src/main/java/org/apache/carbondata/datamap/lucene/LuceneDataMapDistributable.java
similarity index 100%
rename from datamap/lucene/src/main/java/org/apache/carbondata/datamap/lucene/LuceneDataMapDistributable.java
rename to index/lucene/src/main/java/org/apache/carbondata/datamap/lucene/LuceneDataMapDistributable.java
diff --git a/datamap/lucene/src/main/java/org/apache/carbondata/datamap/lucene/LuceneDataMapFactoryBase.java b/index/lucene/src/main/java/org/apache/carbondata/datamap/lucene/LuceneDataMapFactoryBase.java
similarity index 100%
rename from datamap/lucene/src/main/java/org/apache/carbondata/datamap/lucene/LuceneDataMapFactoryBase.java
rename to index/lucene/src/main/java/org/apache/carbondata/datamap/lucene/LuceneDataMapFactoryBase.java
diff --git a/datamap/lucene/src/main/java/org/apache/carbondata/datamap/lucene/LuceneDataMapWriter.java b/index/lucene/src/main/java/org/apache/carbondata/datamap/lucene/LuceneDataMapWriter.java
similarity index 100%
rename from datamap/lucene/src/main/java/org/apache/carbondata/datamap/lucene/LuceneDataMapWriter.java
rename to index/lucene/src/main/java/org/apache/carbondata/datamap/lucene/LuceneDataMapWriter.java
diff --git a/datamap/lucene/src/main/java/org/apache/carbondata/datamap/lucene/LuceneFineGrainDataMap.java b/index/lucene/src/main/java/org/apache/carbondata/datamap/lucene/LuceneFineGrainDataMap.java
similarity index 100%
rename from datamap/lucene/src/main/java/org/apache/carbondata/datamap/lucene/LuceneFineGrainDataMap.java
rename to index/lucene/src/main/java/org/apache/carbondata/datamap/lucene/LuceneFineGrainDataMap.java
diff --git a/datamap/lucene/src/main/java/org/apache/carbondata/datamap/lucene/LuceneFineGrainDataMapFactory.java b/index/lucene/src/main/java/org/apache/carbondata/datamap/lucene/LuceneFineGrainDataMapFactory.java
similarity index 100%
rename from datamap/lucene/src/main/java/org/apache/carbondata/datamap/lucene/LuceneFineGrainDataMapFactory.java
rename to index/lucene/src/main/java/org/apache/carbondata/datamap/lucene/LuceneFineGrainDataMapFactory.java
diff --git a/secondary_index/pom.xml b/index/secondary-index/pom.xml
similarity index 96%
rename from secondary_index/pom.xml
rename to index/secondary-index/pom.xml
index 749d6a6..2160b2b 100644
--- a/secondary_index/pom.xml
+++ b/index/secondary-index/pom.xml
@@ -23,14 +23,14 @@
<groupId>org.apache.carbondata</groupId>
<artifactId>carbondata-parent</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>carbondata-secondary_index</artifactId>
- <name>Apache CarbonData :: SecondaryIndex</name>
+ <artifactId>carbondata-secondary-index</artifactId>
+ <name>Apache CarbonData :: Secondary Index</name>
<properties>
- <dev.path>${basedir}/../dev</dev.path>
+ <dev.path>${basedir}/../../dev</dev.path>
<jacoco.append>true</jacoco.append>
</properties>
@@ -45,7 +45,7 @@
</dependency>
<dependency>
<groupId>org.apache.carbondata</groupId>
- <artifactId>carbondata-spark2</artifactId>
+ <artifactId>carbondata-spark</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
@@ -69,7 +69,7 @@
</dependency>
<dependency>
<groupId>org.apache.carbondata</groupId>
- <artifactId>carbondata-store-sdk</artifactId>
+ <artifactId>carbondata-sdk</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/secondary_index/src/test/scala/org/apache/carbondata/spark/testsuite/mergedata/CarbonDataFileMergeTestCaseOnSI.scala b/index/secondary-index/src/test/scala/org/apache/carbondata/spark/testsuite/mergedata/CarbonDataFileMergeTestCaseOnSI.scala
similarity index 100%
rename from secondary_index/src/test/scala/org/apache/carbondata/spark/testsuite/mergedata/CarbonDataFileMergeTestCaseOnSI.scala
rename to index/secondary-index/src/test/scala/org/apache/carbondata/spark/testsuite/mergedata/CarbonDataFileMergeTestCaseOnSI.scala
diff --git a/secondary_index/src/test/scala/org/apache/carbondata/spark/testsuite/mergeindex/CarbonIndexFileMergeTestCaseWithSI.scala b/index/secondary-index/src/test/scala/org/apache/carbondata/spark/testsuite/mergeindex/CarbonIndexFileMergeTestCaseWithSI.scala
similarity index 100%
rename from secondary_index/src/test/scala/org/apache/carbondata/spark/testsuite/mergeindex/CarbonIndexFileMergeTestCaseWithSI.scala
rename to index/secondary-index/src/test/scala/org/apache/carbondata/spark/testsuite/mergeindex/CarbonIndexFileMergeTestCaseWithSI.scala
diff --git a/secondary_index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/DropTableTest.scala b/index/secondary-index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/DropTableTest.scala
similarity index 100%
rename from secondary_index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/DropTableTest.scala
rename to index/secondary-index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/DropTableTest.scala
diff --git a/secondary_index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/InsertIntoCarbonTableTestCase.scala b/index/secondary-index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/InsertIntoCarbonTableTestCase.scala
similarity index 100%
rename from secondary_index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/InsertIntoCarbonTableTestCase.scala
rename to index/secondary-index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/InsertIntoCarbonTableTestCase.scala
diff --git a/secondary_index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestAlterTableColumnRenameWithSecondaryIndex.scala b/index/secondary-index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestAlterTableColumnRenameWithSecondaryIndex.scala
similarity index 100%
rename from secondary_index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestAlterTableColumnRenameWithSecondaryIndex.scala
rename to index/secondary-index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestAlterTableColumnRenameWithSecondaryIndex.scala
diff --git a/secondary_index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestBroadCastSIFilterPushJoinWithUDF.scala b/index/secondary-index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestBroadCastSIFilterPushJoinWithUDF.scala
similarity index 100%
rename from secondary_index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestBroadCastSIFilterPushJoinWithUDF.scala
rename to index/secondary-index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestBroadCastSIFilterPushJoinWithUDF.scala
diff --git a/secondary_index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestCTASWithSecondaryIndex.scala b/index/secondary-index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestCTASWithSecondaryIndex.scala
similarity index 100%
rename from secondary_index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestCTASWithSecondaryIndex.scala
rename to index/secondary-index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestCTASWithSecondaryIndex.scala
diff --git a/secondary_index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestCacheOperationsForSI.scala b/index/secondary-index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestCacheOperationsForSI.scala
similarity index 100%
rename from secondary_index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestCacheOperationsForSI.scala
rename to index/secondary-index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestCacheOperationsForSI.scala
diff --git a/secondary_index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestCarbonJoin.scala b/index/secondary-index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestCarbonJoin.scala
similarity index 100%
rename from secondary_index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestCarbonJoin.scala
rename to index/secondary-index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestCarbonJoin.scala
diff --git a/secondary_index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestCreateIndexForCleanAndDeleteSegment.scala b/index/secondary-index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestCreateIndexForCleanAndDeleteSegment.scala
similarity index 100%
rename from secondary_index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestCreateIndexForCleanAndDeleteSegment.scala
rename to index/secondary-index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestCreateIndexForCleanAndDeleteSegment.scala
diff --git a/secondary_index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestCreateIndexTable.scala b/index/secondary-index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestCreateIndexTable.scala
similarity index 100%
rename from secondary_index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestCreateIndexTable.scala
rename to index/secondary-index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestCreateIndexTable.scala
diff --git a/secondary_index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestCreateIndexWithLoadAndCompaction.scala b/index/secondary-index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestCreateIndexWithLoadAndCompaction.scala
similarity index 98%
rename from secondary_index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestCreateIndexWithLoadAndCompaction.scala
rename to index/secondary-index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestCreateIndexWithLoadAndCompaction.scala
index f8a6f0f..b0ae754 100644
--- a/secondary_index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestCreateIndexWithLoadAndCompaction.scala
+++ b/index/secondary-index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestCreateIndexWithLoadAndCompaction.scala
@@ -23,7 +23,7 @@ import org.apache.carbondata.core.constants.CarbonCommonConstants
import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatus, SegmentStatusManager}
import org.apache.carbondata.core.util.CarbonProperties
import org.apache.spark.sql.hive.CarbonRelation
-import org.apache.spark.sql.test.Spark2TestQueryExecutor
+import org.apache.spark.sql.test.SparkTestQueryExecutor
import org.apache.spark.sql.test.util.QueryTest
import org.apache.carbondata.core.util.path.CarbonTablePath
@@ -206,8 +206,8 @@ class TestCreateIndexWithLoadAndCompaction extends QueryTest with BeforeAndAfter
sql("alter table si_compaction_test compact 'minor'")
// get index table from relation
- val indexCarbonTable = CarbonEnv.getInstance(Spark2TestQueryExecutor.spark).carbonMetaStore
- .lookupRelation(Option("default"), "alter_i1")(Spark2TestQueryExecutor.spark)
+ val indexCarbonTable = CarbonEnv.getInstance(SparkTestQueryExecutor.spark).carbonMetaStore
+ .lookupRelation(Option("default"), "alter_i1")(SparkTestQueryExecutor.spark)
.asInstanceOf[CarbonRelation].carbonTable
// read load metadata details
val loadDetails: Array[LoadMetadataDetails] = SegmentStatusManager
diff --git a/secondary_index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestLikeQueryWithSecondaryIndex.scala b/index/secondary-index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestLikeQueryWithSecondaryIndex.scala
similarity index 100%
rename from secondary_index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestLikeQueryWithSecondaryIndex.scala
rename to index/secondary-index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestLikeQueryWithSecondaryIndex.scala
diff --git a/secondary_index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestNIQueryWithSecondaryIndex.scala b/index/secondary-index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestNIQueryWithSecondaryIndex.scala
similarity index 100%
rename from secondary_index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestNIQueryWithSecondaryIndex.scala
rename to index/secondary-index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestNIQueryWithSecondaryIndex.scala
diff --git a/secondary_index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestRegisterIndexCarbonTable.scala b/index/secondary-index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestRegisterIndexCarbonTable.scala
similarity index 100%
rename from secondary_index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestRegisterIndexCarbonTable.scala
rename to index/secondary-index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestRegisterIndexCarbonTable.scala
diff --git a/secondary_index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestSIWithAddSegment.scala b/index/secondary-index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestSIWithAddSegment.scala
similarity index 100%
rename from secondary_index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestSIWithAddSegment.scala
rename to index/secondary-index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestSIWithAddSegment.scala
diff --git a/secondary_index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestSIWithSecondryIndex.scala b/index/secondary-index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestSIWithSecondryIndex.scala
similarity index 100%
rename from secondary_index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestSIWithSecondryIndex.scala
rename to index/secondary-index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestSIWithSecondryIndex.scala
diff --git a/secondary_index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestSecondaryIndexForORFilterPushDown.scala b/index/secondary-index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestSecondaryIndexForORFilterPushDown.scala
similarity index 100%
rename from secondary_index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestSecondaryIndexForORFilterPushDown.scala
rename to index/secondary-index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestSecondaryIndexForORFilterPushDown.scala
diff --git a/secondary_index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestSecondaryIndexWithAggQueries.scala b/index/secondary-index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestSecondaryIndexWithAggQueries.scala
similarity index 100%
rename from secondary_index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestSecondaryIndexWithAggQueries.scala
rename to index/secondary-index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestSecondaryIndexWithAggQueries.scala
diff --git a/secondary_index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestSecondaryIndexWithIUD.scala b/index/secondary-index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestSecondaryIndexWithIUD.scala
similarity index 100%
rename from secondary_index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestSecondaryIndexWithIUD.scala
rename to index/secondary-index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestSecondaryIndexWithIUD.scala
diff --git a/secondary_index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestSecondaryIndexWithIndexOnFirstColumnAndSortColumns.scala b/index/secondary-index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestSecondaryIndexWithIndexOnFirstColumnAndSortColumns.scala
similarity index 100%
rename from secondary_index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestSecondaryIndexWithIndexOnFirstColumnAndSortColumns.scala
rename to index/secondary-index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestSecondaryIndexWithIndexOnFirstColumnAndSortColumns.scala
diff --git a/secondary_index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestSecondaryIndexWithLocalDictionary.scala b/index/secondary-index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestSecondaryIndexWithLocalDictionary.scala
similarity index 100%
rename from secondary_index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestSecondaryIndexWithLocalDictionary.scala
rename to index/secondary-index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestSecondaryIndexWithLocalDictionary.scala
diff --git a/secondary_index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestSecondaryIndexWithUnsafeColumnPage.scala b/index/secondary-index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestSecondaryIndexWithUnsafeColumnPage.scala
similarity index 100%
rename from secondary_index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestSecondaryIndexWithUnsafeColumnPage.scala
rename to index/secondary-index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestSecondaryIndexWithUnsafeColumnPage.scala
diff --git a/secondary_index/src/test/scala/org/apache/spark/util/TestCarbonSegmentUtil.scala b/index/secondary-index/src/test/scala/org/apache/spark/util/TestCarbonSegmentUtil.scala
similarity index 92%
rename from secondary_index/src/test/scala/org/apache/spark/util/TestCarbonSegmentUtil.scala
rename to index/secondary-index/src/test/scala/org/apache/spark/util/TestCarbonSegmentUtil.scala
index 1541581..5e81256 100644
--- a/secondary_index/src/test/scala/org/apache/spark/util/TestCarbonSegmentUtil.scala
+++ b/index/secondary-index/src/test/scala/org/apache/spark/util/TestCarbonSegmentUtil.scala
@@ -26,7 +26,7 @@ import org.apache.spark.sql.catalyst.InternalRow
import org.apache.spark.sql.execution.strategy.CarbonDataSourceScan
import org.apache.spark.sql.secondaryindex.joins.BroadCastSIFilterPushJoin
import org.apache.spark.sql.secondaryindex.util.SecondaryIndexUtil
-import org.apache.spark.sql.test.{Spark2TestQueryExecutor, TestQueryExecutor}
+import org.apache.spark.sql.test.{SparkTestQueryExecutor, TestQueryExecutor}
import org.apache.spark.sql.test.util.QueryTest
import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager}
@@ -60,7 +60,7 @@ class TestCarbonSegmentUtil extends QueryTest {
def test_getFilteredSegmentsUsingDataFrame() {
createTable(tableName)
val expected = BroadCastSIFilterPushJoin
- .getFilteredSegments(s"select * from $tableName", Spark2TestQueryExecutor.spark)
+ .getFilteredSegments(s"select * from $tableName", SparkTestQueryExecutor.spark)
assert(expected.length == 4)
dropTables(tableName)
}
@@ -73,7 +73,7 @@ class TestCarbonSegmentUtil extends QueryTest {
val exception = intercept[UnsupportedOperationException] {
BroadCastSIFilterPushJoin
.getFilteredSegments("select * from test_table t1 join test_table1 t2 on t1.c1=t2.c1",
- Spark2TestQueryExecutor.spark)
+ SparkTestQueryExecutor.spark)
}
exception.getMessage.contains("Get Filter Segments API supports if and only if only " +
"one carbon main table is present in query.")
@@ -88,7 +88,7 @@ class TestCarbonSegmentUtil extends QueryTest {
val exception = intercept[UnsupportedOperationException] {
BroadCastSIFilterPushJoin
.getFilteredSegments(s"select * from $tableName",
- Spark2TestQueryExecutor.spark)
+ SparkTestQueryExecutor.spark)
}
exception.getMessage.contains("Get Filter Segments API supports if and only if " +
"only one carbon main table is present in query.")
@@ -99,7 +99,7 @@ class TestCarbonSegmentUtil extends QueryTest {
def test_identifySegmentsToBeMerged_Major() {
createTable(tableName)
val expected = SecondaryIndexUtil
- .identifySegmentsToBeMerged(Spark2TestQueryExecutor.spark,
+ .identifySegmentsToBeMerged(SparkTestQueryExecutor.spark,
tableName,
databaseName)
assert(expected.size() == 4)
@@ -115,7 +115,7 @@ class TestCarbonSegmentUtil extends QueryTest {
sql(s"delete from table $tableName where SEGMENT.ID in (1)")
sql(s"show segments for table $tableName").show(false)
val expected = SecondaryIndexUtil
- .identifySegmentsToBeMerged(Spark2TestQueryExecutor.spark,
+ .identifySegmentsToBeMerged(SparkTestQueryExecutor.spark,
tableName,
databaseName)
assert(expected.size() == 0)
@@ -127,12 +127,12 @@ class TestCarbonSegmentUtil extends QueryTest {
def test_identifySegmentsToBeMergedCustom() {
createTable(tableName)
val carbonTable = CarbonEnv
- .getCarbonTable(Option(databaseName), tableName)(Spark2TestQueryExecutor.spark)
+ .getCarbonTable(Option(databaseName), tableName)(SparkTestQueryExecutor.spark)
val customSegments = new util.ArrayList[String]()
customSegments.add("1")
customSegments.add("2")
val expected = SecondaryIndexUtil
- .identifySegmentsToBeMergedCustom(Spark2TestQueryExecutor.spark,
+ .identifySegmentsToBeMergedCustom(SparkTestQueryExecutor.spark,
tableName,
databaseName,
customSegments
@@ -146,7 +146,7 @@ class TestCarbonSegmentUtil extends QueryTest {
def test_getMergedLoadName() {
createTable(tableName)
val carbonTable = CarbonEnv
- .getCarbonTable(Option(databaseName), tableName)(Spark2TestQueryExecutor.spark)
+ .getCarbonTable(Option(databaseName), tableName)(SparkTestQueryExecutor.spark)
val loadMetadataDetails = SegmentStatusManager.readLoadMetadata(carbonTable.getMetadataPath)
val expected = SecondaryIndexUtil
.getMergedLoadName(loadMetadataDetails.toList.asJava)
@@ -161,7 +161,7 @@ class TestCarbonSegmentUtil extends QueryTest {
sql(s"CREATE TABLE $tableName(c1 string, c2 string, c3 string) STORED AS carbondata")
sql(s"INSERT INTO $tableName SELECT 'c1v1', '1', 'c3v1'")
val carbonTable = CarbonEnv
- .getCarbonTable(Option(databaseName), tableName)(Spark2TestQueryExecutor.spark)
+ .getCarbonTable(Option(databaseName), tableName)(SparkTestQueryExecutor.spark)
val loadMetadataDetails = SegmentStatusManager.readLoadMetadata(carbonTable.getMetadataPath)
val exception = intercept[UnsupportedOperationException] {
SecondaryIndexUtil
@@ -178,7 +178,7 @@ class TestCarbonSegmentUtil extends QueryTest {
def test_getMergedLoadName_unsorted_segment_list() {
createTable(tableName)
val carbonTable = CarbonEnv
- .getCarbonTable(Option(databaseName), tableName)(Spark2TestQueryExecutor.spark)
+ .getCarbonTable(Option(databaseName), tableName)(SparkTestQueryExecutor.spark)
val loadMetadataDetails = SegmentStatusManager.readLoadMetadata(carbonTable.getMetadataPath)
val segments: util.List[LoadMetadataDetails] = new util.ArrayList[LoadMetadataDetails]()
val load1 = new LoadMetadataDetails()
@@ -201,12 +201,12 @@ class TestCarbonSegmentUtil extends QueryTest {
def test_getFilteredSegments_set_segments() {
createTable(tableName)
val expected = BroadCastSIFilterPushJoin
- .getFilteredSegments(s"select * from $tableName", Spark2TestQueryExecutor.spark)
+ .getFilteredSegments(s"select * from $tableName", SparkTestQueryExecutor.spark)
assert(expected.length == 4)
sql(s"set carbon.input.segments.$databaseName.$tableName=0")
val dataFrame_with_set_seg = sql(s"select count(*) from $tableName where c1='c1v1'")
assert(dataFrame_with_set_seg.collect().length == 1)
- sql("reset")
+ sql(s"set carbon.input.segments.$databaseName.$tableName")
dropTables(tableName)
}
@@ -223,14 +223,14 @@ class TestCarbonSegmentUtil extends QueryTest {
sql(s"create index si_index_table1 on table $tableName(c2) AS 'carbondata' ")
assert(BroadCastSIFilterPushJoin
.getFilteredSegments(s"select * from $tableName where c3='c3v1'",
- Spark2TestQueryExecutor.spark).length == 2)
+ SparkTestQueryExecutor.spark).length == 2)
assert(BroadCastSIFilterPushJoin
.getFilteredSegments(s"select * from $tableName where c3='c3v1' or c2 ='2'",
- Spark2TestQueryExecutor.spark).length == 4)
+ SparkTestQueryExecutor.spark).length == 4)
val exception = intercept[UnsupportedOperationException] {
BroadCastSIFilterPushJoin
.getFilteredSegments(s"select * from si_index_table",
- Spark2TestQueryExecutor.spark)
+ SparkTestQueryExecutor.spark)
}
exception.getMessage.contains("Get Filter Segments API supports if and only if " +
"only one carbon main table is present in query.")
@@ -293,7 +293,7 @@ class TestCarbonSegmentUtil extends QueryTest {
"P_CAP_TIME','bad_records_action'='force')")
assert(BroadCastSIFilterPushJoin
.getFilteredSegments(s"select * from $tableName",
- Spark2TestQueryExecutor.spark).length == 1)
+ SparkTestQueryExecutor.spark).length == 1)
dropTables(tableName)
}
diff --git a/datamap/mv/core/pom.xml b/mv/core/pom.xml
similarity index 98%
rename from datamap/mv/core/pom.xml
rename to mv/core/pom.xml
index 5d0ab54..7a3166d 100644
--- a/datamap/mv/core/pom.xml
+++ b/mv/core/pom.xml
@@ -23,14 +23,14 @@
<groupId>org.apache.carbondata</groupId>
<artifactId>carbondata-parent</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <relativePath>../../../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>carbondata-mv-core</artifactId>
<name>Apache CarbonData :: Materialized View Core</name>
<properties>
- <dev.path>${basedir}/../../../dev</dev.path>
+ <dev.path>${basedir}/../../dev</dev.path>
<jacoco.append>true</jacoco.append>
</properties>
@@ -42,7 +42,7 @@
</dependency>
<dependency>
<groupId>org.apache.carbondata</groupId>
- <artifactId>carbondata-spark2</artifactId>
+ <artifactId>carbondata-spark</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/datamap/mv/core/src/main/scala/org/apache/carbondata/mv/extension/MVAnalyzerRule.scala b/mv/core/src/main/scala/org/apache/carbondata/mv/extension/MVAnalyzerRule.scala
similarity index 100%
rename from datamap/mv/core/src/main/scala/org/apache/carbondata/mv/extension/MVAnalyzerRule.scala
rename to mv/core/src/main/scala/org/apache/carbondata/mv/extension/MVAnalyzerRule.scala
diff --git a/datamap/mv/core/src/main/scala/org/apache/carbondata/mv/extension/MVDataMapProvider.scala b/mv/core/src/main/scala/org/apache/carbondata/mv/extension/MVDataMapProvider.scala
similarity index 100%
rename from datamap/mv/core/src/main/scala/org/apache/carbondata/mv/extension/MVDataMapProvider.scala
rename to mv/core/src/main/scala/org/apache/carbondata/mv/extension/MVDataMapProvider.scala
diff --git a/datamap/mv/core/src/main/scala/org/apache/carbondata/mv/extension/MVExtension.scala b/mv/core/src/main/scala/org/apache/carbondata/mv/extension/MVExtension.scala
similarity index 100%
rename from datamap/mv/core/src/main/scala/org/apache/carbondata/mv/extension/MVExtension.scala
rename to mv/core/src/main/scala/org/apache/carbondata/mv/extension/MVExtension.scala
diff --git a/datamap/mv/core/src/main/scala/org/apache/carbondata/mv/extension/MVExtensionSqlParser.scala b/mv/core/src/main/scala/org/apache/carbondata/mv/extension/MVExtensionSqlParser.scala
similarity index 100%
rename from datamap/mv/core/src/main/scala/org/apache/carbondata/mv/extension/MVExtensionSqlParser.scala
rename to mv/core/src/main/scala/org/apache/carbondata/mv/extension/MVExtensionSqlParser.scala
diff --git a/datamap/mv/core/src/main/scala/org/apache/carbondata/mv/extension/MVHelper.scala b/mv/core/src/main/scala/org/apache/carbondata/mv/extension/MVHelper.scala
similarity index 100%
rename from datamap/mv/core/src/main/scala/org/apache/carbondata/mv/extension/MVHelper.scala
rename to mv/core/src/main/scala/org/apache/carbondata/mv/extension/MVHelper.scala
diff --git a/datamap/mv/core/src/main/scala/org/apache/carbondata/mv/extension/MVParser.scala b/mv/core/src/main/scala/org/apache/carbondata/mv/extension/MVParser.scala
similarity index 100%
rename from datamap/mv/core/src/main/scala/org/apache/carbondata/mv/extension/MVParser.scala
rename to mv/core/src/main/scala/org/apache/carbondata/mv/extension/MVParser.scala
diff --git a/datamap/mv/core/src/main/scala/org/apache/carbondata/mv/extension/MVUtil.scala b/mv/core/src/main/scala/org/apache/carbondata/mv/extension/MVUtil.scala
similarity index 100%
rename from datamap/mv/core/src/main/scala/org/apache/carbondata/mv/extension/MVUtil.scala
rename to mv/core/src/main/scala/org/apache/carbondata/mv/extension/MVUtil.scala
diff --git a/datamap/mv/core/src/main/scala/org/apache/carbondata/mv/extension/command/CreateMaterializedViewCommand.scala b/mv/core/src/main/scala/org/apache/carbondata/mv/extension/command/CreateMaterializedViewCommand.scala
similarity index 100%
rename from datamap/mv/core/src/main/scala/org/apache/carbondata/mv/extension/command/CreateMaterializedViewCommand.scala
rename to mv/core/src/main/scala/org/apache/carbondata/mv/extension/command/CreateMaterializedViewCommand.scala
diff --git a/datamap/mv/core/src/main/scala/org/apache/carbondata/mv/extension/command/DropMaterializedViewCommand.scala b/mv/core/src/main/scala/org/apache/carbondata/mv/extension/command/DropMaterializedViewCommand.scala
similarity index 100%
rename from datamap/mv/core/src/main/scala/org/apache/carbondata/mv/extension/command/DropMaterializedViewCommand.scala
rename to mv/core/src/main/scala/org/apache/carbondata/mv/extension/command/DropMaterializedViewCommand.scala
diff --git a/datamap/mv/core/src/main/scala/org/apache/carbondata/mv/extension/command/RefreshMaterializedViewCommand.scala b/mv/core/src/main/scala/org/apache/carbondata/mv/extension/command/RefreshMaterializedViewCommand.scala
similarity index 100%
rename from datamap/mv/core/src/main/scala/org/apache/carbondata/mv/extension/command/RefreshMaterializedViewCommand.scala
rename to mv/core/src/main/scala/org/apache/carbondata/mv/extension/command/RefreshMaterializedViewCommand.scala
diff --git a/datamap/mv/core/src/main/scala/org/apache/carbondata/mv/extension/command/ShowMaterializedViewCommand.scala b/mv/core/src/main/scala/org/apache/carbondata/mv/extension/command/ShowMaterializedViewCommand.scala
similarity index 100%
rename from datamap/mv/core/src/main/scala/org/apache/carbondata/mv/extension/command/ShowMaterializedViewCommand.scala
rename to mv/core/src/main/scala/org/apache/carbondata/mv/extension/command/ShowMaterializedViewCommand.scala
diff --git a/datamap/mv/core/src/main/scala/org/apache/carbondata/mv/rewrite/DefaultMatchMaker.scala b/mv/core/src/main/scala/org/apache/carbondata/mv/rewrite/DefaultMatchMaker.scala
similarity index 100%
rename from datamap/mv/core/src/main/scala/org/apache/carbondata/mv/rewrite/DefaultMatchMaker.scala
rename to mv/core/src/main/scala/org/apache/carbondata/mv/rewrite/DefaultMatchMaker.scala
diff --git a/datamap/mv/core/src/main/scala/org/apache/carbondata/mv/rewrite/MVUdf.scala b/mv/core/src/main/scala/org/apache/carbondata/mv/rewrite/MVUdf.scala
similarity index 100%
rename from datamap/mv/core/src/main/scala/org/apache/carbondata/mv/rewrite/MVUdf.scala
rename to mv/core/src/main/scala/org/apache/carbondata/mv/rewrite/MVUdf.scala
diff --git a/datamap/mv/core/src/main/scala/org/apache/carbondata/mv/rewrite/MatchMaker.scala b/mv/core/src/main/scala/org/apache/carbondata/mv/rewrite/MatchMaker.scala
similarity index 100%
rename from datamap/mv/core/src/main/scala/org/apache/carbondata/mv/rewrite/MatchMaker.scala
rename to mv/core/src/main/scala/org/apache/carbondata/mv/rewrite/MatchMaker.scala
diff --git a/datamap/mv/core/src/main/scala/org/apache/carbondata/mv/rewrite/Navigator.scala b/mv/core/src/main/scala/org/apache/carbondata/mv/rewrite/Navigator.scala
similarity index 100%
rename from datamap/mv/core/src/main/scala/org/apache/carbondata/mv/rewrite/Navigator.scala
rename to mv/core/src/main/scala/org/apache/carbondata/mv/rewrite/Navigator.scala
diff --git a/datamap/mv/core/src/main/scala/org/apache/carbondata/mv/rewrite/QueryRewrite.scala b/mv/core/src/main/scala/org/apache/carbondata/mv/rewrite/QueryRewrite.scala
similarity index 100%
rename from datamap/mv/core/src/main/scala/org/apache/carbondata/mv/rewrite/QueryRewrite.scala
rename to mv/core/src/main/scala/org/apache/carbondata/mv/rewrite/QueryRewrite.scala
diff --git a/datamap/mv/core/src/main/scala/org/apache/carbondata/mv/rewrite/SummaryDatasetCatalog.scala b/mv/core/src/main/scala/org/apache/carbondata/mv/rewrite/SummaryDatasetCatalog.scala
similarity index 100%
rename from datamap/mv/core/src/main/scala/org/apache/carbondata/mv/rewrite/SummaryDatasetCatalog.scala
rename to mv/core/src/main/scala/org/apache/carbondata/mv/rewrite/SummaryDatasetCatalog.scala
diff --git a/datamap/mv/core/src/main/scala/org/apache/carbondata/mv/rewrite/Utils.scala b/mv/core/src/main/scala/org/apache/carbondata/mv/rewrite/Utils.scala
similarity index 100%
rename from datamap/mv/core/src/main/scala/org/apache/carbondata/mv/rewrite/Utils.scala
rename to mv/core/src/main/scala/org/apache/carbondata/mv/rewrite/Utils.scala
diff --git a/datamap/mv/core/src/main/scala/org/apache/carbondata/mv/session/MVSession.scala b/mv/core/src/main/scala/org/apache/carbondata/mv/session/MVSession.scala
similarity index 100%
rename from datamap/mv/core/src/main/scala/org/apache/carbondata/mv/session/MVSession.scala
rename to mv/core/src/main/scala/org/apache/carbondata/mv/session/MVSession.scala
diff --git a/datamap/mv/core/src/main/scala/org/apache/carbondata/mv/session/internal/SessionState.scala b/mv/core/src/main/scala/org/apache/carbondata/mv/session/internal/SessionState.scala
similarity index 100%
rename from datamap/mv/core/src/main/scala/org/apache/carbondata/mv/session/internal/SessionState.scala
rename to mv/core/src/main/scala/org/apache/carbondata/mv/session/internal/SessionState.scala
diff --git a/datamap/mv/core/src/main/scala/org/apache/carbondata/mv/timeseries/Granularity.java b/mv/core/src/main/scala/org/apache/carbondata/mv/timeseries/Granularity.java
similarity index 100%
rename from datamap/mv/core/src/main/scala/org/apache/carbondata/mv/timeseries/Granularity.java
rename to mv/core/src/main/scala/org/apache/carbondata/mv/timeseries/Granularity.java
diff --git a/datamap/mv/core/src/main/scala/org/apache/carbondata/mv/timeseries/TimeSeriesFunction.scala b/mv/core/src/main/scala/org/apache/carbondata/mv/timeseries/TimeSeriesFunction.scala
similarity index 100%
rename from datamap/mv/core/src/main/scala/org/apache/carbondata/mv/timeseries/TimeSeriesFunction.scala
rename to mv/core/src/main/scala/org/apache/carbondata/mv/timeseries/TimeSeriesFunction.scala
diff --git a/datamap/mv/core/src/main/scala/org/apache/carbondata/mv/timeseries/TimeSeriesUtil.scala b/mv/core/src/main/scala/org/apache/carbondata/mv/timeseries/TimeSeriesUtil.scala
similarity index 100%
rename from datamap/mv/core/src/main/scala/org/apache/carbondata/mv/timeseries/TimeSeriesUtil.scala
rename to mv/core/src/main/scala/org/apache/carbondata/mv/timeseries/TimeSeriesUtil.scala
diff --git a/datamap/mv/core/src/main/spark2.3/org/apache/carbondata/mv/extension/MVOptimizer.scala b/mv/core/src/main/spark2.3/org/apache/carbondata/mv/extension/MVOptimizer.scala
similarity index 100%
rename from datamap/mv/core/src/main/spark2.3/org/apache/carbondata/mv/extension/MVOptimizer.scala
rename to mv/core/src/main/spark2.3/org/apache/carbondata/mv/extension/MVOptimizer.scala
diff --git a/datamap/mv/core/src/main/spark2.4/org/apache/carbondata/mv/extension/MVOptimizer.scala b/mv/core/src/main/spark2.4/org/apache/carbondata/mv/extension/MVOptimizer.scala
similarity index 100%
rename from datamap/mv/core/src/main/spark2.4/org/apache/carbondata/mv/extension/MVOptimizer.scala
rename to mv/core/src/main/spark2.4/org/apache/carbondata/mv/extension/MVOptimizer.scala
diff --git a/datamap/mv/core/src/test/scala/org/apache/carbondata/mv/plans/ExtractJoinConditionsSuite.scala b/mv/core/src/test/scala/org/apache/carbondata/mv/plans/ExtractJoinConditionsSuite.scala
similarity index 100%
rename from datamap/mv/core/src/test/scala/org/apache/carbondata/mv/plans/ExtractJoinConditionsSuite.scala
rename to mv/core/src/test/scala/org/apache/carbondata/mv/plans/ExtractJoinConditionsSuite.scala
diff --git a/datamap/mv/core/src/test/scala/org/apache/carbondata/mv/plans/IsSPJGHSuite.scala b/mv/core/src/test/scala/org/apache/carbondata/mv/plans/IsSPJGHSuite.scala
similarity index 100%
rename from datamap/mv/core/src/test/scala/org/apache/carbondata/mv/plans/IsSPJGHSuite.scala
rename to mv/core/src/test/scala/org/apache/carbondata/mv/plans/IsSPJGHSuite.scala
diff --git a/datamap/mv/core/src/test/scala/org/apache/carbondata/mv/plans/LogicalToModularPlanSuite.scala b/mv/core/src/test/scala/org/apache/carbondata/mv/plans/LogicalToModularPlanSuite.scala
similarity index 100%
rename from datamap/mv/core/src/test/scala/org/apache/carbondata/mv/plans/LogicalToModularPlanSuite.scala
rename to mv/core/src/test/scala/org/apache/carbondata/mv/plans/LogicalToModularPlanSuite.scala
diff --git a/datamap/mv/core/src/test/scala/org/apache/carbondata/mv/plans/ModularToSQLSuite.scala b/mv/core/src/test/scala/org/apache/carbondata/mv/plans/ModularToSQLSuite.scala
similarity index 98%
rename from datamap/mv/core/src/test/scala/org/apache/carbondata/mv/plans/ModularToSQLSuite.scala
rename to mv/core/src/test/scala/org/apache/carbondata/mv/plans/ModularToSQLSuite.scala
index 6305125..8933677 100644
--- a/datamap/mv/core/src/test/scala/org/apache/carbondata/mv/plans/ModularToSQLSuite.scala
+++ b/mv/core/src/test/scala/org/apache/carbondata/mv/plans/ModularToSQLSuite.scala
@@ -29,7 +29,6 @@ class ModularToSQLSuite extends ModularPlanTest with BeforeAndAfter {
val spark = sqlContext
val testHive = sqlContext.sparkSession
- val hiveClient = CarbonSessionCatalogUtil.getClient(spark.sparkSession)
ignore("convert modular plans to sqls") {
diff --git a/datamap/mv/core/src/test/scala/org/apache/carbondata/mv/plans/SignatureSuite.scala b/mv/core/src/test/scala/org/apache/carbondata/mv/plans/SignatureSuite.scala
similarity index 97%
rename from datamap/mv/core/src/test/scala/org/apache/carbondata/mv/plans/SignatureSuite.scala
rename to mv/core/src/test/scala/org/apache/carbondata/mv/plans/SignatureSuite.scala
index c44a55a..0153e5a 100644
--- a/datamap/mv/core/src/test/scala/org/apache/carbondata/mv/plans/SignatureSuite.scala
+++ b/mv/core/src/test/scala/org/apache/carbondata/mv/plans/SignatureSuite.scala
@@ -30,7 +30,6 @@ class SignatureSuite extends ModularPlanTest with BeforeAndAfterAll {
val spark = sqlContext
val testHive = sqlContext.sparkSession
- val hiveClient = CarbonSessionCatalogUtil.getClient(spark.sparkSession)
ignore("test signature computing") {
diff --git a/datamap/mv/core/src/test/scala/org/apache/carbondata/mv/plans/Tpcds_1_4_BenchmarkSuite.scala b/mv/core/src/test/scala/org/apache/carbondata/mv/plans/Tpcds_1_4_BenchmarkSuite.scala
similarity index 100%
rename from datamap/mv/core/src/test/scala/org/apache/carbondata/mv/plans/Tpcds_1_4_BenchmarkSuite.scala
rename to mv/core/src/test/scala/org/apache/carbondata/mv/plans/Tpcds_1_4_BenchmarkSuite.scala
diff --git a/datamap/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/MVCoalesceTestCase.scala b/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/MVCoalesceTestCase.scala
similarity index 100%
rename from datamap/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/MVCoalesceTestCase.scala
rename to mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/MVCoalesceTestCase.scala
diff --git a/datamap/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/MVCountAndCaseTestCase.scala b/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/MVCountAndCaseTestCase.scala
similarity index 100%
rename from datamap/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/MVCountAndCaseTestCase.scala
rename to mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/MVCountAndCaseTestCase.scala
diff --git a/datamap/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/MVCreateTestCase.scala b/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/MVCreateTestCase.scala
similarity index 99%
rename from datamap/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/MVCreateTestCase.scala
rename to mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/MVCreateTestCase.scala
index 6e48758..633db24 100644
--- a/datamap/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/MVCreateTestCase.scala
+++ b/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/MVCreateTestCase.scala
@@ -35,10 +35,10 @@ class MVCreateTestCase extends QueryTest with BeforeAndAfterAll {
drop()
CarbonProperties.getInstance()
.addProperty(CarbonCommonConstants.CARBON_TIMESTAMP_FORMAT, "yyyy/MM/dd")
- val projectPath = new File(this.getClass.getResource("/").getPath + "../../../../../")
+ val projectPath = new File(this.getClass.getResource("/").getPath + "../../../../")
.getCanonicalPath.replaceAll("\\\\", "/")
val integrationPath = s"$projectPath/integration"
- val resourcesPath = s"$integrationPath/spark-common-test/src/test/resources"
+ val resourcesPath = s"$integrationPath/spark/src/test/resources"
sql(
"""
| CREATE TABLE fact_table1 (empname String, designation String, doj Timestamp,
diff --git a/datamap/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/MVExceptionTestCase.scala b/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/MVExceptionTestCase.scala
similarity index 100%
rename from datamap/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/MVExceptionTestCase.scala
rename to mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/MVExceptionTestCase.scala
diff --git a/datamap/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/MVFilterAndJoinTest.scala b/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/MVFilterAndJoinTest.scala
similarity index 99%
rename from datamap/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/MVFilterAndJoinTest.scala
rename to mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/MVFilterAndJoinTest.scala
index 4c05938..0df8d07 100644
--- a/datamap/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/MVFilterAndJoinTest.scala
+++ b/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/MVFilterAndJoinTest.scala
@@ -23,6 +23,7 @@ import org.scalatest.BeforeAndAfterAll
class MVFilterAndJoinTest extends QueryTest with BeforeAndAfterAll {
override def beforeAll(): Unit = {
+ defaultConfig()
drop
sql("create table main_table (name string,age int,height int) STORED AS carbondata")
sql("create table dim_table (name string,age int,height int) STORED AS carbondata")
diff --git a/datamap/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/MVIncrementalLoadingTestcase.scala b/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/MVIncrementalLoadingTestcase.scala
similarity index 98%
rename from datamap/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/MVIncrementalLoadingTestcase.scala
rename to mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/MVIncrementalLoadingTestcase.scala
index 8431516..82338bb 100644
--- a/datamap/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/MVIncrementalLoadingTestcase.scala
+++ b/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/MVIncrementalLoadingTestcase.scala
@@ -33,6 +33,7 @@ import org.apache.carbondata.core.statusmanager.{SegmentStatus, SegmentStatusMan
class MVIncrementalLoadingTestcase extends QueryTest with BeforeAndAfterAll {
override def beforeAll(): Unit = {
+ defaultConfig()
sql("drop table IF EXISTS test_table")
sql("drop table IF EXISTS test_table1")
sql("drop table IF EXISTS main_table")
@@ -101,7 +102,7 @@ class MVIncrementalLoadingTestcase extends QueryTest with BeforeAndAfterAll {
sql("Delete from table test_table1 where segment.id in (0)")
sql("drop materialized view if exists datamap1")
sql("create materialized view datamap1 with deferred refresh as select empname, designation " +
- "from test_table")
+ "from test_table")
loadDataToFactTable("test_table")
loadDataToFactTable("test_table1")
sql(s"refresh materialized view datamap1")
@@ -306,7 +307,6 @@ class MVIncrementalLoadingTestcase extends QueryTest with BeforeAndAfterAll {
sql("drop table IF EXISTS test_table")
}
-
test("test set segments with main table having mv before refresh") {
sql("drop table IF EXISTS main_table")
sql("create table main_table(a string,b string,c int) STORED AS carbondata")
@@ -318,7 +318,8 @@ class MVIncrementalLoadingTestcase extends QueryTest with BeforeAndAfterAll {
sql(s"refresh materialized view datamap1")
val df = sql("select a, sum(c) from main_table group by a")
assert(!TestUtil.verifyMVDataMap(df.queryExecution.optimizedPlan, "datamap1"))
- sql("reset")
+ defaultConfig()
+ sqlContext.sparkSession.conf.unset("carbon.input.segments.default.main_table")
checkAnswer(sql("select a, sum(c) from main_table group by a"), Seq(Row("a", 1), Row("b", 2)))
val df1= sql("select a, sum(c) from main_table group by a")
assert(TestUtil.verifyMVDataMap(df1.queryExecution.optimizedPlan, "datamap1"))
@@ -612,6 +613,13 @@ class MVIncrementalLoadingTestcase extends QueryTest with BeforeAndAfterAll {
override def afterAll(): Unit = {
+ defaultConfig()
+ Seq("carbon.enable.auto.load.merge",
+ "carbon.input.segments.default.main_table",
+ "carbon.input.segments.default.test_table",
+ "carbon.input.segments.default.datamap1_table").foreach { key =>
+ sqlContext.sparkSession.conf.unset(key)
+ }
sql("drop table if exists products")
sql("drop table if exists sales")
sql("drop table if exists products1")
@@ -639,4 +647,4 @@ class MVIncrementalLoadingTestcase extends QueryTest with BeforeAndAfterAll {
s"""LOAD DATA local inpath '$resourcesPath/data_big.csv' INTO TABLE $tableName OPTIONS
|('DELIMITER'= ',', 'QUOTECHAR'= '"')""".stripMargin)
}
-}
\ No newline at end of file
+}
diff --git a/datamap/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/MVInvalidTestCase.scala b/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/MVInvalidTestCase.scala
similarity index 100%
rename from datamap/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/MVInvalidTestCase.scala
rename to mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/MVInvalidTestCase.scala
diff --git a/datamap/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/MVMultiJoinTestCase.scala b/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/MVMultiJoinTestCase.scala
similarity index 100%
rename from datamap/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/MVMultiJoinTestCase.scala
rename to mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/MVMultiJoinTestCase.scala
diff --git a/datamap/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/MVRewriteTestCase.scala b/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/MVRewriteTestCase.scala
similarity index 100%
rename from datamap/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/MVRewriteTestCase.scala
rename to mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/MVRewriteTestCase.scala
diff --git a/datamap/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/MVSampleTestCase.scala b/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/MVSampleTestCase.scala
similarity index 98%
rename from datamap/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/MVSampleTestCase.scala
rename to mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/MVSampleTestCase.scala
index e58a72a..a050e7e 100644
--- a/datamap/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/MVSampleTestCase.scala
+++ b/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/MVSampleTestCase.scala
@@ -31,10 +31,10 @@ class MVSampleTestCase extends QueryTest with BeforeAndAfterAll {
drop()
CarbonProperties.getInstance()
.addProperty(CarbonCommonConstants.CARBON_TIMESTAMP_FORMAT, "yyyy/MM/dd")
- val projectPath = new File(this.getClass.getResource("/").getPath + "../../../../../")
+ val projectPath = new File(this.getClass.getResource("/").getPath + "../../../../")
.getCanonicalPath.replaceAll("\\\\", "/")
val integrationPath = s"$projectPath/integration"
- val resourcesPath = s"$integrationPath/spark-common-test/src/test/resources"
+ val resourcesPath = s"$integrationPath/spark/src/test/resources"
sql("drop database if exists sample cascade")
sql("create database sample")
sql("use sample")
diff --git a/datamap/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/MVTPCDSTestCase.scala b/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/MVTPCDSTestCase.scala
similarity index 98%
rename from datamap/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/MVTPCDSTestCase.scala
rename to mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/MVTPCDSTestCase.scala
index 6fdc487..dbef5f5 100644
--- a/datamap/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/MVTPCDSTestCase.scala
+++ b/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/MVTPCDSTestCase.scala
@@ -32,10 +32,10 @@ class MVTPCDSTestCase extends QueryTest with BeforeAndAfterAll {
drop()
CarbonProperties.getInstance()
.addProperty(CarbonCommonConstants.CARBON_TIMESTAMP_FORMAT, "yyyy/MM/dd")
- val projectPath = new File(this.getClass.getResource("/").getPath + "../../../../../")
+ val projectPath = new File(this.getClass.getResource("/").getPath + "../../../../")
.getCanonicalPath.replaceAll("\\\\", "/")
val integrationPath = s"$projectPath/integration"
- val resourcesPath = s"$integrationPath/spark-common-test/src/test/resources"
+ val resourcesPath = s"$integrationPath/spark/src/test/resources"
sql("drop database if exists tpcds cascade")
sql("create database tpcds")
sql("use tpcds")
diff --git a/datamap/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/MVTpchTestCase.scala b/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/MVTpchTestCase.scala
similarity index 99%
rename from datamap/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/MVTpchTestCase.scala
rename to mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/MVTpchTestCase.scala
index f6e65ba..8490d0f 100644
--- a/datamap/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/MVTpchTestCase.scala
+++ b/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/MVTpchTestCase.scala
@@ -27,10 +27,10 @@ class MVTpchTestCase extends QueryTest with BeforeAndAfterAll {
override def beforeAll {
drop()
- val projectPath = new File(this.getClass.getResource("/").getPath + "../../../../../")
+ val projectPath = new File(this.getClass.getResource("/").getPath + "../../../../")
.getCanonicalPath.replaceAll("\\\\", "/")
val integrationPath = s"$projectPath/integration"
- val resourcesPath = s"$integrationPath/spark-common-test/src/test/resources"
+ val resourcesPath = s"$integrationPath/spark/src/test/resources"
sql(s"""create table if not exists LINEITEM( L_SHIPDATE date, L_SHIPMODE string, L_SHIPINSTRUCT string, L_RETURNFLAG string, L_RECEIPTDATE date, L_ORDERKEY INT , L_PARTKEY INT , L_SUPPKEY string, L_LINENUMBER int, L_QUANTITY double, L_EXTENDEDPRICE double, L_DISCOUNT double, L_TAX double, L_LINESTATUS string, L_COMMITDATE date, L_COMMENT string) STORED AS carbondata""")
sql(s"""create table if not exists ORDERS( O_ORDERDATE date, O_ORDERPRIORITY string, O_ORDERSTATUS string, O_ORDERKEY int, O_CUSTKEY string, O_TOTALPRICE double, O_CLERK string, O_SHIPPRIORITY int, O_COMMENT string) STORED AS carbondata""")
diff --git a/datamap/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/SelectAllColumnsSuite.scala b/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/SelectAllColumnsSuite.scala
similarity index 100%
rename from datamap/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/SelectAllColumnsSuite.scala
rename to mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/SelectAllColumnsSuite.scala
diff --git a/datamap/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/SelectSelectExactChildrenSuite.scala b/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/SelectSelectExactChildrenSuite.scala
similarity index 100%
rename from datamap/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/SelectSelectExactChildrenSuite.scala
rename to mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/SelectSelectExactChildrenSuite.scala
diff --git a/datamap/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/TestAllOperationsOnMV.scala b/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/TestAllOperationsOnMV.scala
similarity index 98%
rename from datamap/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/TestAllOperationsOnMV.scala
rename to mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/TestAllOperationsOnMV.scala
index 78bcda3..2d444f7 100644
--- a/datamap/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/TestAllOperationsOnMV.scala
+++ b/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/TestAllOperationsOnMV.scala
@@ -420,7 +420,7 @@ class TestAllOperationsOnMV extends QueryTest with BeforeAndAfterEach {
test("test todate UDF function with mv") {
sql("drop table IF EXISTS maintable")
sql("CREATE TABLE maintable (CUST_ID int,CUST_NAME String,ACTIVE_EMUI_VERSION string, DOB timestamp, DOJ timestamp, BIGINT_COLUMN1 bigint,BIGINT_COLUMN2 bigint,DECIMAL_COLUMN1 decimal(30,10), DECIMAL_COLUMN2 decimal(36,10),Double_COLUMN1 double, Double_COLUMN2 double,INTEGER_COLUMN1 int) STORED AS carbondata")
- sql("insert into maintable values(1, 'abc', 'abc001', '1975-06-11 01:00:03.0','1975-06-11 02:00:03.0', 120, 1234,4.34,24.56,12345, 2464, 45)")
+ sql("insert into maintable values(1, 'abc', 'abc001', '1975-06-11 01:00:03.0','1975-06-11 02:00:03.0', 120, 1234,4.34,24.56,12345, 2464, 45)")
sql("drop materialized view if exists dm ")
sql("create materialized view dm as select max(to_date(dob)) , min(to_date(dob)) from maintable where to_date(dob)='1975-06-11' or to_date(dob)='1975-06-23'")
checkExistence(sql("select max(to_date(dob)) , min(to_date(dob)) from maintable where to_date(dob)='1975-06-11' or to_date(dob)='1975-06-23'"), true, "1975-06-11 1975-06-11")
@@ -577,12 +577,15 @@ class TestAllOperationsOnMV extends QueryTest with BeforeAndAfterEach {
intercept[Exception] {
sql("alter table maintable drop columns(c_code)")
}.getMessage.contains("Column name cannot be dropped because it exists in mv materialized view: dm1")
- sql("drop table if exists maintable")
+ sql("drop table if exists maintable")
}
test("drop meta cache on mv materialized view table") {
+ defaultConfig()
+ printConfiguration()
sql("drop table IF EXISTS maintable")
sql("create table maintable(name string, c_code int, price int) STORED AS carbondata")
+ printTable("maintable")
sql("insert into table maintable select 'abc',21,2000")
sql("drop materialized view if exists dm ")
sql("create materialized view dm as select name, sum(price) from maintable group by name")
@@ -606,6 +609,10 @@ class TestAllOperationsOnMV extends QueryTest with BeforeAndAfterEach {
assert(droppedCacheKeys.asScala.exists(key => key.startsWith(tablePath)))
// check if cache does not have any more table index entries
+ cacheAfterDrop.asScala.foreach { key =>
+ LOGGER.error("cacheAfterDrop - key : " + key)
+ }
+ LOGGER.error("table path: " + tablePath)
assert(!cacheAfterDrop.asScala.exists(key => key.startsWith(tablePath)))
// Check if mv index entries are dropped
@@ -620,6 +627,5 @@ class TestAllOperationsOnMV extends QueryTest with BeforeAndAfterEach {
newSet.addAll(oldSet)
newSet
}
-
-}
+}
diff --git a/datamap/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/TestPartitionWithMV.scala b/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/TestPartitionWithMV.scala
similarity index 99%
rename from datamap/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/TestPartitionWithMV.scala
rename to mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/TestPartitionWithMV.scala
index 27e7d90..c781598 100644
--- a/datamap/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/TestPartitionWithMV.scala
+++ b/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/TestPartitionWithMV.scala
@@ -33,6 +33,7 @@ class TestPartitionWithMV extends QueryTest with BeforeAndAfterAll {
val testData = s"$resourcesPath/sample.csv"
override def beforeAll(): Unit = {
+ defaultConfig()
sql("drop database if exists partition_mv cascade")
sql("create database partition_mv")
sql("use partition_mv")
diff --git a/datamap/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/TestSQLSuite.scala b/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/TestSQLSuite.scala
similarity index 97%
rename from datamap/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/TestSQLSuite.scala
rename to mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/TestSQLSuite.scala
index c6c7510..90cf7af 100644
--- a/datamap/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/TestSQLSuite.scala
+++ b/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/TestSQLSuite.scala
@@ -27,8 +27,7 @@ class TestSQLSuite extends ModularPlanTest with BeforeAndAfter {
val spark = sqlContext
val testHive = sqlContext.sparkSession
- val hiveClient = CarbonSessionCatalogUtil.getClient(spark.sparkSession)
-
+
ignore("protypical mqo rewrite test") {
hiveClient.runSqlHive(
diff --git a/datamap/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/Tpcds_1_4_Suite.scala b/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/Tpcds_1_4_Suite.scala
similarity index 97%
rename from datamap/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/Tpcds_1_4_Suite.scala
rename to mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/Tpcds_1_4_Suite.scala
index ee6445a..9ae601b 100644
--- a/datamap/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/Tpcds_1_4_Suite.scala
+++ b/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/Tpcds_1_4_Suite.scala
@@ -31,7 +31,6 @@ class Tpcds_1_4_Suite extends ModularPlanTest with BeforeAndAfter {
val spark = sqlContext
val testHive = sqlContext.sparkSession
- val hiveClient = CarbonSessionCatalogUtil.getClient(spark.sparkSession)
test("test using tpc-ds queries") {
diff --git a/datamap/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/matching/TestSQLBatch.scala b/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/matching/TestSQLBatch.scala
similarity index 100%
rename from datamap/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/matching/TestSQLBatch.scala
rename to mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/matching/TestSQLBatch.scala
diff --git a/datamap/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/matching/TestTPCDS_1_4_Batch.scala b/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/matching/TestTPCDS_1_4_Batch.scala
similarity index 100%
rename from datamap/mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/matching/TestTPCDS_1_4_Batch.scala
rename to mv/core/src/test/scala/org/apache/carbondata/mv/rewrite/matching/TestTPCDS_1_4_Batch.scala
diff --git a/datamap/mv/core/src/test/scala/org/apache/carbondata/mv/testutil/ModularPlanTest.scala b/mv/core/src/test/scala/org/apache/carbondata/mv/testutil/ModularPlanTest.scala
similarity index 100%
rename from datamap/mv/core/src/test/scala/org/apache/carbondata/mv/testutil/ModularPlanTest.scala
rename to mv/core/src/test/scala/org/apache/carbondata/mv/testutil/ModularPlanTest.scala
diff --git a/datamap/mv/core/src/test/scala/org/apache/carbondata/mv/testutil/TestSQLBatch.scala b/mv/core/src/test/scala/org/apache/carbondata/mv/testutil/TestSQLBatch.scala
similarity index 100%
rename from datamap/mv/core/src/test/scala/org/apache/carbondata/mv/testutil/TestSQLBatch.scala
rename to mv/core/src/test/scala/org/apache/carbondata/mv/testutil/TestSQLBatch.scala
diff --git a/datamap/mv/core/src/test/scala/org/apache/carbondata/mv/testutil/TestSQLBatch2.scala b/mv/core/src/test/scala/org/apache/carbondata/mv/testutil/TestSQLBatch2.scala
similarity index 100%
rename from datamap/mv/core/src/test/scala/org/apache/carbondata/mv/testutil/TestSQLBatch2.scala
rename to mv/core/src/test/scala/org/apache/carbondata/mv/testutil/TestSQLBatch2.scala
diff --git a/datamap/mv/core/src/test/scala/org/apache/carbondata/mv/testutil/Tpcds_1_4_QueryBatch.scala b/mv/core/src/test/scala/org/apache/carbondata/mv/testutil/Tpcds_1_4_QueryBatch.scala
similarity index 100%
rename from datamap/mv/core/src/test/scala/org/apache/carbondata/mv/testutil/Tpcds_1_4_QueryBatch.scala
rename to mv/core/src/test/scala/org/apache/carbondata/mv/testutil/Tpcds_1_4_QueryBatch.scala
diff --git a/datamap/mv/core/src/test/scala/org/apache/carbondata/mv/testutil/Tpcds_1_4_Tables.scala b/mv/core/src/test/scala/org/apache/carbondata/mv/testutil/Tpcds_1_4_Tables.scala
similarity index 100%
rename from datamap/mv/core/src/test/scala/org/apache/carbondata/mv/testutil/Tpcds_1_4_Tables.scala
rename to mv/core/src/test/scala/org/apache/carbondata/mv/testutil/Tpcds_1_4_Tables.scala
diff --git a/datamap/mv/core/src/test/scala/org/apache/carbondata/mv/timeseries/TestMVTimeSeriesCreateDataMapCommand.scala b/mv/core/src/test/scala/org/apache/carbondata/mv/timeseries/TestMVTimeSeriesCreateDataMapCommand.scala
similarity index 100%
rename from datamap/mv/core/src/test/scala/org/apache/carbondata/mv/timeseries/TestMVTimeSeriesCreateDataMapCommand.scala
rename to mv/core/src/test/scala/org/apache/carbondata/mv/timeseries/TestMVTimeSeriesCreateDataMapCommand.scala
diff --git a/datamap/mv/core/src/test/scala/org/apache/carbondata/mv/timeseries/TestMVTimeSeriesLoadAndQuery.scala b/mv/core/src/test/scala/org/apache/carbondata/mv/timeseries/TestMVTimeSeriesLoadAndQuery.scala
similarity index 100%
rename from datamap/mv/core/src/test/scala/org/apache/carbondata/mv/timeseries/TestMVTimeSeriesLoadAndQuery.scala
rename to mv/core/src/test/scala/org/apache/carbondata/mv/timeseries/TestMVTimeSeriesLoadAndQuery.scala
diff --git a/datamap/mv/core/src/test/scala/org/apache/carbondata/mv/timeseries/TestMVTimeSeriesQueryRollUp.scala b/mv/core/src/test/scala/org/apache/carbondata/mv/timeseries/TestMVTimeSeriesQueryRollUp.scala
similarity index 100%
rename from datamap/mv/core/src/test/scala/org/apache/carbondata/mv/timeseries/TestMVTimeSeriesQueryRollUp.scala
rename to mv/core/src/test/scala/org/apache/carbondata/mv/timeseries/TestMVTimeSeriesQueryRollUp.scala
diff --git a/datamap/mv/plan/pom.xml b/mv/plan/pom.xml
similarity index 97%
rename from datamap/mv/plan/pom.xml
rename to mv/plan/pom.xml
index 27d32ed..d9d4bd3 100644
--- a/datamap/mv/plan/pom.xml
+++ b/mv/plan/pom.xml
@@ -23,20 +23,20 @@
<groupId>org.apache.carbondata</groupId>
<artifactId>carbondata-parent</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <relativePath>../../../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>carbondata-mv-plan</artifactId>
<name>Apache CarbonData :: Materialized View Plan</name>
<properties>
- <dev.path>${basedir}/../../../dev</dev.path>
+ <dev.path>${basedir}/../../dev</dev.path>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.carbondata</groupId>
- <artifactId>carbondata-spark2</artifactId>
+ <artifactId>carbondata-spark</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/datamap/mv/plan/src/main/scala/org/apache/carbondata/mv/dsl/package.scala b/mv/plan/src/main/scala/org/apache/carbondata/mv/dsl/package.scala
similarity index 100%
rename from datamap/mv/plan/src/main/scala/org/apache/carbondata/mv/dsl/package.scala
rename to mv/plan/src/main/scala/org/apache/carbondata/mv/dsl/package.scala
diff --git a/datamap/mv/plan/src/main/scala/org/apache/carbondata/mv/expressions/modular/subquery.scala b/mv/plan/src/main/scala/org/apache/carbondata/mv/expressions/modular/subquery.scala
similarity index 100%
rename from datamap/mv/plan/src/main/scala/org/apache/carbondata/mv/expressions/modular/subquery.scala
rename to mv/plan/src/main/scala/org/apache/carbondata/mv/expressions/modular/subquery.scala
diff --git a/datamap/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/modular/AggregatePushDown.scala b/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/modular/AggregatePushDown.scala
similarity index 100%
rename from datamap/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/modular/AggregatePushDown.scala
rename to mv/plan/src/main/scala/org/apache/carbondata/mv/plans/modular/AggregatePushDown.scala
diff --git a/datamap/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/modular/Flags.scala b/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/modular/Flags.scala
similarity index 100%
rename from datamap/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/modular/Flags.scala
rename to mv/plan/src/main/scala/org/apache/carbondata/mv/plans/modular/Flags.scala
diff --git a/datamap/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/modular/Harmonizer.scala b/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/modular/Harmonizer.scala
similarity index 100%
rename from datamap/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/modular/Harmonizer.scala
rename to mv/plan/src/main/scala/org/apache/carbondata/mv/plans/modular/Harmonizer.scala
diff --git a/datamap/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/modular/ModularPatterns.scala b/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/modular/ModularPatterns.scala
similarity index 100%
rename from datamap/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/modular/ModularPatterns.scala
rename to mv/plan/src/main/scala/org/apache/carbondata/mv/plans/modular/ModularPatterns.scala
diff --git a/datamap/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/modular/ModularPlan.scala b/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/modular/ModularPlan.scala
similarity index 100%
rename from datamap/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/modular/ModularPlan.scala
rename to mv/plan/src/main/scala/org/apache/carbondata/mv/plans/modular/ModularPlan.scala
diff --git a/datamap/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/modular/ModularPlanSignatureGenerator.scala b/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/modular/ModularPlanSignatureGenerator.scala
similarity index 100%
rename from datamap/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/modular/ModularPlanSignatureGenerator.scala
rename to mv/plan/src/main/scala/org/apache/carbondata/mv/plans/modular/ModularPlanSignatureGenerator.scala
diff --git a/datamap/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/modular/ModularRelation.scala b/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/modular/ModularRelation.scala
similarity index 100%
rename from datamap/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/modular/ModularRelation.scala
rename to mv/plan/src/main/scala/org/apache/carbondata/mv/plans/modular/ModularRelation.scala
diff --git a/datamap/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/modular/Modularizer.scala b/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/modular/Modularizer.scala
similarity index 100%
rename from datamap/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/modular/Modularizer.scala
rename to mv/plan/src/main/scala/org/apache/carbondata/mv/plans/modular/Modularizer.scala
diff --git a/datamap/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/modular/basicOperators.scala b/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/modular/basicOperators.scala
similarity index 100%
rename from datamap/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/modular/basicOperators.scala
rename to mv/plan/src/main/scala/org/apache/carbondata/mv/plans/modular/basicOperators.scala
diff --git a/datamap/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/modular/queryGraph.scala b/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/modular/queryGraph.scala
similarity index 100%
rename from datamap/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/modular/queryGraph.scala
rename to mv/plan/src/main/scala/org/apache/carbondata/mv/plans/modular/queryGraph.scala
diff --git a/datamap/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/package.scala b/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/package.scala
similarity index 100%
rename from datamap/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/package.scala
rename to mv/plan/src/main/scala/org/apache/carbondata/mv/plans/package.scala
diff --git a/datamap/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/util/BirdcageOptimizer.scala b/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/util/BirdcageOptimizer.scala
similarity index 100%
rename from datamap/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/util/BirdcageOptimizer.scala
rename to mv/plan/src/main/scala/org/apache/carbondata/mv/plans/util/BirdcageOptimizer.scala
diff --git a/datamap/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/util/Logical2ModularExtractions.scala b/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/util/Logical2ModularExtractions.scala
similarity index 100%
rename from datamap/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/util/Logical2ModularExtractions.scala
rename to mv/plan/src/main/scala/org/apache/carbondata/mv/plans/util/Logical2ModularExtractions.scala
diff --git a/datamap/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/util/LogicalPlanSignatureGenerator.scala b/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/util/LogicalPlanSignatureGenerator.scala
similarity index 100%
rename from datamap/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/util/LogicalPlanSignatureGenerator.scala
rename to mv/plan/src/main/scala/org/apache/carbondata/mv/plans/util/LogicalPlanSignatureGenerator.scala
diff --git a/datamap/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/util/Printers.scala b/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/util/Printers.scala
similarity index 100%
rename from datamap/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/util/Printers.scala
rename to mv/plan/src/main/scala/org/apache/carbondata/mv/plans/util/Printers.scala
diff --git a/datamap/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/util/SQLBuild.scala b/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/util/SQLBuild.scala
similarity index 100%
rename from datamap/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/util/SQLBuild.scala
rename to mv/plan/src/main/scala/org/apache/carbondata/mv/plans/util/SQLBuild.scala
diff --git a/datamap/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/util/SQLBuildDSL.scala b/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/util/SQLBuildDSL.scala
similarity index 100%
rename from datamap/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/util/SQLBuildDSL.scala
rename to mv/plan/src/main/scala/org/apache/carbondata/mv/plans/util/SQLBuildDSL.scala
diff --git a/datamap/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/util/SQLBuilder.scala b/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/util/SQLBuilder.scala
similarity index 100%
rename from datamap/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/util/SQLBuilder.scala
rename to mv/plan/src/main/scala/org/apache/carbondata/mv/plans/util/SQLBuilder.scala
diff --git a/datamap/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/util/Signature.scala b/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/util/Signature.scala
similarity index 100%
rename from datamap/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/util/Signature.scala
rename to mv/plan/src/main/scala/org/apache/carbondata/mv/plans/util/Signature.scala
diff --git a/datamap/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/util/TableCluster.scala b/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/util/TableCluster.scala
similarity index 100%
rename from datamap/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/util/TableCluster.scala
rename to mv/plan/src/main/scala/org/apache/carbondata/mv/plans/util/TableCluster.scala
diff --git a/store/CSDK/CMakeLists.txt b/sdk/CSDK/CMakeLists.txt
similarity index 100%
rename from store/CSDK/CMakeLists.txt
rename to sdk/CSDK/CMakeLists.txt
diff --git a/store/CSDK/src/CarbonProperties.cpp b/sdk/CSDK/src/CarbonProperties.cpp
similarity index 100%
rename from store/CSDK/src/CarbonProperties.cpp
rename to sdk/CSDK/src/CarbonProperties.cpp
diff --git a/store/CSDK/src/CarbonProperties.h b/sdk/CSDK/src/CarbonProperties.h
similarity index 100%
rename from store/CSDK/src/CarbonProperties.h
rename to sdk/CSDK/src/CarbonProperties.h
diff --git a/store/CSDK/src/CarbonReader.cpp b/sdk/CSDK/src/CarbonReader.cpp
similarity index 100%
rename from store/CSDK/src/CarbonReader.cpp
rename to sdk/CSDK/src/CarbonReader.cpp
diff --git a/store/CSDK/src/CarbonReader.h b/sdk/CSDK/src/CarbonReader.h
similarity index 100%
rename from store/CSDK/src/CarbonReader.h
rename to sdk/CSDK/src/CarbonReader.h
diff --git a/store/CSDK/src/CarbonRow.cpp b/sdk/CSDK/src/CarbonRow.cpp
similarity index 100%
rename from store/CSDK/src/CarbonRow.cpp
rename to sdk/CSDK/src/CarbonRow.cpp
diff --git a/store/CSDK/src/CarbonRow.h b/sdk/CSDK/src/CarbonRow.h
similarity index 100%
rename from store/CSDK/src/CarbonRow.h
rename to sdk/CSDK/src/CarbonRow.h
diff --git a/store/CSDK/src/CarbonSchemaReader.cpp b/sdk/CSDK/src/CarbonSchemaReader.cpp
similarity index 100%
rename from store/CSDK/src/CarbonSchemaReader.cpp
rename to sdk/CSDK/src/CarbonSchemaReader.cpp
diff --git a/store/CSDK/src/CarbonSchemaReader.h b/sdk/CSDK/src/CarbonSchemaReader.h
similarity index 100%
rename from store/CSDK/src/CarbonSchemaReader.h
rename to sdk/CSDK/src/CarbonSchemaReader.h
diff --git a/store/CSDK/src/CarbonWriter.cpp b/sdk/CSDK/src/CarbonWriter.cpp
similarity index 100%
rename from store/CSDK/src/CarbonWriter.cpp
rename to sdk/CSDK/src/CarbonWriter.cpp
diff --git a/store/CSDK/src/CarbonWriter.h b/sdk/CSDK/src/CarbonWriter.h
similarity index 100%
rename from store/CSDK/src/CarbonWriter.h
rename to sdk/CSDK/src/CarbonWriter.h
diff --git a/store/CSDK/src/Configuration.cpp b/sdk/CSDK/src/Configuration.cpp
similarity index 100%
rename from store/CSDK/src/Configuration.cpp
rename to sdk/CSDK/src/Configuration.cpp
diff --git a/store/CSDK/src/Configuration.h b/sdk/CSDK/src/Configuration.h
similarity index 100%
rename from store/CSDK/src/Configuration.h
rename to sdk/CSDK/src/Configuration.h
diff --git a/store/CSDK/src/Schema.cpp b/sdk/CSDK/src/Schema.cpp
similarity index 100%
rename from store/CSDK/src/Schema.cpp
rename to sdk/CSDK/src/Schema.cpp
diff --git a/store/CSDK/src/Schema.h b/sdk/CSDK/src/Schema.h
similarity index 100%
rename from store/CSDK/src/Schema.h
rename to sdk/CSDK/src/Schema.h
diff --git a/store/CSDK/test/main.cpp b/sdk/CSDK/test/main.cpp
similarity index 99%
rename from store/CSDK/test/main.cpp
rename to sdk/CSDK/test/main.cpp
index 2e1b5e5..b221d08 100644
--- a/store/CSDK/test/main.cpp
+++ b/sdk/CSDK/test/main.cpp
@@ -748,7 +748,7 @@ bool testWriteDataWithSchemaFile(JNIEnv *env, char *path, int argc, char *argv[]
writer.builder(env);
writer.outputPath(path);
writer.withCsvInput();
- writer.withSchemaFile("../../../integration/spark-common/target/warehouse/add_segment_test/Metadata/schema");
+ writer.withSchemaFile("../../../integration/spark/target/warehouse/add_segment_test/Metadata/schema");
writer.writtenBy("CSDK");
writer.taskNo(15541554.81);
writer.withThreadSafe(1);
diff --git a/store/sdk/pom.xml b/sdk/sdk/pom.xml
similarity index 98%
rename from store/sdk/pom.xml
rename to sdk/sdk/pom.xml
index 9e43a8b..3f8256e 100644
--- a/store/sdk/pom.xml
+++ b/sdk/sdk/pom.xml
@@ -11,8 +11,8 @@
<relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>carbondata-store-sdk</artifactId>
- <name>Apache CarbonData :: Store SDK</name>
+ <artifactId>carbondata-sdk</artifactId>
+ <name>Apache CarbonData :: SDK</name>
<properties>
<dev.path>${basedir}/../../dev</dev.path>
diff --git a/store/sdk/src/main/java/org/apache/carbondata/sdk/file/ArrowCarbonReader.java b/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/ArrowCarbonReader.java
similarity index 100%
rename from store/sdk/src/main/java/org/apache/carbondata/sdk/file/ArrowCarbonReader.java
rename to sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/ArrowCarbonReader.java
diff --git a/store/sdk/src/main/java/org/apache/carbondata/sdk/file/AvroCarbonWriter.java b/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/AvroCarbonWriter.java
similarity index 100%
rename from store/sdk/src/main/java/org/apache/carbondata/sdk/file/AvroCarbonWriter.java
rename to sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/AvroCarbonWriter.java
diff --git a/store/sdk/src/main/java/org/apache/carbondata/sdk/file/CSVCarbonWriter.java b/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/CSVCarbonWriter.java
similarity index 100%
rename from store/sdk/src/main/java/org/apache/carbondata/sdk/file/CSVCarbonWriter.java
rename to sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/CSVCarbonWriter.java
diff --git a/store/sdk/src/main/java/org/apache/carbondata/sdk/file/CarbonReader.java b/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/CarbonReader.java
similarity index 100%
rename from store/sdk/src/main/java/org/apache/carbondata/sdk/file/CarbonReader.java
rename to sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/CarbonReader.java
diff --git a/store/sdk/src/main/java/org/apache/carbondata/sdk/file/CarbonReaderBuilder.java b/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/CarbonReaderBuilder.java
similarity index 100%
rename from store/sdk/src/main/java/org/apache/carbondata/sdk/file/CarbonReaderBuilder.java
rename to sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/CarbonReaderBuilder.java
diff --git a/store/sdk/src/main/java/org/apache/carbondata/sdk/file/CarbonSchemaReader.java b/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/CarbonSchemaReader.java
similarity index 100%
rename from store/sdk/src/main/java/org/apache/carbondata/sdk/file/CarbonSchemaReader.java
rename to sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/CarbonSchemaReader.java
diff --git a/store/sdk/src/main/java/org/apache/carbondata/sdk/file/CarbonWriter.java b/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/CarbonWriter.java
similarity index 100%
rename from store/sdk/src/main/java/org/apache/carbondata/sdk/file/CarbonWriter.java
rename to sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/CarbonWriter.java
diff --git a/store/sdk/src/main/java/org/apache/carbondata/sdk/file/CarbonWriterBuilder.java b/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/CarbonWriterBuilder.java
similarity index 100%
rename from store/sdk/src/main/java/org/apache/carbondata/sdk/file/CarbonWriterBuilder.java
rename to sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/CarbonWriterBuilder.java
diff --git a/store/sdk/src/main/java/org/apache/carbondata/sdk/file/Field.java b/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/Field.java
similarity index 100%
rename from store/sdk/src/main/java/org/apache/carbondata/sdk/file/Field.java
rename to sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/Field.java
diff --git a/store/sdk/src/main/java/org/apache/carbondata/sdk/file/JsonCarbonWriter.java b/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/JsonCarbonWriter.java
similarity index 100%
rename from store/sdk/src/main/java/org/apache/carbondata/sdk/file/JsonCarbonWriter.java
rename to sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/JsonCarbonWriter.java
diff --git a/store/sdk/src/main/java/org/apache/carbondata/sdk/file/RowUtil.java b/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/RowUtil.java
similarity index 100%
rename from store/sdk/src/main/java/org/apache/carbondata/sdk/file/RowUtil.java
rename to sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/RowUtil.java
diff --git a/store/sdk/src/main/java/org/apache/carbondata/sdk/file/Schema.java b/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/Schema.java
similarity index 100%
rename from store/sdk/src/main/java/org/apache/carbondata/sdk/file/Schema.java
rename to sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/Schema.java
diff --git a/store/sdk/src/main/java/org/apache/carbondata/sdk/file/TestUtil.java b/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/TestUtil.java
similarity index 100%
rename from store/sdk/src/main/java/org/apache/carbondata/sdk/file/TestUtil.java
rename to sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/TestUtil.java
diff --git a/store/sdk/src/main/java/org/apache/carbondata/sdk/file/arrow/ArrowConverter.java b/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/arrow/ArrowConverter.java
similarity index 100%
rename from store/sdk/src/main/java/org/apache/carbondata/sdk/file/arrow/ArrowConverter.java
rename to sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/arrow/ArrowConverter.java
diff --git a/store/sdk/src/main/java/org/apache/carbondata/sdk/file/arrow/ArrowFieldWriter.java b/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/arrow/ArrowFieldWriter.java
similarity index 100%
rename from store/sdk/src/main/java/org/apache/carbondata/sdk/file/arrow/ArrowFieldWriter.java
rename to sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/arrow/ArrowFieldWriter.java
diff --git a/store/sdk/src/main/java/org/apache/carbondata/sdk/file/arrow/ArrowUtils.java b/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/arrow/ArrowUtils.java
similarity index 100%
rename from store/sdk/src/main/java/org/apache/carbondata/sdk/file/arrow/ArrowUtils.java
rename to sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/arrow/ArrowUtils.java
diff --git a/store/sdk/src/main/java/org/apache/carbondata/sdk/file/arrow/ArrowWriter.java b/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/arrow/ArrowWriter.java
similarity index 100%
rename from store/sdk/src/main/java/org/apache/carbondata/sdk/file/arrow/ArrowWriter.java
rename to sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/arrow/ArrowWriter.java
diff --git a/store/sdk/src/main/java/org/apache/carbondata/sdk/file/utils/SDKUtil.java b/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/utils/SDKUtil.java
similarity index 100%
rename from store/sdk/src/main/java/org/apache/carbondata/sdk/file/utils/SDKUtil.java
rename to sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/utils/SDKUtil.java
diff --git a/store/sdk/src/main/java/org/apache/carbondata/store/CarbonRowReadSupport.java b/sdk/sdk/src/main/java/org/apache/carbondata/store/CarbonRowReadSupport.java
similarity index 100%
rename from store/sdk/src/main/java/org/apache/carbondata/store/CarbonRowReadSupport.java
rename to sdk/sdk/src/main/java/org/apache/carbondata/store/CarbonRowReadSupport.java
diff --git a/store/sdk/src/main/java/org/apache/carbondata/store/CarbonStore.java b/sdk/sdk/src/main/java/org/apache/carbondata/store/CarbonStore.java
similarity index 100%
rename from store/sdk/src/main/java/org/apache/carbondata/store/CarbonStore.java
rename to sdk/sdk/src/main/java/org/apache/carbondata/store/CarbonStore.java
diff --git a/store/sdk/src/main/java/org/apache/carbondata/store/LocalCarbonStore.java b/sdk/sdk/src/main/java/org/apache/carbondata/store/LocalCarbonStore.java
similarity index 100%
rename from store/sdk/src/main/java/org/apache/carbondata/store/LocalCarbonStore.java
rename to sdk/sdk/src/main/java/org/apache/carbondata/store/LocalCarbonStore.java
diff --git a/store/sdk/src/main/java/org/apache/carbondata/store/MetaCachedCarbonStore.java b/sdk/sdk/src/main/java/org/apache/carbondata/store/MetaCachedCarbonStore.java
similarity index 100%
rename from store/sdk/src/main/java/org/apache/carbondata/store/MetaCachedCarbonStore.java
rename to sdk/sdk/src/main/java/org/apache/carbondata/store/MetaCachedCarbonStore.java
diff --git a/store/sdk/src/main/resources/log4j.properties b/sdk/sdk/src/main/resources/log4j.properties
similarity index 100%
rename from store/sdk/src/main/resources/log4j.properties
rename to sdk/sdk/src/main/resources/log4j.properties
diff --git a/store/sdk/src/test/java/org/apache/carbondata/sdk/file/ArrowCarbonReaderTest.java b/sdk/sdk/src/test/java/org/apache/carbondata/sdk/file/ArrowCarbonReaderTest.java
similarity index 100%
rename from store/sdk/src/test/java/org/apache/carbondata/sdk/file/ArrowCarbonReaderTest.java
rename to sdk/sdk/src/test/java/org/apache/carbondata/sdk/file/ArrowCarbonReaderTest.java
diff --git a/store/sdk/src/test/java/org/apache/carbondata/sdk/file/AvroCarbonWriterTest.java b/sdk/sdk/src/test/java/org/apache/carbondata/sdk/file/AvroCarbonWriterTest.java
similarity index 100%
rename from store/sdk/src/test/java/org/apache/carbondata/sdk/file/AvroCarbonWriterTest.java
rename to sdk/sdk/src/test/java/org/apache/carbondata/sdk/file/AvroCarbonWriterTest.java
diff --git a/store/sdk/src/test/java/org/apache/carbondata/sdk/file/CSVCarbonWriterTest.java b/sdk/sdk/src/test/java/org/apache/carbondata/sdk/file/CSVCarbonWriterTest.java
similarity index 100%
rename from store/sdk/src/test/java/org/apache/carbondata/sdk/file/CSVCarbonWriterTest.java
rename to sdk/sdk/src/test/java/org/apache/carbondata/sdk/file/CSVCarbonWriterTest.java
diff --git a/store/sdk/src/test/java/org/apache/carbondata/sdk/file/CarbonReaderTest.java b/sdk/sdk/src/test/java/org/apache/carbondata/sdk/file/CarbonReaderTest.java
similarity index 100%
rename from store/sdk/src/test/java/org/apache/carbondata/sdk/file/CarbonReaderTest.java
rename to sdk/sdk/src/test/java/org/apache/carbondata/sdk/file/CarbonReaderTest.java
diff --git a/store/sdk/src/test/java/org/apache/carbondata/sdk/file/CarbonSchemaReaderTest.java b/sdk/sdk/src/test/java/org/apache/carbondata/sdk/file/CarbonSchemaReaderTest.java
similarity index 100%
rename from store/sdk/src/test/java/org/apache/carbondata/sdk/file/CarbonSchemaReaderTest.java
rename to sdk/sdk/src/test/java/org/apache/carbondata/sdk/file/CarbonSchemaReaderTest.java
diff --git a/store/sdk/src/test/java/org/apache/carbondata/sdk/file/ConcurrentAvroSdkWriterTest.java b/sdk/sdk/src/test/java/org/apache/carbondata/sdk/file/ConcurrentAvroSdkWriterTest.java
similarity index 100%
rename from store/sdk/src/test/java/org/apache/carbondata/sdk/file/ConcurrentAvroSdkWriterTest.java
rename to sdk/sdk/src/test/java/org/apache/carbondata/sdk/file/ConcurrentAvroSdkWriterTest.java
diff --git a/store/sdk/src/test/java/org/apache/carbondata/sdk/file/ConcurrentSdkReaderTest.java b/sdk/sdk/src/test/java/org/apache/carbondata/sdk/file/ConcurrentSdkReaderTest.java
similarity index 100%
rename from store/sdk/src/test/java/org/apache/carbondata/sdk/file/ConcurrentSdkReaderTest.java
rename to sdk/sdk/src/test/java/org/apache/carbondata/sdk/file/ConcurrentSdkReaderTest.java
diff --git a/store/sdk/src/test/java/org/apache/carbondata/sdk/file/ConcurrentSdkWriterTest.java b/sdk/sdk/src/test/java/org/apache/carbondata/sdk/file/ConcurrentSdkWriterTest.java
similarity index 100%
rename from store/sdk/src/test/java/org/apache/carbondata/sdk/file/ConcurrentSdkWriterTest.java
rename to sdk/sdk/src/test/java/org/apache/carbondata/sdk/file/ConcurrentSdkWriterTest.java
diff --git a/store/sdk/src/test/java/org/apache/carbondata/sdk/file/ImageTest.java b/sdk/sdk/src/test/java/org/apache/carbondata/sdk/file/ImageTest.java
similarity index 100%
rename from store/sdk/src/test/java/org/apache/carbondata/sdk/file/ImageTest.java
rename to sdk/sdk/src/test/java/org/apache/carbondata/sdk/file/ImageTest.java
diff --git a/store/sdk/src/test/java/org/apache/carbondata/sdk/file/MinMaxTest.java b/sdk/sdk/src/test/java/org/apache/carbondata/sdk/file/MinMaxTest.java
similarity index 100%
rename from store/sdk/src/test/java/org/apache/carbondata/sdk/file/MinMaxTest.java
rename to sdk/sdk/src/test/java/org/apache/carbondata/sdk/file/MinMaxTest.java
diff --git a/store/sdk/src/test/java/org/apache/carbondata/sdk/file/MultithreadSDKBlockletReaderTest.java b/sdk/sdk/src/test/java/org/apache/carbondata/sdk/file/MultithreadSDKBlockletReaderTest.java
similarity index 100%
rename from store/sdk/src/test/java/org/apache/carbondata/sdk/file/MultithreadSDKBlockletReaderTest.java
rename to sdk/sdk/src/test/java/org/apache/carbondata/sdk/file/MultithreadSDKBlockletReaderTest.java
diff --git a/store/sdk/src/test/java/org/apache/carbondata/store/LocalCarbonStoreTest.java b/sdk/sdk/src/test/java/org/apache/carbondata/store/LocalCarbonStoreTest.java
similarity index 100%
rename from store/sdk/src/test/java/org/apache/carbondata/store/LocalCarbonStoreTest.java
rename to sdk/sdk/src/test/java/org/apache/carbondata/store/LocalCarbonStoreTest.java
diff --git a/store/sdk/src/test/java/org/apache/carbondata/util/BinaryUtil.java b/sdk/sdk/src/test/java/org/apache/carbondata/util/BinaryUtil.java
similarity index 100%
rename from store/sdk/src/test/java/org/apache/carbondata/util/BinaryUtil.java
rename to sdk/sdk/src/test/java/org/apache/carbondata/util/BinaryUtil.java
diff --git a/store/sdk/src/test/resources/image/carbondatalogo.jpg b/sdk/sdk/src/test/resources/image/carbondatalogo.jpg
similarity index 100%
rename from store/sdk/src/test/resources/image/carbondatalogo.jpg
rename to sdk/sdk/src/test/resources/image/carbondatalogo.jpg
diff --git a/store/sdk/src/test/resources/image/flowers/10686568196_b1915544a8.jpg b/sdk/sdk/src/test/resources/image/flowers/10686568196_b1915544a8.jpg
similarity index 100%
rename from store/sdk/src/test/resources/image/flowers/10686568196_b1915544a8.jpg
rename to sdk/sdk/src/test/resources/image/flowers/10686568196_b1915544a8.jpg
diff --git a/store/sdk/src/test/resources/image/flowers/10686568196_b1915544a8.txt b/sdk/sdk/src/test/resources/image/flowers/10686568196_b1915544a8.txt
similarity index 100%
rename from store/sdk/src/test/resources/image/flowers/10686568196_b1915544a8.txt
rename to sdk/sdk/src/test/resources/image/flowers/10686568196_b1915544a8.txt
diff --git a/store/sdk/src/test/resources/image/flowers/10712722853_5632165b04.jpg b/sdk/sdk/src/test/resources/image/flowers/10712722853_5632165b04.jpg
similarity index 100%
rename from store/sdk/src/test/resources/image/flowers/10712722853_5632165b04.jpg
rename to sdk/sdk/src/test/resources/image/flowers/10712722853_5632165b04.jpg
diff --git a/store/sdk/src/test/resources/image/flowers/10712722853_5632165b04.txt b/sdk/sdk/src/test/resources/image/flowers/10712722853_5632165b04.txt
similarity index 100%
rename from store/sdk/src/test/resources/image/flowers/10712722853_5632165b04.txt
rename to sdk/sdk/src/test/resources/image/flowers/10712722853_5632165b04.txt
diff --git a/store/sdk/src/test/resources/image/flowers/subfolder/10841136265_af473efc60.jpg b/sdk/sdk/src/test/resources/image/flowers/subfolder/10841136265_af473efc60.jpg
similarity index 100%
rename from store/sdk/src/test/resources/image/flowers/subfolder/10841136265_af473efc60.jpg
rename to sdk/sdk/src/test/resources/image/flowers/subfolder/10841136265_af473efc60.jpg
diff --git a/store/sdk/src/test/resources/image/flowers/subfolder/10841136265_af473efc60.txt b/sdk/sdk/src/test/resources/image/flowers/subfolder/10841136265_af473efc60.txt
similarity index 100%
rename from store/sdk/src/test/resources/image/flowers/subfolder/10841136265_af473efc60.txt
rename to sdk/sdk/src/test/resources/image/flowers/subfolder/10841136265_af473efc60.txt
diff --git a/store/sdk/src/test/resources/image/voc/2007_000027.jpg b/sdk/sdk/src/test/resources/image/voc/2007_000027.jpg
similarity index 100%
rename from store/sdk/src/test/resources/image/voc/2007_000027.jpg
rename to sdk/sdk/src/test/resources/image/voc/2007_000027.jpg
diff --git a/store/sdk/src/test/resources/image/voc/2007_000027.xml b/sdk/sdk/src/test/resources/image/voc/2007_000027.xml
similarity index 100%
rename from store/sdk/src/test/resources/image/voc/2007_000027.xml
rename to sdk/sdk/src/test/resources/image/voc/2007_000027.xml
diff --git a/store/sdk/src/test/resources/image/vocForSegmentationClass/2007_000032.jpg b/sdk/sdk/src/test/resources/image/voc/2007_000032.jpg
similarity index 100%
rename from store/sdk/src/test/resources/image/vocForSegmentationClass/2007_000032.jpg
rename to sdk/sdk/src/test/resources/image/voc/2007_000032.jpg
diff --git a/store/sdk/src/test/resources/image/voc/2007_000032.xml b/sdk/sdk/src/test/resources/image/voc/2007_000032.xml
similarity index 100%
rename from store/sdk/src/test/resources/image/voc/2007_000032.xml
rename to sdk/sdk/src/test/resources/image/voc/2007_000032.xml
diff --git a/store/sdk/src/test/resources/image/vocForSegmentationClass/2007_000033.jpg b/sdk/sdk/src/test/resources/image/voc/2007_000033.jpg
similarity index 100%
rename from store/sdk/src/test/resources/image/vocForSegmentationClass/2007_000033.jpg
rename to sdk/sdk/src/test/resources/image/voc/2007_000033.jpg
diff --git a/store/sdk/src/test/resources/image/voc/2007_000033.xml b/sdk/sdk/src/test/resources/image/voc/2007_000033.xml
similarity index 100%
rename from store/sdk/src/test/resources/image/voc/2007_000033.xml
rename to sdk/sdk/src/test/resources/image/voc/2007_000033.xml
diff --git a/store/sdk/src/test/resources/image/voc/2007_000039.jpg b/sdk/sdk/src/test/resources/image/voc/2007_000039.jpg
similarity index 100%
rename from store/sdk/src/test/resources/image/voc/2007_000039.jpg
rename to sdk/sdk/src/test/resources/image/voc/2007_000039.jpg
diff --git a/store/sdk/src/test/resources/image/voc/2007_000039.xml b/sdk/sdk/src/test/resources/image/voc/2007_000039.xml
similarity index 100%
rename from store/sdk/src/test/resources/image/voc/2007_000039.xml
rename to sdk/sdk/src/test/resources/image/voc/2007_000039.xml
diff --git a/store/sdk/src/test/resources/image/voc/2009_001444.jpg b/sdk/sdk/src/test/resources/image/voc/2009_001444.jpg
similarity index 100%
rename from store/sdk/src/test/resources/image/voc/2009_001444.jpg
rename to sdk/sdk/src/test/resources/image/voc/2009_001444.jpg
diff --git a/store/sdk/src/test/resources/image/voc/2009_001444.xml b/sdk/sdk/src/test/resources/image/voc/2009_001444.xml
similarity index 100%
rename from store/sdk/src/test/resources/image/voc/2009_001444.xml
rename to sdk/sdk/src/test/resources/image/voc/2009_001444.xml
diff --git a/store/sdk/src/test/resources/image/voc/2007_000032.jpg b/sdk/sdk/src/test/resources/image/vocForSegmentationClass/2007_000032.jpg
similarity index 100%
rename from store/sdk/src/test/resources/image/voc/2007_000032.jpg
rename to sdk/sdk/src/test/resources/image/vocForSegmentationClass/2007_000032.jpg
diff --git a/store/sdk/src/test/resources/image/vocForSegmentationClass/2007_000032.png b/sdk/sdk/src/test/resources/image/vocForSegmentationClass/2007_000032.png
similarity index 100%
rename from store/sdk/src/test/resources/image/vocForSegmentationClass/2007_000032.png
rename to sdk/sdk/src/test/resources/image/vocForSegmentationClass/2007_000032.png
diff --git a/store/sdk/src/test/resources/image/voc/2007_000033.jpg b/sdk/sdk/src/test/resources/image/vocForSegmentationClass/2007_000033.jpg
similarity index 100%
rename from store/sdk/src/test/resources/image/voc/2007_000033.jpg
rename to sdk/sdk/src/test/resources/image/vocForSegmentationClass/2007_000033.jpg
diff --git a/store/sdk/src/test/resources/image/vocForSegmentationClass/2007_000033.png b/sdk/sdk/src/test/resources/image/vocForSegmentationClass/2007_000033.png
similarity index 100%
rename from store/sdk/src/test/resources/image/vocForSegmentationClass/2007_000033.png
rename to sdk/sdk/src/test/resources/image/vocForSegmentationClass/2007_000033.png
diff --git a/store/sdk/src/test/resources/image/vocForSegmentationClass/2007_000042.jpg b/sdk/sdk/src/test/resources/image/vocForSegmentationClass/2007_000042.jpg
similarity index 100%
rename from store/sdk/src/test/resources/image/vocForSegmentationClass/2007_000042.jpg
rename to sdk/sdk/src/test/resources/image/vocForSegmentationClass/2007_000042.jpg
diff --git a/store/sdk/src/test/resources/image/vocForSegmentationClass/2007_000042.png b/sdk/sdk/src/test/resources/image/vocForSegmentationClass/2007_000042.png
similarity index 100%
rename from store/sdk/src/test/resources/image/vocForSegmentationClass/2007_000042.png
rename to sdk/sdk/src/test/resources/image/vocForSegmentationClass/2007_000042.png