http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/afa88ee6/core/src/test/java/org/apache/carbondata/core/updatestatus/locks/ZooKeeperLockingTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/carbondata/core/updatestatus/locks/ZooKeeperLockingTest.java b/core/src/test/java/org/apache/carbondata/core/updatestatus/locks/ZooKeeperLockingTest.java deleted file mode 100644 index f0037cf..0000000 --- a/core/src/test/java/org/apache/carbondata/core/updatestatus/locks/ZooKeeperLockingTest.java +++ /dev/null @@ -1,142 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.carbondata.core.updatestatus.locks; - -import java.io.File; -import java.io.IOException; -import java.net.ServerSocket; -import java.util.Properties; - -import org.apache.carbondata.core.metadata.CarbonTableIdentifier; -import org.apache.carbondata.core.util.CarbonProperties; - -import mockit.NonStrictExpectations; -import org.apache.zookeeper.server.ServerConfig; -import org.apache.zookeeper.server.ZooKeeperServerMain; -import org.apache.zookeeper.server.quorum.QuorumPeerConfig; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - -/** - * @author Administrator - */ -public class ZooKeeperLockingTest { - - int freePort; - - /** - * @throws java.lang.Exception - */ - @Before public void setUp() throws Exception { - Properties startupProperties = new Properties(); - startupProperties.setProperty("dataDir", (new File("./target").getAbsolutePath())); - startupProperties.setProperty("dataLogDir", (new File("./target").getAbsolutePath())); - freePort = findFreePort(); - startupProperties.setProperty("clientPort", "" + freePort); - QuorumPeerConfig quorumConfiguration = new QuorumPeerConfig(); - try { - quorumConfiguration.parseProperties(startupProperties); - } catch (Exception e) { - throw new RuntimeException(e); - } - - final ZooKeeperServerMain zooKeeperServer = new ZooKeeperServerMain(); - final ServerConfig configuration = new ServerConfig(); - configuration.readFrom(quorumConfiguration); - new Thread() { - public void run() { - try { - zooKeeperServer.runFromConfig(configuration); - } catch (IOException e) { - System.out.println("ZooKeeper failure"); - } - } - }.start(); - } - - /** - * @throws java.lang.Exception - */ - @After public void tearDown() throws Exception { - } - - @Test public void testZooKeeperLockingByTryingToAcquire2Locks() - throws IllegalArgumentException, IllegalAccessException, NoSuchFieldException, - SecurityException { - - final CarbonProperties cp = CarbonProperties.getInstance(); - new NonStrictExpectations(cp) { - { - cp.getProperty("/CarbonLocks"); - result = "/carbontests"; - cp.getProperty("spark.deploy.zookeeper.url"); - result = "127.0.0.1:" + freePort; - } - }; - - ZookeeperInit zki = ZookeeperInit.getInstance("127.0.0.1:" + freePort); - - CarbonTableIdentifier tableIdentifier = new CarbonTableIdentifier("dbName", "tableName", "tableId"); - ZooKeeperLocking zkl = - new ZooKeeperLocking(tableIdentifier, - LockUsage.METADATA_LOCK); - Assert.assertTrue(zkl.lock()); - - ZooKeeperLocking zk2 = new ZooKeeperLocking( - tableIdentifier, LockUsage.METADATA_LOCK); - Assert.assertTrue(!zk2.lock()); - - Assert.assertTrue(zkl.unlock()); - Assert.assertTrue(zk2.lock()); - Assert.assertTrue(zk2.unlock()); - } - - /** - * For finding the free port available. - * - * @return - */ - private static int findFreePort() { - ServerSocket socket = null; - try { - socket = new ServerSocket(0); - socket.setReuseAddress(true); - int port = socket.getLocalPort(); - try { - socket.close(); - } catch (IOException e) { - // Ignore IOException on close() - } - return port; - } catch (Exception e) { - // Ignore - } finally { - if (socket != null) { - try { - socket.close(); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - } - return 2181; - } -}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/afa88ee6/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/datacompaction/DataCompactionLockTest.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/datacompaction/DataCompactionLockTest.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/datacompaction/DataCompactionLockTest.scala index 83753c5..0462797 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/datacompaction/DataCompactionLockTest.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/datacompaction/DataCompactionLockTest.scala @@ -31,7 +31,7 @@ import org.apache.carbondata.core.constants.CarbonCommonConstants import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, CarbonTableIdentifier} import org.apache.carbondata.core.updatestatus.SegmentStatusManager import org.apache.carbondata.core.util.CarbonProperties -import org.apache.carbondata.core.updatestatus.locks.{CarbonLockFactory, ICarbonLock, LockUsage} +import org.apache.carbondata.core.locks.{CarbonLockFactory, ICarbonLock, LockUsage} /** http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/afa88ee6/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataretention/DataRetentionTestCase.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataretention/DataRetentionTestCase.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataretention/DataRetentionTestCase.scala index e6922fe..4a20609 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataretention/DataRetentionTestCase.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataretention/DataRetentionTestCase.scala @@ -22,7 +22,7 @@ package org.apache.carbondata.spark.testsuite.dataretention import java.text.SimpleDateFormat import org.apache.carbondata.core.updatestatus.{LoadMetadataDetails, SegmentStatusManager} -import org.apache.carbondata.core.updatestatus.locks.{CarbonLockFactory, ICarbonLock, LockUsage} +import org.apache.carbondata.core.locks.{CarbonLockFactory, ICarbonLock, LockUsage} import org.apache.commons.lang3.time.DateUtils import org.apache.spark.sql.Row import org.apache.spark.sql.common.util.QueryTest http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/afa88ee6/integration/spark-common/src/main/java/org/apache/carbondata/spark/load/CarbonLoaderUtil.java ---------------------------------------------------------------------- diff --git a/integration/spark-common/src/main/java/org/apache/carbondata/spark/load/CarbonLoaderUtil.java b/integration/spark-common/src/main/java/org/apache/carbondata/spark/load/CarbonLoaderUtil.java index 0f783e8..9cbfec0 100644 --- a/integration/spark-common/src/main/java/org/apache/carbondata/spark/load/CarbonLoaderUtil.java +++ b/integration/spark-common/src/main/java/org/apache/carbondata/spark/load/CarbonLoaderUtil.java @@ -55,6 +55,7 @@ import org.apache.carbondata.core.datastore.filesystem.CarbonFile; import org.apache.carbondata.core.datastore.filesystem.CarbonFileFilter; import org.apache.carbondata.core.datastore.impl.FileFactory; import org.apache.carbondata.core.datastore.impl.FileFactory.FileType; +import org.apache.carbondata.core.locks.ICarbonLock; import org.apache.carbondata.core.metadata.AbsoluteTableIdentifier; import org.apache.carbondata.core.metadata.CarbonMetadata; import org.apache.carbondata.core.metadata.CarbonTableIdentifier; @@ -66,7 +67,6 @@ import org.apache.carbondata.core.path.CarbonTablePath; import org.apache.carbondata.core.update.CarbonUpdateUtil; import org.apache.carbondata.core.updatestatus.LoadMetadataDetails; import org.apache.carbondata.core.updatestatus.SegmentStatusManager; -import org.apache.carbondata.core.updatestatus.locks.ICarbonLock; import org.apache.carbondata.core.util.CarbonProperties; import org.apache.carbondata.core.util.CarbonUtil; import org.apache.carbondata.processing.api.dataloader.DataLoadModel; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/afa88ee6/integration/spark-common/src/main/java/org/apache/carbondata/spark/merger/CarbonDataMergerUtil.java ---------------------------------------------------------------------- diff --git a/integration/spark-common/src/main/java/org/apache/carbondata/spark/merger/CarbonDataMergerUtil.java b/integration/spark-common/src/main/java/org/apache/carbondata/spark/merger/CarbonDataMergerUtil.java index ca87db9..672c461 100644 --- a/integration/spark-common/src/main/java/org/apache/carbondata/spark/merger/CarbonDataMergerUtil.java +++ b/integration/spark-common/src/main/java/org/apache/carbondata/spark/merger/CarbonDataMergerUtil.java @@ -39,6 +39,9 @@ import org.apache.carbondata.core.constants.CarbonCommonConstants; import org.apache.carbondata.core.datastore.filesystem.CarbonFile; import org.apache.carbondata.core.datastore.filesystem.CarbonFileFilter; import org.apache.carbondata.core.datastore.impl.FileFactory; +import org.apache.carbondata.core.locks.CarbonLockFactory; +import org.apache.carbondata.core.locks.ICarbonLock; +import org.apache.carbondata.core.locks.LockUsage; import org.apache.carbondata.core.metadata.AbsoluteTableIdentifier; import org.apache.carbondata.core.metadata.CarbonTableIdentifier; import org.apache.carbondata.core.metadata.schema.table.CarbonTable; @@ -51,9 +54,6 @@ import org.apache.carbondata.core.update.SegmentUpdateDetails; import org.apache.carbondata.core.updatestatus.LoadMetadataDetails; import org.apache.carbondata.core.updatestatus.SegmentStatusManager; import org.apache.carbondata.core.updatestatus.SegmentUpdateStatusManager; -import org.apache.carbondata.core.updatestatus.locks.CarbonLockFactory; -import org.apache.carbondata.core.updatestatus.locks.ICarbonLock; -import org.apache.carbondata.core.updatestatus.locks.LockUsage; import org.apache.carbondata.core.util.CarbonProperties; import org.apache.carbondata.core.writer.CarbonDeleteDeltaWriterImpl; import org.apache.carbondata.processing.model.CarbonLoadModel; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/afa88ee6/integration/spark-common/src/main/scala/org/apache/carbondata/spark/rdd/CarbonGlobalDictionaryRDD.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common/src/main/scala/org/apache/carbondata/spark/rdd/CarbonGlobalDictionaryRDD.scala b/integration/spark-common/src/main/scala/org/apache/carbondata/spark/rdd/CarbonGlobalDictionaryRDD.scala index 77499a6..77d5784 100644 --- a/integration/spark-common/src/main/scala/org/apache/carbondata/spark/rdd/CarbonGlobalDictionaryRDD.scala +++ b/integration/spark-common/src/main/scala/org/apache/carbondata/spark/rdd/CarbonGlobalDictionaryRDD.scala @@ -36,11 +36,11 @@ import org.apache.carbondata.common.logging.LogServiceFactory import org.apache.carbondata.core.cache.dictionary.Dictionary import org.apache.carbondata.core.constants.CarbonCommonConstants import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.locks.{CarbonLockFactory, LockUsage} import org.apache.carbondata.core.metadata.{CarbonTableIdentifier, ColumnIdentifier} import org.apache.carbondata.core.metadata.schema.table.column.CarbonDimension import org.apache.carbondata.core.path.CarbonTablePath import org.apache.carbondata.core.service.{CarbonCommonFactory, PathService} -import org.apache.carbondata.core.updatestatus.locks.{CarbonLockFactory, LockUsage} import org.apache.carbondata.core.util.{CarbonProperties, CarbonTimeStatisticsFactory, CarbonUtil} import org.apache.carbondata.processing.model.CarbonLoadModel import org.apache.carbondata.spark.load.CarbonLoaderUtil http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/afa88ee6/integration/spark-common/src/main/scala/org/apache/carbondata/spark/rdd/DataManagementFunc.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common/src/main/scala/org/apache/carbondata/spark/rdd/DataManagementFunc.scala b/integration/spark-common/src/main/scala/org/apache/carbondata/spark/rdd/DataManagementFunc.scala index 3e4c5ac..ad97626 100644 --- a/integration/spark-common/src/main/scala/org/apache/carbondata/spark/rdd/DataManagementFunc.scala +++ b/integration/spark-common/src/main/scala/org/apache/carbondata/spark/rdd/DataManagementFunc.scala @@ -28,11 +28,11 @@ import org.apache.spark.sql.execution.command.{CompactionCallableModel, Compacti import org.apache.carbondata.common.logging.LogServiceFactory import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.locks.{CarbonLockFactory, CarbonLockUtil, LockUsage} import org.apache.carbondata.core.metadata.{CarbonMetadata, CarbonTableIdentifier} import org.apache.carbondata.core.metadata.schema.table.CarbonTable import org.apache.carbondata.core.update.CarbonUpdateUtil import org.apache.carbondata.core.updatestatus.{LoadMetadataDetails, SegmentStatusManager} -import org.apache.carbondata.core.updatestatus.locks.{CarbonLockFactory, CarbonLockUtil, LockUsage} import org.apache.carbondata.processing.model.{CarbonDataLoadSchema, CarbonLoadModel} import org.apache.carbondata.spark._ import org.apache.carbondata.spark.load._ http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/afa88ee6/integration/spark/src/main/scala/org/apache/carbondata/spark/rdd/CarbonDataRDDFactory.scala ---------------------------------------------------------------------- diff --git a/integration/spark/src/main/scala/org/apache/carbondata/spark/rdd/CarbonDataRDDFactory.scala b/integration/spark/src/main/scala/org/apache/carbondata/spark/rdd/CarbonDataRDDFactory.scala index 8fe690b..5e8af1f 100644 --- a/integration/spark/src/main/scala/org/apache/carbondata/spark/rdd/CarbonDataRDDFactory.scala +++ b/integration/spark/src/main/scala/org/apache/carbondata/spark/rdd/CarbonDataRDDFactory.scala @@ -46,7 +46,7 @@ import org.apache.carbondata.core.metadata.schema.table.CarbonTable import org.apache.carbondata.core.path.CarbonStorePath import org.apache.carbondata.core.update.CarbonUpdateUtil import org.apache.carbondata.core.updatestatus.LoadMetadataDetails -import org.apache.carbondata.core.updatestatus.locks.{CarbonLockFactory, ICarbonLock, LockUsage} +import org.apache.carbondata.core.locks.{CarbonLockFactory, ICarbonLock, LockUsage} import org.apache.carbondata.core.util.CarbonProperties import org.apache.carbondata.processing.csvreaderstep.{BlockDetails, RddInpututilsForUpdate} import org.apache.carbondata.processing.etl.DataLoadingException http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/afa88ee6/integration/spark/src/main/scala/org/apache/spark/sql/execution/command/IUDCommands.scala ---------------------------------------------------------------------- diff --git a/integration/spark/src/main/scala/org/apache/spark/sql/execution/command/IUDCommands.scala b/integration/spark/src/main/scala/org/apache/spark/sql/execution/command/IUDCommands.scala index 156153d..4edcd34 100644 --- a/integration/spark/src/main/scala/org/apache/spark/sql/execution/command/IUDCommands.scala +++ b/integration/spark/src/main/scala/org/apache/spark/sql/execution/command/IUDCommands.scala @@ -39,7 +39,7 @@ import org.apache.carbondata.core.path.{CarbonStorePath, CarbonTablePath} import org.apache.carbondata.core.update._ import org.apache.carbondata.core.update.data.RowCountDetailsVO import org.apache.carbondata.core.updatestatus.{SegmentStatusManager, SegmentUpdateStatusManager} -import org.apache.carbondata.core.updatestatus.locks.{CarbonLockFactory, CarbonLockUtil, LockUsage} +import org.apache.carbondata.core.locks.{CarbonLockFactory, CarbonLockUtil, LockUsage} import org.apache.carbondata.core.util.CarbonProperties import org.apache.carbondata.core.writer.CarbonDeleteDeltaWriterImpl import org.apache.carbondata.processing.exception.MultipleMatchingException http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/afa88ee6/integration/spark/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala ---------------------------------------------------------------------- diff --git a/integration/spark/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala b/integration/spark/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala index 323c090..0cca07e 100644 --- a/integration/spark/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala +++ b/integration/spark/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala @@ -48,7 +48,7 @@ import org.apache.carbondata.core.metadata.schema.table.{CarbonTable, TableInfo} import org.apache.carbondata.core.metadata.schema.table.column.CarbonDimension import org.apache.carbondata.core.path.CarbonStorePath import org.apache.carbondata.core.update.{CarbonUpdateUtil, TupleIdEnum} -import org.apache.carbondata.core.updatestatus.locks.{CarbonLockFactory, LockUsage} +import org.apache.carbondata.core.locks.{CarbonLockFactory, LockUsage} import org.apache.carbondata.core.util.{CarbonProperties, CarbonUtil} import org.apache.carbondata.processing.constants.TableOptionConstant import org.apache.carbondata.processing.etl.DataLoadingException http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/afa88ee6/integration/spark/src/main/scala/org/apache/spark/sql/hive/CarbonMetastore.scala ---------------------------------------------------------------------- diff --git a/integration/spark/src/main/scala/org/apache/spark/sql/hive/CarbonMetastore.scala b/integration/spark/src/main/scala/org/apache/spark/sql/hive/CarbonMetastore.scala index 970a7ea..e1d3454 100644 --- a/integration/spark/src/main/scala/org/apache/spark/sql/hive/CarbonMetastore.scala +++ b/integration/spark/src/main/scala/org/apache/spark/sql/hive/CarbonMetastore.scala @@ -43,7 +43,7 @@ import org.apache.carbondata.core.metadata.schema.table.CarbonTable import org.apache.carbondata.core.path.{CarbonStorePath, CarbonTablePath} import org.apache.carbondata.core.reader.ThriftReader import org.apache.carbondata.core.stats.{QueryStatistic, QueryStatisticsConstants} -import org.apache.carbondata.core.updatestatus.locks.ZookeeperInit +import org.apache.carbondata.core.locks.ZookeeperInit import org.apache.carbondata.core.util.{CarbonProperties, CarbonTimeStatisticsFactory, CarbonUtil} import org.apache.carbondata.core.writer.ThriftWriter import org.apache.carbondata.format.{SchemaEvolutionEntry, TableInfo} http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/afa88ee6/integration/spark2/src/main/scala/org/apache/carbondata/spark/rdd/CarbonDataRDDFactory.scala ---------------------------------------------------------------------- diff --git a/integration/spark2/src/main/scala/org/apache/carbondata/spark/rdd/CarbonDataRDDFactory.scala b/integration/spark2/src/main/scala/org/apache/carbondata/spark/rdd/CarbonDataRDDFactory.scala index db67940..5359cd7 100644 --- a/integration/spark2/src/main/scala/org/apache/carbondata/spark/rdd/CarbonDataRDDFactory.scala +++ b/integration/spark2/src/main/scala/org/apache/carbondata/spark/rdd/CarbonDataRDDFactory.scala @@ -30,22 +30,22 @@ import org.apache.hadoop.conf.{Configurable, Configuration} import org.apache.hadoop.fs.Path import org.apache.hadoop.mapreduce.Job import org.apache.hadoop.mapreduce.lib.input.{FileInputFormat, FileSplit} +import org.apache.spark.{SparkEnv, SparkException} import org.apache.spark.rdd.{DataLoadCoalescedRDD, DataLoadPartitionCoalescer, UpdateCoalescedRDD} +import org.apache.spark.sql.{CarbonEnv, DataFrame, Row, SQLContext} import org.apache.spark.sql.execution.command.{AlterTableModel, CompactionModel, ExecutionErrors, UpdateTableModel} import org.apache.spark.sql.hive.DistributionUtil -import org.apache.spark.sql.{CarbonEnv, DataFrame, Row, SQLContext} import org.apache.spark.util.SparkUtil -import org.apache.spark.{SparkEnv, SparkException} import org.apache.carbondata.common.logging.LogServiceFactory import org.apache.carbondata.core.constants.CarbonCommonConstants import org.apache.carbondata.core.datastore.block.{Distributable, TableBlockInfo} -import org.apache.carbondata.core.metadata.schema.table.CarbonTable +import org.apache.carbondata.core.locks.{CarbonLockFactory, ICarbonLock, LockUsage} import org.apache.carbondata.core.metadata.{CarbonTableIdentifier, ColumnarFormatVersion} +import org.apache.carbondata.core.metadata.schema.table.CarbonTable import org.apache.carbondata.core.path.CarbonStorePath import org.apache.carbondata.core.update.CarbonUpdateUtil import org.apache.carbondata.core.updatestatus.LoadMetadataDetails -import org.apache.carbondata.core.updatestatus.locks.{CarbonLockFactory, ICarbonLock, LockUsage} import org.apache.carbondata.core.util.CarbonProperties import org.apache.carbondata.processing.csvreaderstep.{BlockDetails, RddInpututilsForUpdate} import org.apache.carbondata.processing.etl.DataLoadingException http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/afa88ee6/integration/spark2/src/main/scala/org/apache/spark/sql/CarbonDataFrameWriter.scala ---------------------------------------------------------------------- diff --git a/integration/spark2/src/main/scala/org/apache/spark/sql/CarbonDataFrameWriter.scala b/integration/spark2/src/main/scala/org/apache/spark/sql/CarbonDataFrameWriter.scala index a733291..04505b5 100644 --- a/integration/spark2/src/main/scala/org/apache/spark/sql/CarbonDataFrameWriter.scala +++ b/integration/spark2/src/main/scala/org/apache/spark/sql/CarbonDataFrameWriter.scala @@ -23,8 +23,8 @@ import org.apache.spark.sql.execution.command.LoadTable import org.apache.spark.sql.types._ import org.apache.carbondata.common.logging.LogServiceFactory -import org.apache.carbondata.core.metadata.{DataType => CarbonType} import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.metadata.{DataType => CarbonType} import org.apache.carbondata.spark.CarbonOption class CarbonDataFrameWriter(sqlContext: SQLContext, val dataFrame: DataFrame) { http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/afa88ee6/integration/spark2/src/main/scala/org/apache/spark/sql/CarbonScan.scala ---------------------------------------------------------------------- diff --git a/integration/spark2/src/main/scala/org/apache/spark/sql/CarbonScan.scala b/integration/spark2/src/main/scala/org/apache/spark/sql/CarbonScan.scala index 8f3dcdf..85046cf 100644 --- a/integration/spark2/src/main/scala/org/apache/spark/sql/CarbonScan.scala +++ b/integration/spark2/src/main/scala/org/apache/spark/sql/CarbonScan.scala @@ -23,8 +23,6 @@ import scala.collection.mutable.ArrayBuffer import org.apache.spark.sql.catalyst.expressions._ import org.apache.spark.sql.hive.CarbonRelation -import org.apache.carbondata.core.constants.CarbonCommonConstants -import org.apache.carbondata.core.util.CarbonProperties import org.apache.carbondata.core.scan.model._ import org.apache.carbondata.spark.CarbonFilters http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/afa88ee6/integration/spark2/src/main/scala/org/apache/spark/sql/TableCreator.scala ---------------------------------------------------------------------- diff --git a/integration/spark2/src/main/scala/org/apache/spark/sql/TableCreator.scala b/integration/spark2/src/main/scala/org/apache/spark/sql/TableCreator.scala index dd12fd4..9590c39 100644 --- a/integration/spark2/src/main/scala/org/apache/spark/sql/TableCreator.scala +++ b/integration/spark2/src/main/scala/org/apache/spark/sql/TableCreator.scala @@ -23,8 +23,8 @@ import scala.collection.mutable.{LinkedHashSet, Map} import org.apache.spark.sql.execution.command.{BucketFields, ColumnProperty, Field, PartitionerField, TableModel} -import org.apache.carbondata.core.metadata.DataType import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.metadata.DataType import org.apache.carbondata.core.util.DataTypeUtil import org.apache.carbondata.spark.exception.MalformedCarbonCommandException import org.apache.carbondata.spark.util.CommonUtil http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/afa88ee6/integration/spark2/src/main/scala/org/apache/spark/sql/execution/CarbonLateDecodeStrategy.scala ---------------------------------------------------------------------- diff --git a/integration/spark2/src/main/scala/org/apache/spark/sql/execution/CarbonLateDecodeStrategy.scala b/integration/spark2/src/main/scala/org/apache/spark/sql/execution/CarbonLateDecodeStrategy.scala index 3277c18..821ff69 100644 --- a/integration/spark2/src/main/scala/org/apache/spark/sql/execution/CarbonLateDecodeStrategy.scala +++ b/integration/spark2/src/main/scala/org/apache/spark/sql/execution/CarbonLateDecodeStrategy.scala @@ -33,9 +33,9 @@ import org.apache.spark.sql.optimizer.CarbonDecoderRelation import org.apache.spark.sql.sources.{BaseRelation, Filter} import org.apache.spark.sql.types.{AtomicType, IntegerType} +import org.apache.carbondata.core.constants.CarbonCommonConstants import org.apache.carbondata.core.metadata.schema.BucketingInfo import org.apache.carbondata.core.metadata.schema.table.CarbonTable -import org.apache.carbondata.core.constants.CarbonCommonConstants import org.apache.carbondata.spark.CarbonAliasDecoderRelation import org.apache.carbondata.spark.rdd.CarbonScanRDD import org.apache.carbondata.spark.util.CarbonScalaUtil http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/afa88ee6/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala ---------------------------------------------------------------------- diff --git a/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala b/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala index 9e9ef9e..8f49806 100644 --- a/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala +++ b/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala @@ -37,12 +37,12 @@ import org.apache.carbondata.api.CarbonStore import org.apache.carbondata.common.logging.LogServiceFactory import org.apache.carbondata.core.constants.CarbonCommonConstants import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.locks.{CarbonLockFactory, LockUsage} import org.apache.carbondata.core.metadata.{CarbonMetadata, CarbonTableIdentifier, Encoding} -import org.apache.carbondata.core.metadata.schema.table.column.CarbonDimension import org.apache.carbondata.core.metadata.schema.table.{CarbonTable, TableInfo} +import org.apache.carbondata.core.metadata.schema.table.column.CarbonDimension import org.apache.carbondata.core.path.CarbonStorePath import org.apache.carbondata.core.update.{CarbonUpdateUtil, TupleIdEnum} -import org.apache.carbondata.core.updatestatus.locks.{CarbonLockFactory, LockUsage} import org.apache.carbondata.core.util.{CarbonProperties, CarbonUtil} import org.apache.carbondata.processing.constants.TableOptionConstant import org.apache.carbondata.processing.etl.DataLoadingException http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/afa88ee6/integration/spark2/src/main/scala/org/apache/spark/sql/hive/CarbonMetastore.scala ---------------------------------------------------------------------- diff --git a/integration/spark2/src/main/scala/org/apache/spark/sql/hive/CarbonMetastore.scala b/integration/spark2/src/main/scala/org/apache/spark/sql/hive/CarbonMetastore.scala index 5b77249..500f818 100644 --- a/integration/spark2/src/main/scala/org/apache/spark/sql/hive/CarbonMetastore.scala +++ b/integration/spark2/src/main/scala/org/apache/spark/sql/hive/CarbonMetastore.scala @@ -18,36 +18,36 @@ package org.apache.spark.sql.hive import java.io._ -import java.util.concurrent.atomic.AtomicLong import java.util.{GregorianCalendar, LinkedHashSet, UUID} +import java.util.concurrent.atomic.AtomicLong import scala.Array.canBuildFrom import scala.collection.JavaConverters._ import scala.collection.mutable.ArrayBuffer import scala.util.parsing.combinator.RegexParsers +import org.apache.spark.sql.{RuntimeConfig, SparkSession} import org.apache.spark.sql.catalyst.TableIdentifier import org.apache.spark.sql.catalyst.analysis.{MultiInstanceRelation, NoSuchTableException} import org.apache.spark.sql.catalyst.expressions.AttributeReference import org.apache.spark.sql.catalyst.plans.logical.{LeafNode, LogicalPlan, Statistics} import org.apache.spark.sql.execution.command.Partitioner import org.apache.spark.sql.types._ -import org.apache.spark.sql.{RuntimeConfig, SparkSession} import org.apache.carbondata.common.logging.LogServiceFactory import org.apache.carbondata.core.constants.CarbonCommonConstants import org.apache.carbondata.core.datastore.filesystem.CarbonFile import org.apache.carbondata.core.datastore.impl.FileFactory import org.apache.carbondata.core.datastore.impl.FileFactory.FileType +import org.apache.carbondata.core.locks.ZookeeperInit +import org.apache.carbondata.core.metadata.{CarbonMetadata, CarbonTableIdentifier, DataType => CarbonDataType} import org.apache.carbondata.core.metadata.converter.ThriftWrapperSchemaConverterImpl import org.apache.carbondata.core.metadata.schema.table.CarbonTable import org.apache.carbondata.core.metadata.schema.table.column.CarbonDimension -import org.apache.carbondata.core.metadata.{CarbonMetadata, CarbonTableIdentifier, DataType => CarbonDataType} import org.apache.carbondata.core.path.{CarbonStorePath, CarbonTablePath} import org.apache.carbondata.core.reader.ThriftReader import org.apache.carbondata.core.stats.{QueryStatistic, QueryStatisticsConstants} import org.apache.carbondata.core.updatestatus.SegmentStatusManager -import org.apache.carbondata.core.updatestatus.locks.ZookeeperInit import org.apache.carbondata.core.util.{CarbonProperties, CarbonTimeStatisticsFactory, CarbonUtil} import org.apache.carbondata.core.writer.ThriftWriter import org.apache.carbondata.format.{SchemaEvolutionEntry, TableInfo}
