You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by ra...@apache.org on 2017/01/20 17:39:09 UTC
[01/50] [abbrv] incubator-carbondata git commit: [CARBONDATA-619]
give error if compaction type is not minor or major This closes #543
Repository: incubator-carbondata
Updated Branches:
refs/heads/branch-1.0 95d38d651 -> bd09f9bc1
[CARBONDATA-619] give error if compaction type is not minor or major This closes #543
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/3a596f61
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/3a596f61
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/3a596f61
Branch: refs/heads/branch-1.0
Commit: 3a596f611fd47766f26001d62538d1806d81a0ce
Parents: 33c9a81 9f99dfb
Author: ravipesala <ra...@gmail.com>
Authored: Wed Jan 18 01:38:01 2017 +0530
Committer: ravipesala <ra...@gmail.com>
Committed: Wed Jan 18 01:38:01 2017 +0530
----------------------------------------------------------------------
.../core/constants/CarbonCommonConstants.java | 4 ++++
.../org/apache/spark/util/Compaction.scala | 22 ++++++++++++++------
2 files changed, 20 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
[19/50] [abbrv] incubator-carbondata git commit: fix docs issues This
closes #559
Posted by ra...@apache.org.
fix docs issues This closes #559
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/db2c5f91
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/db2c5f91
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/db2c5f91
Branch: refs/heads/branch-1.0
Commit: db2c5f9170f987ad85ea2e79f0139a83f2f3b8fb
Parents: 4ad8090 9edb2b9
Author: chenliang613 <ch...@huawei.com>
Authored: Thu Jan 19 22:39:12 2017 +0800
Committer: chenliang613 <ch...@huawei.com>
Committed: Thu Jan 19 22:39:12 2017 +0800
----------------------------------------------------------------------
README.md | 1 -
docs/Data-Management.md | 166 ---------------------------
docs/data-management.md | 166 +++++++++++++++++++++++++++
docs/images/carbon_data_full_scan.png | Bin 35710 -> 0 bytes
docs/images/carbon_data_motivation.png | Bin 25388 -> 0 bytes
docs/images/carbon_data_olap_scan.png | Bin 45235 -> 0 bytes
docs/images/carbon_data_random_scan.png | Bin 46317 -> 0 bytes
7 files changed, 166 insertions(+), 167 deletions(-)
----------------------------------------------------------------------
[16/50] [abbrv] incubator-carbondata git commit: Make no kettle flow
as default
Posted by ra...@apache.org.
Make no kettle flow as default
Added use_kettle property to carbon properties
Fixed style
Fixed error
Fixed comment
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/7d5a031c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/7d5a031c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/7d5a031c
Branch: refs/heads/branch-1.0
Commit: 7d5a031c2b90023d0b332f64bf6088dce61b26b2
Parents: 3374aeb
Author: ravipesala <ra...@gmail.com>
Authored: Tue Jan 17 23:23:59 2017 +0530
Committer: jackylk <ja...@huawei.com>
Committed: Thu Jan 19 22:05:32 2017 +0800
----------------------------------------------------------------------
.../core/constants/CarbonCommonConstants.java | 4 ++++
.../carbondata/examples/util/ExampleUtils.scala | 2 +-
.../org/apache/carbondata/spark/CarbonOption.scala | 2 +-
.../carbondata/spark/CarbonDataFrameWriter.scala | 2 +-
.../sql/execution/command/carbonTableSchema.scala | 14 +++++++++++---
.../org/apache/carbondata/spark/CarbonOption.scala | 0
.../org/apache/spark/sql/CarbonDataFrameWriter.scala | 2 +-
.../sql/execution/command/carbonTableSchema.scala | 14 +++++++++++---
8 files changed, 30 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/7d5a031c/core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java b/core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java
index c134f3b..6726d83 100644
--- a/core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java
+++ b/core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java
@@ -1129,6 +1129,10 @@ public final class CarbonCommonConstants {
public static final String LOCAL_FILE_PREFIX = "file://";
+ public static final String USE_KETTLE = "use_kettle";
+
+ public static final String USE_KETTLE_DEFAULT = "false";
+
private CarbonCommonConstants() {
}
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/7d5a031c/examples/spark/src/main/scala/org/apache/carbondata/examples/util/ExampleUtils.scala
----------------------------------------------------------------------
diff --git a/examples/spark/src/main/scala/org/apache/carbondata/examples/util/ExampleUtils.scala b/examples/spark/src/main/scala/org/apache/carbondata/examples/util/ExampleUtils.scala
index 54d9139..41912bc 100644
--- a/examples/spark/src/main/scala/org/apache/carbondata/examples/util/ExampleUtils.scala
+++ b/examples/spark/src/main/scala/org/apache/carbondata/examples/util/ExampleUtils.scala
@@ -90,7 +90,7 @@ object ExampleUtils {
.format("carbondata")
.option("tableName", tableName)
.option("compress", "true")
- .option("useKettle", "false")
+ .option("use_kettle", "false")
.option("tempCSV", "false")
.mode(mode)
.save()
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/7d5a031c/integration/spark-common/src/main/scala/org/apache/carbondata/spark/CarbonOption.scala
----------------------------------------------------------------------
diff --git a/integration/spark-common/src/main/scala/org/apache/carbondata/spark/CarbonOption.scala b/integration/spark-common/src/main/scala/org/apache/carbondata/spark/CarbonOption.scala
index c63b43d..aa4e211 100644
--- a/integration/spark-common/src/main/scala/org/apache/carbondata/spark/CarbonOption.scala
+++ b/integration/spark-common/src/main/scala/org/apache/carbondata/spark/CarbonOption.scala
@@ -44,7 +44,7 @@ class CarbonOption(options: Map[String, String]) {
def compress: Boolean = options.getOrElse("compress", "false").toBoolean
- def useKettle: Boolean = options.getOrElse("useKettle", "true").toBoolean
+ def useKettle: Boolean = options.getOrElse("use_kettle", "false").toBoolean
def bucketNumber: Int = options.getOrElse("bucketnumber", "0").toInt
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/7d5a031c/integration/spark/src/main/scala/org/apache/carbondata/spark/CarbonDataFrameWriter.scala
----------------------------------------------------------------------
diff --git a/integration/spark/src/main/scala/org/apache/carbondata/spark/CarbonDataFrameWriter.scala b/integration/spark/src/main/scala/org/apache/carbondata/spark/CarbonDataFrameWriter.scala
index 7c6b171..b843f59 100644
--- a/integration/spark/src/main/scala/org/apache/carbondata/spark/CarbonDataFrameWriter.scala
+++ b/integration/spark/src/main/scala/org/apache/carbondata/spark/CarbonDataFrameWriter.scala
@@ -189,7 +189,7 @@ class CarbonDataFrameWriter(val dataFrame: DataFrame) {
s"""
LOAD DATA INPATH '$csvFolder'
INTO TABLE ${options.dbName}.${options.tableName}
- OPTIONS ('FILEHEADER' = '${dataFrame.columns.mkString(",")}')
+ OPTIONS ('FILEHEADER' = '${dataFrame.columns.mkString(",")}', 'USE_KETTLE' = 'true')
"""
} else {
s"""
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/7d5a031c/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 a286086..f4eea84 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
@@ -390,11 +390,19 @@ case class LoadTable(
val useKettle = options.get("use_kettle") match {
case Some(value) => value.toBoolean
case _ =>
- val useKettleLocal = System.getProperty("use.kettle")
+ var useKettleLocal = System.getProperty("use_kettle")
+ if (useKettleLocal == null && sqlContext.sparkContext.getConf.contains("use_kettle")) {
+ useKettleLocal = sqlContext.sparkContext.getConf.get("use_kettle")
+ }
if (useKettleLocal == null) {
- sqlContext.sparkContext.getConf.get("use_kettle_default", "true").toBoolean
- } else {
+ useKettleLocal = CarbonProperties.getInstance().
+ getProperty(CarbonCommonConstants.USE_KETTLE,
+ CarbonCommonConstants.USE_KETTLE_DEFAULT)
+ }
+ try {
useKettleLocal.toBoolean
+ } catch {
+ case e: Exception => CarbonCommonConstants.USE_KETTLE_DEFAULT.toBoolean
}
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/7d5a031c/integration/spark2/src/main/scala/org/apache/carbondata/spark/CarbonOption.scala
----------------------------------------------------------------------
diff --git a/integration/spark2/src/main/scala/org/apache/carbondata/spark/CarbonOption.scala b/integration/spark2/src/main/scala/org/apache/carbondata/spark/CarbonOption.scala
new file mode 100644
index 0000000..e69de29
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/7d5a031c/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 8c891c7..1c7cd3b 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
@@ -174,7 +174,7 @@ class CarbonDataFrameWriter(sqlContext: SQLContext, val dataFrame: DataFrame) {
s"""
LOAD DATA INPATH '$csvFolder'
INTO TABLE ${options.dbName}.${options.tableName}
- OPTIONS ('FILEHEADER' = '${dataFrame.columns.mkString(",")}')
+ OPTIONS ('FILEHEADER' = '${dataFrame.columns.mkString(",")}', 'USE_KETTLE' = 'true')
"""
} else {
s"""
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/7d5a031c/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 edc337a..c45f5a1 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
@@ -385,11 +385,19 @@ case class LoadTable(
val useKettle = options.get("use_kettle") match {
case Some(value) => value.toBoolean
case _ =>
- val useKettleLocal = System.getProperty("use.kettle")
+ var useKettleLocal = System.getProperty("use_kettle")
+ if (useKettleLocal == null && sparkSession.sparkContext.getConf.contains("use_kettle")) {
+ useKettleLocal = sparkSession.sparkContext.getConf.get("use_kettle")
+ }
if (useKettleLocal == null) {
- sparkSession.sqlContext.sparkContext.getConf.get("use_kettle_default", "true").toBoolean
- } else {
+ useKettleLocal = CarbonProperties.getInstance().
+ getProperty(CarbonCommonConstants.USE_KETTLE,
+ CarbonCommonConstants.USE_KETTLE_DEFAULT)
+ }
+ try {
useKettleLocal.toBoolean
+ } catch {
+ case e: Exception => CarbonCommonConstants.USE_KETTLE_DEFAULT.toBoolean
}
}
[08/50] [abbrv] incubator-carbondata git commit: Simplify the carbon
session creation.
Posted by ra...@apache.org.
Simplify the carbon session creation.
Fixed testcase
Fixed comments
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/5f75a8a5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/5f75a8a5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/5f75a8a5
Branch: refs/heads/branch-1.0
Commit: 5f75a8a5ef111dd8db132106a40d0a426d39a424
Parents: 678530e
Author: ravipesala <ra...@gmail.com>
Authored: Wed Jan 18 01:04:30 2017 +0530
Committer: chenliang613 <ch...@huawei.com>
Committed: Wed Jan 18 23:11:52 2017 +0800
----------------------------------------------------------------------
.../examples/CarbonSessionExample.scala | 19 ++---------
.../examples/SparkSessionExample.scala | 2 +-
.../spark/sql/test/TestQueryExecutor.scala | 2 +-
.../org/apache/spark/sql/CarbonSession.scala | 33 +++++++++++++++++---
.../sql/test/Spark2TestQueryExecutor.scala | 7 ++---
5 files changed, 35 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/5f75a8a5/examples/spark2/src/main/scala/org/apache/carbondata/examples/CarbonSessionExample.scala
----------------------------------------------------------------------
diff --git a/examples/spark2/src/main/scala/org/apache/carbondata/examples/CarbonSessionExample.scala b/examples/spark2/src/main/scala/org/apache/carbondata/examples/CarbonSessionExample.scala
index 0d9c43f..1d485cd 100644
--- a/examples/spark2/src/main/scala/org/apache/carbondata/examples/CarbonSessionExample.scala
+++ b/examples/spark2/src/main/scala/org/apache/carbondata/examples/CarbonSessionExample.scala
@@ -19,7 +19,6 @@ package org.apache.carbondata.examples
import java.io.File
-import org.apache.commons.io.FileUtils
import org.apache.spark.sql.SparkSession
import org.apache.carbondata.core.constants.CarbonCommonConstants
@@ -32,19 +31,10 @@ object CarbonSessionExample {
+ "../../../..").getCanonicalPath
val storeLocation = s"$rootPath/examples/spark2/target/store"
val warehouse = s"$rootPath/examples/spark2/target/warehouse"
- val metastoredb = s"$rootPath/examples/spark2/target/metastore_db"
-
- // clean data folder
- if (true) {
- val clean = (path: String) => FileUtils.deleteDirectory(new File(path))
- clean(storeLocation)
- clean(warehouse)
- clean(metastoredb)
- }
+ val metastoredb = s"$rootPath/examples/spark2/target"
CarbonProperties.getInstance()
.addProperty("carbon.kettle.home", s"$rootPath/processing/carbonplugins")
- .addProperty("carbon.storelocation", storeLocation)
.addProperty(CarbonCommonConstants.CARBON_TIMESTAMP_FORMAT, "yyyy/MM/dd")
import org.apache.spark.sql.CarbonSession._
@@ -52,12 +42,9 @@ object CarbonSessionExample {
val spark = SparkSession
.builder()
.master("local")
- .appName("CarbonExample")
- .enableHiveSupport()
+ .appName("CarbonSessionExample")
.config("spark.sql.warehouse.dir", warehouse)
- .config("javax.jdo.option.ConnectionURL",
- s"jdbc:derby:;databaseName=$metastoredb;create=true")
- .getOrCreateCarbonSession()
+ .getOrCreateCarbonSession(storeLocation, metastoredb)
spark.sparkContext.setLogLevel("WARN")
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/5f75a8a5/examples/spark2/src/main/scala/org/apache/carbondata/examples/SparkSessionExample.scala
----------------------------------------------------------------------
diff --git a/examples/spark2/src/main/scala/org/apache/carbondata/examples/SparkSessionExample.scala b/examples/spark2/src/main/scala/org/apache/carbondata/examples/SparkSessionExample.scala
index 1ab3276..8e01fec 100644
--- a/examples/spark2/src/main/scala/org/apache/carbondata/examples/SparkSessionExample.scala
+++ b/examples/spark2/src/main/scala/org/apache/carbondata/examples/SparkSessionExample.scala
@@ -46,7 +46,7 @@ object SparkSessionExample {
val spark = SparkSession
.builder()
.master("local")
- .appName("CarbonExample")
+ .appName("SparkSessionExample")
.enableHiveSupport()
.config("spark.sql.warehouse.dir", warehouse)
.config("javax.jdo.option.ConnectionURL",
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/5f75a8a5/integration/spark-common/src/main/scala/org/apache/spark/sql/test/TestQueryExecutor.scala
----------------------------------------------------------------------
diff --git a/integration/spark-common/src/main/scala/org/apache/spark/sql/test/TestQueryExecutor.scala b/integration/spark-common/src/main/scala/org/apache/spark/sql/test/TestQueryExecutor.scala
index 1c0bc61..f284345 100644
--- a/integration/spark-common/src/main/scala/org/apache/spark/sql/test/TestQueryExecutor.scala
+++ b/integration/spark-common/src/main/scala/org/apache/spark/sql/test/TestQueryExecutor.scala
@@ -45,7 +45,7 @@ object TestQueryExecutor {
val resourcesPath = s"$integrationPath/spark-common-test/src/test/resources"
val storeLocation = s"$integrationPath/spark-common/target/store"
val warehouse = s"$integrationPath/spark-common/target/warehouse"
- val metastoredb = s"$integrationPath/spark-common/target/metastore_db"
+ val metastoredb = s"$integrationPath/spark-common/target"
val kettleHome = s"$projectPath/processing/carbonplugins"
val timestampFormat = "dd-MM-yyyy"
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/5f75a8a5/integration/spark2/src/main/scala/org/apache/spark/sql/CarbonSession.scala
----------------------------------------------------------------------
diff --git a/integration/spark2/src/main/scala/org/apache/spark/sql/CarbonSession.scala b/integration/spark2/src/main/scala/org/apache/spark/sql/CarbonSession.scala
index 8958227..23040b3 100644
--- a/integration/spark2/src/main/scala/org/apache/spark/sql/CarbonSession.scala
+++ b/integration/spark2/src/main/scala/org/apache/spark/sql/CarbonSession.scala
@@ -16,15 +16,17 @@
*/
package org.apache.spark.sql
-import scala.reflect.ClassTag
-import scala.util.control.NonFatal
+import java.io.File
+import org.apache.hadoop.conf.Configuration
import org.apache.spark.{SparkConf, SparkContext}
import org.apache.spark.scheduler.{SparkListener, SparkListenerApplicationEnd}
import org.apache.spark.sql.SparkSession.Builder
import org.apache.spark.sql.hive.CarbonSessionState
import org.apache.spark.sql.internal.{SessionState, SharedState}
-import org.apache.spark.util.Utils
+
+import org.apache.carbondata.core.constants.CarbonCommonConstants
+import org.apache.carbondata.core.util.CarbonProperties
/**
* Session implementation for {org.apache.spark.sql.SparkSession}
@@ -62,14 +64,32 @@ object CarbonSession {
implicit class CarbonBuilder(builder: Builder) {
+ def getOrCreateCarbonSession(): SparkSession = {
+ getOrCreateCarbonSession(
+ new File(CarbonCommonConstants.STORE_LOCATION_DEFAULT_VAL).getCanonicalPath,
+ new File(CarbonCommonConstants.METASTORE_LOCATION_DEFAULT_VAL).getCanonicalPath)
+ }
- def getOrCreateCarbonSession(): SparkSession = synchronized {
+ def getOrCreateCarbonSession(storePath: String): SparkSession = {
+ getOrCreateCarbonSession(
+ storePath,
+ new File(CarbonCommonConstants.METASTORE_LOCATION_DEFAULT_VAL).getCanonicalPath)
+ }
+ def getOrCreateCarbonSession(storePath: String,
+ metaStorePath: String): SparkSession = synchronized {
+ builder.enableHiveSupport()
val options =
getValue("options", builder).asInstanceOf[scala.collection.mutable.HashMap[String, String]]
val userSuppliedContext: Option[SparkContext] =
getValue("userSuppliedContext", builder).asInstanceOf[Option[SparkContext]]
-
+ if (options.get(CarbonCommonConstants.HIVE_CONNECTION_URL).isEmpty &&
+ new Configuration().get(CarbonCommonConstants.HIVE_CONNECTION_URL) == null) {
+ val metaStorePathAbsolute = new File(metaStorePath).getCanonicalPath
+ val hiveMetaStoreDB = metaStorePathAbsolute + "/metastore_db"
+ options ++= Map[String, String]((CarbonCommonConstants.HIVE_CONNECTION_URL,
+ s"jdbc:derby:;databaseName=$hiveMetaStoreDB;create=true"))
+ }
// Get the session from current thread's active session.
var session: SparkSession = SparkSession.getActiveSession match {
case Some(sparkSession: CarbonSession) =>
@@ -120,6 +140,9 @@ object CarbonSession {
}
sc
}
+
+ CarbonProperties.getInstance()
+ .addProperty(CarbonCommonConstants.STORE_LOCATION, storePath)
session = new CarbonSession(sparkContext)
options.foreach { case (k, v) => session.sessionState.conf.setConfString(k, v) }
SparkSession.setDefaultSession(session)
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/5f75a8a5/integration/spark2/src/main/scala/org/apache/spark/sql/test/Spark2TestQueryExecutor.scala
----------------------------------------------------------------------
diff --git a/integration/spark2/src/main/scala/org/apache/spark/sql/test/Spark2TestQueryExecutor.scala b/integration/spark2/src/main/scala/org/apache/spark/sql/test/Spark2TestQueryExecutor.scala
index 0df98b8..b8f715f 100644
--- a/integration/spark2/src/main/scala/org/apache/spark/sql/test/Spark2TestQueryExecutor.scala
+++ b/integration/spark2/src/main/scala/org/apache/spark/sql/test/Spark2TestQueryExecutor.scala
@@ -38,7 +38,6 @@ object Spark2TestQueryExecutor {
private val LOGGER = LogServiceFactory.getLogService(this.getClass.getCanonicalName)
LOGGER.info("use TestQueryExecutorImplV2")
CarbonProperties.getInstance()
- .addProperty(CarbonCommonConstants.STORE_LOCATION, TestQueryExecutor.storeLocation)
.addProperty("carbon.kettle.home", TestQueryExecutor.kettleHome)
.addProperty(CarbonCommonConstants.CARBON_TIMESTAMP_FORMAT, TestQueryExecutor.timestampFormat)
.addProperty(CarbonCommonConstants.STORE_LOCATION_TEMP_PATH,
@@ -50,12 +49,10 @@ object Spark2TestQueryExecutor {
val spark = SparkSession
.builder()
.master("local[2]")
- .appName("CarbonExample")
+ .appName("Spark2TestQueryExecutor")
.enableHiveSupport()
.config("spark.sql.warehouse.dir", TestQueryExecutor.warehouse)
- .config("javax.jdo.option.ConnectionURL",
- s"jdbc:derby:;databaseName=${TestQueryExecutor.metastoredb};create=true")
- .getOrCreateCarbonSession()
+ .getOrCreateCarbonSession(TestQueryExecutor.storeLocation, TestQueryExecutor.metastoredb)
spark.sparkContext.setLogLevel("ERROR")
}
[34/50] [abbrv] incubator-carbondata git commit: Problem: Dataloads
fail when no. of column in load query is greater than the no. of column in
create table
Posted by ra...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/1cd0450b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestDataLoadWithColumnsMoreThanSchema.scala
----------------------------------------------------------------------
diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestDataLoadWithColumnsMoreThanSchema.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestDataLoadWithColumnsMoreThanSchema.scala
index e87a1cd..7f620b9 100644
--- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestDataLoadWithColumnsMoreThanSchema.scala
+++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestDataLoadWithColumnsMoreThanSchema.scala
@@ -31,6 +31,7 @@ class TestDataLoadWithColumnsMoreThanSchema extends QueryTest with BeforeAndAfte
override def beforeAll {
sql("DROP TABLE IF EXISTS char_test")
sql("DROP TABLE IF EXISTS hive_char_test")
+ sql("DROP TABLE IF EXISTS smart_500_DE")
sql("CREATE TABLE char_test (imei string,age int,task bigint,num double,level decimal(10,3),productdate timestamp,mark int,name string)STORED BY 'org.apache.carbondata.format'")
sql("CREATE TABLE hive_char_test (imei string,age int,task bigint,num double,level decimal(10,3),productdate timestamp,mark int,name string)row format delimited fields terminated by ','")
sql(s"LOAD DATA LOCAL INPATH '$resourcesPath/character_carbon.csv' into table char_test")
@@ -126,6 +127,16 @@ class TestDataLoadWithColumnsMoreThanSchema extends QueryTest with BeforeAndAfte
}
}
+ test("test for duplicate column name in the Fileheader options in load command") {
+ sql("create table smart_500_DE (MSISDN string,IMSI string,IMEI string,INTERFACEID int,GROUPID int,GGSN_ID double,SGSN_ID double,SESSION_INDICATOR int,BEGIN_TIME double,BEGIN_TIME_MSEL int,END_TIME double,END_TIME_MSEL int,PROT_CATEGORY int,PROT_TYPE int,L7_CARRIER_PROT int,SUB_PROT_TYPE int,SID double,PROBEID double,ENCRYPT_VERSION int,ROAMING_TYPE int,ROAM_DIRECTION int,MS_IP string,SERVER_IP string,MS_PORT int,SERVER_DECIMAL Decimal,APN string,SGSN_SIG_IP string,GGSN_SIG_IP_BigInt_NEGATIVE bigint,SGSN_USER_IP string,GGSN_USER_IP string,MCC string,MNC string,RAT int,LAC string,RAC string,SAC string,CI string,BROWSER_TIMESTAMP timestamp,TCP_CONN_STATES int,TCP_STATES_BIGINTPOSITIVE int,TCP_WIN_SIZE int,TCP_MSS int,TCP_CONN_TIMES int,TCP_CONN_2_FAILED_TIMES int,TCP_CONN_3_FAILED_TIMES int,HOST string,STREAMING_URL string,GET_STREAMING_FAILED_CODE int,GET_STREAMING_FLAG int,GET_NUM int,GET_SUCCEED_NUM int,GET_RETRANS_NUM int,GET_TIMEOUT_NUM int,INTBUFFER_FST_FLAG int,INTBUFFER_FUL
L_FLAG int,STALL_NUM int,VIDEO_FRAME_RATE int,VIDEO_CODEC_ID string,VIDEO_WIDTH int,VIDEO_HEIGHT int,AUDIO_CODEC_ID string,MEDIA_FILE_TYPE int,PLAY_STATE int,STREAMING_FLAG int,TCP_STATUS_INDICATOR int,DISCONNECTION_FLAG int,FAILURE_CODE int,FLAG int,TAC string,ECI string,TCP_SYN_TIME_MSEL int,TCP_FST_SYN_DIRECTION int,RAN_NE_USER_IP string,HOMEMCC string,HOMEMNC string,CHARGE_FLAG int,PREPAID_FLAG int,USER_AGENT string,MS_WIN_STAT_TOTAL_NUM int,MS_WIN_STAT_SMALL_NUM int,MS_ACK_TO_1STGET_DELAY int,SERVER_ACK_TO_1STDATA_DELAY int,STREAMING_TYPE int,SOURCE_VIDEO_QUALITY int,TETHERING_FLAG int,CARRIER_ID double,LAYER1ID int,LAYER2ID int,LAYER3ID int,LAYER4ID int,LAYER5ID int,LAYER6ID int,CHARGING_RULE_BASE_NAME string,SP string,EXTENDED_URL string,SV string,FIRST_SAI_CGI_ECGI string,EXTENDED_URL_OTHER string,SIGNALING_USE_FLAG int,DNS_RETRANS_NUM int,DNS_FAIL_CODE int,FIRST_RAT int,MS_INDICATOR string,LAST_SAI_CGI_ECGI string,LAST_RAT int,FIRST_LONGITUDE double,FIRST_LATITUDE double,FI
RST_ALTITUDE int,FIRST_RASTERLONGITUDE double,FIRST_RASTERLATITUDE double,FIRST_RASTERALTITUDE int,FIRST_FREQUENCYSPOT int,FIRST_CLUTTER int,FIRST_USERBEHAVIOR int,FIRST_SPEED int,FIRST_CREDIBILITY int,LAST_LONGITUDE double,LAST_LATITUDE double,LAST_ALTITUDE int,LAST_RASTERLONGITUDE double,LAST_RASTERLATITUDE double,LAST_RASTERALTITUDE int,LAST_FREQUENCYSPOT int,LAST_CLUTTER int,LAST_USERBEHAVIOR int,LAST_SPEED int,LAST_CREDIBILITY int,IMEI_CIPHERTEXT string,APP_ID int,DOMAIN_NAME string,STREAMING_CACHE_IP string,STOP_LONGER_THAN_MIN_THRESHOLD int,STOP_LONGER_THAN_MAX_THRESHOLD int,PLAY_END_STAT int,STOP_START_TIME1 double,STOP_END_TIME1 double,STOP_START_TIME2 double,STOP_END_TIME2 double,STOP_START_TIME3 double,STOP_END_TIME3 double,STOP_START_TIME4 double,STOP_END_TIME4 double,STOP_START_TIME5 double,STOP_END_TIME5 double,STOP_START_TIME6 double,STOP_END_TIME6 double,STOP_START_TIME7 double,STOP_END_TIME7 double,STOP_START_TIME8 double,STOP_END_TIME8 double,STOP_START_TIME9 doubl
e,STOP_END_TIME9 double,STOP_START_TIME10 double,STOP_END_TIME10 double,FAIL_CLASS double,RECORD_TYPE double,NODATA_COUNT double,VIDEO_NODATA_DURATION double,VIDEO_SMOOTH_DURATION double,VIDEO_SD_DURATION double,VIDEO_HD_DURATION double,VIDEO_UHD_DURATION double,VIDEO_FHD_DURATION double,FLUCTUATION double,START_DOWNLOAD_THROUGHPUT double,L7_UL_GOODPUT_FULL_MSS double,SESSIONKEY string,FIRST_UCELLID double,LAST_UCELLID double,UCELLID1 double,LONGITUDE1 double,LATITUDE1 double,UCELLID2 double,LONGITUDE2 double,LATITUDE2 double,UCELLID3 double,LONGITUDE3 double,LATITUDE3 double,UCELLID4 double,LONGITUDE4 double,LATITUDE4 double,UCELLID5 double,LONGITUDE5 double,LATITUDE5 double,UCELLID6 double,LONGITUDE6 double,LATITUDE6 double,UCELLID7 double,LONGITUDE7 double,LATITUDE7 double,UCELLID8 double,LONGITUDE8 double,LATITUDE8 double,UCELLID9 double,LONGITUDE9 double,LATITUDE9 double,UCELLID10 double,LONGITUDE10 double,LATITUDE10 double,INTBUFFER_FULL_DELAY double,STALL_DURATION double,STRE
AMING_DW_PACKETS double,STREAMING_DOWNLOAD_DELAY double,PLAY_DURATION double,STREAMING_QUALITY int,VIDEO_DATA_RATE double,AUDIO_DATA_RATE double,STREAMING_FILESIZE double,STREAMING_DURATIOIN double,TCP_SYN_TIME double,TCP_RTT_STEP1 double,CHARGE_ID double,UL_REVERSE_TO_DL_DELAY double,DL_REVERSE_TO_UL_DELAY double,DATATRANS_DW_GOODPUT double,DATATRANS_DW_TOTAL_DURATION double,SUM_FRAGMENT_INTERVAL double,TCP_FIN_TIMES double,TCP_RESET_TIMES double,URL_CLASSIFICATION double,STREAMING_LQ_DURATIOIN double,MAX_DNS_DELAY double,MAX_DNS2SYN double,MAX_LATANCY_OF_LINK_SETUP double,MAX_SYNACK2FIRSTACK double,MAX_SYNACK2LASTACK double,MAX_ACK2GET_DELAY double,MAX_FRAG_INTERVAL_PREDELAY double,SUM_FRAG_INTERVAL_PREDELAY double,SERVICE_DELAY_MSEC double,HOMEPROVINCE double,HOMECITY double,SERVICE_ID double,CHARGING_CLASS double,DATATRANS_UL_DURATION double,ASSOCIATED_ID double,PACKET_LOSS_NUM double,JITTER double,MS_DNS_DELAY_MSEL double,GET_STREAMING_DELAY double,TCP_UL_RETRANS_WITHOUTPL doub
le,TCP_DW_RETRANS_WITHOUTPL double,GET_MAX_UL_SIZE double,GET_MIN_UL_SIZE double,GET_MAX_DL_SIZE double,GET_MIN_DL_SIZE double,L4_UL_THROUGHPUT double,L4_DW_THROUGHPUT double,L4_UL_GOODPUT double,L4_DW_GOODPUT double,NETWORK_UL_TRAFFIC double,NETWORK_DL_TRAFFIC double,L4_UL_PACKETS double,L4_DW_PACKETS double,TCP_RTT double,TCP_UL_OUTOFSEQU double,TCP_DW_OUTOFSEQU double,TCP_UL_RETRANS double,TCP_DW_RETRANS double,TCP_UL_RETRANS_WITHPL double,TCP_DW_RETRANS_WITHPL double,TCP_UL_PACKAGES_WITHPL double,TCP_DW_PACKAGES_WITHPL double,TCP_UL_PACKAGES_WITHOUTPL double,TCP_DW_PACKAGES_WITHOUTPL double,UPPERLAYER_IP_UL_PACKETS double,UPPERLAYER_IP_DL_PACKETS double,DOWNLAYER_IP_UL_PACKETS double,DOWNLAYER_IP_DL_PACKETS double,UPPERLAYER_IP_UL_FRAGMENTS double,UPPERLAYER_IP_DL_FRAGMENTS double,DOWNLAYER_IP_UL_FRAGMENTS double,DOWNLAYER_IP_DL_FRAGMENTS double,VALID_TRANS_DURATION double,AIR_PORT_DURATION double,RADIO_CONN_TIMES double,RAN_NE_ID double,AVG_UL_RTT double,AVG_DW_RTT double,UL_RT
T_LONG_NUM int,DW_RTT_LONG_NUM int,UL_RTT_STAT_NUM int,DW_RTT_STAT_NUM int,USER_PROBE_UL_LOST_PKT int,SERVER_PROBE_UL_LOST_PKT int,SERVER_PROBE_DW_LOST_PKT int,USER_PROBE_DW_LOST_PKT int,CHARGING_CHARACTERISTICS double,DL_SERIOUS_OUT_OF_ORDER_NUM double,DL_SLIGHT_OUT_OF_ORDER_NUM double,DL_FLIGHT_TOTAL_SIZE double,DL_FLIGHT_TOTAL_NUM double,DL_MAX_FLIGHT_SIZE double,UL_SERIOUS_OUT_OF_ORDER_NUM double,UL_SLIGHT_OUT_OF_ORDER_NUM double,UL_FLIGHT_TOTAL_SIZE double,UL_FLIGHT_TOTAL_NUM double,UL_MAX_FLIGHT_SIZE double,USER_DL_SLIGHT_OUT_OF_ORDER_PACKETS double,SERVER_UL_SLIGHT_OUT_OF_ORDER_PACKETS double,DL_CONTINUOUS_RETRANSMISSION_DELAY double,USER_HUNGRY_DELAY double,SERVER_HUNGRY_DELAY double,AVG_DW_RTT_MICRO_SEC int,AVG_UL_RTT_MICRO_SEC int,FLOW_SAMPLE_RATIO int) STORED BY 'org.apache.carbondata.format' TBLPROPERTIES ( 'DICTIONARY_EXCLUDE'='MSISDN,IMSI,IMEI,MS_IP,SERVER_IP,HOST,SP,MS_INDICATOR,streaming_url','DICTIONARY_INCLUDE'='SESSION_INDICATOR,SERVER_DECIMAL,TCP_STATES_BIGINTPOS
ITIVE')")
+ try {
+ sql(s"LOAD DATA INPATH '$resourcesPath/seq_500Records.csv' into table smart_500_DE options('DELIMITER'=',','BAD_RECORDS_ACTION'='FORCE','FILEHEADER'='SID,PROBEID,INTERFACEID,GROUPID,GGSN_ID,SGSN_ID,dummy,SESSION_INDICATOR,BEGIN_TIME,BEGIN_TIME_MSEL,END_TIME,END_TIME_MSEL,PROT_CATEGORY,PROT_TYPE,L7_CARRIER_PROT,SUB_PROT_TYPE,MSISDN,IMSI,IMEI,ENCRYPT_VERSION,ROAMING_TYPE,ROAM_DIRECTION,MS_IP,SERVER_IP,MS_PORT,APN,SGSN_SIG_IP,GGSN_USER_IP,SGSN_USER_IP,MCC,MNC,RAT,LAC,RAC,SAC,CI,SERVER_DECIMAL,BROWSER_TIMESTAMP,TCP_CONN_STATES,GGSN_SIG_IP_BigInt_NEGATIVE,TCP_STATES_BIGINTPOSITIVE,dummy,TCP_WIN_SIZE,dummy,TCP_MSS,dummy,TCP_CONN_TIMES,dummy,TCP_CONN_2_FAILED_TIMES,dummy,TCP_CONN_3_FAILED_TIMES,HOST,STREAMING_URL,dummy,GET_STREAMING_FAILED_CODE,dummy,GET_STREAMING_FLAG,dummy,GET_NUM,dummy,GET_SUCCEED_NUM,dummy,GET_RETRANS_NUM,dummy,GET_TIMEOUT_NUM,INTBUFFER_FST_FLAG,INTBUFFER_FULL_FLAG,STALL_NUM,dummy,VIDEO_FRAME_RATE,dummy,VIDEO_CODEC_ID,dummy,VIDEO_WIDTH,dummy,VIDEO_HEIGHT,dummy,AU
DIO_CODEC_ID,dummy,MEDIA_FILE_TYPE,dummy,PLAY_STATE,dummy,PLAY_STATE,dummy,STREAMING_FLAG,dummy,TCP_STATUS_INDICATOR,dummy,DISCONNECTION_FLAG,dummy,FAILURE_CODE,FLAG,TAC,ECI,dummy,TCP_SYN_TIME_MSEL,dummy,TCP_FST_SYN_DIRECTION,RAN_NE_USER_IP,HOMEMCC,HOMEMNC,dummy,CHARGE_FLAG,dummy,PREPAID_FLAG,dummy,USER_AGENT,dummy,MS_WIN_STAT_TOTAL_NUM,dummy,MS_WIN_STAT_SMALL_NUM,dummy,MS_ACK_TO_1STGET_DELAY,dummy,SERVER_ACK_TO_1STDATA_DELAY,dummy,STREAMING_TYPE,dummy,SOURCE_VIDEO_QUALITY,TETHERING_FLAG,CARRIER_ID,LAYER1ID,LAYER2ID,dummy,LAYER3ID,dummy,LAYER4ID,dummy,LAYER5ID,dummy,LAYER6ID,CHARGING_RULE_BASE_NAME,SP,dummy,EXTENDED_URL,SV,FIRST_SAI_CGI_ECGI,dummy,EXTENDED_URL_OTHER,SIGNALING_USE_FLAG,dummy,DNS_RETRANS_NUM,dummy,DNS_FAIL_CODE,FIRST_RAT,FIRST_RAT,MS_INDICATOR,LAST_SAI_CGI_ECGI,LAST_RAT,dummy,FIRST_LONGITUDE,dummy,FIRST_LATITUDE,dummy,FIRST_ALTITUDE,dummy,FIRST_RASTERLONGITUDE,dummy,FIRST_RASTERLATITUDE,dummy,FIRST_RASTERALTITUDE,dummy,FIRST_FREQUENCYSPOT,dummy,FIRST_CLUTTER,dummy,FIR
ST_USERBEHAVIOR,dummy,FIRST_SPEED,dummy,FIRST_CREDIBILITY,dummy,LAST_LONGITUDE,dummy,LAST_LATITUDE,dummy,LAST_ALTITUDE,dummy,LAST_RASTERLONGITUDE,dummy,LAST_RASTERLATITUDE,dummy,LAST_RASTERALTITUDE,dummy,LAST_FREQUENCYSPOT,dummy,LAST_CLUTTER,dummy,LAST_USERBEHAVIOR,dummy,LAST_SPEED,dummy,LAST_CREDIBILITY,dummy,IMEI_CIPHERTEXT,APP_ID,dummy,DOMAIN_NAME,dummy,STREAMING_CACHE_IP,dummy,STOP_LONGER_THAN_MIN_THRESHOLD,dummy,STOP_LONGER_THAN_MAX_THRESHOLD,dummy,PLAY_END_STAT,dummy,STOP_START_TIME1,dummy,STOP_END_TIME1,dummy,STOP_START_TIME2,dummy,STOP_END_TIME2,dummy,STOP_START_TIME3,dummy,STOP_END_TIME3,dummy,STOP_START_TIME4,dummy,STOP_END_TIME4,dummy,STOP_START_TIME5,dummy,STOP_END_TIME5,dummy,STOP_START_TIME6,dummy,STOP_END_TIME6,dummy,STOP_START_TIME7,dummy,STOP_END_TIME7,dummy,STOP_START_TIME8,dummy,STOP_END_TIME8,dummy,STOP_START_TIME9,dummy,STOP_END_TIME9,dummy,STOP_START_TIME10,dummy,STOP_END_TIME10,dummy,FAIL_CLASS,RECORD_TYPE,dummy,NODATA_COUNT,dummy,VIDEO_NODATA_DURATION,dummy,V
IDEO_SMOOTH_DURATION,dummy,VIDEO_SD_DURATION,dummy,VIDEO_HD_DURATION,dummy,VIDEO_UHD_DURATION,dummy,VIDEO_FHD_DURATION,dummy,FLUCTUATION,dummy,START_DOWNLOAD_THROUGHPUT,dummy,L7_UL_GOODPUT_FULL_MSS,dummy,SESSIONKEY,dummy,FIRST_UCELLID,dummy,LAST_UCELLID,dummy,UCELLID1,dummy,LONGITUDE1,dummy,LATITUDE1,dummy,UCELLID2,dummy,LONGITUDE2,dummy,LATITUDE2,dummy,UCELLID3,dummy,LONGITUDE3,dummy,LATITUDE3,dummy,UCELLID4,dummy,LONGITUDE4,dummy,LATITUDE4,dummy,UCELLID5,dummy,LONGITUDE5,dummy,LATITUDE5,dummy,UCELLID6,dummy,LONGITUDE6,dummy,LATITUDE6,dummy,UCELLID7,dummy,LONGITUDE7,dummy,LATITUDE7,dummy,UCELLID8,dummy,LONGITUDE8,dummy,LATITUDE8,dummy,UCELLID9,dummy,LONGITUDE9,dummy,LATITUDE9,dummy,UCELLID10,dummy,LONGITUDE10,dummy,LATITUDE10,dummy,INTBUFFER_FULL_DELAY,dummy,STALL_DURATION,dummy,STREAMING_DW_PACKETS,dummy,STREAMING_DOWNLOAD_DELAY,dummy,PLAY_DURATION,dummy,STREAMING_QUALITY,dummy,VIDEO_DATA_RATE,dummy,AUDIO_DATA_RATE,dummy,STREAMING_FILESIZE,dummy,STREAMING_DURATIOIN,dummy,TCP_SYN_T
IME,dummy,TCP_RTT_STEP1,CHARGE_ID,dummy,UL_REVERSE_TO_DL_DELAY,dummy,DL_REVERSE_TO_UL_DELAY,dummy,DATATRANS_DW_GOODPUT,dummy,DATATRANS_DW_TOTAL_DURATION,dummy,SUM_FRAGMENT_INTERVAL,dummy,TCP_FIN_TIMES,dummy,TCP_RESET_TIMES,dummy,URL_CLASSIFICATION,dummy,STREAMING_LQ_DURATIOIN,dummy,MAX_DNS_DELAY,dummy,MAX_DNS2SYN,dummy,MAX_LATANCY_OF_LINK_SETUP,dummy,MAX_SYNACK2FIRSTACK,dummy,MAX_SYNACK2LASTACK,dummy,MAX_ACK2GET_DELAY,dummy,MAX_FRAG_INTERVAL_PREDELAY,dummy,SUM_FRAG_INTERVAL_PREDELAY,dummy,SERVICE_DELAY_MSEC,dummy,HOMEPROVINCE,dummy,HOMECITY,dummy,SERVICE_ID,dummy,CHARGING_CLASS,dummy,DATATRANS_UL_DURATION,dummy,ASSOCIATED_ID,dummy,PACKET_LOSS_NUM,dummy,JITTER,dummy,MS_DNS_DELAY_MSEL,dummy,GET_STREAMING_DELAY,dummy,TCP_UL_RETRANS_WITHOUTPL,dummy,TCP_DW_RETRANS_WITHOUTPL,dummy,GET_MAX_UL_SIZE,dummy,GET_MIN_UL_SIZE,dummy,GET_MAX_DL_SIZE,dummy,GET_MIN_DL_SIZE,dummy,FLOW_SAMPLE_RATIO,dummy,UL_RTT_LONG_NUM,dummy,DW_RTT_LONG_NUM,dummy,UL_RTT_STAT_NUM,dummy,DW_RTT_STAT_NUM,dummy,USER_PROBE_
UL_LOST_PKT,dummy,SERVER_PROBE_UL_LOST_PKT,dummy,SERVER_PROBE_DW_LOST_PKT,dummy,USER_PROBE_DW_LOST_PKT,dummy,AVG_DW_RTT_MICRO_SEC,dummy,AVG_UL_RTT_MICRO_SEC,dummy,RAN_NE_ID,dummy,AVG_UL_RTT,dummy,AVG_DW_RTT,dummy,CHARGING_CHARACTERISTICS,dummy,DL_SERIOUS_OUT_OF_ORDER_NUM,dummy,DL_SLIGHT_OUT_OF_ORDER_NUM,dummy,DL_FLIGHT_TOTAL_SIZE,dummy,DL_FLIGHT_TOTAL_NUM,dummy,DL_MAX_FLIGHT_SIZE,dummy,VALID_TRANS_DURATION,dummy,AIR_PORT_DURATION,dummy,RADIO_CONN_TIMES,dummy,UL_SERIOUS_OUT_OF_ORDER_NUM,dummy,UL_SLIGHT_OUT_OF_ORDER_NUM,dummy,UL_FLIGHT_TOTAL_SIZE,dummy,UL_FLIGHT_TOTAL_NUM,dummy,UL_MAX_FLIGHT_SIZE,dummy,USER_DL_SLIGHT_OUT_OF_ORDER_PACKETS,dummy,SERVER_UL_SLIGHT_OUT_OF_ORDER_PACKETS,dummy,DL_CONTINUOUS_RETRANSMISSION_DELAY,dummy,USER_HUNGRY_DELAY,dummy,SERVER_HUNGRY_DELAY,dummy,UPPERLAYER_IP_UL_FRAGMENTS,dummy,UPPERLAYER_IP_DL_FRAGMENTS,dummy,DOWNLAYER_IP_UL_FRAGMENTS,dummy,DOWNLAYER_IP_DL_FRAGMENTS,dummy,UPPERLAYER_IP_UL_PACKETS,dummy,UPPERLAYER_IP_DL_PACKETS,dummy,DOWNLAYER_IP_UL_PACK
ETS,dummy,DOWNLAYER_IP_DL_PACKETS,dummy,TCP_UL_PACKAGES_WITHPL,dummy,TCP_DW_PACKAGES_WITHPL,dummy,TCP_UL_PACKAGES_WITHOUTPL,dummy,TCP_DW_PACKAGES_WITHOUTPL,dummy,TCP_UL_RETRANS_WITHPL,dummy,TCP_DW_RETRANS_WITHPL,L4_UL_THROUGHPUT,L4_DW_THROUGHPUT,L4_UL_GOODPUT,L4_DW_GOODPUT,NETWORK_UL_TRAFFIC,NETWORK_DL_TRAFFIC,L4_UL_PACKETS,L4_DW_PACKETS,TCP_RTT,TCP_UL_OUTOFSEQU,TCP_DW_OUTOFSEQU,TCP_UL_RETRANS,TCP_DW_RETRANS')")
+ assert(true)
+ } catch {
+ case _: Throwable => assert(false)
+ }
+ }
+
override def afterAll {
sql("DROP TABLE IF EXISTS char_test")
sql("DROP TABLE IF EXISTS hive_char_test")
@@ -133,5 +144,6 @@ class TestDataLoadWithColumnsMoreThanSchema extends QueryTest with BeforeAndAfte
sql("DROP TABLE IF EXISTS boundary_max_columns_test")
sql("DROP TABLE IF EXISTS valid_max_columns_test")
sql("DROP TABLE IF EXISTS max_columns_test")
+ sql("DROP TABLE IF EXISTS smart_500_DE")
}
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/1cd0450b/processing/src/main/java/org/apache/carbondata/processing/newflow/parser/impl/RowParserImpl.java
----------------------------------------------------------------------
diff --git a/processing/src/main/java/org/apache/carbondata/processing/newflow/parser/impl/RowParserImpl.java b/processing/src/main/java/org/apache/carbondata/processing/newflow/parser/impl/RowParserImpl.java
index f28e74c..5e7aaa6 100644
--- a/processing/src/main/java/org/apache/carbondata/processing/newflow/parser/impl/RowParserImpl.java
+++ b/processing/src/main/java/org/apache/carbondata/processing/newflow/parser/impl/RowParserImpl.java
@@ -63,7 +63,8 @@ public class RowParserImpl implements RowParser {
DataField[] input = new DataField[fields.length];
inputMapping = new int[input.length];
int k = 0;
- for (int i = 0; i < numberOfColumns; i++) {
+ // value of k can be max equivalent to the number of columns in schema
+ for (int i = 0; i < numberOfColumns && k < fields.length; i++) {
for (int j = 0; j < fields.length; j++) {
if (header[i].equalsIgnoreCase(fields[j].getColumn().getColName())) {
input[k] = fields[j];
[27/50] [abbrv] incubator-carbondata git commit: [CARBONDATA-603]
Fixed Date Filter issue This closes #551
Posted by ra...@apache.org.
[CARBONDATA-603] Fixed Date Filter issue This closes #551
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/af30254f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/af30254f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/af30254f
Branch: refs/heads/branch-1.0
Commit: af30254faf5123b172becc31768514ed35ca72ec
Parents: 913d266 ea04fce
Author: ravipesala <ra...@gmail.com>
Authored: Fri Jan 20 13:41:37 2017 +0530
Committer: ravipesala <ra...@gmail.com>
Committed: Fri Jan 20 13:41:37 2017 +0530
----------------------------------------------------------------------
.../cache/dictionary/ColumnDictionaryInfo.java | 6 +--
.../core/constants/CarbonCommonConstants.java | 9 ++++
.../DirectDictionaryGenerator.java | 1 +
.../DirectDictionaryKeyGeneratorFactory.java | 8 +---
.../DateDirectDictionaryGenerator.java | 32 +++++++------
.../core/scan/expression/ExpressionResult.java | 12 +++--
.../carbondata/core/scan/filter/FilterUtil.java | 19 +++++---
.../visitor/CustomTypeDictionaryVisitor.java | 28 ++++++++----
.../apache/carbondata/core/util/CarbonUtil.java | 22 +++++++++
.../carbondata/core/util/DataTypeUtil.java | 24 +++++++++-
.../sortindex/CarbonDictionarySortModel.java | 7 ++-
.../DateDataTypeDirectDictionaryTest.scala | 6 +--
...TypeDirectDictionaryWithNoDictTestCase.scala | 6 +--
.../DateDataTypeNullDataTest.scala | 6 +--
.../spark/rdd/CarbonDataLoadRDD.scala | 18 +++++---
.../spark/rdd/CarbonGlobalDictionaryRDD.scala | 18 +++++---
.../spark/rdd/NewCarbonDataLoadRDD.scala | 9 ++--
.../carbondata/spark/util/CarbonScalaUtil.scala | 11 ++---
.../spark/util/GlobalDictionaryUtil.scala | 47 +++++++++++---------
.../execution/command/carbonTableSchema.scala | 3 ++
.../util/ExternalColumnDictionaryTestCase.scala | 3 ++
...GlobalDictionaryUtilConcurrentTestCase.scala | 3 ++
.../util/GlobalDictionaryUtilTestCase.scala | 3 ++
.../execution/command/carbonTableSchema.scala | 3 ++
.../processing/model/CarbonLoadModel.java | 38 ++++++++++++----
25 files changed, 232 insertions(+), 110 deletions(-)
----------------------------------------------------------------------
[05/50] [abbrv] incubator-carbondata git commit: [CARBONDATA-634]
Load Query options invalid values are not consistent behavior. This closes
#548
Posted by ra...@apache.org.
[CARBONDATA-634] Load Query options invalid values are not consistent behavior. This closes #548
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/e882aedb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/e882aedb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/e882aedb
Branch: refs/heads/branch-1.0
Commit: e882aedbefd70710707f2b8786a2cfc7463af45a
Parents: 7f8401d 8031954
Author: ravipesala <ra...@gmail.com>
Authored: Wed Jan 18 15:38:47 2017 +0530
Committer: ravipesala <ra...@gmail.com>
Committed: Wed Jan 18 15:38:47 2017 +0530
----------------------------------------------------------------------
.../badrecordloger/BadRecordLoggerTest.scala | 18 ++++++++++++++++++
.../spark/sql/catalyst/CarbonDDLSqlParser.scala | 13 +++++++++++++
2 files changed, 31 insertions(+)
----------------------------------------------------------------------
[38/50] [abbrv] incubator-carbondata git commit: Fixed
crabon.properties read from sqlconf first
Posted by ra...@apache.org.
Fixed crabon.properties read from sqlconf first
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/c2ee320b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/c2ee320b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/c2ee320b
Branch: refs/heads/branch-1.0
Commit: c2ee320b746c3a872bf288d52242afa00f1cc447
Parents: 1fb5391
Author: ravipesala <ra...@gmail.com>
Authored: Thu Jan 19 19:13:51 2017 +0530
Committer: Venkata Ramana G <ra...@huawei.com>
Committed: Fri Jan 20 18:28:11 2017 +0530
----------------------------------------------------------------------
.../carbondata/spark/util/CarbonScalaUtil.scala | 5 +++-
.../spark/thriftserver/CarbonThriftServer.scala | 18 ++++++++++----
.../apache/carbondata/spark/CarbonOption.scala | 0
.../spark/thriftserver/CarbonThriftServer.scala | 25 +++++++++++++-------
4 files changed, 34 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/c2ee320b/integration/spark-common/src/main/scala/org/apache/carbondata/spark/util/CarbonScalaUtil.scala
----------------------------------------------------------------------
diff --git a/integration/spark-common/src/main/scala/org/apache/carbondata/spark/util/CarbonScalaUtil.scala b/integration/spark-common/src/main/scala/org/apache/carbondata/spark/util/CarbonScalaUtil.scala
index 35bd775..428df48 100644
--- a/integration/spark-common/src/main/scala/org/apache/carbondata/spark/util/CarbonScalaUtil.scala
+++ b/integration/spark-common/src/main/scala/org/apache/carbondata/spark/util/CarbonScalaUtil.scala
@@ -92,7 +92,10 @@ object CarbonScalaUtil {
}
def getKettleHome(sqlContext: SQLContext): String = {
- var kettleHomePath = CarbonProperties.getInstance.getProperty("carbon.kettle.home")
+ var kettleHomePath = sqlContext.getConf("carbon.kettle.home", null)
+ if (null == kettleHomePath) {
+ kettleHomePath = CarbonProperties.getInstance.getProperty("carbon.kettle.home")
+ }
if (null == kettleHomePath) {
val carbonHome = System.getenv("CARBON_HOME")
if (null != carbonHome) {
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/c2ee320b/integration/spark/src/main/scala/org/apache/carbondata/spark/thriftserver/CarbonThriftServer.scala
----------------------------------------------------------------------
diff --git a/integration/spark/src/main/scala/org/apache/carbondata/spark/thriftserver/CarbonThriftServer.scala b/integration/spark/src/main/scala/org/apache/carbondata/spark/thriftserver/CarbonThriftServer.scala
index efedc91..b8ba9f7 100644
--- a/integration/spark/src/main/scala/org/apache/carbondata/spark/thriftserver/CarbonThriftServer.scala
+++ b/integration/spark/src/main/scala/org/apache/carbondata/spark/thriftserver/CarbonThriftServer.scala
@@ -17,6 +17,8 @@
package org.apache.carbondata.spark.thriftserver
+import java.io.File
+
import org.apache.spark.{SparkConf, SparkContext}
import org.apache.spark.sql.CarbonContext
import org.apache.spark.sql.hive.thriftserver.HiveThriftServer2
@@ -29,11 +31,17 @@ object CarbonThriftServer {
def main(args: Array[String]): Unit = {
val conf = new SparkConf()
.setAppName("Carbon Thrift Server")
- val sparkHome = System.getenv.get("SPARK_HOME")
- if (null != sparkHome) {
- conf.set("carbon.properties.filepath", sparkHome + '/' + "conf" + '/' + "carbon.properties")
- System.setProperty("carbon.properties.filepath",
- sparkHome + '/' + "conf" + '/' + "carbon.properties")
+ if (!conf.contains("carbon.properties.filepath")) {
+ val sparkHome = System.getenv.get("SPARK_HOME")
+ if (sparkHome != null) {
+ val file = new File(sparkHome + '/' + "conf" + '/' + "carbon.properties")
+ if (file.exists()) {
+ conf.set("carbon.properties.filepath", file.getCanonicalPath)
+ System.setProperty("carbon.properties.filepath", file.getCanonicalPath)
+ }
+ }
+ } else {
+ System.setProperty("carbon.properties.filepath", conf.get("carbon.properties.filepath"))
}
if (org.apache.spark.SPARK_VERSION.startsWith("1.6")) {
conf.set("spark.sql.hive.thriftServer.singleSession", "true")
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/c2ee320b/integration/spark2/src/main/scala/org/apache/carbondata/spark/CarbonOption.scala
----------------------------------------------------------------------
diff --git a/integration/spark2/src/main/scala/org/apache/carbondata/spark/CarbonOption.scala b/integration/spark2/src/main/scala/org/apache/carbondata/spark/CarbonOption.scala
deleted file mode 100644
index e69de29..0000000
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/c2ee320b/integration/spark2/src/main/scala/org/apache/carbondata/spark/thriftserver/CarbonThriftServer.scala
----------------------------------------------------------------------
diff --git a/integration/spark2/src/main/scala/org/apache/carbondata/spark/thriftserver/CarbonThriftServer.scala b/integration/spark2/src/main/scala/org/apache/carbondata/spark/thriftserver/CarbonThriftServer.scala
index 6a6ee00..aba6891 100644
--- a/integration/spark2/src/main/scala/org/apache/carbondata/spark/thriftserver/CarbonThriftServer.scala
+++ b/integration/spark2/src/main/scala/org/apache/carbondata/spark/thriftserver/CarbonThriftServer.scala
@@ -17,11 +17,14 @@
package org.apache.carbondata.spark.thriftserver
+import java.io.File
+
import org.apache.spark.SparkConf
import org.apache.spark.sql.SparkSession
import org.apache.spark.sql.hive.thriftserver.HiveThriftServer2
import org.apache.carbondata.common.logging.LogServiceFactory
+import org.apache.carbondata.core.constants.CarbonCommonConstants
import org.apache.carbondata.core.util.CarbonProperties
object CarbonThriftServer {
@@ -37,16 +40,22 @@ object CarbonThriftServer {
.appName("Carbon Thrift Server(uses CarbonSession)")
.enableHiveSupport()
- val sparkHome = System.getenv.get("SPARK_HOME")
- if (null != sparkHome) {
- builder.config("carbon.properties.filepath",
- sparkHome + '/' + "conf" + '/' + "carbon.properties")
- System.setProperty("carbon.properties.filepath",
- sparkHome + '/' + "conf" + '/' + "carbon.properties")
+ if (!sparkConf.contains("carbon.properties.filepath")) {
+ val sparkHome = System.getenv.get("SPARK_HOME")
+ if (null != sparkHome) {
+ val file = new File(sparkHome + '/' + "conf" + '/' + "carbon.properties")
+ if (file.exists()) {
+ builder.config("carbon.properties.filepath", file.getCanonicalPath)
+ System.setProperty("carbon.properties.filepath", file.getCanonicalPath)
+ }
+ }
+ } else {
+ System.setProperty("carbon.properties.filepath", sparkConf.get("carbon.properties.filepath"))
}
- CarbonProperties.getInstance().addProperty("carbon.storelocation", args.head)
- val spark = builder.getOrCreateCarbonSession()
+ CarbonProperties.getInstance().addProperty(CarbonCommonConstants.STORE_LOCATION, args.head)
+
+ val spark = builder.getOrCreateCarbonSession(args.head)
val warmUpTime = CarbonProperties.getInstance().getProperty("carbon.spark.warmUpTime", "5000")
try {
Thread.sleep(Integer.parseInt(warmUpTime))
[43/50] [abbrv] incubator-carbondata git commit:
[CARBONDATA-671]Fixed Date issue when date is less the 1970 This closes #564
Posted by ra...@apache.org.
[CARBONDATA-671]Fixed Date issue when date is less the 1970 This closes #564
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/254af99a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/254af99a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/254af99a
Branch: refs/heads/branch-1.0
Commit: 254af99a7a7eb0cfa2c530e4b49232e6535c5938
Parents: b2eb9c7 c33e5b2
Author: ravipesala <ra...@gmail.com>
Authored: Fri Jan 20 20:58:46 2017 +0530
Committer: ravipesala <ra...@gmail.com>
Committed: Fri Jan 20 20:58:46 2017 +0530
----------------------------------------------------------------------
.../timestamp/DateDirectDictionaryGenerator.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[14/50] [abbrv] incubator-carbondata git commit: update carbondata
documents
Posted by ra...@apache.org.
update carbondata documents
update carbondata documents
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/acb9d223
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/acb9d223
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/acb9d223
Branch: refs/heads/branch-1.0
Commit: acb9d22385d4f554625f23885a6e64b7c9ceeeb1
Parents: 10703cf
Author: chenliang613 <ch...@huawei.com>
Authored: Thu Jan 19 18:32:30 2017 +0800
Committer: ravipesala <ra...@gmail.com>
Committed: Thu Jan 19 16:26:27 2017 +0530
----------------------------------------------------------------------
README.md | 37 +++-----
docs/overview-of-carbondata.md | 178 -----------------------------------
docs/quick-start-guide.md | 71 ++++----------
docs/table-of-content.md | 47 ---------
docs/use-cases-of-carbondata.md | 77 ---------------
docs/user-guide-toc.md | 47 ---------
docs/using-carbondata.md | 35 -------
7 files changed, 32 insertions(+), 460 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/acb9d223/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index ce71666..afd3061 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@
under the License.
-->
-<img src="/docs/images/format/CarbonData_logo.png" width="200" height="40">
+<img src="/docs/images/CarbonData_logo.png" width="200" height="40">
Apache CarbonData(incubating) is an indexed columnar data format for fast analytics on big data platform, e.g.Apache Hadoop, Apache Spark, etc.
@@ -36,36 +36,25 @@ CarbonData file format is a columnar store in HDFS, it has many features that a
* Operable encoded data :Through supporting efficient compression and global encoding schemes, can query on compressed/encoded data, the data can be converted just before returning the results to the users, which is "late materialized".
* Supports for various use cases with one single Data format : like interactive OLAP-style query, Sequential Access (big scan), Random Access (narrow scan).
-## Building CarbonData,using development tools and cluster deployment guide
-Please refer [Building CarbonData and Configuring IDE](https://cwiki.apache.org/confluence/display/CARBONDATA/Building+CarbonData+And+IDE+Configuration)
+## Building CarbonData
+CarbonData is built using Apache Maven, to [build CarbonData](https://github.com/apache/incubator-carbondata/blob/master/build)
-Please refer [Cluster Deployment Guide](https://cwiki.apache.org/confluence/display/CARBONDATA/Cluster+deployment+guide)
-
-## Getting Started
-Read the [quick start](https://cwiki.apache.org/confluence/display/CARBONDATA/Quick+Start)
-
-## Usage of CarbonData
- [DDL Operations on CarbonData](https://cwiki.apache.org/confluence/display/CARBONDATA/DDL+operations+on+CarbonData)
-
- [DML Operations on CarbonData](https://cwiki.apache.org/confluence/display/CARBONDATA/DML+operations+on+CarbonData)
-
- [CarbonData data management](https://cwiki.apache.org/confluence/display/CARBONDATA/Data+Management)
-
-## CarbonData File Structure and interfaces
-Please refer [CarbonData File Format](https://cwiki.apache.org/confluence/display/CARBONDATA/CarbonData+File+Structure+and+Format)
-
-## CarbonData FAQ
-[Configurations For Optimizing CarbonData Performance](https://cwiki.apache.org/confluence/display/CARBONDATA/Configurations+For+Optimizing+CarbonData+Performance)
-
-[Suggestion to create CarbonData table]
-(https://cwiki.apache.org/confluence/display/CARBONDATA/Suggestion+to+create+CarbonData+table)
+## Online Documentation
+* [Quick Start](https://github.com/apache/incubator-carbondata/blob/master/docs/quick-start-guide.md)
+* [Data Management](https://github.com/apache/incubator-carbondata/blob/master/docs/data-management.md)
+* [DDL Operations on CarbonData](https://github.com/apache/incubator-carbondata/blob/master/docs/ddl-operation-on-carbondata.md)
+* [DML Operations on CarbonData](https://github.com/apache/incubator-carbondata/blob/master/docs/dml-operation-on-carbondata.md)
+* [Cluster Installation and Deployment](https://github.com/apache/incubator-carbondata/blob/master/docs/installation-guide.md)
+* [FAQ](https://github.com/apache/incubator-carbondata/blob/master/docs/faq.md)
+* [Trouble Shooting](https://github.com/apache/incubator-carbondata/blob/master/docs/troubleshooting.md)
+* [Useful Tips](https://github.com/apache/incubator-carbondata/blob/master/docs/useful-tips-on-carbondata.md)
## Other Technical Material
[Apache CarbonData meetup material](https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=66850609)
## Fork and Contribute
This is an active open source project for everyone, and we are always open to people who want to use this system or contribute to it.
-This guide document introduce [how to contribute to CarbonData](https://cwiki.apache.org/confluence/display/CARBONDATA/Contributing+to+CarbonData).
+This guide document introduce [how to contribute to CarbonData](https://github.com/apache/incubator-carbondata/blob/master/docs/How-to-contribute-to-Apache-CarbonData.md).
## Contact us
To get involved in CarbonData:
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/acb9d223/docs/overview-of-carbondata.md
----------------------------------------------------------------------
diff --git a/docs/overview-of-carbondata.md b/docs/overview-of-carbondata.md
deleted file mode 100644
index 5e983cb..0000000
--- a/docs/overview-of-carbondata.md
+++ /dev/null
@@ -1,178 +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.
--->
-# Overview
-This tutorial provides a detailed overview about :
-
-* [Introduction](#introduction)
-* [CarbonData File Structure](#carbondata-file-structure)
-* [Features](#features)
-* [Data Types](#data-types)
-* [Interfaces](#interfaces)
-
-## Introduction
-
-CarbonData is a fully indexed columnar and Hadoop native data-store for processing heavy analytical workloads and detailed queries on big data. CarbonData allows faster interactive query using advanced columnar storage, index, compression and encoding techniques to improve computing efficiency, which helps in speeding up queries by an order of magnitude faster over PetaBytes of data.
-
-In customer benchmarks, CarbonData has proven to manage Petabyte of data running on extraordinarily low-cost hardware and answers queries around 10 times faster than the current open source solutions (column-oriented SQL on Hadoop data-stores).
-
-Some of the salient features of CarbonData are :
-
-* Low-Latency for various types of data access patterns like Sequential, Random and OLAP.
-* Fast query on fast data.
-* Space efficiency.
-* General format available on Hadoop-ecosystem.
-
-## CarbonData File Structure
-
-CarbonData files contain groups of data called blocklets, along with all required information like schema, offsets and indices etc, in a file footer, co-located in HDFS.
-
-The file footer can be read once to build the indices in memory, which can be utilized for optimizing the scans and processing for all subsequent queries.
-
-Each blocklet in the file is further divided into chunks of data called data chunks. Each data chunk is organized either in columnar format or row format, and stores the data of either a single column or a set of columns. All blocklets in a file contain the same number and type of data chunks.
-
-
-
-Each data chunk contains multiple groups of data called as pages. There are three types of pages.
-
-* Data Page: Contains the encoded data of a column/group of columns.
-* Row ID Page (optional): Contains the row ID mappings used when the data page is stored as an inverted index.
-* RLE Page (optional): Contains additional metadata used when the data page is RLE coded.
-
-
-
-## Features
-
-CarbonData file format is a columnar store in HDFS. It has many features that a modern columnar format has, such as splittable, compression schema, complex data type etc and CarbonData has following unique features:
-
-* Unique Data Organization: Though CarbonData stores data in Columnar format, it differs from traditional Columnar formats as the columns in each row-group(Data Block) is sorted independent of the other columns. Though this arrangement requires CarbonData to store the row-number mapping against each column value, it makes it possible to use binary search for faster filtering and since the values are sorted, same/similar values come together which yields better compression and offsets the storage overhead required by the row number mapping.
-
-* Advanced Push Down Optimizations: CarbonData pushes as much of query processing as possible close to the data to minimize the amount of data being read, processed, converted and transmitted/shuffled. Using projections and filters it reads only the required columns form the store and also reads only the rows that match the filter conditions provided in the query.
-
-* Multi Level Indexing: CarbonData uses multiple indices at various levels to enable faster search and speed up query processing.
-
-* Global Multi Dimensional Keys(MDK) based B+Tree Index for all non- measure columns: Aids in quickly locating the row groups(Data Blocks) that contain the data matching search/filter criteria.
-
-* Min-Max Index for all columns: Aids in quickly locating the row groups(Data Blocks) that contain the data matching search/filter criteria.
-
-* Data Block level Inverted Index for all columns: Aids in quickly locating the rows that contain the data matching search/filter criteria within a row group(Data Blocks).
-
-* Dictionary Encoding: Most databases and big data SQL data stores employ columnar encoding to achieve data compression by storing small integers numbers (surrogate value) instead of full string values. However, almost all existing databases and data stores divide the data into row groups containing anywhere from few thousand to a million rows and employ dictionary encoding only within each row group. Hence, the same column value can have different surrogate values in different row groups. So, while reading the data, conversion from surrogate value to actual value needs to be done immediately after the data is read from the disk. But CarbonData employs global surrogate key which means that a common dictionary is maintained for the full store on one machine/node. So CarbonData can perform all the query processing work such as grouping/aggregation, sorting etc on light weight surrogate values. The conversion from surrogate to actual values needs to be done only on the final result. Th
is procedure improves performance on two aspects. Conversion from surrogate values to actual values is done only for the final result rows which are much less than the actual rows read from the store. All query processing and computation such as grouping/aggregation, sorting, and so on is done on lightweight surrogate values which requires less memory and CPU time compared to actual values.
-
-* Deep Spark Integration: It has built-in spark integration for Spark 1.5, 1.6 and interfaces for Spark SQL, DataFrame API and query optimization. It supports bulk data ingestion and allows saving of spark dataframes as CarbonData files.
-
-* Update Delete Support: It supports batch updates like daily update scenarios for OLAP and Base+Delta file based design.
-
-* Store data along with index: Significantly accelerates query performance and reduces the I/O scans and CPU resources, when there are filters in the query. CarbonData index consists of multiple levels of indices. A processing framework can leverage this index to reduce the task it needs to schedule and process. It can also do skip scan in more finer grain units (called blocklet) in task side scanning instead of scanning the whole file.
-
-* Operable encoded data: It supports efficient compression and global encoding schemes and can query on compressed/encoded data. The data can be converted just before returning the results to the users, which is "late materialized".
-
-* Column group: Allows multiple columns to form a column group that would be stored as row format. This reduces the row reconstruction cost at query time.
-
-* Support for various use cases with one single Data format: Examples are interactive OLAP-style query, Sequential Access (big scan) and Random Access (narrow scan).
-
-## Data Types
-
-#### CarbonData supports the following data types:
-
- * Numeric Types
- * SMALLINT
- * INT/INTEGER
- * BIGINT
- * DOUBLE
- * DECIMAL
-
- * Date/Time Types
- * TIMESTAMP
-
- * String Types
- * STRING
-
- * Complex Types
- * arrays: ARRAY``<data_type>``
- * structs: STRUCT``<col_name : data_type COMMENT col_comment, ...>``
-
-## Interfaces
-
-#### API
-CarbonData can be used in following scenarios:
-
-* For MapReduce application user
-
- This User API is provided by carbon-hadoop. In this scenario, user can process CarbonData files in his MapReduce application by choosing CarbonInput/OutputFormat, and is responsible for using it correctly. Currently only CarbonInputFormat is provided and OutputFormat will be provided soon.
-
-* For Spark user
-
- This User API is provided by Spark itself. There are two levels of APIs
-
- * **CarbonData File**
-
- Similar to parquet, json, or other data source in Spark, CarbonData can be used with data source API. For example (please refer to DataFrameAPIExample for more detail):
-
-```
- // User can create a DataFrame from any data source
- // or transformation.
- val df = ...
-
- // Write data
- // User can write a DataFrame to a CarbonData file
- df.write
- .format("carbondata")
- .option("tableName", "carbontable")
- .mode(SaveMode.Overwrite)
- .save()
-
-
- // read CarbonData by data source API
- df = carbonContext.read
- .format("carbondata")
- .option("tableName", "carbontable")
- .load("/path")
-
- // User can then use DataFrame for analysis
- df.count
- SVMWithSGD.train(df, numIterations)
-
- // User can also register the DataFrame with a table name,
- // and use SQL for analysis
- df.registerTempTable("t1") // register temporary table
- // in SparkSQL catalog
- df.registerHiveTable("t2") // Or, use a implicit funtion
- // to register to Hive metastore
- sqlContext.sql("select count(*) from t1").show
-```
-
- * **Managed CarbonData Table**
-
- CarbonData has in built support for high level concept like Table, Database, and supports full data lifecycle management, instead of dealing with just files user can use CarbonData specific DDL to manipulate data in Table and Database level. Please refer [DDL](https://github.com/HuaweiBigData/carbondata/wiki/Language-Manual:-DDL) and [DML](https://github.com/HuaweiBigData/carbondata/wiki/Language-Manual:-DML).
-
-```
- // Use SQL to manage table and query data
- create database db1;
- use database db1;
- show databases;
- create table tbl1 using org.apache.carbondata.spark;
- load data into table tlb1 path 'some_files';
- select count(*) from tbl1;
-```
-
-* For developer who want to integrate CarbonData into processing engines like spark, hive or flink, use API provided by carbon-hadoop and carbon-processing:
- - **Query** : Integrate carbon-hadoop with engine specific API, like spark data source API.
-
- - **Data life cycle management** : CarbonData provides utility functions in carbon-processing to manage data life cycle, like data loading, compact, retention, schema evolution. Developer can implement DDLs of their choice and leverage these utility function to do data life cycle management.
-
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/acb9d223/docs/quick-start-guide.md
----------------------------------------------------------------------
diff --git a/docs/quick-start-guide.md b/docs/quick-start-guide.md
index 8800ca6..ceeaac0 100644
--- a/docs/quick-start-guide.md
+++ b/docs/quick-start-guide.md
@@ -20,45 +20,20 @@
# Quick Start
This tutorial provides a quick introduction to using CarbonData.
-## Getting started with Apache CarbonData
-
-* [Installation](#installation)
-* [Prerequisites](#prerequisites)
-* [Interactive Analysis with Spark Shell Version 2.1](#interactive-analysis-with-spark-shell)
- - Basics
- - Executing Queries
- * Creating a Table
- * Loading Data to a Table
- * Query Data from a Table
-* Interactive Analysis with Spark Shell Version 1.6
- - Basics
- - Executing Queries
- * Creating a Table
- * Loading Data to a Table
- * Query Data from a Table
-* [Building CarbonData](#building-carbondata)
-
-
-## Installation
-* Download a released package of [Spark 1.6.2 or 2.1.0](http://spark.apache.org/downloads.html).
-* Download and install [Apache Thrift 0.9.3](http://thrift-tutorial.readthedocs.io/en/latest/installation.html), make sure Thrift is added to system path.
-* Download [Apache CarbonData code](https://github.com/apache/incubator-carbondata) and build it. Please visit [Building CarbonData And IDE Configuration](https://github.com/apache/incubator-carbondata/blob/master/build/README.md) for more information.
-
## Prerequisites
-
+* [Installation and building CarbonData](https://github.com/apache/incubator-carbondata/blob/master/build).
* Create a sample.csv file using the following commands. The CSV file is required for loading data into CarbonData.
```
-$ cd carbondata
-$ cat > sample.csv << EOF
- id,name,city,age
- 1,david,shenzhen,31
- 2,eason,shenzhen,27
- 3,jarry,wuhan,35
- EOF
+cd carbondata
+cat > sample.csv << EOF
+id,name,city,age
+1,david,shenzhen,31
+2,eason,shenzhen,27
+3,jarry,wuhan,35
+EOF
```
-
## Interactive Analysis with Spark Shell
## Version 2.1
@@ -70,7 +45,7 @@ Apache Spark Shell provides a simple way to learn the API, as well as a powerful
Start Spark shell by running the following command in the Spark directory:
```
-./bin/spark-shell --jars <carbondata jar path>
+./bin/spark-shell --jars <carbondata assembly jar path>
```
In this shell, SparkSession is readily available as 'spark' and Spark context is readily available as 'sc'.
@@ -103,29 +78,27 @@ scala>carbon.sql("create table if not exists test_table
##### Loading Data to a Table
```
-scala>carbon.sql(s"load data inpath '${new java.io.File("../carbondata/sample.csv").getCanonicalPath}' into table test_table")
+scala>carbon.sql("load data inpath 'sample.csv file's path' into table test_table")
```
+NOTE:Please provide the real file path of sample.csv for the above script.
###### Query Data from a Table
```
-scala>spark.sql("select * from test_table").show
+scala>spark.sql("select * from test_table").show()
-scala>spark.sql("select city, avg(age),
-sum(age) from test_table group by city").show
+scala>spark.sql("select city, avg(age), sum(age) from test_table group by city").show()
```
-
## Interactive Analysis with Spark Shell
## Version 1.6
-
#### Basics
Start Spark shell by running the following command in the Spark directory:
```
-./bin/spark-shell --jars <carbondata jar path>
+./bin/spark-shell --jars <carbondata assembly jar path>
```
NOTE: In this shell, SparkContext is readily available as sc.
@@ -154,25 +127,19 @@ scala>cc.sql("create table if not exists test_table (id string, name string, cit
To see the table created :
```
-scala>cc.sql("show tables").show
+scala>cc.sql("show tables").show()
```
##### Loading Data to a Table
```
-scala>cc.sql(s"load data inpath '${new java.io.File("../carbondata/sample.csv").getCanonicalPath}' into table test_table")
+scala>cc.sql("load data inpath 'sample.csv file's path' into table test_table")
```
+NOTE:Please provide the real file path of sample.csv for the above script.
##### Query Data from a Table
```
-scala>cc.sql("select * from test_table").show
-scala>cc.sql("select city, avg(age), sum(age) from test_table group by city").show
+scala>cc.sql("select * from test_table").show()
+scala>cc.sql("select city, avg(age), sum(age) from test_table group by city").show()
```
-
-## Building CarbonData
-
-To get started, get CarbonData from the [downloads](http://carbondata.incubator.apache.org/) section on the [http://carbondata.incubator.apache.org.](http://carbondata.incubator.apache.org.)
-CarbonData uses Hadoop\u2019s client libraries for HDFS and YARN and Spark's libraries. Downloads are pre-packaged for a handful of popular Spark versions.
-
-If you\u2019d like to build CarbonData from source, visit [Building CarbonData And IDE Configuration](https://github.com/apache/incubator-carbondata/blob/master/build/README.md).
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/acb9d223/docs/table-of-content.md
----------------------------------------------------------------------
diff --git a/docs/table-of-content.md b/docs/table-of-content.md
deleted file mode 100644
index cbec50b..0000000
--- a/docs/table-of-content.md
+++ /dev/null
@@ -1,47 +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.
--->
-# Table of Contents
-
-* [Quick Start](quick-start-guide.md)
- * [Getting started with Apache CarbonData]()
-* [User Guide](user-guide-toc.md)
- * [Overview](overview-of-carbondata.md)
- * Introduction
- * CarbonData File Structure
- * Features
- * Data Types
- * Interfaces
- * [Installation Guide](installation-guide.md)
- * Installing and Configuring CarbonData on Standalone Spark Cluster
- * Installing and Configuring CarbonData on \u201cSpark on YARN\u201d Cluster
- * [Configuring CarbonData](configuration-parameters.md)
- * System Configuration
- * Performance Configuration
- * Miscellaneous Configuration
- * Spark Configuration
- * [Using CarbonData](using-carbondata.md)
- * [Data Management](data-management.md)
- * [DDL Operations on CarbonData](ddl-operation-on-carbondata.md )
- * [DML Operations on CarbonData](dml-operation-on-carbondata.md )
-* [Useful Tips](useful-tips-on-carbondata.md)
- * Suggestion to create CarbonData Table
- * Configurations for Optimizing CarbonData Performance
-* [CarbonData Use Cases](use-cases-of-carbondata.md)
-* [Troubleshooting](troubleshooting.md)
-* [FAQs](faq.md)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/acb9d223/docs/use-cases-of-carbondata.md
----------------------------------------------------------------------
diff --git a/docs/use-cases-of-carbondata.md b/docs/use-cases-of-carbondata.md
deleted file mode 100644
index 112b6bc..0000000
--- a/docs/use-cases-of-carbondata.md
+++ /dev/null
@@ -1,77 +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.
--->
-
-# CarbonData Use Cases
-This tutorial discusses about the problems that CarbonData addresses. It shall take you through the identified top use cases of CarbonData.
-
-## Introduction
-For big data interactive analysis scenarios, many customers expect sub-second response to query TB-PB level data on general hardware clusters with just a few nodes.
-
-In the current big data ecosystem, there are few columnar storage formats such as ORC and Parquet that are designed for SQL on Big Data. Apache Hive\u2019s ORC format is a columnar storage format with basic indexing capability. However, ORC cannot meet the sub-second query response expectation on TB level data, as it performs only stride level dictionary encoding and all analytical operations such as filtering and aggregation is done on the actual data. Apache Parquet is a columnar storage format that can improve performance in comparison to ORC due to its more efficient storage organization. Though Parquet can provide query response on TB level data in a few seconds, it is still far from the sub-second expectation of interactive analysis users. Cloudera Kudu can effectively solve some query performance issues, but kudu is not hadoop native, can\u2019t seamlessly integrate historic HDFS data into new kudu system.
-
-However, CarbonData uses specially engineered optimizations targeted to improve performance of analytical queries which can include filters, aggregation and distinct counts,
-the required data to be stored in an indexed, well organized, read-optimized format, CarbonData\u2019s query performance can achieve sub-second response.
-
-## Motivation: Single Format to provide Low Latency Response for all Use Cases
-The main motivation behind CarbonData is to provide a single storage format for all the usecases of querying big data on Hadoop. Thus CarbonData is able to cover all use-cases
-into a single storage format.
-
- 
-
-## Use Cases
-### Sequential Access
- - Supports queries that select only a few columns with a group by clause but do not contain any filters.
- This results in full scan over the complete store for the selected columns.
-
- 
-
- **Scenario**
-
- - ETL jobs
- - Log Analysis
-
-### Random Access
- - Supports Point Query. These are queries used from operational applications and usually select all or most of the columns and involves a large number of
- filters which reduce the result to a small size. Such queries generally do not involve any aggregation or group by clause.
- - Row-key query(like HBase)
- - Narrow Scan
- - Requires second/sub-second level low latency
-
- 
-
- **Scenario**
-
- - Operational Query
- - User Profiling
-
-### Olap Style Query
- - Supports Interactive data analysis for any dimensions. These are queries which are typically fired from Interactive Analysis tools.
- Such queries often select a few columns and involves filters and group by on a column or a grouping expression.
- It also supports queries that :
- - Involves aggregation/join
- - Roll-up,Drill-down,Slicing and Dicing
- - Low-latency ad-hoc query
-
- 
-
- **Scenario**
-
- - Dash-board reporting
- - Fraud & Ad-hoc Analysis
-
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/acb9d223/docs/user-guide-toc.md
----------------------------------------------------------------------
diff --git a/docs/user-guide-toc.md b/docs/user-guide-toc.md
deleted file mode 100644
index c05fb09..0000000
--- a/docs/user-guide-toc.md
+++ /dev/null
@@ -1,47 +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.
--->
-# User Guide
-Welcome to Apache CarbonData. Apache CarbonData(incubating) is a new big data file format for faster interactive query using advanced columnar storage, index, compression and encoding techniques to improve computing efficiency, which helps in speeding up queries by an order of magnitude faster over PetaBytes of data.
-This user guide provides a detailed description about the CarbonData and its features.
-
-Let's get started !
-
-* [Overview](overview-of-carbondata.md)
- * Introduction
- * CarbonData File Structure
- * Features
- * Data Types
- * Interfaces
-* [Installation Guide](installation-guide.md)
- * Installing and Configuring CarbonData on Standalone Spark Cluster
- * Installing and Configuring CarbonData on "Spark on YARN Cluster
-* [Configuring CarbonData](configuration-parameters.md)
- * System Configuration
- * Performance Configuration
- * Miscellaneous Configuration
- * Spark Configuration
-* [Using CarbonData](using-carbondata.md)
- * [Data Management](data-management.md)
- * [DDL Operations on CarbonData](ddl-operation-on-carbondata.md )
- * [DML Operations on CarbonData](dml-operation-on-carbondata.md )
-
-
-
-
-
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/acb9d223/docs/using-carbondata.md
----------------------------------------------------------------------
diff --git a/docs/using-carbondata.md b/docs/using-carbondata.md
deleted file mode 100644
index 83a3655..0000000
--- a/docs/using-carbondata.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# Using CarbonData
-This tutorial discusses the disciplines related to management of data in Apache CarbonData.
-Following below each section is a brief introduction to respective disciplines related to data
-management.
-
-## Data Management
-This section shall be dealing with the disciplines related to managing data in the application,
-focusing on conceptual details related to operations like load data, delete data, update data
-and Compacting Data.
-
-For complete details refer to [Data Management](data-management.md)
-
-## Data Definition Language Support
-This section deals with the aspects related to creation and modification of the structure of database.
-It shall discuss in detail about
-
-* Table creation
-* Table deletion
-* Table description
-* Compaction
-
-For complete details refer to [DDL Operations on CarbonData](ddl-operation-on-carbondata.md )
-
-## Data Manipulation Language Support
-This section deals with the aspects related to data manipulation in database. It shall discuss in detail about selecting, loading and deleting in a database.
-This manipulation comprises of
-
-* Loading data into database tables
-* Retrieving existing data
-* Deleting data from existing tables
-* Deleting segments from existing tables
-* Updating data in existing tables
-
-For complete details refer to [DML Operations on CarbonData](dml-operation-on-carbondata.md)
-
[32/50] [abbrv] incubator-carbondata git commit: CleanupTask :
Removed 1. Author names 2. DTS ids
Posted by ra...@apache.org.
CleanupTask : Removed
1. Author names
2. DTS ids
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/6650c635
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/6650c635
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/6650c635
Branch: refs/heads/branch-1.0
Commit: 6650c635d6a25942cd4fa8552a1dda141a84b5e2
Parents: a32632e
Author: Manohar <ma...@gmail.com>
Authored: Tue Jan 17 15:33:10 2017 +0530
Committer: ravipesala <ra...@gmail.com>
Committed: Fri Jan 20 16:51:16 2017 +0530
----------------------------------------------------------------------
.../common/logging/impl/ExtendedRollingFileAppender.java | 4 ++--
.../common/logging/impl/StandardLogServiceTest_UT.java | 1 -
.../core/datastore/exception/IndexBuilderException.java | 2 --
.../core/scan/executor/exception/QueryExecutionException.java | 2 --
.../org/apache/carbondata/hadoop/test/util/StoreCreator.java | 4 ----
.../spark/testsuite/aggquery/IntegerDataTypeTestCase.scala | 2 --
.../spark/testsuite/primitiveTypes/FloatDataTypeTestCase.scala | 3 ---
.../spark/testsuite/dataretention/DataRetentionTestCase.scala | 3 +--
.../spark/testsuite/detailquery/AllDataTypesTestCase.scala | 2 --
.../testsuite/detailquery/HighCardinalityDataTypesTestCase.scala | 3 ---
.../spark/testsuite/detailquery/IntegerDataTypeTestCase.scala | 2 --
.../testsuite/detailquery/ValueCompressionDataTypeTestCase.scala | 3 ---
.../spark/testsuite/filterexpr/AllDataTypesTestCaseFilter.scala | 2 --
.../spark/testsuite/filterexpr/CountStarTestCase.scala | 3 ---
.../spark/testsuite/filterexpr/IntegerDataTypeTestCase.scala | 2 --
.../spark/testsuite/joinquery/AllDataTypesTestCaseJoin.scala | 2 --
.../spark/testsuite/joinquery/IntegerDataTypeTestCase.scala | 2 --
.../spark/testsuite/sortexpr/AllDataTypesTestCaseSort.scala | 2 --
.../spark/testsuite/sortexpr/IntegerDataTypeTestCase.scala | 3 ---
.../java/org/apache/carbondata/spark/load/DeleteLoadFolders.java | 1 -
.../java/org/apache/carbondata/spark/util/LoadMetadataUtil.java | 1 -
.../carbondata/processing/newflow/sort/unsafe/sort/TimSort.java | 2 --
.../java/org/apache/carbondata/lcm/locks/LocalFileLockTest.java | 2 --
.../org/apache/carbondata/lcm/locks/ZooKeeperLockingTest.java | 2 +-
.../test/java/org/apache/carbondata/test/util/StoreCreator.java | 2 --
25 files changed, 4 insertions(+), 53 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/6650c635/common/src/main/java/org/apache/carbondata/common/logging/impl/ExtendedRollingFileAppender.java
----------------------------------------------------------------------
diff --git a/common/src/main/java/org/apache/carbondata/common/logging/impl/ExtendedRollingFileAppender.java b/common/src/main/java/org/apache/carbondata/common/logging/impl/ExtendedRollingFileAppender.java
index b4f493c..1261726 100644
--- a/common/src/main/java/org/apache/carbondata/common/logging/impl/ExtendedRollingFileAppender.java
+++ b/common/src/main/java/org/apache/carbondata/common/logging/impl/ExtendedRollingFileAppender.java
@@ -44,7 +44,7 @@ public class ExtendedRollingFileAppender extends RollingFileAppender {
private static final String DATE_FORMAT_FOR_TRANSFER = "yyyy-MM-dd'_'HH-mm-ss";
protected int currentLevel = Level.FATAL_INT;
/**
- * Added for DTS DTS2011122001074 Now in log file rolling(after file size
+ * Now in log file rolling(after file size
* exceeded the threshold) and deletion (after file count exceeded the file
* count threshold) it will print log message
*/
@@ -100,7 +100,7 @@ public class ExtendedRollingFileAppender extends RollingFileAppender {
temp = it.next();
File deleteFile = temp.getValue();
// Delete the file
- // Fixed defect DTS2011122001074 after deletion of log file it
+ // After deletion of log file it
// will print the log message in ReportService.log
if (deleteFile.delete()) {
backupFiles--;
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/6650c635/common/src/test/java/org/apache/carbondata/common/logging/impl/StandardLogServiceTest_UT.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/carbondata/common/logging/impl/StandardLogServiceTest_UT.java b/common/src/test/java/org/apache/carbondata/common/logging/impl/StandardLogServiceTest_UT.java
index a0db418..faa90eb 100644
--- a/common/src/test/java/org/apache/carbondata/common/logging/impl/StandardLogServiceTest_UT.java
+++ b/common/src/test/java/org/apache/carbondata/common/logging/impl/StandardLogServiceTest_UT.java
@@ -58,7 +58,6 @@ public class StandardLogServiceTest_UT extends TestCase {
/**
* @throws Exception
- * @Author k00742797
* @Description : tearDown
*/
@After public void tearDown() throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/6650c635/core/src/main/java/org/apache/carbondata/core/datastore/exception/IndexBuilderException.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/exception/IndexBuilderException.java b/core/src/main/java/org/apache/carbondata/core/datastore/exception/IndexBuilderException.java
index 8d59f08..9d69c3b 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/exception/IndexBuilderException.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/exception/IndexBuilderException.java
@@ -22,8 +22,6 @@ import java.util.Locale;
/**
* Exception class for block builder
- *
- * @author Administrator
*/
public class IndexBuilderException extends IOException {
/**
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/6650c635/core/src/main/java/org/apache/carbondata/core/scan/executor/exception/QueryExecutionException.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/executor/exception/QueryExecutionException.java b/core/src/main/java/org/apache/carbondata/core/scan/executor/exception/QueryExecutionException.java
index 37a5684..8e25ff4 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/executor/exception/QueryExecutionException.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/executor/exception/QueryExecutionException.java
@@ -20,8 +20,6 @@ import java.util.Locale;
/**
* Exception class for query execution
- *
- * @author Administrator
*/
public class QueryExecutionException extends Exception {
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/6650c635/hadoop/src/test/java/org/apache/carbondata/hadoop/test/util/StoreCreator.java
----------------------------------------------------------------------
diff --git a/hadoop/src/test/java/org/apache/carbondata/hadoop/test/util/StoreCreator.java b/hadoop/src/test/java/org/apache/carbondata/hadoop/test/util/StoreCreator.java
index 85350c4..532cd43 100644
--- a/hadoop/src/test/java/org/apache/carbondata/hadoop/test/util/StoreCreator.java
+++ b/hadoop/src/test/java/org/apache/carbondata/hadoop/test/util/StoreCreator.java
@@ -76,8 +76,6 @@ import java.util.*;
/**
* This class will create store file based on provided schema
- *
- * @author Administrator
*/
public class StoreCreator {
@@ -489,8 +487,6 @@ public class StoreCreator {
/**
* This is local model object used inside this class to store information related to data loading
- *
- * @author Administrator
*/
private static class LoadModel {
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/6650c635/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/aggquery/IntegerDataTypeTestCase.scala
----------------------------------------------------------------------
diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/aggquery/IntegerDataTypeTestCase.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/aggquery/IntegerDataTypeTestCase.scala
index d50a54c..fa8327e 100644
--- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/aggquery/IntegerDataTypeTestCase.scala
+++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/aggquery/IntegerDataTypeTestCase.scala
@@ -25,8 +25,6 @@ import org.scalatest.BeforeAndAfterAll
/**
* Test Class for aggregate query on Integer datatypes
*
- * @author N00902756
- *
*/
class IntegerDataTypeTestCase extends QueryTest with BeforeAndAfterAll {
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/6650c635/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/primitiveTypes/FloatDataTypeTestCase.scala
----------------------------------------------------------------------
diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/primitiveTypes/FloatDataTypeTestCase.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/primitiveTypes/FloatDataTypeTestCase.scala
index 41f3b40..117fa9a 100644
--- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/primitiveTypes/FloatDataTypeTestCase.scala
+++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/primitiveTypes/FloatDataTypeTestCase.scala
@@ -6,9 +6,6 @@ import org.scalatest.BeforeAndAfterAll
/**
* Test Class for filter query on Float datatypes
- *
- * @author N00902756
- *
*/
class FloatDataTypeTestCase extends QueryTest with BeforeAndAfterAll {
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/6650c635/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 379a422..2c1ec86 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
@@ -33,8 +33,7 @@ import org.apache.carbondata.core.util.CarbonProperties
import org.apache.carbondata.spark.exception.MalformedCarbonCommandException
/**
- * This class contains data retention test cases
- * Created by Manohar on 5/9/2016.
+ * This class contains data retention feature test cases
*/
class DataRetentionTestCase extends QueryTest with BeforeAndAfterAll {
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/6650c635/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/detailquery/AllDataTypesTestCase.scala
----------------------------------------------------------------------
diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/detailquery/AllDataTypesTestCase.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/detailquery/AllDataTypesTestCase.scala
index e8159fb..bdd16a5 100644
--- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/detailquery/AllDataTypesTestCase.scala
+++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/detailquery/AllDataTypesTestCase.scala
@@ -22,8 +22,6 @@ import org.scalatest.BeforeAndAfterAll
/**
* Test Class for detailed query on multiple datatypes
- * @author N00902756
- *
*/
class AllDataTypesTestCase extends QueryTest with BeforeAndAfterAll {
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/6650c635/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/detailquery/HighCardinalityDataTypesTestCase.scala
----------------------------------------------------------------------
diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/detailquery/HighCardinalityDataTypesTestCase.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/detailquery/HighCardinalityDataTypesTestCase.scala
index 4680d2c..31de171 100644
--- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/detailquery/HighCardinalityDataTypesTestCase.scala
+++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/detailquery/HighCardinalityDataTypesTestCase.scala
@@ -26,9 +26,6 @@ import org.apache.carbondata.core.util.CarbonProperties
/**
* Test Class for verifying NO_DICTIONARY_COLUMN feature.
- *
- * @author S71955
- *
*/
class NO_DICTIONARY_COL_TestCase extends QueryTest with BeforeAndAfterAll {
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/6650c635/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/detailquery/IntegerDataTypeTestCase.scala
----------------------------------------------------------------------
diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/detailquery/IntegerDataTypeTestCase.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/detailquery/IntegerDataTypeTestCase.scala
index d43fafe..ca66824 100644
--- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/detailquery/IntegerDataTypeTestCase.scala
+++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/detailquery/IntegerDataTypeTestCase.scala
@@ -23,8 +23,6 @@ import org.scalatest.BeforeAndAfterAll
/**
* Test Class for detailed query on Integer datatypes
- * @author N00902756
- *
*/
class IntegerDataTypeTestCase extends QueryTest with BeforeAndAfterAll {
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/6650c635/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/detailquery/ValueCompressionDataTypeTestCase.scala
----------------------------------------------------------------------
diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/detailquery/ValueCompressionDataTypeTestCase.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/detailquery/ValueCompressionDataTypeTestCase.scala
index fcadfe1..2589c22 100644
--- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/detailquery/ValueCompressionDataTypeTestCase.scala
+++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/detailquery/ValueCompressionDataTypeTestCase.scala
@@ -22,9 +22,6 @@ import org.scalatest.BeforeAndAfterAll
import org.apache.carbondata.core.datastore.impl.FileFactory
import org.apache.carbondata.core.datastore.impl.FileFactory.FileType
-/**
- * Created by on 8/8/2016.
- */
class ValueCompressionDataTypeTestCase extends QueryTest with BeforeAndAfterAll {
val tempDirPath = s"$resourcesPath/temp"
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/6650c635/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/filterexpr/AllDataTypesTestCaseFilter.scala
----------------------------------------------------------------------
diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/filterexpr/AllDataTypesTestCaseFilter.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/filterexpr/AllDataTypesTestCaseFilter.scala
index 06d83b5..027eb3e 100644
--- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/filterexpr/AllDataTypesTestCaseFilter.scala
+++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/filterexpr/AllDataTypesTestCaseFilter.scala
@@ -22,8 +22,6 @@ import org.scalatest.BeforeAndAfterAll
/**
* Test Class for filter expression query on multiple datatypes
- * @author N00902756
- *
*/
class AllDataTypesTestCaseFilter extends QueryTest with BeforeAndAfterAll {
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/6650c635/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/filterexpr/CountStarTestCase.scala
----------------------------------------------------------------------
diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/filterexpr/CountStarTestCase.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/filterexpr/CountStarTestCase.scala
index 5d017e6..87b92b7 100644
--- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/filterexpr/CountStarTestCase.scala
+++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/filterexpr/CountStarTestCase.scala
@@ -26,9 +26,6 @@ import org.apache.carbondata.core.util.CarbonProperties
/**
* Test Class for filter expression query on String datatypes
- *
- * @author N00902756
- *
*/
class CountStarTestCase extends QueryTest with BeforeAndAfterAll {
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/6650c635/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/filterexpr/IntegerDataTypeTestCase.scala
----------------------------------------------------------------------
diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/filterexpr/IntegerDataTypeTestCase.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/filterexpr/IntegerDataTypeTestCase.scala
index b534947..6613b7f 100644
--- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/filterexpr/IntegerDataTypeTestCase.scala
+++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/filterexpr/IntegerDataTypeTestCase.scala
@@ -23,8 +23,6 @@ import org.scalatest.BeforeAndAfterAll
/**
* Test Class for filter expression query on Integer datatypes
- * @author N00902756
- *
*/
class IntegerDataTypeTestCase extends QueryTest with BeforeAndAfterAll {
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/6650c635/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/joinquery/AllDataTypesTestCaseJoin.scala
----------------------------------------------------------------------
diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/joinquery/AllDataTypesTestCaseJoin.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/joinquery/AllDataTypesTestCaseJoin.scala
index 6dd5a45..ecd20e8 100644
--- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/joinquery/AllDataTypesTestCaseJoin.scala
+++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/joinquery/AllDataTypesTestCaseJoin.scala
@@ -23,8 +23,6 @@ import org.scalatest.BeforeAndAfterAll
/**
* Test Class for join query on multiple datatypes
- * @author N00902756
- *
*/
class AllDataTypesTestCaseJoin extends QueryTest with BeforeAndAfterAll {
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/6650c635/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/joinquery/IntegerDataTypeTestCase.scala
----------------------------------------------------------------------
diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/joinquery/IntegerDataTypeTestCase.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/joinquery/IntegerDataTypeTestCase.scala
index 11ac42e..0435082 100644
--- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/joinquery/IntegerDataTypeTestCase.scala
+++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/joinquery/IntegerDataTypeTestCase.scala
@@ -23,8 +23,6 @@ import org.scalatest.BeforeAndAfterAll
/**
* Test Class for join query on Integer datatypes
- * @author N00902756
- *
*/
class IntegerDataTypeTestCase extends QueryTest with BeforeAndAfterAll {
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/6650c635/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/sortexpr/AllDataTypesTestCaseSort.scala
----------------------------------------------------------------------
diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/sortexpr/AllDataTypesTestCaseSort.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/sortexpr/AllDataTypesTestCaseSort.scala
index 8d50dca..bdb470a 100644
--- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/sortexpr/AllDataTypesTestCaseSort.scala
+++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/sortexpr/AllDataTypesTestCaseSort.scala
@@ -22,8 +22,6 @@ import org.scalatest.BeforeAndAfterAll
/**
* Test Class for sort expression query on multiple datatypes
- * @author N00902756
- *
*/
class AllDataTypesTestCaseSort extends QueryTest with BeforeAndAfterAll {
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/6650c635/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/sortexpr/IntegerDataTypeTestCase.scala
----------------------------------------------------------------------
diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/sortexpr/IntegerDataTypeTestCase.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/sortexpr/IntegerDataTypeTestCase.scala
index 2cb5882..40cd1d7 100644
--- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/sortexpr/IntegerDataTypeTestCase.scala
+++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/sortexpr/IntegerDataTypeTestCase.scala
@@ -23,9 +23,6 @@ import org.scalatest.BeforeAndAfterAll
/**
* Test Class for sort expression query on int datatypes
- *
- * @author N00902756
- *
*/
class IntegerDataTypeTestCase extends QueryTest with BeforeAndAfterAll {
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/6650c635/integration/spark-common/src/main/java/org/apache/carbondata/spark/load/DeleteLoadFolders.java
----------------------------------------------------------------------
diff --git a/integration/spark-common/src/main/java/org/apache/carbondata/spark/load/DeleteLoadFolders.java b/integration/spark-common/src/main/java/org/apache/carbondata/spark/load/DeleteLoadFolders.java
index 8db2bff..989d200 100644
--- a/integration/spark-common/src/main/java/org/apache/carbondata/spark/load/DeleteLoadFolders.java
+++ b/integration/spark-common/src/main/java/org/apache/carbondata/spark/load/DeleteLoadFolders.java
@@ -18,7 +18,6 @@
/**
* Project Name : Carbon
* Module Name : CARBON spark interface
- * Author : R00903928
* Created Date : 22-Sep-2015
* FileName : DeleteLoadFolders.java
* Description : for physical deletion of load folders.
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/6650c635/integration/spark-common/src/main/java/org/apache/carbondata/spark/util/LoadMetadataUtil.java
----------------------------------------------------------------------
diff --git a/integration/spark-common/src/main/java/org/apache/carbondata/spark/util/LoadMetadataUtil.java b/integration/spark-common/src/main/java/org/apache/carbondata/spark/util/LoadMetadataUtil.java
index 5177e3e..ae8f784 100644
--- a/integration/spark-common/src/main/java/org/apache/carbondata/spark/util/LoadMetadataUtil.java
+++ b/integration/spark-common/src/main/java/org/apache/carbondata/spark/util/LoadMetadataUtil.java
@@ -18,7 +18,6 @@
/**
* Project Name : Carbon
* Module Name : CARBON Data Processor
- * Author : R00903928
* Created Date : 15-Sep-2015
* FileName : LoadMetadataUtil.java
* Description : Kettle step to generate MD Key
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/6650c635/processing/src/main/java/org/apache/carbondata/processing/newflow/sort/unsafe/sort/TimSort.java
----------------------------------------------------------------------
diff --git a/processing/src/main/java/org/apache/carbondata/processing/newflow/sort/unsafe/sort/TimSort.java b/processing/src/main/java/org/apache/carbondata/processing/newflow/sort/unsafe/sort/TimSort.java
index 11506fe..3c439aa 100644
--- a/processing/src/main/java/org/apache/carbondata/processing/newflow/sort/unsafe/sort/TimSort.java
+++ b/processing/src/main/java/org/apache/carbondata/processing/newflow/sort/unsafe/sort/TimSort.java
@@ -97,8 +97,6 @@ public class TimSort<K, Buffer> {
* (privately) instantiable; a TimSort instance holds the state of an ongoing
* sort, assuming the input array is large enough to warrant the full-blown
* TimSort. Small arrays are sorted in place, using a binary insertion sort.
- *
- * @author Josh Bloch
*/
public void sort(Buffer a, int lo, int hi, Comparator<? super K> c) {
assert c != null;
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/6650c635/processing/src/test/java/org/apache/carbondata/lcm/locks/LocalFileLockTest.java
----------------------------------------------------------------------
diff --git a/processing/src/test/java/org/apache/carbondata/lcm/locks/LocalFileLockTest.java b/processing/src/test/java/org/apache/carbondata/lcm/locks/LocalFileLockTest.java
index edf87ed..4bb7d16 100644
--- a/processing/src/test/java/org/apache/carbondata/lcm/locks/LocalFileLockTest.java
+++ b/processing/src/test/java/org/apache/carbondata/lcm/locks/LocalFileLockTest.java
@@ -26,8 +26,6 @@ import org.pentaho.di.core.util.Assert;
/**
* Test class to test the functionality of the local file locking.
- *
- * @author Administrator
*/
public class LocalFileLockTest {
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/6650c635/processing/src/test/java/org/apache/carbondata/lcm/locks/ZooKeeperLockingTest.java
----------------------------------------------------------------------
diff --git a/processing/src/test/java/org/apache/carbondata/lcm/locks/ZooKeeperLockingTest.java b/processing/src/test/java/org/apache/carbondata/lcm/locks/ZooKeeperLockingTest.java
index 9621742..6ee6287 100644
--- a/processing/src/test/java/org/apache/carbondata/lcm/locks/ZooKeeperLockingTest.java
+++ b/processing/src/test/java/org/apache/carbondata/lcm/locks/ZooKeeperLockingTest.java
@@ -36,7 +36,7 @@ import java.net.ServerSocket;
import java.util.Properties;
/**
- * @author Administrator
+ * ZooKeeperLocking Test cases
*/
public class ZooKeeperLockingTest {
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/6650c635/processing/src/test/java/org/apache/carbondata/test/util/StoreCreator.java
----------------------------------------------------------------------
diff --git a/processing/src/test/java/org/apache/carbondata/test/util/StoreCreator.java b/processing/src/test/java/org/apache/carbondata/test/util/StoreCreator.java
index 0ad6a2c..78e7e83 100644
--- a/processing/src/test/java/org/apache/carbondata/test/util/StoreCreator.java
+++ b/processing/src/test/java/org/apache/carbondata/test/util/StoreCreator.java
@@ -481,8 +481,6 @@ public class StoreCreator {
/**
* This is local model object used inside this class to store information related to data loading
- *
- * @author Administrator
*/
private static class LoadModel {
[12/50] [abbrv] incubator-carbondata git commit: [CARBONDATA-624]
Complete CarbonData document in md files
Posted by ra...@apache.org.
[CARBONDATA-624] Complete CarbonData document in md files
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/276a6111
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/276a6111
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/276a6111
Branch: refs/heads/branch-1.0
Commit: 276a6111e40c2ed02da443130d64781240e2ea3c
Parents: e6fa4ad
Author: sgururajshetty <sg...@gmail.com>
Authored: Wed Jan 18 21:20:10 2017 +0530
Committer: ravipesala <ra...@gmail.com>
Committed: Wed Jan 18 21:20:10 2017 +0530
----------------------------------------------------------------------
...Building-CarbonData-And-IDE-Configuartion.md | 73 -
docs/Carbon-Packaging-and-Interfaces.md | 91 --
docs/Carbondata-File-Structure-and-Format.md | 55 -
docs/DDL-Operations-on-Carbon.md | 187 ---
docs/DML-Operations-on-Carbon.md | 197 ---
docs/Data-Management.md | 255 ++--
docs/Quick-Start.md | 89 --
docs/configuration-parameters.md | 149 ++
docs/ddl-operation-on-carbondata.md | 193 +++
docs/dml-operation-on-carbondata.md | 429 ++++++
docs/faq.md | 47 +
docs/images/CarbonData_logo.png | Bin 0 -> 10971 bytes
docs/images/carbon_data_file_structure_new.png | Bin 0 -> 78374 bytes
docs/images/carbon_data_format_new.png | Bin 0 -> 73708 bytes
docs/images/carbon_data_full_scan.png | Bin 0 -> 35710 bytes
docs/images/carbon_data_motivation.png | Bin 0 -> 25388 bytes
docs/images/carbon_data_olap_scan.png | Bin 0 -> 45235 bytes
docs/images/carbon_data_random_scan.png | Bin 0 -> 46317 bytes
docs/images/format/CarbonData_logo.png | Bin 10971 -> 0 bytes
.../format/carbon_data_file_structure_new.png | Bin 78374 -> 0 bytes
docs/images/format/carbon_data_format_new.png | Bin 73708 -> 0 bytes
docs/images/format/carbon_data_full_scan.png | Bin 35710 -> 0 bytes
docs/images/format/carbon_data_motivation.png | Bin 25388 -> 0 bytes
docs/images/format/carbon_data_olap_scan.png | Bin 45235 -> 0 bytes
docs/images/format/carbon_data_random_scan.png | Bin 46317 -> 0 bytes
docs/installation-guide.md | 187 +++
docs/overview-of-carbondata.md | 178 +++
docs/quick-start-guide.md | 178 +++
docs/table-of-content.md | 47 +
docs/troubleshooting.md | 30 +
docs/use-cases-of-carbondata.md | 77 +
docs/useful-tips-on-carbondata.md | 180 +++
docs/user-guide-toc.md | 47 +
docs/using-carbondata.md | 35 +
log.txt | 1363 ++++++++++++++++++
35 files changed, 3271 insertions(+), 816 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/276a6111/docs/Building-CarbonData-And-IDE-Configuartion.md
----------------------------------------------------------------------
diff --git a/docs/Building-CarbonData-And-IDE-Configuartion.md b/docs/Building-CarbonData-And-IDE-Configuartion.md
deleted file mode 100644
index 941bcc3..0000000
--- a/docs/Building-CarbonData-And-IDE-Configuartion.md
+++ /dev/null
@@ -1,73 +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.
--->
-
-### Building CarbonData
-Prerequisites for building CarbonData:
-* Unix-like environment (Linux, Mac OS X)
-* [Git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git)
-* [Apache Maven (we recommend version 3.3 or later)](https://maven.apache.org/download.cgi)
-* [Java 7 or 8](http://www.oracle.com/technetwork/java/javase/downloads/index.html)
-* Scala 2.10
-* [Apache Thrift 0.9.3](https://thrift.apache.org/download)
-
-I. Clone CarbonData
-```
-$ git clone https://github.com/apache/incubator-carbondata.git
-```
-II. Build the project
-* Build without test.By default carbon takes Spark 1.5.2 to build the project
-```
-$ mvn -DskipTests clean package
-```
-* Build with different spark versions
-```
-$ mvn -DskipTests -Pspark-1.5 -Dspark.version=1.5.0 clean package
-$ mvn -DskipTests -Pspark-1.5 -Dspark.version=1.5.1 clean package
-$ mvn -DskipTests -Pspark-1.5 -Dspark.version=1.5.2 clean package
-
-$ mvn -DskipTests -Pspark-1.6 -Dspark.version=1.6.0 clean package
-$ mvn -DskipTests -Pspark-1.6 -Dspark.version=1.6.1 clean package
-$ mvn -DskipTests -Pspark-1.6 -Dspark.version=1.6.2 clean package
-```
-* Build the assembly jar which includes Spark and Hadoop jars
-```
-$ mvn clean -DskipTests -Pinclude-all package
-```
-* Build with test
-```
-$ mvn clean package
-```
-
-### Developing CarbonData
-The CarbonData committers use IntelliJ IDEA and Eclipse IDE to develop.
-
-#### IntelliJ IDEA
-* Download IntelliJ at https://www.jetbrains.com/idea/ and install the Scala plug-in for IntelliJ at http://plugins.jetbrains.com/plugin/?id=1347
-* Go to "File -> Import Project", locate the CarbonData source directory, and select "Maven Project".
-* In the Import Wizard, select "Import Maven projects automatically" and leave other settings at their default.
-* Leave other settings at their default and you should be able to start your development.
-* When you run the scala test, sometimes you will get out of memory exception. You can increase your VM memory usage by the following setting, for example:
-```
--XX:MaxPermSize=512m -Xmx3072m
-```
-You can also make those setting to be the default by setting to the "Defaults -> ScalaTest".
-
-#### Eclipse
-* Download the Scala IDE (preferred) or install the scala plugin to Eclipse.
-* Import the CarbonData Maven projects ("File" -> "Import" -> "Maven" -> "Existing Maven Projects" -> locate the CarbonData source directory).
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/276a6111/docs/Carbon-Packaging-and-Interfaces.md
----------------------------------------------------------------------
diff --git a/docs/Carbon-Packaging-and-Interfaces.md b/docs/Carbon-Packaging-and-Interfaces.md
deleted file mode 100644
index c114c8f..0000000
--- a/docs/Carbon-Packaging-and-Interfaces.md
+++ /dev/null
@@ -1,91 +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.
--->
-
-## Packaging
-Carbon provides following JAR packages:
-
-
-
-- **carbon-store.jar or carbondata-assembly.jar:** This is the main Jar for carbon project, the target user of it are both user and developer.
- - For MapReduce application users, this jar provides API to read and write carbon files through CarbonInput/OutputFormat in carbon-hadoop module.
- - For developer, this jar can be used to integrate carbon with processing engine like spark and hive, by leveraging API in carbon-processing module.
-
-- **carbon-spark.jar(Currently it is part of assembly jar):** provides support for spark user, spark user can manipulate carbon data files by using native spark DataFrame/SQL interface. Apart from this, in order to leverage carbon's builtin lifecycle management function, higher level concept like Managed Carbon Table, Database and corresponding DDL are introduced.
-
-- **carbon-hive.jar(not yet provided):** similar to carbon-spark, which provides integration to carbon and hive.
-
-## API
-Carbon can be used in following scenarios:
-### 1. For MapReduce application user
-This User API is provided by carbon-hadoop. In this scenario, user can process carbon files in his MapReduce application by choosing CarbonInput/OutputFormat, and is responsible using it correctly.Currently only CarbonInputFormat is provided and OutputFormat will be provided soon.
-
-
-### 2. For Spark user
-This User API is provided by the Spark itself. There are also two levels of APIs
-- **Carbon File**
-
-Similar to parquet, json, or other data source in Spark, carbon can be used with data source API. For example(please refer to DataFrameAPIExample for the more detail):
-```
-// User can create a DataFrame from any data source or transformation.
-val df = ...
-
-// Write data
-// User can write a DataFrame to a carbon file
- df.write
- .format("carbondata")
- .option("tableName", "carbontable")
- .mode(SaveMode.Overwrite)
- .save()
-
-
-// read carbon data by data source API
-df = carbonContext.read
- .format("carbondata")
- .option("tableName", "carbontable")
- .load("/path")
-
-// User can then use DataFrame for analysis
-df.count
-SVMWithSGD.train(df, numIterations)
-
-// User can also register the DataFrame with a table name, and use SQL for analysis
-df.registerTempTable("t1") // register temporary table in SparkSQL catalog
-df.registerHiveTable("t2") // Or, use a implicit funtion to register to Hive metastore
-sqlContext.sql("select count(*) from t1").show
-```
-
-- **Managed Carbon Table**
-
-Since carbon has builtin support for high level concept like Table, Database, and supports full data lifecycle management, instead of dealing with just files, user can use carbon specific DDL to manipulate data in Table and Database level. Please refer [DDL](https://github.com/HuaweiBigData/carbondata/wiki/Language-Manual:-DDL) and [DML] (https://github.com/HuaweiBigData/carbondata/wiki/Language-Manual:-DML)
-
-For example:
-```
-// Use SQL to manage table and query data
-create database db1;
-use database db1;
-show databases;
-create table tbl1 using org.apache.carbondata.spark;
-load data into table tlb1 path 'some_files';
-select count(*) from tbl1;
-```
-
-### 3. For developer
-For developer who want to integrate carbon into a processing engine like spark/hive/flink, use API provided by carbon-hadoop and carbon-processing:
- - Query: integrate carbon-hadoop with engine specific API, like spark data source API
- - Data life cycle management: carbon provides utility functions in carbon-processing to manage data life cycle, like data loading, compact, retention, schema evolution. Developer can implement DDLs of their choice and leverage these utility function to do data life cycle management.
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/276a6111/docs/Carbondata-File-Structure-and-Format.md
----------------------------------------------------------------------
diff --git a/docs/Carbondata-File-Structure-and-Format.md b/docs/Carbondata-File-Structure-and-Format.md
deleted file mode 100644
index fef51eb..0000000
--- a/docs/Carbondata-File-Structure-and-Format.md
+++ /dev/null
@@ -1,55 +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.
--->
-
-## Use Case & Motivation : Why introducing a new file format?
-The motivation behind CarbonData is to create a single file format for all kind of query and analysis on Big Data. Existing data storage formats in Hadoop address only specific use cases requiring users to use multiple file formats for various types of queries resulting in unnecessary duplication of data.
-
-### Sequential Access / Big Scan
-Such queries select only a few columns with a group by clause but do not contain any filters. This results in full scan over the complete store for the selected columns.
-
-
-### OLAP Style Query / Multi-dimensional Analysis
-These are queries which are typically fired from Interactive Analysis tools. Such queries often select a few columns but involve filters and group by on a column or a grouping expression.
-
-
-
-### Random Access / Narrow Scan
-These are queries used from operational applications and usually select all or most of the columns but do involve a large number of filters which reduce the result to a small size. Such queries generally do not involve any aggregation or group by clause.
-
-
-### Single Format to provide low latency response for all usecases
-The main motivation behind CarbonData is to provide a single storage format for all the usecases of querying big data on Hadoop. Thus CarbonData is able to cover all use-cases into a single storage format.
-
-
-
-## CarbonData File Structure
-CarbonData file contains groups of data called blocklet, along with all required information like schema, offsets and indices, etc, in a file footer.
-
-The file footer can be read once to build the indices in memory, which can be utilized for optimizing the scans and processing for all subsequent queries.
-
-Each blocklet in the file is further divided into chunks of data called Data Chunks. Each data chunk is organized either in columnar format or row format, and stores the data of either a single column or a set of columns. All blocklets in one file contain the same number and type of Data Chunks.
-
-
-
-Each Data Chunk contains multiple groups of data called as Pages. There are three types of pages.
-* Data Page: Contains the encoded data of a column/group of columns.
-* Row ID Page (optional): Contains the row id mappings used when the Data Page is stored as an inverted index.
-* RLE Page (optional): Contains additional metadata used when the Data Page in RLE coded.
-
-
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/276a6111/docs/DDL-Operations-on-Carbon.md
----------------------------------------------------------------------
diff --git a/docs/DDL-Operations-on-Carbon.md b/docs/DDL-Operations-on-Carbon.md
deleted file mode 100644
index 07b2be3..0000000
--- a/docs/DDL-Operations-on-Carbon.md
+++ /dev/null
@@ -1,187 +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.
--->
-
-* [CREATE TABLE](#CREATE TABLE)
-* [SHOW TABLE](#SHOW TABLE)
-* [DROP TABLE](#DROP TABLE)
-* [COMPACTION](#COMPACTION)
-
-***
-
-
-# CREATE TABLE
-This command can be used to create carbon table by specifying the list of fields along with the table properties.
-
- ```
- CREATE TABLE [IF NOT EXISTS] [db_name.]table_name
- [(col_name data_type , ...)]
- STORED BY 'carbondata'
- [TBLPROPERTIES (property_name=property_value, ...)]
- // All Carbon's additional table options will go into properties
- ```
-
-
-### Parameter Description
-
-| Parameter | Description | Optional |
-| ------------- | -----| ---------- |
-| db_name | Name of the Database. Database name should consist of Alphanumeric characters and underscore(_) special character. | YES |
-| field_list | Comma separated List of fields with data type. The field names should consist of Alphanumeric characters and underscore(_) special character.| NO |
-|table_name | The name of the table in Database. Table Name should consist of Alphanumeric characters and underscore(_) special character. | NO |
-| STORED BY | "org.apache.carbondata.format", identifies and creates carbon table. | NO |
-| TBLPROPERTIES | List of carbon table properties. | YES |
-
-### Usage Guideline
-Following are the table properties usage.
-
- - **Dictionary Encoding Configuration**
-
- By Default dictionary encoding will be enabled for all String columns, and disabled for non-String columns. User can include and exclude columns for dictionary encoding.
-
- ```ruby
- TBLPROPERTIES ("DICTIONARY_EXCLUDE"="column1, column2")
- TBLPROPERTIES ("DICTIONARY_INCLUDE"="column1, column2")
- ```
-Here, DICTIONARY_EXCLUDE will exclude dictionary creation. This is applicable for high-cardinality columns and is a optional parameter. DICTIONARY_INCLUDE will generate dictionary for the columns specified in the list.
-
- - **Row/Column Format Configuration**
-
- Column groups with more than one column are stored in row format, instead of columnar format. By default, each column is a separate column group.
-
- ```ruby
- TBLPROPERTIES ("COLUMN_GROUPS"="(column1,column3),(Column4,Column5,Column6)")
- ```
- - **Table Block Size Configuration**
-
- The block size of one table's files on hdfs can be defined using an int value whose size is in MB, the range is form 1MB to 2048MB and the default value is 1024MB, if user didn't define this values in ddl, it would use default value to set.
-
- ```ruby
- TBLPROPERTIES ("TABLE_BLOCKSIZE"="512 MB")
- ```
-Here 512 MB means the block size of this table is 512 MB, user also can set it as 512M or 512.
- - **Inverted Index Configuration**
-
- Inverted index is very useful to improve compression ratio and query speed, especially for those low-cardinality columns who are in reward position.
- By default inverted index will be enabled, but user can also set not to use inverted index for some columns.
-
- ```ruby
- TBLPROPERTIES ("NO_INVERTED_INDEX"="column1,column3")
- ```
-Here, NO_INVERTED_INDEX will not use inverted index for the specified columns. This is applicable for high-cardinality columns and is a optional parameter.
-
-*Note : By default all columns except numeric datatype columns are treated as dimensions and all numeric datatype columns are treated as measures. All dimensions except complex datatype columns are part of multi dimensional key(MDK). This behavior can be overridden by using TBLPROPERTIES, If user wants to keep any column (except complex datatype) in multi dimensional key then he can keep the columns either in DICTIONARY_EXCLUDE or DICTIONARY_INCLUDE*
-
-
-**Example:**
-
- ```
- CREATE TABLE IF NOT EXISTS productSchema.productSalesTable (
- productNumber Int,
- productName String,
- storeCity String,
- storeProvince String,
- productCategory String,
- productBatch String,
- saleQuantity Int,
- revenue Int)
- STORED BY 'carbondata'
- TBLPROPERTIES ('COLUMN_GROUPS'='(productName,productCategory)',
- 'DICTIONARY_EXCLUDE'='productName',
- 'DICTIONARY_INCLUDE'='productNumber',
- 'NO_INVERTED_INDEX'='productBatch')
- ```
-***
-
-# SHOW TABLE
-This command can be used to list all the tables in current database or all the tables of a specific database.
-
- ```ruby
- SHOW TABLES [IN db_Name];
- ```
-
-### Parameter Description
-| Parameter | Description | Optional |
-|-----------|-------------| -------- |
-| IN db_Name | Name of the database. Required only if tables of this specific database are to be listed. | YES |
-
-**Example:**
-
- ```ruby
- SHOW TABLES IN ProductSchema;
- ```
-
-***
-
-# DROP TABLE
-This command can be used to delete the existing table.
-
- ```ruby
- DROP TABLE [IF EXISTS] [db_name.]table_name;
- ```
-
-### Parameter Description
-| Parameter | Description | Optional |
-|-----------|-------------| -------- |
-| db_Name | Name of the database. If not specified, current database will be selected. | YES |
-| table_name | Name of the table to be deleted. | NO |
-
-**Example:**
-
- ```ruby
- DROP TABLE IF EXISTS productSchema.productSalesTable;
- ```
-
-***
-
-# COMPACTION
- This command will merge the specified number of segments into one segment. This will enhance the query performance of the table.
-
- ```ruby
- ALTER TABLE [db_name.]table_name COMPACT 'MINOR/MAJOR'
- ```
-
-### Parameter Description
-
-| Parameter | Description | Optional |
-| ------------- | -----| ----------- |
-| db_name | Database name, if it is not specified then it uses current database. | YES |
-| table_name | The name of the table in provided database.| NO |
-
-### Usage Guideline
-Minor Compaction:
- In Minor compaction, you can specify number of loads to be merged (compacted).
- Minor compaction triggers for every data load if the parameter carbon.enable.auto.load.merge is set.
- If any segments are available to be merged, then compaction will run parallel with data load.
- There are 2 levels in minor compaction.
- - Level 1: Merging of the segments which are not yet compacted.
- - Level 2: Merging of the compacted segments again to form a bigger segment.
-
-Major Compaction:
- In Major compaction, many segments can be merged into one big segment.
- You can specify the compaction size until which the segments will be merged.
- Major compaction is usually done during the off-peak time.
-
-**Example:**
-
- ```ruby
- ALTER TABLE carbontable COMPACT MINOR
- ALTER TABLE carbontable COMPACT MAJOR
- ```
-
-***
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/276a6111/docs/DML-Operations-on-Carbon.md
----------------------------------------------------------------------
diff --git a/docs/DML-Operations-on-Carbon.md b/docs/DML-Operations-on-Carbon.md
deleted file mode 100644
index b910ddb..0000000
--- a/docs/DML-Operations-on-Carbon.md
+++ /dev/null
@@ -1,197 +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.
--->
-
-* [LOAD DATA](#LOAD DATA)
-* [SHOW SEGMENTS](#SHOW SEGMENTS)
-* [DELETE SEGMENT BY ID](#DELETE SEGMENT BY ID)
-* [DELETE SEGMENT BY DATE](#DELETE SEGMENT BY DATE)
-
-***
-
-# LOAD DATA
- This command loads the user data in raw format to the Carbon specific data format store, this way Carbon provides good performance while querying the data.Please visit [Data Management](Carbondata-Management.md) for more details on LOAD
-
-### Syntax
-
- ```ruby
- LOAD DATA [LOCAL] INPATH 'folder_path' INTO TABLE [db_name.]table_name
- OPTIONS(property_name=property_value, ...)
- ```
-
-### Parameter Description
-
-| Parameter | Description | Optional |
-| ------------- | -----| -------- |
-| folder_path | Path of raw csv data folder or file. | NO |
-| db_name | Database name, if it is not specified then it uses current database. | YES |
-| table_name | The name of the table in provided database.| NO |
-| OPTIONS | Extra options provided to Load | YES |
-
-
-### Usage Guideline
-Following are the options that can be used in load data:
-- **DELIMITER:** Delimiters can be provided in the load command.
-
- ``` ruby
- OPTIONS('DELIMITER'=',')
- ```
-- **QUOTECHAR:** Quote Characters can be provided in the load command.
-
- ```ruby
- OPTIONS('QUOTECHAR'='"')
- ```
-- **COMMENTCHAR:** Comment Characters can be provided in the load command if user want to comment lines.
-
- ```ruby
- OPTIONS('COMMENTCHAR'='#')
- ```
-- **FILEHEADER:** Headers can be provided in the LOAD DATA command if headers are missing in the source files.
-
- ```ruby
- OPTIONS('FILEHEADER'='column1,column2')
- ```
-- **MULTILINE:** CSV with new line character in quotes.
-
- ```ruby
- OPTIONS('MULTILINE'='true')
- ```
-- **ESCAPECHAR:** Escape char can be provided if user want strict validation of escape character on CSV.
-
- ```ruby
- OPTIONS('ESCAPECHAR'='\')
- ```
-- **COMPLEX_DELIMITER_LEVEL_1:** Split the complex type data column in a row (eg., a$b$c --> Array = {a,b,c}).
-
- ```ruby
- OPTIONS('COMPLEX_DELIMITER_LEVEL_1'='$')
- ```
-- **COMPLEX_DELIMITER_LEVEL_2:** Split the complex type nested data column in a row. Applies level_1 delimiter & applies level_2 based on complex data type (eg., a:b$c:d --> Array> = {{a,b},{c,d}}).
-
- ```ruby
- OPTIONS('COMPLEX_DELIMITER_LEVEL_2'=':')
- ```
-- **ALL_DICTIONARY_PATH:** All dictionary files path.
-
- ```ruby
- OPTIONS('ALL_DICTIONARY_PATH'='/opt/alldictionary/data.dictionary')
- ```
-- **COLUMNDICT:** Dictionary file path for specified column.
-
- ```ruby
- OPTIONS('COLUMNDICT'='column1:dictionaryFilePath1, column2:dictionaryFilePath2')
- ```
- Note: ALL_DICTIONARY_PATH and COLUMNDICT can't be used together.
-- **DATEFORMAT:** Date format for specified column.
-
- ```ruby
- OPTIONS('DATEFORMAT'='column1:dateFormat1, column2:dateFormat2')
- ```
- Note: Date formats are specified by date pattern strings. The date pattern letters in Carbon are
- the same as in JAVA [SimpleDateFormat](http://docs.oracle.com/javase/7/docs/api/java/text/SimpleDateFormat.html).
-
-**Example:**
-
- ```ruby
- LOAD DATA local inpath '/opt/rawdata/data.csv' INTO table carbontable
- options('DELIMITER'=',', 'QUOTECHAR'='"', 'COMMENTCHAR'='#',
- 'FILEHEADER'='empno,empname,
- designation,doj,workgroupcategory,
- workgroupcategoryname,deptno,deptname,projectcode,
- projectjoindate,projectenddate,attendance,utilization,salary',
- 'MULTILINE'='true', 'ESCAPECHAR'='\',
- 'COMPLEX_DELIMITER_LEVEL_1'='$',
- 'COMPLEX_DELIMITER_LEVEL_2'=':',
- 'ALL_DICTIONARY_PATH'='/opt/alldictionary/data.dictionary',
- 'DATEFORMAT'='projectjoindate:yyyy-MM-dd'
- )
- ```
-
-***
-
-# SHOW SEGMENTS
-This command is to show the segments of carbon table to the user.
-
- ```ruby
- SHOW SEGMENTS FOR TABLE [db_name.]table_name LIMIT number_of_segments;
- ```
-
-### Parameter Description
-
-| Parameter | Description | Optional |
-| ------------- | -----| --------- |
-| db_name | Database name, if it is not specified then it uses current database. | YES |
-| table_name | The name of the table in provided database.| NO |
-| number_of_segments | limit the output to this number. | YES |
-
-**Example:**
-
- ```ruby
- SHOW SEGMENTS FOR TABLE CarbonDatabase.CarbonTable LIMIT 2;
- ```
-
-***
-
-# DELETE SEGMENT BY ID
-
-This command is to delete segment by using the segment ID.
-
- ```ruby
- DELETE SEGMENT segment_id1,segment_id2 FROM TABLE [db_name.]table_name;
- ```
-
-### Parameter Description
-
-| Parameter | Description | Optional |
-| ------------- | -----| --------- |
-| segment_id | Segment Id of the load. | NO |
-| db_name | Database name, if it is not specified then it uses current database. | YES |
-| table_name | The name of the table in provided database.| NO |
-
-**Example:**
-
- ```ruby
- DELETE SEGMENT 0 FROM TABLE CarbonDatabase.CarbonTable;
- DELETE SEGMENT 0.1,5,8 FROM TABLE CarbonDatabase.CarbonTable;
- ```
- Note: Here 0.1 is compacted segment sequence id.
-
-***
-
-# DELETE SEGMENT BY DATE
-This command will allow to deletes the Carbon segment(s) from the store based on the date provided by the user in the DML command. The segment created before the particular date will be removed from the specific stores.
-
- ```ruby
- DELETE SEGMENTS FROM TABLE [db_name.]table_name WHERE STARTTIME BEFORE [DATE_VALUE];
- ```
-
-### Parameter Description
-
-| Parameter | Description | Optional |
-| ------------- | -----| ------ |
-| DATE_VALUE | Valid segement load start time value. All the segments before this specified date will be deleted. | NO |
-| db_name | Database name, if it is not specified then it uses current database. | YES |
-| table_name | The name of the table in provided database.| NO |
-
-**Example:**
-
- ```ruby
- DELETE SEGMENTS FROM TABLE CarbonDatabase.CarbonTable WHERE STARTTIME BEFORE '2017-06-01 12:05:06';
- ```
-
-***
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/276a6111/docs/Data-Management.md
----------------------------------------------------------------------
diff --git a/docs/Data-Management.md b/docs/Data-Management.md
index 72671dc..70f4d28 100644
--- a/docs/Data-Management.md
+++ b/docs/Data-Management.md
@@ -17,143 +17,150 @@
under the License.
-->
-* [Load Data](#Load Data)
-* [Deleting Data](#Deleting Data)
-* [Compacting Data](#Compacting Data)
-
-
-***
-
-
-# Load Data
-### Scenario
-Once the table is created, data can be loaded into table using LOAD DATA command and will be available for query. When data load is triggered, the data is encoded in Carbon format and copied into HDFS Carbon store path(mentioned in carbon.properties file) in compressed, multi dimentional columnar format for quick analysis queries.
-The same command can be used for loading the new data or to update the existing data.
-Only one data load can be triggered for one table. The high cardinality columns of the dictionary encoding are automatically recognized and these columns will not be used as dictionary encoding.
-
-### Procedure
-
-Data loading is a process that involves execution of various steps to read, sort, and encode the date in Carbon store format. Each step will be executed in different threads.
-After data loading process is complete, the status (success/partial success) will be updated to Carbon store metadata. Following are the data load status:
-
-1. Success: All the data is loaded into table and no bad records found.
-2. Partial Success: Data is loaded into table and bad records are found. Bad records are stored at carbon.badrecords.location.
-
-In case of failure, the error will be logged in error log.
-Details of loads can be seen with SHOW SEGMENTS command.
-* Sequence Id
-* Status of data load
-* Load Start time
-* Load End time
-Following steps needs to be performed for invoking data load.
-Run the following command for historical data load:
-```ruby
-LOAD DATA [LOCAL] INPATH 'folder_path' [OVERWRITE] INTO TABLE [db_name.]table_name
-OPTIONS(property_name=property_value, ...)
-```
-OPTIONS are not mandatory for data loading process. Inside OPTIONS user can provide either of any options like DELIMITER,QUOTECHAR, ESCAPERCHAR,MULTILINE as per need.
-
-Note: The path shall be canonical path.
-
-***
-
-# Deleting Data
-### Scenario
-If you have loaded wrong data into the table, or too many bad records and wanted to modify and reload the data, you can delete required loads data. The load can be deleted using the load ID or if the table contains date field then the data can be deleted using the date field.
-
-### Delete by Segment ID
-
-Each segment has a unique segment ID associated with it. Using this segment ID, you can remove the segment.
-Run the following command to get the segmentID.
-```ruby
-SHOW SEGMENTS FOR Table dbname.tablename LIMIT number_of_segments
-```
-Example:
-```ruby
-SHOW SEGMENTS FOR TABLE carbonTable
-```
-The above command will show all the segments of the table carbonTable.
-```ruby
-SHOW SEGMENTS FOR TABLE carbonTable LIMIT 3
-```
-The above DDL will show only limited number of segments specified by number_of_segments.
-
-output:
-
-| SegmentSequenceId | Status | Load Start Time | Load End Time |
-|--------------|-----------------|--------------------|--------------------|
-| 2| Success | 2015-11-19 20:25:... | 2015-11-19 20:49:... |
-| 1| Marked for Delete | 2015-11-19 19:54:... | 2015-11-19 20:08:... |
-| 0| Marked for Update | 2015-11-19 19:14:... | 2015-11-19 19:14:... |
+# Data Management
+This tutorial is going to introduce you to the conceptual details of data management like:
+
+* [Loading Data](#loading-data)
+* [Deleting Data](#deleting-data)
+* [Compacting Data](#compacting-data)
+* [Updating Data](#updating-data)
+
+## Loading Data
+
+* **Scenario**
+
+ After creating a table, you can load data to the table using the [LOAD DATA](dml-operation-on-carbondata.md) command. The loaded data is available for querying.
+ When data load is triggered, the data is encoded in CarbonData format and copied into HDFS CarbonData store path (specified in carbon.properties file)
+ in compressed, multi dimensional columnar format for quick analysis queries. The same command can be used to load new data or to
+ update the existing data. Only one data load can be triggered for one table. The high cardinality columns of the dictionary encoding are
+ automatically recognized and these columns will not be used for dictionary encoding.
+
+* **Procedure**
+
+ Data loading is a process that involves execution of multiple steps to read, sort and encode the data in CarbonData store format.
+ Each step is executed on different threads. After data loading process is complete, the status (success/partial success) is updated to
+ CarbonData store metadata. The table below lists the possible load status.
+
+
+| Status | Description |
+|-----------------|------------------------------------------------------------------------------------------------------------|
+| Success | All the data is loaded into table and no bad records found. |
+| Partial Success | Data is loaded into table and bad records are found. Bad records are stored at carbon.badrecords.location. |
+
+ In case of failure, the error will be logged in error log. Details of loads can be seen with [SHOW SEGMENTS](dml-operation-on-carbondata.md) command. The show segment command output consists of :
+
+ - SegmentSequenceID
+ - START_TIME OF LOAD
+ - END_TIME OF LOAD
+ - LOAD STATUS
-The show segment command output consists of SegmentSequenceID, START_TIME OF LOAD, END_TIME OF LOAD, and LOAD STATUS. The latest load will be displayed first in the output.
-After you get the segment ID of the segment that you want to delete, execute the following command to delete the selected segment.
-Command:
-```ruby
-DELETE SEGMENT segment_sequence_id1, segments_sequence_id2, .... FROM TABLE tableName
+ The latest load will be displayed first in the output.
+
+ Refer to [DML operations on CarbonData](dml-operation-on-carbondata.md) for load commands.
+
+
+## Deleting Data
+
+* **Scenario**
+
+ If you have loaded wrong data into the table, or too many bad records are present and you want to modify and reload the data, you can delete required data loads.
+ The load can be deleted using the Segment Sequence Id or if the table contains date field then the data can be deleted using the date field.
+ If there are some specific records that need to be deleted based on some filter condition(s) we can delete by records.
+
+* **Procedure**
+
+ The loaded data can be deleted in the following ways:
+
+ * Delete by Segment ID
+
+ After you get the segment ID of the segment that you want to delete, execute the [DELETE](dml-operation-on-carbondata.md ) command for the selected segment.
+ The status of deleted segment is updated to Marked for delete / Marked for Update.
+
+| SegmentSequenceId | Status | Load Start Time | Load End Time |
+|-------------------|-------------------|----------------------|----------------------|
+| 0 | Success | 2015-11-19 19:14:... | 2015-11-19 19:14:... |
+| 1 | Marked for Update | 2015-11-19 19:54:... | 2015-11-19 20:08:... |
+| 2 | Marked for Delete | 2015-11-19 20:25:... | 2015-11-19 20:49:... |
+
+ * Delete by Date Field
+
+ If the table contains date field, you can delete the data based on a specific date.
+
+ * Delete by Record
+
+ To delete records from CarbonData table based on some filter Condition(s).
+
+ For delete commands refer to [DML operations on CarbonData](dml-operation-on-carbondata.md).
+
+ * **NOTE**:
+
+ - When the delete segment DML is called, segment will not be deleted physically from the file system. Instead the segment status will be marked as "Marked for Delete". For the query execution, this deleted segment will be excluded.
+
+ - The deleted segment will be deleted physically during the next load operation and only after the maximum query execution time configured using "max.query.execution.time". By default it is 60 minutes.
+
+ - If the user wants to force delete the segment physically then he can use CLEAN FILES Command.
+
+Example :
+
```
-Example:
-```ruby
-DELETE SEGMENT l,2,3 FROM TABLE carbonTable
+CLEAN FILES FOR TABLE table1
```
-### Delete by Date Field
-
-If the table contains date field, you can delete the data based on a specific date.
-Command:
-```ruby
-DELETE FROM TABLE [schema_name.]table_name WHERE[DATE_FIELD]BEFORE [DATE_VALUE]
-```
-Example:
-```ruby
-DELETE FROM TABLE table_name WHERE productionDate BEFORE '2017-07-01'
-```
-Here productionDate is the column of type time stamp.
-The above DDL will delete all the data before the date '2017-07-01'.
+ This DML will physically delete the segment which are "Marked for delete" immediately.
+
+## Compacting Data
+
+* **Scenario**
+
+ Frequent data ingestion results in several fragmented CarbonData files in the store directory. Since data is sorted only within each load, the indices perform only within each
+ load. This means that there will be one index for each load and as number of data load increases, the number of indices also increases. As each index works only on one load,
+ the performance of indices is reduced. CarbonData provides provision for compacting the loads. Compaction process combines several segments into one large segment by merge sorting the data from across the segments.
+
+* **Procedure**
+
+ There are two types of compaction Minor and Major compaction.
+
+ - **Minor Compaction**
+
+ In minor compaction the user can specify how many loads to be merged. Minor compaction triggers for every data load if the parameter carbon.enable.auto.load.merge is set. If any segments are available to be merged, then compaction will
+ run parallel with data load. There are 2 levels in minor compaction.
+
+ - Level 1: Merging of the segments which are not yet compacted.
+ - Level 2: Merging of the compacted segments again to form a bigger segment.
+ - **Major Compaction**
+
+ In Major compaction, many segments can be merged into one big segment. User will specify the compaction size until which segments can be merged. Major compaction is usually done during the off-peak time.
+
+ There are number of parameters related to Compaction that can be set in carbon.properties file
+
+| Parameter | Default | Application | Description | Valid Values |
+|-----------------------------------------|---------|-------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------|
+| carbon.compaction.level.threshold | 4, 3 | Minor | This property is for minor compaction which decides how many segments to be merged. Example: If it is set as 2, 3 then minor compaction will be triggered for every 2 segments. 3 is the number of level 1 compacted segment which is further compacted to new segment. | NA |
+| carbon.major.compaction.size | 1024 MB | Major | Major compaction size can be configured using this parameter. Sum of the segments which is below this threshold will be merged. | NA |
+| carbon.numberof.preserve.segments | 0 | Minor/Major | If the user wants to preserve some number of segments from being compacted then he can set this property. Example: carbon.numberof.preserve.segments=2 then 2 latest segments will always be excluded from the compaction. No segments will be preserved by default. | 0-100 |
+| carbon.allowed.compaction.days | 0 | Minor/Major | Compaction will merge the segments which are loaded within the specific number of days configured. Example: If the configuration is 2, then the segments which are loaded in the time frame of 2 days only will get merged. Segments which are loaded 2 days apart will not be merged. This is disabled by default. | 0-100 |
+| carbon.number.of.cores.while.compacting | 2 | Minor/Major | Number of cores which is used to write data during compaction. | 0-100 |
+
+ For compaction commands refer to [DDL operations on CarbonData](ddl-operation-on-carbondata.md)
+## Updating Data
-Note:
-* When the delete segment DML is called, segment will not be deleted physically from the file system. Instead the segment status will be marked as "Marked for Delete". For the query execution, this deleted segment will be excluded.
-* The deleted segment will be deleted physically during the next load operation and only after the maximum query execution time configured using "max.query.execution.time". By default it is 60 minutes.
-* If the user wants to force delete the segment physically then he can use CLEAN FILES DML.
-Example:
-```ruby
-CLEAN FILES FOR TABLE table1
-```
-This DML will physically delete the segment which are "Marked for delete" immediately.
+* **Scenario**
+ Sometimes after the data has been ingested into the System, it is required to be updated. Also there may be situations where some specific columns need to be updated
+ on the basis of column expression and optional filter conditions.
+* **Procedure**
-***
+ To update we need to specify the column expression with an optional filter condition(s).
-# Compacting Data
-### Scenario
-Frequent data ingestion results in several fragmented carbon files in the store directory. Since data is sorted only within each load, the indices perform only within each load. This mean that there will be one index for each load and as number of data load increases, the number of indices also increases. As each index works only on one load, the performance of indices is reduced. Carbon provides provision for compacting the loads. Compaction process combines several segments into one large segment by merge sorting the data from across the segments.
+ For update commands refer to [DML operations on CarbonData](dml-operation-on-carbondata.md).
-### Prerequisite
- The data should be loaded multiple times.
+
-### Procedure
-There are two types of compaction Minor and Major compaction.
-#### Minor Compaction:
-In minor compaction the user can specify how many loads to be merged. Minor compaction triggers for every data load if the parameter carbon.enable.auto.load.merge is set. If any segments are available to be merged, then compaction will run parallel with data load.
-There are 2 levels in minor compaction.
-* Level 1: Merging of the segments which are not yet compacted.
-* Level 2: Merging of the compacted segments again to form a bigger segment.
-
-#### Major Compaction:
-In Major compaction, many segments can be merged into one big segment. User will specify the compaction size until which segments can be merged. Major compaction is usually done during the off-peak time.
-
-### Parameters of Compaction
-| Parameter | Default | Applicable | Description |
-| --------- | --------| -----------|-------------|
-| carbon.compaction.level.threshold | 4,3 | Minor | This property is for minor compaction which decides how many segments to be merged.**Example**: if it is set as 2,3 then minor compaction will be triggered for every 2 segments. 3 is the number of level 1 compacted segment which is further compacted to new segment.
-Valid values are from 0-100. |
-| carbon.major.compaction.size | 1024 mb | Major | Major compaction size can be configured using this parameter. Sum of the segments which is below this threshold will be merged. |
-| carbon.numberof.preserve.segments | 0 | Minor/Major| If the user wants to preserve some number of segments from being compacted then he can set this property.**Example**:carbon.numberof.preserve.segments=2 then 2 latest segments will always be excluded from the compaction.No segments will be preserved by default. |
-| carbon.allowed.compaction.days | 0 | Minor/Major| Compaction will merge the segments which are loaded with in the specific number of days configured.**Example**: if the configuration is 2, then the segments which are loaded in the time frame of 2 days only will get merged. Segments which are loaded 2 days apart will not be merged.This is disabled by default. |
-| carbon.number.of.cores.while.compacting | 2 | Minor/Major| Number of cores which is used to write data during compaction. |
+
+
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/276a6111/docs/Quick-Start.md
----------------------------------------------------------------------
diff --git a/docs/Quick-Start.md b/docs/Quick-Start.md
deleted file mode 100644
index 0020c71..0000000
--- a/docs/Quick-Start.md
+++ /dev/null
@@ -1,89 +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.
--->
-
-# Getting started with Apache CarbonData
-
-This tutorial provides a quick introduction to using CarbonData.
-
-
-## Install
-
-* Download released package of [Spark 1.5.0 or later](http://spark.apache.org/downloads.html)
-* Download and install Apache Thrift 0.9.3, make sure thrift is added to system path.
-* Download [Apache CarbonData code](https://github.com/apache/incubator-carbondata) and build it. Please visit [Building CarbonData And IDE Configuration](Installing-CarbonData-And-IDE-Configuartion.md) for more information.
-
-## Interactive Data Query
-
-### Prerequisite
-Create sample.csv file in carbondata directory
-```
-$ cd carbondata
-$ cat > sample.csv << EOF
- id,name,city,age
- 1,david,shenzhen,31
- 2,eason,shenzhen,27
- 3,jarry,wuhan,35
- EOF
-```
-
-### Carbon Spark Shell
-Carbon Spark shell is a wrapper around Apache Spark Shell, it provides a simple way to learn the API, as well as a powerful tool to analyze data interactively. Please visit Apache Spark Documentation for more details on Spark shell.
-Start Spark shell by running the following in the Carbon directory:
-```
-./bin/carbon-spark-shell
-```
-*Note*: In this shell SparkContext is readily available as sc and CarbonContext is available as cc.
-
-**Create table**
-
-```
-scala>cc.sql("create table if not exists test_table (id string, name string, city string, age Int) STORED BY 'carbondata'")
-```
-
-**Load data to table**
-```
-scala>val dataFilePath = new File("../carbondata/sample.csv").getCanonicalPath
-scala>cc.sql(s"load data inpath '$dataFilePath' into table test_table")
-```
-
-**Query data from table**
-
-```
-scala>cc.sql("select * from test_table").show
-scala>cc.sql("select city, avg(age), sum(age) from test_table group by city").show
-```
-
-### Carbon SQL CLI
-The Carbon Spark SQL CLI is a wrapper around Apache Spark SQL CLI. It is a convenient tool to execute queries input from the command line. Please visit Apache Spark Documentation for more information Spark SQL CLI.
-Start the Carbon Spark SQL CLI, run the following in the Carbon directory
-
-```
-./bin/carbon-spark-sql
-```
-And you can provide your own store location by providing configuration using --conf option like:
-```
-./bin/carbon-spark-sql --conf spark.carbon.storepath=/home/root/carbonstore
-```
-
-**Execute Queries in CLI**
-```
-spark-sql> create table if not exists test_table (id string, name string, city string, age Int) STORED BY 'carbondata'
-spark-sql> load data inpath '../sample.csv' into table test_table
-spark-sql> select city, avg(age), sum(age) from test_table group by city
-```
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/276a6111/docs/configuration-parameters.md
----------------------------------------------------------------------
diff --git a/docs/configuration-parameters.md b/docs/configuration-parameters.md
new file mode 100644
index 0000000..bc6919a
--- /dev/null
+++ b/docs/configuration-parameters.md
@@ -0,0 +1,149 @@
+<!--
+ 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.
+-->
+
+# Configuring CarbonData
+ This tutorial guides you through the advanced configurations of CarbonData :
+
+ * [System Configuration](#system-configuration)
+ * [Performance Configuration](#performance-configuration)
+ * [Miscellaneous Configuration](#miscellaneous-configuration)
+ * [Spark Configuration](#spark-configuration)
+
+
+## System Configuration
+This section provides the details of all the configurations required for the CarbonData System.
+
+<b><p align="center">System Configuration in carbon.properties</p></b>
+
+| Property | Default Value | Description |
+|----------------------------|-------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| carbon.storelocation | /user/hive/warehouse/carbon.store | Location where CarbonData will create the store, and write the data in its own format. NOTE: Store location should be in HDFS. |
+| carbon.ddl.base.hdfs.url | hdfs://hacluster/opt/data | This property is used to configure the HDFS relative path from the HDFS base path, configured in fs.defaultFS. The path configured in carbon.ddl.base.hdfs.url will be appended to the HDFS path configured in fs.defaultFS. If this path is configured, then user need not pass the complete path while dataload. For example: If absolute path of the csv file is hdfs://10.18.101.155:54310/data/cnbc/2016/xyz.csv, the path "hdfs://10.18.101.155:54310" will come from property fs.defaultFS and user can configure the /data/cnbc/ as carbon.ddl.base.hdfs.url. Now while dataload user can specify the csv path as /2016/xyz.csv. |
+| carbon.badRecords.location | /opt/Carbon/Spark/badrecords | Path where the bad records are stored. |
+| carbon.kettle.home | $SPARK_HOME/carbonlib/carbonplugins | Path used by CarbonData internally to create graph for loading the data. |
+| carbon.data.file.version | 2 | If this parameter value is set to 1, then CarbonData will support the data load which is in old format. If the value is set to 2, then CarbonData will support the data load of new format only. NOTE: The file format created before DataSight Spark V100R002C30 is considered as old format. |
+
+## Performance Configuration
+This section provides the details of all the configurations required for CarbonData Performance Optimization.
+
+<b><p align="center">Performance Configuration in carbon.properties</p></b>
+
+* **Data Loading Configuration**
+
+| Parameter | Default Value | Description | Range |
+|--------------------------------------|---------------|----------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| carbon.sort.file.buffer.size | 20 | File read buffer size used during sorting. This value is expressed in MB. | Min=1 and Max=100 |
+| carbon.graph.rowset.size | 100000 | Rowset size exchanged between data load graph steps. | Min=500 and Max=1000000 |
+| carbon.number.of.cores.while.loading | 6 | Number of cores to be used while loading data. | |
+| carbon.sort.size | 500000 | Record count to sort and write intermediate files to temp. | |
+| carbon.enableXXHash | true | Algorithm for hashmap for hashkey calculation. | |
+| carbon.number.of.cores.block.sort | 7 | Number of cores to use for block sort while loading data. | |
+| carbon.max.driver.lru.cache.size | -1 | Max LRU cache size upto which data will be loaded at the driver side. This value is expressed in MB. Default value of -1 means there is no memory limit for caching. Only integer values greater than 0 are accepted. | |
+| carbon.max.executor.lru.cache.size | -1 | Max LRU cache size upto which data will be loaded at the executor side. This value is expressed in MB. Default value of -1 means there is no memory limit for caching. Only integer values greater than 0 are accepted. If this parameter is not configured, then the carbon.max.driver.lru.cache.size value will be considered. | |
+| carbon.merge.sort.prefetch | true | Enable prefetch of data during merge sort while reading data from sort temp files in data loading. | |
+| carbon.update.persist.enable | true | Enabling this parameter considers persistent data. Enabling this will reduce the execution time of UPDATE operation. | |
+
+
+
+* **Compaction Configuration**
+
+| Parameter | Default Value | Description | Range |
+|-----------------------------------------------|---------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------|
+| carbon.number.of.cores.while.compacting | 2 | Number of cores which are used to write data during compaction. | |
+| carbon.compaction.level.threshold | 4, 3 | This property is for minor compaction which decides how many segments to be merged. Example: If it is set as 2, 3 then minor compaction will be triggered for every 2 segments. 3 is the number of level 1 compacted segment which is further compacted to new segment. | Valid values are from 0-100. |
+| carbon.major.compaction.size | 1024 | Major compaction size can be configured using this parameter. Sum of the segments which is below this threshold will be merged. This value is expressed in MB. | |
+| carbon.horizontal.compaction.enable | true | This property is used to turn ON/OFF horizontal compaction. After every DELETE and UPDATE statement, horizontal compaction may occur in case the delta (DELETE/ UPDATE) files becomes more than specified threshold. | |
+| carbon.horizontal.UPDATE.compaction.threshold | 1 | This property specifies the threshold limit on number of UPDATE delta files within a segment. In case the number of delta files goes beyond the threshold, the UPDATE delta files within the segment becomes eligible for horizontal compaction and compacted into single UPDATE delta file. | Values between 1 to 10000. |
+| carbon.horizontal.DELETE.compaction.threshold | 1 | This property specifies the threshold limit on number of DELETE delta files within a block of a segment. In case the number of delta files goes beyond the threshold, the DELETE delta files for the particular block of the segment becomes eligible for horizontal compaction and compacted into single DELETE delta file. | Values between 1 to 10000. |
+
+
+
+* **Query Configuration**
+
+| Parameter | Default Value | Description | Range |
+|--------------------------------------|---------------|---------------------------------------------------|---------------------------|
+| carbon.number.of.cores | 4 | Number of cores to be used while querying. | |
+| carbon.inmemory.record.size | 120000 | Number of records to be in memory while querying. | Min=100000 and Max=240000 |
+| carbon.enable.quick.filter | false | Improves the performance of filter query. | |
+| no.of.cores.to.load.blocks.in.driver | 10 | Number of core to load the blocks in driver. | |
+
+
+## Miscellaneous Configuration
+
+<b><p align="center">Extra Configuration in carbon.properties</p></b>
+
+* **Time format for CarbonData**
+
+| Parameter | Default Format | Description |
+|-------------------------|---------------------|--------------------------------------------------------------|
+| carbon.timestamp.format | yyyy-MM-dd HH:mm:ss | Timestamp format of input data used for timestamp data type. |
+
+* **Dataload Configuration**
+
+| Parameter | Default Value | Description |
+|---------------------------------------------|--------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| carbon.sort.file.write.buffer.size | 10485760 | File write buffer size used during sorting. |
+| carbon.lock.type | LOCALLOCK | This configuration specifies the type of lock to be acquired during concurrent operations on table. There are following types of lock implementation: - LOCALLOCK: Lock is created on local file system as file. This lock is useful when only one spark driver (thrift server) runs on a machine and no other CarbonData spark application is launched concurrently. - HDFSLOCK: Lock is created on HDFS file system as file. This lock is useful when multiple CarbonData spark applications are launched and no ZooKeeper is running on cluster and HDFS supports file based locking. |
+| carbon.sort.intermediate.files.limit | 20 | Minimum number of intermediate files after which merged sort can be started. |
+| carbon.block.meta.size.reserved.percentage | 10 | Space reserved in percentage for writing block meta data in CarbonData file. |
+| carbon.csv.read.buffersize.byte | 1048576 | csv reading buffer size. |
+| high.cardinality.value | 100000 | To identify and apply compression for non-high cardinality columns. |
+| carbon.merge.sort.reader.thread | 3 | Maximum no of threads used for reading intermediate files for final merging. |
+| carbon.load.metadata.lock.retries | 3 | Maximum number of retries to get the metadata lock for loading data to table. |
+| carbon.load.metadata.lock.retry.timeout.sec | 5 | Interval between the retries to get the lock. |
+| carbon.tempstore.location | /opt/Carbon/TempStoreLoc | Temporary store location. By default it takes System.getProperty("java.io.tmpdir"). |
+| carbon.load.log.counter | 500000 | Data loading records count logger. |
+
+
+* **Compaction Configuration**
+
+| Parameter | Default Value | Description |
+|-----------------------------------|---------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| carbon.numberof.preserve.segments | 0 | If the user wants to preserve some number of segments from being compacted then he can set this property. Example: carbon.numberof.preserve.segments=2 then 2 latest segments will always be excluded from the compaction. No segments will be preserved by default. |
+| carbon.allowed.compaction.days | 0 | Compaction will merge the segments which are loaded with in the specific number of days configured. Example: If the configuration is 2, then the segments which are loaded in the time frame of 2 days only will get merged. Segments which are loaded 2 days apart will not be merged. This is disabled by default. |
+| carbon.enable.auto.load.merge | false | To enable compaction while data loading. |
+
+
+* **Query Configuration**
+
+| Parameter | Default Value | Description |
+|--------------------------|---------------|-----------------------------------------------------------------------------------------------|
+| max.query.execution.time | 60 | Maximum time allowed for one query to be executed. The value is in minutes. |
+| carbon.enableMinMax | true | Min max is feature added to enhance query performance. To disable this feature, set it false. |
+
+* **Global Dictionary Configurations**
+
+| Parameter | Default Value | Description |
+|---------------------------------------|---------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| high.cardinality.identify.enable | true | If the parameter is true, the high cardinality columns of the dictionary code are automatically recognized and these columns will not be used as global dictionary encoding. If the parameter is false, all dictionary encoding columns are used as dictionary encoding. The high cardinality column must meet the following requirements: value of cardinality > configured value of high.cardinalityEqually, the value of cardinality is higher than the threshold.value of cardinality/ row number x 100 > configured value of high.cardinality.row.count.percentageEqually, the ratio of the cardinality value to data row number is higher than the configured percentage. |
+| high.cardinality.threshold | 1000000 | Threshold to identify whether high cardinality column.Configuration value formula: Value of cardinality > configured value of high.cardinality. The minimum value is 10000. |
+| high.cardinality.row.count.percentage | 80 | Percentage to identify whether column cardinality is more than configured percent of total row count.Configuration value formula:Value of cardinality/ row number x 100 > configured value of high.cardinality.row.count.percentageThe value of the parameter must be larger than 0. |
+| carbon.cutOffTimestamp | 1970-01-01 05:30:00 | Sets the start date for calculating the timestamp. Java counts the number of milliseconds from start of "1970-01-01 00:00:00". This property is used to customize the start of position. For example "2000-01-01 00:00:00". The date must be in the form "carbon.timestamp.format". NOTE: The CarbonData supports data store up to 68 years from the cut-off time defined. For example, if the cut-off time is 1970-01-01 05:30:00, then the data can be stored up to 2038-01-01 05:30:00. |
+| carbon.timegranularity | SECOND | The property used to set the data granularity level DAY, HOUR, MINUTE, or SECOND. |
+
+## Spark Configuration
+ <b><p align="center">Spark Configuration Reference in spark-defaults.conf</p></b>
+
+| Parameter | Default Value | Description |
+|----------------------------------------|--------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| spark.driver.memory | 1g | Amount of memory to use for the driver process, i.e. where SparkContext is initialized. NOTE: In client mode, this config must not be set through the SparkConf directly in your application, because the driver JVM has already started at that point. Instead, please set this through the --driver-memory command line option or in your default properties file. |
+| spark.executor.memory | 1g | Amount of memory to use per executor process. |
+| spark.sql.bigdata.register.analyseRule | org.apache.spark.sql.hive.acl.CarbonAccessControlRules | CarbonAccessControlRules need to be set for enabling Access Control. |
+
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/276a6111/docs/ddl-operation-on-carbondata.md
----------------------------------------------------------------------
diff --git a/docs/ddl-operation-on-carbondata.md b/docs/ddl-operation-on-carbondata.md
new file mode 100644
index 0000000..d261963
--- /dev/null
+++ b/docs/ddl-operation-on-carbondata.md
@@ -0,0 +1,193 @@
+<!--
+ 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.
+-->
+
+# DDL Operations on CarbonData
+This tutorial guides you through the data definition language support provided by CarbonData.
+
+## Overview
+The following DDL operations are supported in CarbonData :
+
+* [CREATE TABLE](#create-table)
+* [SHOW TABLE](#show-table)
+* [DROP TABLE](#drop-table)
+* [COMPACTION](#compaction)
+
+## CREATE TABLE
+ This command can be used to create a CarbonData table by specifying the list of fields along with the table properties.
+
+```
+ CREATE TABLE [IF NOT EXISTS] [db_name.]table_name
+ [(col_name data_type , ...)]
+ STORED BY 'carbondata'
+ [TBLPROPERTIES (property_name=property_value, ...)]
+ // All Carbon's additional table options will go into properties
+```
+
+### Parameter Description
+
+| Parameter | Description | Optional |
+|---------------|-----------------------------------------------------------------------------------------------------------------------------------------------|----------|
+| db_name | Name of the database. Database name should consist of alphanumeric characters and underscore(_) special character. | Yes |
+| field_list | Comma separated List of fields with data type. The field names should consist of alphanumeric characters and underscore(_) special character. | No |
+| table_name | The name of the table in Database. Table Name should consist of alphanumeric characters and underscore(_) special character. | No |
+| STORED BY | "org.apache.carbondata.format", identifies and creates a CarbonData table. | No |
+| TBLPROPERTIES | List of CarbonData table properties. | |
+
+
+### Usage Guidelines
+
+ Following are the guidelines for using table properties.
+
+ - **Dictionary Encoding Configuration**
+
+ Dictionary encoding is enabled by default for all String columns, and disabled for non-String columns. You can include and exclude columns for dictionary encoding.
+
+```
+ TBLPROPERTIES ("DICTIONARY_EXCLUDE"="column1, column2")
+ TBLPROPERTIES ("DICTIONARY_INCLUDE"="column1, column2")
+```
+
+ Here, DICTIONARY_EXCLUDE will exclude dictionary creation. This is applicable for high-cardinality columns and is an optional parameter. DICTIONARY_INCLUDE will generate dictionary for the columns specified in the list.
+
+ - **Row/Column Format Configuration**
+
+ Column groups with more than one column are stored in row format, instead of columnar format. By default, each column is a separate column group.
+
+```
+TBLPROPERTIES ("COLUMN_GROUPS"="(column1,column3),
+(Column4,Column5,Column6)")
+```
+
+ - **Table Block Size Configuration**
+
+ The block size of table files can be defined using the property TABLE_BLOCKSIZE. It accepts only integer values. The default value is 1024 MB and supports a range of 1 MB to 2048 MB.
+ If you do not specify this value in the DDL command , default value is used.
+
+```
+ TBLPROPERTIES ("TABLE_BLOCKSIZE"="512 MB")
+```
+
+ Here 512 MB means the block size of this table is 512 MB, you can also set it as 512M or 512.
+
+ - **Inverted Index Configuration**
+
+ Inverted index is very useful to improve compression ratio and query speed, especially for those low-cardinality columns who are in reward position.
+ By default inverted index is enabled. The user can disable the inverted index creation for some columns.
+
+```
+ TBLPROPERTIES ("NO_INVERTED_INDEX"="column1,column3")
+```
+
+ No inverted index shall be generated for the columns specified in NO_INVERTED_INDEX. This property is applicable on columns with high-cardinality and is an optional parameter.
+
+ NOTE:
+
+ - By default all columns other than numeric datatype are treated as dimensions and all columns of numeric datatype are treated as measures.
+
+ - All dimensions except complex datatype columns are part of multi dimensional key(MDK). This behavior can be overridden by using TBLPROPERTIES. If the user wants to keep any column (except columns of complex datatype) in multi dimensional key then he can keep the columns either in DICTIONARY_EXCLUDE or DICTIONARY_INCLUDE.
+
+
+### Example:
+```
+ CREATE TABLE IF NOT EXISTS productSchema.productSalesTable (
+ productNumber Int,
+ productName String,
+ storeCity String,
+ storeProvince String,
+ productCategory String,
+ productBatch String,
+ saleQuantity Int,
+ revenue Int)
+ STORED BY 'carbondata'
+ TBLPROPERTIES ('COLUMN_GROUPS'='(productName,productCategory)',
+ 'DICTIONARY_EXCLUDE'='productName',
+ 'DICTIONARY_INCLUDE'='productNumber',
+ 'NO_INVERTED_INDEX'='productBatch')
+```
+
+## SHOW TABLE
+
+ This command can be used to list all the tables in current database or all the tables of a specific database.
+```
+ SHOW TABLES [IN db_Name];
+```
+
+### Parameter Description
+| Parameter | Description | Optional |
+|------------|-------------------------------------------------------------------------------------------|----------|
+| IN db_Name | Name of the database. Required only if tables of this specific database are to be listed. | Yes |
+
+### Example:
+
+```
+ SHOW TABLES IN ProductSchema;
+```
+
+## DROP TABLE
+
+ This command is used to delete an existing table.
+
+```
+ DROP TABLE [IF EXISTS] [db_name.]table_name;
+```
+
+### Parameter Description
+| Parameter | Description | Optional |
+|-----------|-------------| -------- |
+| db_Name | Name of the database. If not specified, current database will be selected. | YES |
+| table_name | Name of the table to be deleted. | NO |
+
+### Example:
+
+```
+ DROP TABLE IF EXISTS productSchema.productSalesTable;
+```
+
+## COMPACTION
+
+This command merges the specified number of segments into one segment. This enhances the query performance of the table.
+
+```
+ ALTER TABLE [db_name.]table_name COMPACT 'MINOR/MAJOR';
+```
+
+ To get details about Compaction refer to [Data Management](data-management.md)
+
+### Parameter Description
+
+| Parameter | Description | Optional |
+| ------------- | -----| ----------- |
+| db_name | Database name, if it is not specified then it uses current database. | YES |
+| table_name | The name of the table in provided database.| NO |
+
+### Syntax
+
+- **Minor Compaction**
+
+```
+ALTER TABLE table_name COMPACT 'MINOR';
+```
+- **Major Compaction**
+
+```
+ALTER TABLE table_name COMPACT 'MAJOR';
+```
+
+
+
[06/50] [abbrv] incubator-carbondata git commit: CARBONDATA-561
delete duplicated code in spark2
Posted by ra...@apache.org.
CARBONDATA-561 delete duplicated code in spark2
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/84b0ca38
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/84b0ca38
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/84b0ca38
Branch: refs/heads/branch-1.0
Commit: 84b0ca380f838c8f76db6331a5ee1e9a9370008d
Parents: e882aed
Author: hexiaoqiao <he...@meituan.com>
Authored: Wed Jan 18 18:20:11 2017 +0800
Committer: hexiaoqiao <he...@meituan.com>
Committed: Wed Jan 18 18:20:11 2017 +0800
----------------------------------------------------------------------
.../apache/carbondata/spark/CarbonOption.scala | 57 --------------------
1 file changed, 57 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b0ca38/integration/spark2/src/main/scala/org/apache/carbondata/spark/CarbonOption.scala
----------------------------------------------------------------------
diff --git a/integration/spark2/src/main/scala/org/apache/carbondata/spark/CarbonOption.scala b/integration/spark2/src/main/scala/org/apache/carbondata/spark/CarbonOption.scala
deleted file mode 100644
index 3b87e41..0000000
--- a/integration/spark2/src/main/scala/org/apache/carbondata/spark/CarbonOption.scala
+++ /dev/null
@@ -1,57 +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.spark
-
-import org.apache.carbondata.core.constants.CarbonCommonConstants
-
-/**
- * Contains all options for Spark data source
- */
-class CarbonOption(options: Map[String, String]) {
- def tableIdentifier: String = options.getOrElse("tableName", s"$dbName.$tableName")
-
- def dbName: String = options.getOrElse("dbName", CarbonCommonConstants.DATABASE_DEFAULT_NAME)
-
- def tableName: String = options.getOrElse("tableName", "default_table")
-
- def tableId: String = options.getOrElse("tableId", "default_table_id")
-
- def tablePath: String = s"$dbName/$tableName"
-
- def partitionCount: String = options.getOrElse("partitionCount", "1")
-
- def partitionClass: String = {
- options.getOrElse("partitionClass",
- "org.apache.carbondata.spark.partition.api.impl.SampleDataPartitionerImpl")
- }
-
- def tempCSV: Boolean = options.getOrElse("tempCSV", "true").toBoolean
-
- def compress: Boolean = options.getOrElse("compress", "false").toBoolean
-
- def useKettle: Boolean = options.getOrElse("useKettle", "true").toBoolean
-
- def bucketNumber: Int = options.getOrElse("bucketnumber", "0").toInt
-
- def bucketColumns: String = options.getOrElse("bucketcolumns", "")
-
- def isBucketingEnabled: Boolean = options.contains("bucketcolumns") &&
- options.contains("bucketnumber")
-
- def toMap: Map[String, String] = options
-}
[46/50] [abbrv] incubator-carbondata git commit:
[CARBONDATA-673]Reverting big decimal compression as it has below issue This
closes #561
Posted by ra...@apache.org.
[CARBONDATA-673]Reverting big decimal compression as it has below issue This closes #561
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/4a1f6ae5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/4a1f6ae5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/4a1f6ae5
Branch: refs/heads/branch-1.0
Commit: 4a1f6ae5dcb09c021af7798ba6c854c61a531d1a
Parents: 254af99 9e24a3d
Author: ravipesala <ra...@gmail.com>
Authored: Fri Jan 20 21:02:38 2017 +0530
Committer: ravipesala <ra...@gmail.com>
Committed: Fri Jan 20 21:02:38 2017 +0530
----------------------------------------------------------------------
.../core/compression/BigDecimalCompressor.java | 74 --------
.../measure/AbstractMeasureChunkReader.java | 10 +-
...CompressedMeasureChunkFileBasedReaderV1.java | 4 +-
...CompressedMeasureChunkFileBasedReaderV2.java | 6 +-
.../chunk/store/MeasureChunkStoreFactory.java | 8 +-
.../safe/SafeBigDecimalMeasureChunkStore.java | 98 +++++++++++
.../UnsafeBigDecimalMeasureChunkStore.java | 140 +++++++++++++++
...afeVariableLengthDimesionDataChunkStore.java | 63 ++++---
.../compression/ValueCompressionHolder.java | 55 +++---
.../compression/decimal/CompressByteArray.java | 108 ++++++++++++
.../decimal/CompressionMaxMinByte.java | 32 ++--
.../decimal/CompressionMaxMinDefault.java | 29 ++--
.../decimal/CompressionMaxMinInt.java | 28 +--
.../decimal/CompressionMaxMinLong.java | 30 ++--
.../decimal/CompressionMaxMinShort.java | 27 +--
.../nondecimal/CompressionNonDecimalByte.java | 32 ++--
.../CompressionNonDecimalDefault.java | 29 ++--
.../nondecimal/CompressionNonDecimalInt.java | 30 ++--
.../nondecimal/CompressionNonDecimalLong.java | 31 ++--
.../CompressionNonDecimalMaxMinByte.java | 34 ++--
.../CompressionNonDecimalMaxMinDefault.java | 30 ++--
.../CompressionNonDecimalMaxMinInt.java | 26 ++-
.../CompressionNonDecimalMaxMinLong.java | 30 ++--
.../CompressionNonDecimalMaxMinShort.java | 27 +--
.../nondecimal/CompressionNonDecimalShort.java | 30 ++--
.../compression/none/CompressionNoneByte.java | 28 +--
.../none/CompressionNoneDefault.java | 29 ++--
.../compression/none/CompressionNoneInt.java | 28 +--
.../compression/none/CompressionNoneLong.java | 26 ++-
.../compression/none/CompressionNoneShort.java | 28 +--
.../compression/type/CompressionBigDecimal.java | 144 ----------------
.../dataholder/CarbonWriteDataHolder.java | 50 ------
...ractHeavyCompressedDoubleArrayDataStore.java | 3 +-
.../core/util/BigDecimalCompressionFinder.java | 92 ----------
.../carbondata/core/util/DataTypeUtil.java | 13 ++
.../core/util/ValueCompressionUtil.java | 59 +------
...mpressedMeasureChunkFileBasedReaderTest.java | 171 ++++++++-----------
.../store/CarbonFactDataHandlerColumnar.java | 71 +-------
38 files changed, 851 insertions(+), 902 deletions(-)
----------------------------------------------------------------------
[24/50] [abbrv] incubator-carbondata git commit: Supporting Spark
1.6.3 Version in CarbonData
Posted by ra...@apache.org.
Supporting Spark 1.6.3 Version in CarbonData
# Conflicts:
# docs/Building-CarbonData-And-IDE-Configuartion.md
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/75a94c03
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/75a94c03
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/75a94c03
Branch: refs/heads/branch-1.0
Commit: 75a94c03ec68eae0f19306fa596a31eeba4e9c5a
Parents: ee95624
Author: nareshpr <pr...@gmail.com>
Authored: Thu Jan 19 19:15:21 2017 +0530
Committer: ravipesala <ra...@gmail.com>
Committed: Fri Jan 20 12:51:05 2017 +0530
----------------------------------------------------------------------
build/README.md | 1 +
.../main/scala/org/apache/spark/sql/CodeGenerateFactory.scala | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/75a94c03/build/README.md
----------------------------------------------------------------------
diff --git a/build/README.md b/build/README.md
index a150a90..0115f5d 100644
--- a/build/README.md
+++ b/build/README.md
@@ -48,6 +48,7 @@ mvn -DskipTests -Pspark-1.5 -Dspark.version=1.5.2 clean package
mvn -DskipTests -Pspark-1.6 -Dspark.version=1.6.1 clean package
mvn -DskipTests -Pspark-1.6 -Dspark.version=1.6.2 clean package
+mvn -DskipTests -Pspark-1.6 -Dspark.version=1.6.3 clean package
mvn -DskipTests -Pspark-2.1 -Dspark.version=2.1.0 clean package
```
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/75a94c03/integration/spark/src/main/scala/org/apache/spark/sql/CodeGenerateFactory.scala
----------------------------------------------------------------------
diff --git a/integration/spark/src/main/scala/org/apache/spark/sql/CodeGenerateFactory.scala b/integration/spark/src/main/scala/org/apache/spark/sql/CodeGenerateFactory.scala
index 7ab2bf7..065dfed 100644
--- a/integration/spark/src/main/scala/org/apache/spark/sql/CodeGenerateFactory.scala
+++ b/integration/spark/src/main/scala/org/apache/spark/sql/CodeGenerateFactory.scala
@@ -25,8 +25,8 @@ import org.apache.spark.util.{ScalaCompilerUtil, Utils}
private[sql] class CodeGenerateFactory(version: String) {
- val optimizerFactory = if (version.equals("1.6.2")) {
- ScalaCompilerUtil.compiledCode(CodeTemplates.spark1_6_2_OptimizerString)
+ val optimizerFactory = if (version.equals("1.6.2") || version.equals("1.6.3")) {
+ ScalaCompilerUtil.compiledCode(CodeTemplates.spark1_6_OptimizerString)
.asInstanceOf[AbstractCarbonOptimizerFactory]
} else if (version.startsWith("1.6") || version.startsWith("1.5")) {
ScalaCompilerUtil.compiledCode(CodeTemplates.defaultOptimizerString)
@@ -90,7 +90,7 @@ object CodeGenerateFactory {
object CodeTemplates {
- val spark1_6_2_OptimizerString =
+ val spark1_6_OptimizerString =
s"""
import org.apache.spark.sql._;
import org.apache.spark.sql.optimizer._;
[39/50] [abbrv] incubator-carbondata git commit: [CARBONDATA-667] Set
proper carbon properties location.This closes #557
Posted by ra...@apache.org.
[CARBONDATA-667] Set proper carbon properties location.This closes #557
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/556a4118
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/556a4118
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/556a4118
Branch: refs/heads/branch-1.0
Commit: 556a4118ed10e015491088b664ff72db52e3ab8b
Parents: 1fb5391 c2ee320
Author: Venkata Ramana G <ra...@huawei.com>
Authored: Fri Jan 20 18:32:30 2017 +0530
Committer: Venkata Ramana G <ra...@huawei.com>
Committed: Fri Jan 20 18:32:30 2017 +0530
----------------------------------------------------------------------
.../carbondata/spark/util/CarbonScalaUtil.scala | 5 +++-
.../spark/thriftserver/CarbonThriftServer.scala | 18 ++++++++++----
.../apache/carbondata/spark/CarbonOption.scala | 0
.../spark/thriftserver/CarbonThriftServer.scala | 25 +++++++++++++-------
4 files changed, 34 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
[21/50] [abbrv] incubator-carbondata git commit:
[CARBONDATA-635]Insert query fails when functions are used in select query
This closes #553
Posted by ra...@apache.org.
[CARBONDATA-635]Insert query fails when functions are used in select query This closes #553
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/68a16d2c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/68a16d2c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/68a16d2c
Branch: refs/heads/branch-1.0
Commit: 68a16d2c96132d9179fea23271036a4d83fef200
Parents: db2c5f9 529c06d
Author: jackylk <ja...@huawei.com>
Authored: Thu Jan 19 23:19:58 2017 +0800
Committer: jackylk <ja...@huawei.com>
Committed: Thu Jan 19 23:19:58 2017 +0800
----------------------------------------------------------------------
.../examples/CarbonSessionExample.scala | 19 +++++-
.../src/test/resources/data_with_all_types.csv | 10 ++++
.../InsertIntoCarbonTableTestCase.scala | 62 ++++++++++++++++----
.../execution/CarbonLateDecodeStrategy.scala | 45 +++++++-------
4 files changed, 102 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
[23/50] [abbrv] incubator-carbondata git commit: [CARBONDATA-654] Add
data update and deletion example This closes #540
Posted by ra...@apache.org.
[CARBONDATA-654] Add data update and deletion example This closes #540
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/ee956241
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/ee956241
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/ee956241
Branch: refs/heads/branch-1.0
Commit: ee9562414e906b89cbf2a8f8cdbb6d557818ce14
Parents: 68a16d2 6583d2e
Author: ravipesala <ra...@gmail.com>
Authored: Thu Jan 19 22:34:33 2017 +0530
Committer: ravipesala <ra...@gmail.com>
Committed: Thu Jan 19 22:34:33 2017 +0530
----------------------------------------------------------------------
.../spark/src/main/resources/data_update.csv | 11 ++
.../examples/DataUpdateDeleteExample.scala | 117 +++++++++++++++++++
2 files changed, 128 insertions(+)
----------------------------------------------------------------------
[22/50] [abbrv] incubator-carbondata git commit: add data update and
deletion example
Posted by ra...@apache.org.
add data update and deletion example
add data update and deletion example
fix comments
fix comments
fix ci issues
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/6583d2eb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/6583d2eb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/6583d2eb
Branch: refs/heads/branch-1.0
Commit: 6583d2eb7cb72d1448fabcdd489af36738934198
Parents: 68a16d2
Author: chenliang613 <ch...@huawei.com>
Authored: Mon Jan 16 16:07:09 2017 +0800
Committer: ravipesala <ra...@gmail.com>
Committed: Thu Jan 19 22:33:27 2017 +0530
----------------------------------------------------------------------
.../spark/src/main/resources/data_update.csv | 11 ++
.../examples/DataUpdateDeleteExample.scala | 117 +++++++++++++++++++
2 files changed, 128 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/6583d2eb/examples/spark/src/main/resources/data_update.csv
----------------------------------------------------------------------
diff --git a/examples/spark/src/main/resources/data_update.csv b/examples/spark/src/main/resources/data_update.csv
new file mode 100644
index 0000000..3f72e00
--- /dev/null
+++ b/examples/spark/src/main/resources/data_update.csv
@@ -0,0 +1,11 @@
+ID,country,name,phonetype,serialname,salary
+1,france,bbb1,phone197,ASD69643,25000
+2,france,bbb2,phone756,ASD42892,25001
+3,france,bbb3,phone1904,ASD37014,25002
+4,france,bbb4,phone2435,ASD66902,25003
+5,france,bbb5,phone2441,ASD90633,25004
+6,germany,bbb6,phone294,ASD59961,25005
+7,germany,bbb7,phone610,ASD14875,25006
+8,germany,bbb8,phone1848,ASD57308,25007
+9,germany,bbb9,phone706,ASD86717,25008
+10,germany,bbb10,phone685,ASD30505,25009
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/6583d2eb/examples/spark/src/main/scala/org/apache/carbondata/examples/DataUpdateDeleteExample.scala
----------------------------------------------------------------------
diff --git a/examples/spark/src/main/scala/org/apache/carbondata/examples/DataUpdateDeleteExample.scala b/examples/spark/src/main/scala/org/apache/carbondata/examples/DataUpdateDeleteExample.scala
new file mode 100644
index 0000000..a6c35cc
--- /dev/null
+++ b/examples/spark/src/main/scala/org/apache/carbondata/examples/DataUpdateDeleteExample.scala
@@ -0,0 +1,117 @@
+/*
+ * 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.examples
+
+import org.apache.carbondata.core.constants.CarbonCommonConstants
+import org.apache.carbondata.core.util.CarbonProperties
+import org.apache.carbondata.examples.util.ExampleUtils
+
+object DataUpdateDeleteExample {
+
+ def main(args: Array[String]) {
+ val cc = ExampleUtils.createCarbonContext("DataUpdateDeleteExample")
+ val testData = ExampleUtils.currentPath + "/src/main/resources/data.csv"
+ val testData1 = ExampleUtils.currentPath + "/src/main/resources/data_update.csv"
+
+ // Specify timestamp format based on raw data
+ CarbonProperties.getInstance()
+ .addProperty(CarbonCommonConstants.CARBON_TIMESTAMP_FORMAT, "yyyy/MM/dd")
+
+ cc.sql("DROP TABLE IF EXISTS t3")
+ cc.sql("DROP TABLE IF EXISTS update_table")
+
+ // Create table, 6 dimensions, 1 measure
+ cc.sql("""
+ CREATE TABLE IF NOT EXISTS t3
+ (ID Int, date Timestamp, country String,
+ name String, phonetype String, serialname char(10), salary Int)
+ STORED BY 'carbondata'
+ """)
+
+ cc.sql(s"""
+ LOAD DATA LOCAL INPATH '$testData' INTO TABLE t3
+ """)
+
+ // 1.Update data with simple SET
+ cc.sql("""
+ SELECT * FROM t3 ORDER BY ID
+ """).show()
+
+ // Update data where salary < 15003
+ cc.sql("""
+ UPDATE t3 SET (t3.country) = ('india') WHERE t3.salary < 15003
+ """).show()
+ cc.sql("""
+ UPDATE t3 SET (t3.salary) = (t3.salary + 9) WHERE t3.name = 'aaa1'
+ """).show()
+
+ // Query data again after the above update
+ cc.sql("""
+ SELECT * FROM t3 ORDER BY ID
+ """).show()
+
+ // 2.Update data with subquery result SET
+ cc.sql("""
+ CREATE TABLE IF NOT EXISTS update_table
+ (ID Int, country String,
+ name String, phonetype String, serialname char(10), salary Int)
+ STORED BY 'carbondata'
+ """)
+
+ cc.sql(s"""
+ LOAD DATA LOCAL INPATH '$testData1' INTO TABLE update_table
+ """)
+
+ cc.sql("""
+ UPDATE t3
+ SET (t3.country, t3.name) = (SELECT u.country, u.name FROM update_table u WHERE u.id = 5)
+ WHERE t3.id < 5""").show()
+
+ // Query data again after the above update
+ cc.sql("""
+ SELECT * FROM t3 ORDER BY ID
+ """).show()
+
+ // 3.Update data with join query result SET
+ cc.sql("""
+ UPDATE t3
+ SET (t3.country, t3.salary) =
+ (SELECT u.country, f.salary FROM update_table u FULL JOIN update_table f
+ WHERE u.id = 8 and f.id=6) WHERE t3.id >6""").show()
+
+ // Query data again after the above update
+ cc.sql("""
+ SELECT * FROM t3 ORDER BY ID
+ """).show()
+
+ // 4.Delete data where salary > 15005
+ cc.sql("""
+ DELETE FROM t3 WHERE salary > 15005
+ """).show()
+
+ // Query data again after delete data
+ cc.sql("""
+ SELECT * FROM t3 ORDER BY ID
+ """).show()
+
+ // Drop table
+ cc.sql("DROP TABLE IF EXISTS t3")
+ cc.sql("DROP TABLE IF EXISTS update_table")
+ }
+
+}
[30/50] [abbrv] incubator-carbondata git commit: Fixed random test
case failure
Posted by ra...@apache.org.
Fixed random test case failure
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/4543de62
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/4543de62
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/4543de62
Branch: refs/heads/branch-1.0
Commit: 4543de6220191289335946fcc2284a542e5d562c
Parents: 1160b57
Author: mohammadshahidkhan <mo...@gmail.com>
Authored: Thu Jan 19 21:23:13 2017 +0530
Committer: Venkata Ramana G <ra...@huawei.com>
Committed: Fri Jan 20 16:42:00 2017 +0530
----------------------------------------------------------------------
.../datastore/AbstractBlockIndexStoreCache.java | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/4543de62/core/src/main/java/org/apache/carbondata/core/datastore/AbstractBlockIndexStoreCache.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/AbstractBlockIndexStoreCache.java b/core/src/main/java/org/apache/carbondata/core/datastore/AbstractBlockIndexStoreCache.java
index 4eb6b7a..340f290 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/AbstractBlockIndexStoreCache.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/AbstractBlockIndexStoreCache.java
@@ -93,21 +93,21 @@ public abstract class AbstractBlockIndexStoreCache<K, V>
long requiredMetaSize = CarbonUtil.calculateMetaSize(blockInfo);
if (requiredMetaSize > 0) {
tableBlock.setMemorySize(requiredMetaSize);
+ // load table blocks data
+ // getting the data file meta data of the block
+ DataFileFooter footer = CarbonUtil.readMetadatFile(blockInfo);
+ footer.setBlockInfo(new BlockInfo(blockInfo));
+ // building the block
+ tableBlock.buildIndex(Collections.singletonList(footer));
tableBlock.incrementAccessCount();
boolean isTableBlockAddedToLruCache = lruCache.put(lruCacheKey, tableBlock, requiredMetaSize);
- // if column is successfully added to lru cache then only load the
- // table blocks data
- if (isTableBlockAddedToLruCache) {
- // load table blocks data
- // getting the data file meta data of the block
- DataFileFooter footer = CarbonUtil.readMetadatFile(blockInfo);
- footer.setBlockInfo(new BlockInfo(blockInfo));
- // building the block
- tableBlock.buildIndex(Collections.singletonList(footer));
- } else {
+ if (!isTableBlockAddedToLruCache) {
throw new IndexBuilderException(
"Cannot load table blocks into memory. Not enough memory available");
}
+ } else {
+ throw new IndexBuilderException(
+ "Invalid carbon data file: " + blockInfo.getFilePath());
}
}
}
[33/50] [abbrv] incubator-carbondata git commit: [CARBONDATA-648]
Code Clean UpTask This closes #544
Posted by ra...@apache.org.
[CARBONDATA-648] Code Clean UpTask This closes #544
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/28abe7e0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/28abe7e0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/28abe7e0
Branch: refs/heads/branch-1.0
Commit: 28abe7e0ebb93c1d2c4a9871b57ebb494354b17a
Parents: a32632e 6650c63
Author: ravipesala <ra...@gmail.com>
Authored: Fri Jan 20 16:52:23 2017 +0530
Committer: ravipesala <ra...@gmail.com>
Committed: Fri Jan 20 16:52:23 2017 +0530
----------------------------------------------------------------------
.../common/logging/impl/ExtendedRollingFileAppender.java | 4 ++--
.../common/logging/impl/StandardLogServiceTest_UT.java | 1 -
.../core/datastore/exception/IndexBuilderException.java | 2 --
.../core/scan/executor/exception/QueryExecutionException.java | 2 --
.../org/apache/carbondata/hadoop/test/util/StoreCreator.java | 4 ----
.../spark/testsuite/aggquery/IntegerDataTypeTestCase.scala | 2 --
.../spark/testsuite/primitiveTypes/FloatDataTypeTestCase.scala | 3 ---
.../spark/testsuite/dataretention/DataRetentionTestCase.scala | 3 +--
.../spark/testsuite/detailquery/AllDataTypesTestCase.scala | 2 --
.../testsuite/detailquery/HighCardinalityDataTypesTestCase.scala | 3 ---
.../spark/testsuite/detailquery/IntegerDataTypeTestCase.scala | 2 --
.../testsuite/detailquery/ValueCompressionDataTypeTestCase.scala | 3 ---
.../spark/testsuite/filterexpr/AllDataTypesTestCaseFilter.scala | 2 --
.../spark/testsuite/filterexpr/CountStarTestCase.scala | 3 ---
.../spark/testsuite/filterexpr/IntegerDataTypeTestCase.scala | 2 --
.../spark/testsuite/joinquery/AllDataTypesTestCaseJoin.scala | 2 --
.../spark/testsuite/joinquery/IntegerDataTypeTestCase.scala | 2 --
.../spark/testsuite/sortexpr/AllDataTypesTestCaseSort.scala | 2 --
.../spark/testsuite/sortexpr/IntegerDataTypeTestCase.scala | 3 ---
.../java/org/apache/carbondata/spark/load/DeleteLoadFolders.java | 1 -
.../java/org/apache/carbondata/spark/util/LoadMetadataUtil.java | 1 -
.../carbondata/processing/newflow/sort/unsafe/sort/TimSort.java | 2 --
.../java/org/apache/carbondata/lcm/locks/LocalFileLockTest.java | 2 --
.../org/apache/carbondata/lcm/locks/ZooKeeperLockingTest.java | 2 +-
.../test/java/org/apache/carbondata/test/util/StoreCreator.java | 2 --
25 files changed, 4 insertions(+), 53 deletions(-)
----------------------------------------------------------------------
[26/50] [abbrv] incubator-carbondata git commit: Date filter fix
issue-CARBONDATA-603
Posted by ra...@apache.org.
Date filter fix issue-CARBONDATA-603
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/ea04fce1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/ea04fce1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/ea04fce1
Branch: refs/heads/branch-1.0
Commit: ea04fce1d6df2a56ec8e40f6dd4716ab61b8d6f8
Parents: 913d266
Author: kumarvishal <ku...@gmail.com>
Authored: Wed Jan 11 20:29:31 2017 +0800
Committer: ravipesala <ra...@gmail.com>
Committed: Fri Jan 20 13:41:01 2017 +0530
----------------------------------------------------------------------
.../cache/dictionary/ColumnDictionaryInfo.java | 6 +--
.../core/constants/CarbonCommonConstants.java | 9 ++++
.../DirectDictionaryGenerator.java | 1 +
.../DirectDictionaryKeyGeneratorFactory.java | 8 +---
.../DateDirectDictionaryGenerator.java | 32 +++++++------
.../core/scan/expression/ExpressionResult.java | 12 +++--
.../carbondata/core/scan/filter/FilterUtil.java | 19 +++++---
.../visitor/CustomTypeDictionaryVisitor.java | 28 ++++++++----
.../apache/carbondata/core/util/CarbonUtil.java | 22 +++++++++
.../carbondata/core/util/DataTypeUtil.java | 24 +++++++++-
.../sortindex/CarbonDictionarySortModel.java | 7 ++-
.../DateDataTypeDirectDictionaryTest.scala | 6 +--
...TypeDirectDictionaryWithNoDictTestCase.scala | 6 +--
.../DateDataTypeNullDataTest.scala | 6 +--
.../spark/rdd/CarbonDataLoadRDD.scala | 18 +++++---
.../spark/rdd/CarbonGlobalDictionaryRDD.scala | 18 +++++---
.../spark/rdd/NewCarbonDataLoadRDD.scala | 9 ++--
.../carbondata/spark/util/CarbonScalaUtil.scala | 11 ++---
.../spark/util/GlobalDictionaryUtil.scala | 47 +++++++++++---------
.../execution/command/carbonTableSchema.scala | 3 ++
.../util/ExternalColumnDictionaryTestCase.scala | 3 ++
...GlobalDictionaryUtilConcurrentTestCase.scala | 3 ++
.../util/GlobalDictionaryUtilTestCase.scala | 3 ++
.../execution/command/carbonTableSchema.scala | 3 ++
.../processing/model/CarbonLoadModel.java | 38 ++++++++++++----
25 files changed, 232 insertions(+), 110 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ea04fce1/core/src/main/java/org/apache/carbondata/core/cache/dictionary/ColumnDictionaryInfo.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/cache/dictionary/ColumnDictionaryInfo.java b/core/src/main/java/org/apache/carbondata/core/cache/dictionary/ColumnDictionaryInfo.java
index 9774f19..d3599da 100644
--- a/core/src/main/java/org/apache/carbondata/core/cache/dictionary/ColumnDictionaryInfo.java
+++ b/core/src/main/java/org/apache/carbondata/core/cache/dictionary/ColumnDictionaryInfo.java
@@ -27,7 +27,6 @@ import java.util.concurrent.atomic.AtomicReference;
import org.apache.carbondata.core.constants.CarbonCommonConstants;
import org.apache.carbondata.core.metadata.datatype.DataType;
import org.apache.carbondata.core.util.ByteUtil;
-import org.apache.carbondata.core.util.CarbonProperties;
import org.apache.carbondata.core.util.CarbonUtil;
import org.apache.carbondata.core.util.DataTypeUtil;
/**
@@ -285,9 +284,8 @@ public class ColumnDictionaryInfo extends AbstractColumnDictionaryInfo {
.compare((Boolean.parseBoolean(dictionaryVal)), (Boolean.parseBoolean(memberVal)));
case DATE:
case TIMESTAMP:
- SimpleDateFormat parser = new SimpleDateFormat(CarbonProperties.getInstance()
- .getProperty(CarbonCommonConstants.CARBON_TIMESTAMP_FORMAT,
- CarbonCommonConstants.CARBON_TIMESTAMP_DEFAULT_FORMAT));
+ String format = CarbonUtil.getFormatFromProperty(dataType);
+ SimpleDateFormat parser = new SimpleDateFormat(format);
Date dateToStr;
Date dictionaryDate;
dateToStr = parser.parse(memberVal);
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ea04fce1/core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java b/core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java
index 6726d83..d1c5eb1 100644
--- a/core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java
+++ b/core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java
@@ -380,6 +380,15 @@ public final class CarbonCommonConstants {
* CARBON_TIMESTAMP_DEFAULT_FORMAT
*/
public static final String CARBON_TIMESTAMP_FORMAT = "carbon.timestamp.format";
+
+ /**
+ * CARBON_DATE_DEFAULT_FORMAT
+ */
+ public static final String CARBON_DATE_DEFAULT_FORMAT = "yyyy-MM-dd";
+ /**
+ * CARBON_DATE_DEFAULT_FORMAT
+ */
+ public static final String CARBON_DATE_FORMAT = "carbon.date.format";
/**
* STORE_LOCATION_HDFS
*/
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ea04fce1/core/src/main/java/org/apache/carbondata/core/keygenerator/directdictionary/DirectDictionaryGenerator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/keygenerator/directdictionary/DirectDictionaryGenerator.java b/core/src/main/java/org/apache/carbondata/core/keygenerator/directdictionary/DirectDictionaryGenerator.java
index 97f1899..469fe1e 100644
--- a/core/src/main/java/org/apache/carbondata/core/keygenerator/directdictionary/DirectDictionaryGenerator.java
+++ b/core/src/main/java/org/apache/carbondata/core/keygenerator/directdictionary/DirectDictionaryGenerator.java
@@ -57,6 +57,7 @@ public interface DirectDictionaryGenerator {
/**
* Return value datatype for this generator
+ *
* @return
*/
DataType getReturnType();
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ea04fce1/core/src/main/java/org/apache/carbondata/core/keygenerator/directdictionary/DirectDictionaryKeyGeneratorFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/keygenerator/directdictionary/DirectDictionaryKeyGeneratorFactory.java b/core/src/main/java/org/apache/carbondata/core/keygenerator/directdictionary/DirectDictionaryKeyGeneratorFactory.java
index 8bf0148..e20ebb2 100644
--- a/core/src/main/java/org/apache/carbondata/core/keygenerator/directdictionary/DirectDictionaryKeyGeneratorFactory.java
+++ b/core/src/main/java/org/apache/carbondata/core/keygenerator/directdictionary/DirectDictionaryKeyGeneratorFactory.java
@@ -16,11 +16,10 @@
*/
package org.apache.carbondata.core.keygenerator.directdictionary;
-import org.apache.carbondata.core.constants.CarbonCommonConstants;
import org.apache.carbondata.core.keygenerator.directdictionary.timestamp.DateDirectDictionaryGenerator;
import org.apache.carbondata.core.keygenerator.directdictionary.timestamp.TimeStampDirectDictionaryGenerator;
import org.apache.carbondata.core.metadata.datatype.DataType;
-import org.apache.carbondata.core.util.CarbonProperties;
+import org.apache.carbondata.core.util.CarbonUtil;
/**
* Factory for DirectDictionary Key generator
@@ -57,9 +56,6 @@ public final class DirectDictionaryKeyGeneratorFactory {
}
public static DirectDictionaryGenerator getDirectDictionaryGenerator(DataType dataType) {
- return getDirectDictionaryGenerator(dataType,
- CarbonProperties.getInstance()
- .getProperty(CarbonCommonConstants.CARBON_TIMESTAMP_FORMAT,
- CarbonCommonConstants.CARBON_TIMESTAMP_DEFAULT_FORMAT));
+ return getDirectDictionaryGenerator(dataType, CarbonUtil.getFormatFromProperty(dataType));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ea04fce1/core/src/main/java/org/apache/carbondata/core/keygenerator/directdictionary/timestamp/DateDirectDictionaryGenerator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/keygenerator/directdictionary/timestamp/DateDirectDictionaryGenerator.java b/core/src/main/java/org/apache/carbondata/core/keygenerator/directdictionary/timestamp/DateDirectDictionaryGenerator.java
index 8401b80..5572f70 100644
--- a/core/src/main/java/org/apache/carbondata/core/keygenerator/directdictionary/timestamp/DateDirectDictionaryGenerator.java
+++ b/core/src/main/java/org/apache/carbondata/core/keygenerator/directdictionary/timestamp/DateDirectDictionaryGenerator.java
@@ -18,7 +18,9 @@ package org.apache.carbondata.core.keygenerator.directdictionary.timestamp;
import java.text.ParseException;
import java.text.SimpleDateFormat;
+import java.util.Calendar;
import java.util.Date;
+import java.util.TimeZone;
import org.apache.carbondata.common.logging.LogService;
import org.apache.carbondata.common.logging.LogServiceFactory;
@@ -33,13 +35,17 @@ import org.apache.carbondata.core.util.CarbonProperties;
*/
public class DateDirectDictionaryGenerator implements DirectDictionaryGenerator {
- static final int cutOffDate = Integer.MAX_VALUE >> 1;
- static final long SECONDS_PER_DAY = 60 * 60 * 24L;
- static final long MILLIS_PER_DAY = SECONDS_PER_DAY * 1000L;
-
+ private static final long SECONDS_PER_DAY = 60 * 60 * 24L;
+ private static final long MILLIS_PER_DAY = SECONDS_PER_DAY * 1000L;
private ThreadLocal<SimpleDateFormat> simpleDateFormatLocal = new ThreadLocal<>();
+ //Java TimeZone has no mention of thread safety. Use thread local instance to be safe.
+ private ThreadLocal<TimeZone> threadLocalLocalTimeZone = new ThreadLocal() {
+ @Override protected TimeZone initialValue() {
+ return Calendar.getInstance().getTimeZone();
+ }
+ };
private String dateFormat;
/**
@@ -48,16 +54,14 @@ public class DateDirectDictionaryGenerator implements DirectDictionaryGenerator
private static final LogService LOGGER =
LogServiceFactory.getLogService(DateDirectDictionaryGenerator.class.getName());
-
public DateDirectDictionaryGenerator(String dateFormat) {
this.dateFormat = dateFormat;
initialize();
}
public DateDirectDictionaryGenerator() {
- this(CarbonProperties.getInstance()
- .getProperty(CarbonCommonConstants.CARBON_TIMESTAMP_FORMAT,
- CarbonCommonConstants.CARBON_TIMESTAMP_DEFAULT_FORMAT));
+ this(CarbonProperties.getInstance().getProperty(CarbonCommonConstants.CARBON_DATE_FORMAT,
+ CarbonCommonConstants.CARBON_DATE_DEFAULT_FORMAT));
}
/**
@@ -127,7 +131,7 @@ public class DateDirectDictionaryGenerator implements DirectDictionaryGenerator
if (key == 1) {
return null;
}
- return key - cutOffDate;
+ return key;
}
private int generateDirectSurrogateKeyForNonTimestampType(String memberStr) {
@@ -135,9 +139,8 @@ public class DateDirectDictionaryGenerator implements DirectDictionaryGenerator
try {
timeValue = Long.valueOf(memberStr) / 1000;
} catch (NumberFormatException e) {
- LOGGER.debug(
- "Cannot convert " + memberStr + " Long type value. Value considered as null." + e
- .getMessage());
+ LOGGER.debug("Cannot convert " + memberStr + " Long type value. Value considered as null." + e
+ .getMessage());
}
if (timeValue == -1) {
return 1;
@@ -147,11 +150,12 @@ public class DateDirectDictionaryGenerator implements DirectDictionaryGenerator
}
private int generateKey(long timeValue) {
- int key = (int)Math.floor((double)timeValue / MILLIS_PER_DAY) + cutOffDate;
+ long milli = timeValue + threadLocalLocalTimeZone.get().getOffset(timeValue);
+ int key = (int) Math.floor((double) milli / MILLIS_PER_DAY);
return key;
}
- public void initialize(){
+ public void initialize() {
if (simpleDateFormatLocal.get() == null) {
simpleDateFormatLocal.set(new SimpleDateFormat(dateFormat));
simpleDateFormatLocal.get().setLenient(false);
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ea04fce1/core/src/main/java/org/apache/carbondata/core/scan/expression/ExpressionResult.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/expression/ExpressionResult.java b/core/src/main/java/org/apache/carbondata/core/scan/expression/ExpressionResult.java
index 090ce0e..1e57bf2 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/expression/ExpressionResult.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/expression/ExpressionResult.java
@@ -28,7 +28,7 @@ import java.util.List;
import org.apache.carbondata.core.constants.CarbonCommonConstants;
import org.apache.carbondata.core.metadata.datatype.DataType;
import org.apache.carbondata.core.scan.expression.exception.FilterIllegalMemberException;
-import org.apache.carbondata.core.util.CarbonProperties;
+import org.apache.carbondata.core.util.CarbonUtil;
public class ExpressionResult implements Comparable<ExpressionResult> {
@@ -175,9 +175,8 @@ public class ExpressionResult implements Comparable<ExpressionResult> {
switch (this.getDataType()) {
case DATE:
case TIMESTAMP:
- SimpleDateFormat parser = new SimpleDateFormat(CarbonProperties.getInstance()
- .getProperty(CarbonCommonConstants.CARBON_TIMESTAMP_FORMAT,
- CarbonCommonConstants.CARBON_TIMESTAMP_DEFAULT_FORMAT));
+ String format = CarbonUtil.getFormatFromProperty(this.getDataType());
+ SimpleDateFormat parser = new SimpleDateFormat(format);
if (value instanceof Timestamp) {
return parser.format((Timestamp) value);
} else if (value instanceof java.sql.Date) {
@@ -523,9 +522,8 @@ public class ExpressionResult implements Comparable<ExpressionResult> {
return val1.compareTo(val2);
case DATE:
case TIMESTAMP:
- SimpleDateFormat parser = new SimpleDateFormat(CarbonProperties.getInstance()
- .getProperty(CarbonCommonConstants.CARBON_TIMESTAMP_FORMAT,
- CarbonCommonConstants.CARBON_TIMESTAMP_DEFAULT_FORMAT));
+ String format= CarbonUtil.getFormatFromProperty(o.dataType);
+ SimpleDateFormat parser = new SimpleDateFormat(format);
Date date1 = null;
Date date2 = null;
date1 = parser.parse(this.getString());
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ea04fce1/core/src/main/java/org/apache/carbondata/core/scan/filter/FilterUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/filter/FilterUtil.java b/core/src/main/java/org/apache/carbondata/core/scan/filter/FilterUtil.java
index 65a118e..14f45c1 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/filter/FilterUtil.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/filter/FilterUtil.java
@@ -1078,9 +1078,8 @@ public final class FilterUtil {
.compare((Boolean.parseBoolean(dictionaryVal)), (Boolean.parseBoolean(memberVal)));
case DATE:
case TIMESTAMP:
- SimpleDateFormat parser = new SimpleDateFormat(CarbonProperties.getInstance()
- .getProperty(CarbonCommonConstants.CARBON_TIMESTAMP_FORMAT,
- CarbonCommonConstants.CARBON_TIMESTAMP_DEFAULT_FORMAT));
+ String format= CarbonUtil.getFormatFromProperty(dataType);
+ SimpleDateFormat parser = new SimpleDateFormat(format);
Date dateToStr;
Date dictionaryDate;
dateToStr = parser.parse(memberVal);
@@ -1203,9 +1202,17 @@ public final class FilterUtil {
if (CarbonCommonConstants.MEMBER_DEFAULT_VAL.equals(filterMember1)) {
return 1;
}
- SimpleDateFormat parser = new SimpleDateFormat(CarbonProperties.getInstance()
- .getProperty(CarbonCommonConstants.CARBON_TIMESTAMP_FORMAT,
- CarbonCommonConstants.CARBON_TIMESTAMP_DEFAULT_FORMAT));
+ String format= null;
+ if(dataType==DataType.DATE) {
+ format = CarbonProperties.getInstance()
+ .getProperty(CarbonCommonConstants.CARBON_DATE_FORMAT,
+ CarbonCommonConstants.CARBON_DATE_DEFAULT_FORMAT);
+ } else {
+ format = CarbonProperties.getInstance()
+ .getProperty(CarbonCommonConstants.CARBON_TIMESTAMP_FORMAT,
+ CarbonCommonConstants.CARBON_TIMESTAMP_DEFAULT_FORMAT);
+ }
+ SimpleDateFormat parser = new SimpleDateFormat(format);
Date date1 = null;
Date date2 = null;
date1 = parser.parse(filterMember1);
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ea04fce1/core/src/main/java/org/apache/carbondata/core/scan/filter/resolver/resolverinfo/visitor/CustomTypeDictionaryVisitor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/filter/resolver/resolverinfo/visitor/CustomTypeDictionaryVisitor.java b/core/src/main/java/org/apache/carbondata/core/scan/filter/resolver/resolverinfo/visitor/CustomTypeDictionaryVisitor.java
index 4dcb306..257cca0 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/filter/resolver/resolverinfo/visitor/CustomTypeDictionaryVisitor.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/filter/resolver/resolverinfo/visitor/CustomTypeDictionaryVisitor.java
@@ -23,6 +23,7 @@ import java.util.List;
import org.apache.carbondata.core.constants.CarbonCommonConstants;
import org.apache.carbondata.core.keygenerator.directdictionary.DirectDictionaryGenerator;
import org.apache.carbondata.core.keygenerator.directdictionary.DirectDictionaryKeyGeneratorFactory;
+import org.apache.carbondata.core.metadata.datatype.DataType;
import org.apache.carbondata.core.scan.expression.ColumnExpression;
import org.apache.carbondata.core.scan.expression.exception.FilterIllegalMemberException;
import org.apache.carbondata.core.scan.expression.exception.FilterUnsupportedException;
@@ -41,7 +42,7 @@ public class CustomTypeDictionaryVisitor implements ResolvedFilterInfoVisitorInt
* @param visitableObj
* @param metadata
* @throws FilterUnsupportedException,if exception occurs while evaluating
- * filter models.
+ * filter models.
*/
public void populateFilterResolvedInfo(DimColumnResolvedFilterInfo visitableObj,
FilterResolverMetadata metadata) throws FilterUnsupportedException {
@@ -54,7 +55,8 @@ public class CustomTypeDictionaryVisitor implements ResolvedFilterInfoVisitorInt
throw new FilterUnsupportedException(e);
}
resolvedFilterObject = getDirectDictionaryValKeyMemberForFilter(metadata.getColumnExpression(),
- evaluateResultListFinal, metadata.isIncludeFilter());
+ evaluateResultListFinal, metadata.isIncludeFilter(),
+ metadata.getColumnExpression().getDimension().getDataType());
if (!metadata.isIncludeFilter() && null != resolvedFilterObject && !resolvedFilterObject
.getFilterList().contains(CarbonCommonConstants.MEMBER_DEFAULT_VAL_SURROGATE_KEY)) {
// Adding default surrogate key of null member inorder to not display the same while
@@ -68,13 +70,13 @@ public class CustomTypeDictionaryVisitor implements ResolvedFilterInfoVisitorInt
private DimColumnFilterInfo getDirectDictionaryValKeyMemberForFilter(
ColumnExpression columnExpression, List<String> evaluateResultListFinal,
- boolean isIncludeFilter) {
+ boolean isIncludeFilter, DataType dataType) {
List<Integer> surrogates = new ArrayList<Integer>(20);
DirectDictionaryGenerator directDictionaryGenerator = DirectDictionaryKeyGeneratorFactory
.getDirectDictionaryGenerator(columnExpression.getDimension().getDataType());
// Reading the dictionary value direct
- getSurrogateValuesForDictionary(evaluateResultListFinal, surrogates,
- directDictionaryGenerator);
+ getSurrogateValuesForDictionary(evaluateResultListFinal, surrogates, directDictionaryGenerator,
+ dataType);
Collections.sort(surrogates);
DimColumnFilterInfo columnFilterInfo = null;
@@ -87,10 +89,18 @@ public class CustomTypeDictionaryVisitor implements ResolvedFilterInfoVisitorInt
}
private void getSurrogateValuesForDictionary(List<String> evaluateResultListFinal,
- List<Integer> surrogates, DirectDictionaryGenerator directDictionaryGenerator) {
- String timeFormat = CarbonProperties.getInstance()
- .getProperty(CarbonCommonConstants.CARBON_TIMESTAMP_FORMAT,
- CarbonCommonConstants.CARBON_TIMESTAMP_DEFAULT_FORMAT);
+ List<Integer> surrogates, DirectDictionaryGenerator directDictionaryGenerator,
+ DataType dataType) {
+ String timeFormat = null;
+ if (dataType == DataType.DATE) {
+ timeFormat = CarbonProperties.getInstance()
+ .getProperty(CarbonCommonConstants.CARBON_DATE_FORMAT,
+ CarbonCommonConstants.CARBON_DATE_DEFAULT_FORMAT);
+ } else {
+ timeFormat = CarbonProperties.getInstance()
+ .getProperty(CarbonCommonConstants.CARBON_TIMESTAMP_FORMAT,
+ CarbonCommonConstants.CARBON_TIMESTAMP_DEFAULT_FORMAT);
+ }
for (String filterMember : evaluateResultListFinal) {
surrogates
.add(directDictionaryGenerator.generateDirectSurrogateKey(filterMember, timeFormat));
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ea04fce1/core/src/main/java/org/apache/carbondata/core/util/CarbonUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/util/CarbonUtil.java b/core/src/main/java/org/apache/carbondata/core/util/CarbonUtil.java
index 440c448..07ac127 100644
--- a/core/src/main/java/org/apache/carbondata/core/util/CarbonUtil.java
+++ b/core/src/main/java/org/apache/carbondata/core/util/CarbonUtil.java
@@ -1420,5 +1420,27 @@ public final class CarbonUtil {
}
return false;
}
+
+ /**
+ * Below method will be used to get the format for
+ * date or timestamp data type from property. This
+ * is added to avoid the code duplication
+ *
+ * @param dataType
+ * @return format
+ */
+ public static String getFormatFromProperty(DataType dataType) {
+ switch (dataType) {
+ case DATE:
+ return CarbonProperties.getInstance().getProperty(CarbonCommonConstants.CARBON_DATE_FORMAT,
+ CarbonCommonConstants.CARBON_DATE_DEFAULT_FORMAT);
+ case TIMESTAMP:
+ return CarbonProperties.getInstance()
+ .getProperty(CarbonCommonConstants.CARBON_TIMESTAMP_FORMAT,
+ CarbonCommonConstants.CARBON_TIMESTAMP_DEFAULT_FORMAT);
+ default:
+ return null;
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ea04fce1/core/src/main/java/org/apache/carbondata/core/util/DataTypeUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/util/DataTypeUtil.java b/core/src/main/java/org/apache/carbondata/core/util/DataTypeUtil.java
index 4294563..074c00d 100644
--- a/core/src/main/java/org/apache/carbondata/core/util/DataTypeUtil.java
+++ b/core/src/main/java/org/apache/carbondata/core/util/DataTypeUtil.java
@@ -45,7 +45,7 @@ public final class DataTypeUtil {
LogServiceFactory.getLogService(DataTypeUtil.class.getName());
private static final Map<String, String> dataTypeDisplayNames;
- private static final ThreadLocal<DateFormat> formatter = new ThreadLocal<DateFormat>() {
+ private static final ThreadLocal<DateFormat> timeStampformatter = new ThreadLocal<DateFormat>() {
@Override
protected DateFormat initialValue() {
return new SimpleDateFormat(
@@ -54,6 +54,15 @@ public final class DataTypeUtil {
}
};
+ private static final ThreadLocal<DateFormat> dateformatter = new ThreadLocal<DateFormat>() {
+ @Override
+ protected DateFormat initialValue() {
+ return new SimpleDateFormat(
+ CarbonProperties.getInstance().getProperty(CarbonCommonConstants.CARBON_DATE_FORMAT,
+ CarbonCommonConstants.CARBON_DATE_DEFAULT_FORMAT));
+ }
+ };
+
static {
dataTypeDisplayNames = new HashMap<String, String>(16);
dataTypeDisplayNames.put(DataType.DATE.toString(), DataType.DATE.getName());
@@ -256,12 +265,23 @@ public final class DataTypeUtil {
}
return Long.parseLong(data);
case DATE:
+ if (data.isEmpty()) {
+ return null;
+ }
+ try {
+ Date dateToStr = dateformatter.get().parse(data);
+ return dateToStr.getTime() * 1000;
+ } catch (ParseException e) {
+ LOGGER.error("Cannot convert" + data + " to Time/Long type value" + e.getMessage());
+ return null;
+ }
+
case TIMESTAMP:
if (data.isEmpty()) {
return null;
}
try {
- Date dateToStr = formatter.get().parse(data);
+ Date dateToStr = timeStampformatter.get().parse(data);
return dateToStr.getTime() * 1000;
} catch (ParseException e) {
LOGGER.error("Cannot convert" + data + " to Time/Long type value" + e.getMessage());
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ea04fce1/core/src/main/java/org/apache/carbondata/core/writer/sortindex/CarbonDictionarySortModel.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/writer/sortindex/CarbonDictionarySortModel.java b/core/src/main/java/org/apache/carbondata/core/writer/sortindex/CarbonDictionarySortModel.java
index 46a23e7..df40a1d 100644
--- a/core/src/main/java/org/apache/carbondata/core/writer/sortindex/CarbonDictionarySortModel.java
+++ b/core/src/main/java/org/apache/carbondata/core/writer/sortindex/CarbonDictionarySortModel.java
@@ -22,7 +22,7 @@ import java.util.Date;
import org.apache.carbondata.core.constants.CarbonCommonConstants;
import org.apache.carbondata.core.metadata.datatype.DataType;
-import org.apache.carbondata.core.util.CarbonProperties;
+import org.apache.carbondata.core.util.CarbonUtil;
/**
* Dictionary sort model class holds the member byte value and corresponding key value.
@@ -102,9 +102,8 @@ public class CarbonDictionarySortModel implements Comparable<CarbonDictionarySor
return val1.compareTo(val2);
case DATE:
case TIMESTAMP:
- SimpleDateFormat parser = new SimpleDateFormat(CarbonProperties.getInstance()
- .getProperty(CarbonCommonConstants.CARBON_TIMESTAMP_FORMAT,
- CarbonCommonConstants.CARBON_TIMESTAMP_DEFAULT_FORMAT));
+ String format= CarbonUtil.getFormatFromProperty(dataType);
+ SimpleDateFormat parser = new SimpleDateFormat(format);
Date date1 = null;
Date date2 = null;
try {
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ea04fce1/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/directdictionary/DateDataTypeDirectDictionaryTest.scala
----------------------------------------------------------------------
diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/directdictionary/DateDataTypeDirectDictionaryTest.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/directdictionary/DateDataTypeDirectDictionaryTest.scala
index 1c96f08..e1d9369 100644
--- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/directdictionary/DateDataTypeDirectDictionaryTest.scala
+++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/directdictionary/DateDataTypeDirectDictionaryTest.scala
@@ -53,7 +53,7 @@ class DateDataTypeDirectDictionaryTest extends QueryTest with BeforeAndAfterAll
)
CarbonProperties.getInstance()
- .addProperty(CarbonCommonConstants.CARBON_TIMESTAMP_FORMAT, "yyyy-MM-dd")
+ .addProperty(CarbonCommonConstants.CARBON_DATE_FORMAT, "yyyy-MM-dd")
val csvFilePath = s"$resourcesPath/datasamplefordate.csv"
sql("LOAD DATA local inpath '" + csvFilePath + "' INTO TABLE directDictionaryTable OPTIONS" +
"('DELIMITER'= ',', 'QUOTECHAR'= '\"')" )
@@ -63,7 +63,7 @@ class DateDataTypeDirectDictionaryTest extends QueryTest with BeforeAndAfterAll
case x: Throwable =>
x.printStackTrace()
CarbonProperties.getInstance()
- .addProperty(CarbonCommonConstants.CARBON_TIMESTAMP_FORMAT, "dd-MM-yyyy")
+ .addProperty(CarbonCommonConstants.CARBON_DATE_FORMAT, "dd-MM-yyyy")
}
}
@@ -142,7 +142,7 @@ class DateDataTypeDirectDictionaryTest extends QueryTest with BeforeAndAfterAll
sql("drop table directDictionaryTable")
sql("drop table directDictionaryTable_hive")
CarbonProperties.getInstance()
- .addProperty(CarbonCommonConstants.CARBON_TIMESTAMP_FORMAT, "dd-MM-yyyy")
+ .addProperty(CarbonCommonConstants.CARBON_DATE_FORMAT, "dd-MM-yyyy")
CarbonProperties.getInstance().addProperty("carbon.direct.dictionary", "false")
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ea04fce1/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/directdictionary/DateDataTypeDirectDictionaryWithNoDictTestCase.scala
----------------------------------------------------------------------
diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/directdictionary/DateDataTypeDirectDictionaryWithNoDictTestCase.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/directdictionary/DateDataTypeDirectDictionaryWithNoDictTestCase.scala
index 42517db..2ad8592 100644
--- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/directdictionary/DateDataTypeDirectDictionaryWithNoDictTestCase.scala
+++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/directdictionary/DateDataTypeDirectDictionaryWithNoDictTestCase.scala
@@ -47,7 +47,7 @@ class DateDataTypeDirectDictionaryWithNoDictTestCase extends QueryTest with Befo
)
CarbonProperties.getInstance()
- .addProperty(CarbonCommonConstants.CARBON_TIMESTAMP_FORMAT, "yyyy-MM-dd HH:mm:ss")
+ .addProperty(CarbonCommonConstants.CARBON_DATE_FORMAT, "yyyy-MM-dd")
val csvFilePath = s"$resourcesPath/datasample.csv"
sql("LOAD DATA local inpath '" + csvFilePath + "' INTO TABLE directDictionaryTable OPTIONS"
+ "('DELIMITER'= ',', 'QUOTECHAR'= '\"')");
@@ -55,7 +55,7 @@ class DateDataTypeDirectDictionaryWithNoDictTestCase extends QueryTest with Befo
case x: Throwable =>
x.printStackTrace()
CarbonProperties.getInstance()
- .addProperty(CarbonCommonConstants.CARBON_TIMESTAMP_FORMAT, "dd-MM-yyyy")
+ .addProperty(CarbonCommonConstants.CARBON_DATE_FORMAT, "dd-MM-yyyy")
}
}
@@ -90,7 +90,7 @@ class DateDataTypeDirectDictionaryWithNoDictTestCase extends QueryTest with Befo
override def afterAll {
sql("drop table directDictionaryTable")
CarbonProperties.getInstance()
- .addProperty(CarbonCommonConstants.CARBON_TIMESTAMP_FORMAT, "dd-MM-yyyy")
+ .addProperty(CarbonCommonConstants.CARBON_DATE_FORMAT, "dd-MM-yyyy")
CarbonProperties.getInstance().addProperty("carbon.direct.dictionary", "false")
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ea04fce1/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/directdictionary/DateDataTypeNullDataTest.scala
----------------------------------------------------------------------
diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/directdictionary/DateDataTypeNullDataTest.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/directdictionary/DateDataTypeNullDataTest.scala
index cd98210..0215a7b 100644
--- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/directdictionary/DateDataTypeNullDataTest.scala
+++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/directdictionary/DateDataTypeNullDataTest.scala
@@ -45,7 +45,7 @@ class DateDataTypeNullDataTest extends QueryTest with BeforeAndAfterAll {
)
CarbonProperties.getInstance()
- .addProperty(CarbonCommonConstants.CARBON_TIMESTAMP_FORMAT, "yyyy/MM/dd")
+ .addProperty(CarbonCommonConstants.CARBON_DATE_FORMAT, "yyyy/MM/dd")
val csvFilePath = s"$resourcesPath/datasamplenull.csv"
sql("LOAD DATA LOCAL INPATH '" + csvFilePath + "' INTO TABLE timestampTyeNullData").collect();
@@ -53,7 +53,7 @@ class DateDataTypeNullDataTest extends QueryTest with BeforeAndAfterAll {
case x: Throwable =>
x.printStackTrace()
CarbonProperties.getInstance()
- .addProperty(CarbonCommonConstants.CARBON_TIMESTAMP_FORMAT, "dd-MM-yyyy")
+ .addProperty(CarbonCommonConstants.CARBON_DATE_FORMAT, "dd-MM-yyyy")
}
}
@@ -74,7 +74,7 @@ class DateDataTypeNullDataTest extends QueryTest with BeforeAndAfterAll {
override def afterAll {
sql("drop table timestampTyeNullData")
CarbonProperties.getInstance()
- .addProperty(CarbonCommonConstants.CARBON_TIMESTAMP_FORMAT, "dd-MM-yyyy")
+ .addProperty(CarbonCommonConstants.CARBON_DATE_FORMAT, "dd-MM-yyyy")
CarbonProperties.getInstance().addProperty("carbon.direct.dictionary", "false")
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ea04fce1/integration/spark-common/src/main/scala/org/apache/carbondata/spark/rdd/CarbonDataLoadRDD.scala
----------------------------------------------------------------------
diff --git a/integration/spark-common/src/main/scala/org/apache/carbondata/spark/rdd/CarbonDataLoadRDD.scala b/integration/spark-common/src/main/scala/org/apache/carbondata/spark/rdd/CarbonDataLoadRDD.scala
index 697c3a7..e3f2cf6 100644
--- a/integration/spark-common/src/main/scala/org/apache/carbondata/spark/rdd/CarbonDataLoadRDD.scala
+++ b/integration/spark-common/src/main/scala/org/apache/carbondata/spark/rdd/CarbonDataLoadRDD.scala
@@ -585,9 +585,12 @@ class RddIterator(rddIter: Iterator[Row],
carbonLoadModel: CarbonLoadModel,
context: TaskContext) extends CarbonIterator[Array[String]] {
- val formatString = CarbonProperties.getInstance().getProperty(CarbonCommonConstants
+ val timeStampformatString = CarbonProperties.getInstance().getProperty(CarbonCommonConstants
.CARBON_TIMESTAMP_FORMAT, CarbonCommonConstants.CARBON_TIMESTAMP_DEFAULT_FORMAT)
- val format = new SimpleDateFormat(formatString)
+ val timeStampFormat = new SimpleDateFormat(timeStampformatString)
+ val dateFormatString = CarbonProperties.getInstance().getProperty(CarbonCommonConstants
+ .CARBON_DATE_FORMAT, CarbonCommonConstants.CARBON_DATE_DEFAULT_FORMAT)
+ val dateFormat = new SimpleDateFormat(dateFormatString)
val delimiterLevel1 = carbonLoadModel.getComplexDelimiterLevel1
val delimiterLevel2 = carbonLoadModel.getComplexDelimiterLevel2
val serializationNullFormat =
@@ -599,7 +602,7 @@ class RddIterator(rddIter: Iterator[Row],
val columns = new Array[String](row.length)
for (i <- 0 until columns.length) {
columns(i) = CarbonScalaUtil.getString(row.get(i), serializationNullFormat,
- delimiterLevel1, delimiterLevel2, format)
+ delimiterLevel1, delimiterLevel2, timeStampFormat, dateFormat)
}
columns
}
@@ -612,9 +615,12 @@ class RddIterator(rddIter: Iterator[Row],
class RddIteratorForUpdate(rddIter: Iterator[Row],
carbonLoadModel: CarbonLoadModel) extends java.util.Iterator[Array[String]] {
- val formatString = CarbonProperties.getInstance().getProperty(CarbonCommonConstants
+ val timeStampformatString = CarbonProperties.getInstance().getProperty(CarbonCommonConstants
.CARBON_TIMESTAMP_FORMAT, CarbonCommonConstants.CARBON_TIMESTAMP_DEFAULT_FORMAT)
- val format = new SimpleDateFormat(formatString)
+ val timeStampFormat = new SimpleDateFormat(timeStampformatString)
+ val dateFormatString = CarbonProperties.getInstance().getProperty(CarbonCommonConstants
+ .CARBON_DATE_FORMAT, CarbonCommonConstants.CARBON_DATE_DEFAULT_FORMAT)
+ val dateFormat = new SimpleDateFormat(dateFormatString)
val delimiterLevel1 = carbonLoadModel.getComplexDelimiterLevel1
val delimiterLevel2 = carbonLoadModel.getComplexDelimiterLevel2
val serializationNullFormat =
@@ -628,7 +634,7 @@ class RddIteratorForUpdate(rddIter: Iterator[Row],
for (i <- 0 until row.length) {
// columns(i) = CarbonScalaUtil.getStringForUpdate(row(i), delimiterLevel1, delimiterLevel2)
columns(i) = CarbonScalaUtil.getString(row.get(i), serializationNullFormat,
- delimiterLevel1, delimiterLevel2, format)
+ delimiterLevel1, delimiterLevel2, timeStampFormat, dateFormat)
if (columns(i).length() > CarbonCommonConstants.DEFAULT_COLUMN_LENGTH) {
sys.error(s" Error processing input: Length of parsed input (${
CarbonCommonConstants
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ea04fce1/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 cf6d5cc..c825da6 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
@@ -161,7 +161,8 @@ case class DictionaryLoadModel(table: CarbonTableIdentifier,
lockType: String,
zooKeeperUrl: String,
serializationNullFormat: String,
- defaultTimestampFormat: String) extends Serializable
+ defaultTimestampFormat: String,
+ defaultDateFormat: String) extends Serializable
case class ColumnDistinctValues(values: Array[String], rowCount: Long) extends Serializable
@@ -287,7 +288,8 @@ class CarbonBlockDistinctValuesCombineRDD(
val dimNum = model.dimensions.length
var row: Row = null
val rddIter = firstParent[Row].iterator(split, context)
- val format = new SimpleDateFormat(model.defaultTimestampFormat)
+ val timeStampFormat = new SimpleDateFormat(model.defaultTimestampFormat)
+ val dateFormat = new SimpleDateFormat(model.defaultDateFormat)
// generate block distinct value set
while (rddIter.hasNext) {
row = rddIter.next()
@@ -295,7 +297,11 @@ class CarbonBlockDistinctValuesCombineRDD(
rowCount += 1
for (i <- 0 until dimNum) {
dimensionParsers(i).parseString(CarbonScalaUtil.getString(row.get(i),
- model.serializationNullFormat, model.delimiters(0), model.delimiters(1), format))
+ model.serializationNullFormat,
+ model.delimiters(0),
+ model.delimiters(1),
+ timeStampFormat,
+ dateFormat))
}
}
}
@@ -340,9 +346,9 @@ class CarbonGlobalDictionaryGenerateRDD(
val pathService: PathService = CarbonCommonFactory.getPathService
val carbonTablePath: CarbonTablePath =
pathService.getCarbonTablePath(model.hdfsLocation, model.table)
- if (StringUtils.isNotBlank(model.hdfsTempLocation )) {
- CarbonProperties.getInstance.addProperty(CarbonCommonConstants.HDFS_TEMP_LOCATION,
- model.hdfsTempLocation)
+ if (StringUtils.isNotBlank(model.hdfsTempLocation)) {
+ CarbonProperties.getInstance.addProperty(CarbonCommonConstants.HDFS_TEMP_LOCATION,
+ model.hdfsTempLocation)
}
if (StringUtils.isNotBlank(model.lockType)) {
CarbonProperties.getInstance.addProperty(CarbonCommonConstants.LOCK_TYPE,
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ea04fce1/integration/spark-common/src/main/scala/org/apache/carbondata/spark/rdd/NewCarbonDataLoadRDD.scala
----------------------------------------------------------------------
diff --git a/integration/spark-common/src/main/scala/org/apache/carbondata/spark/rdd/NewCarbonDataLoadRDD.scala b/integration/spark-common/src/main/scala/org/apache/carbondata/spark/rdd/NewCarbonDataLoadRDD.scala
index 3af07d8..9ed0913 100644
--- a/integration/spark-common/src/main/scala/org/apache/carbondata/spark/rdd/NewCarbonDataLoadRDD.scala
+++ b/integration/spark-common/src/main/scala/org/apache/carbondata/spark/rdd/NewCarbonDataLoadRDD.scala
@@ -399,9 +399,12 @@ class NewRddIterator(rddIter: Iterator[Row],
carbonLoadModel: CarbonLoadModel,
context: TaskContext) extends CarbonIterator[Array[AnyRef]] {
- val formatString = CarbonProperties.getInstance().getProperty(CarbonCommonConstants
+ val timeStampformatString = CarbonProperties.getInstance().getProperty(CarbonCommonConstants
.CARBON_TIMESTAMP_FORMAT, CarbonCommonConstants.CARBON_TIMESTAMP_DEFAULT_FORMAT)
- val format = new SimpleDateFormat(formatString)
+ val timeStampFormat = new SimpleDateFormat(timeStampformatString)
+ val dateFormatString = CarbonProperties.getInstance().getProperty(CarbonCommonConstants
+ .CARBON_DATE_FORMAT, CarbonCommonConstants.CARBON_DATE_DEFAULT_FORMAT)
+ val dateFormat = new SimpleDateFormat(dateFormatString)
val delimiterLevel1 = carbonLoadModel.getComplexDelimiterLevel1
val delimiterLevel2 = carbonLoadModel.getComplexDelimiterLevel2
val serializationNullFormat =
@@ -413,7 +416,7 @@ class NewRddIterator(rddIter: Iterator[Row],
val columns = new Array[AnyRef](row.length)
for (i <- 0 until columns.length) {
columns(i) = CarbonScalaUtil.getString(row.get(i), serializationNullFormat,
- delimiterLevel1, delimiterLevel2, format)
+ delimiterLevel1, delimiterLevel2, timeStampFormat, dateFormat)
}
columns
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ea04fce1/integration/spark-common/src/main/scala/org/apache/carbondata/spark/util/CarbonScalaUtil.scala
----------------------------------------------------------------------
diff --git a/integration/spark-common/src/main/scala/org/apache/carbondata/spark/util/CarbonScalaUtil.scala b/integration/spark-common/src/main/scala/org/apache/carbondata/spark/util/CarbonScalaUtil.scala
index f462adb..35bd775 100644
--- a/integration/spark-common/src/main/scala/org/apache/carbondata/spark/util/CarbonScalaUtil.scala
+++ b/integration/spark-common/src/main/scala/org/apache/carbondata/spark/util/CarbonScalaUtil.scala
@@ -144,7 +144,8 @@ object CarbonScalaUtil {
serializationNullFormat: String,
delimiterLevel1: String,
delimiterLevel2: String,
- format: SimpleDateFormat,
+ timeStampFormat: SimpleDateFormat,
+ dateFormat: SimpleDateFormat,
level: Int = 1): String = {
if (value == null) {
serializationNullFormat
@@ -154,8 +155,8 @@ object CarbonScalaUtil {
case d: java.math.BigDecimal => d.toPlainString
case i: java.lang.Integer => i.toString
case d: java.lang.Double => d.toString
- case t: java.sql.Timestamp => format format t
- case d: java.sql.Date => format format d
+ case t: java.sql.Timestamp => timeStampFormat format t
+ case d: java.sql.Date => dateFormat format d
case b: java.lang.Boolean => b.toString
case s: java.lang.Short => s.toString
case f: java.lang.Float => f.toString
@@ -169,7 +170,7 @@ object CarbonScalaUtil {
val builder = new StringBuilder()
s.foreach { x =>
builder.append(getString(x, serializationNullFormat, delimiterLevel1,
- delimiterLevel2, format, level + 1)).append(delimiter)
+ delimiterLevel2, timeStampFormat, dateFormat, level + 1)).append(delimiter)
}
builder.substring(0, builder.length - 1)
case m: scala.collection.Map[Any, Any] =>
@@ -183,7 +184,7 @@ object CarbonScalaUtil {
val builder = new StringBuilder()
for (i <- 0 until r.length) {
builder.append(getString(r(i), serializationNullFormat, delimiterLevel1,
- delimiterLevel2, format, level + 1)).append(delimiter)
+ delimiterLevel2, timeStampFormat, dateFormat, level + 1)).append(delimiter)
}
builder.substring(0, builder.length - 1)
case other => other.toString
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ea04fce1/integration/spark-common/src/main/scala/org/apache/carbondata/spark/util/GlobalDictionaryUtil.scala
----------------------------------------------------------------------
diff --git a/integration/spark-common/src/main/scala/org/apache/carbondata/spark/util/GlobalDictionaryUtil.scala b/integration/spark-common/src/main/scala/org/apache/carbondata/spark/util/GlobalDictionaryUtil.scala
index f29493e..867a374 100644
--- a/integration/spark-common/src/main/scala/org/apache/carbondata/spark/util/GlobalDictionaryUtil.scala
+++ b/integration/spark-common/src/main/scala/org/apache/carbondata/spark/util/GlobalDictionaryUtil.scala
@@ -352,7 +352,8 @@ object GlobalDictionaryUtil {
lockType,
zookeeperUrl,
serializationNullFormat,
- carbonLoadModel.getDefaultTimestampFormat)
+ carbonLoadModel.getDefaultTimestampFormat,
+ carbonLoadModel.getDefaultDateFormat)
}
/**
@@ -363,29 +364,29 @@ object GlobalDictionaryUtil {
*/
def loadDataFrame(sqlContext: SQLContext,
carbonLoadModel: CarbonLoadModel): DataFrame = {
- val hadoopConfiguration = new Configuration()
- CommonUtil.configureCSVInputFormat(hadoopConfiguration, carbonLoadModel)
- hadoopConfiguration.set(FileInputFormat.INPUT_DIR, carbonLoadModel.getFactFilePath)
- val columnNames = carbonLoadModel.getCsvHeaderColumns
- val schema = StructType(columnNames.map[StructField, Array[StructField]]{ column =>
- StructField(column, StringType)
- })
- val values = new Array[String](columnNames.length)
- val row = new StringArrayRow(values)
- val rdd = new NewHadoopRDD[NullWritable, StringArrayWritable](
- sqlContext.sparkContext,
- classOf[CSVInputFormat],
- classOf[NullWritable],
- classOf[StringArrayWritable],
- hadoopConfiguration).setName("global dictionary").map[Row] { currentRow =>
- row.setValues(currentRow._2.get())
- }
- sqlContext.createDataFrame(rdd, schema)
+ val hadoopConfiguration = new Configuration()
+ CommonUtil.configureCSVInputFormat(hadoopConfiguration, carbonLoadModel)
+ hadoopConfiguration.set(FileInputFormat.INPUT_DIR, carbonLoadModel.getFactFilePath)
+ val columnNames = carbonLoadModel.getCsvHeaderColumns
+ val schema = StructType(columnNames.map[StructField, Array[StructField]] { column =>
+ StructField(column, StringType)
+ })
+ val values = new Array[String](columnNames.length)
+ val row = new StringArrayRow(values)
+ val rdd = new NewHadoopRDD[NullWritable, StringArrayWritable](
+ sqlContext.sparkContext,
+ classOf[CSVInputFormat],
+ classOf[NullWritable],
+ classOf[StringArrayWritable],
+ hadoopConfiguration).setName("global dictionary").map[Row] { currentRow =>
+ row.setValues(currentRow._2.get())
+ }
+ sqlContext.createDataFrame(rdd, schema)
}
// Hack for spark2 integration
var updateTableMetadataFunc: (CarbonLoadModel, SQLContext, DictionaryLoadModel,
- Array[CarbonDimension]) => Unit = _
+ Array[CarbonDimension]) => Unit = _
/**
* check whether global dictionary have been generated successfully or not
@@ -466,7 +467,11 @@ object GlobalDictionaryUtil {
colName match {
case "" => colName
case _ =>
- if (parentDimName.isEmpty) middleDimName else "." + middleDimName
+ if (parentDimName.isEmpty) {
+ middleDimName
+ } else {
+ "." + middleDimName
+ }
}
}
// judge whether the column is exists
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ea04fce1/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 f4eea84..62463fe 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
@@ -432,6 +432,9 @@ case class LoadTable(
carbonLoadModel.setDefaultTimestampFormat(CarbonProperties.getInstance().getProperty(
CarbonCommonConstants.CARBON_TIMESTAMP_FORMAT,
CarbonCommonConstants.CARBON_TIMESTAMP_DEFAULT_FORMAT))
+ carbonLoadModel.setDefaultDateFormat(CarbonProperties.getInstance().getProperty(
+ CarbonCommonConstants.CARBON_DATE_FORMAT,
+ CarbonCommonConstants.CARBON_DATE_DEFAULT_FORMAT))
carbonLoadModel
.setSerializationNullFormat(
TableOptionConstant.SERIALIZATION_NULL_FORMAT.getName + "," + serializationNullFormat)
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ea04fce1/integration/spark/src/test/scala/org/apache/carbondata/spark/util/ExternalColumnDictionaryTestCase.scala
----------------------------------------------------------------------
diff --git a/integration/spark/src/test/scala/org/apache/carbondata/spark/util/ExternalColumnDictionaryTestCase.scala b/integration/spark/src/test/scala/org/apache/carbondata/spark/util/ExternalColumnDictionaryTestCase.scala
index 361d183..5a986b7 100644
--- a/integration/spark/src/test/scala/org/apache/carbondata/spark/util/ExternalColumnDictionaryTestCase.scala
+++ b/integration/spark/src/test/scala/org/apache/carbondata/spark/util/ExternalColumnDictionaryTestCase.scala
@@ -144,6 +144,9 @@ class ExternalColumnDictionaryTestCase extends QueryTest with BeforeAndAfterAll
carbonLoadModel.setDefaultTimestampFormat(CarbonProperties.getInstance().getProperty(
CarbonCommonConstants.CARBON_TIMESTAMP_FORMAT,
CarbonCommonConstants.CARBON_TIMESTAMP_DEFAULT_FORMAT))
+ carbonLoadModel.setDefaultDateFormat(CarbonProperties.getInstance().getProperty(
+ CarbonCommonConstants.CARBON_DATE_FORMAT,
+ CarbonCommonConstants.CARBON_DATE_DEFAULT_FORMAT))
carbonLoadModel.setCsvHeaderColumns(CommonUtil.getCsvHeaderColumns(carbonLoadModel))
carbonLoadModel
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ea04fce1/integration/spark/src/test/scala/org/apache/carbondata/spark/util/GlobalDictionaryUtilConcurrentTestCase.scala
----------------------------------------------------------------------
diff --git a/integration/spark/src/test/scala/org/apache/carbondata/spark/util/GlobalDictionaryUtilConcurrentTestCase.scala b/integration/spark/src/test/scala/org/apache/carbondata/spark/util/GlobalDictionaryUtilConcurrentTestCase.scala
index 0206bcf..377bbaa 100644
--- a/integration/spark/src/test/scala/org/apache/carbondata/spark/util/GlobalDictionaryUtilConcurrentTestCase.scala
+++ b/integration/spark/src/test/scala/org/apache/carbondata/spark/util/GlobalDictionaryUtilConcurrentTestCase.scala
@@ -60,6 +60,9 @@ class GlobalDictionaryUtilConcurrentTestCase extends QueryTest with BeforeAndAft
carbonLoadModel.setDefaultTimestampFormat(CarbonProperties.getInstance().getProperty(
CarbonCommonConstants.CARBON_TIMESTAMP_FORMAT,
CarbonCommonConstants.CARBON_TIMESTAMP_DEFAULT_FORMAT))
+ carbonLoadModel.setDefaultDateFormat(CarbonProperties.getInstance().getProperty(
+ CarbonCommonConstants.CARBON_DATE_FORMAT,
+ CarbonCommonConstants.CARBON_DATE_DEFAULT_FORMAT))
carbonLoadModel.setCsvHeaderColumns(CommonUtil.getCsvHeaderColumns(carbonLoadModel))
carbonLoadModel
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ea04fce1/integration/spark/src/test/scala/org/apache/carbondata/spark/util/GlobalDictionaryUtilTestCase.scala
----------------------------------------------------------------------
diff --git a/integration/spark/src/test/scala/org/apache/carbondata/spark/util/GlobalDictionaryUtilTestCase.scala b/integration/spark/src/test/scala/org/apache/carbondata/spark/util/GlobalDictionaryUtilTestCase.scala
index 728a0c6..189e694 100644
--- a/integration/spark/src/test/scala/org/apache/carbondata/spark/util/GlobalDictionaryUtilTestCase.scala
+++ b/integration/spark/src/test/scala/org/apache/carbondata/spark/util/GlobalDictionaryUtilTestCase.scala
@@ -66,6 +66,9 @@ class GlobalDictionaryUtilTestCase extends QueryTest with BeforeAndAfterAll {
carbonLoadModel.setDefaultTimestampFormat(CarbonProperties.getInstance().getProperty(
CarbonCommonConstants.CARBON_TIMESTAMP_FORMAT,
CarbonCommonConstants.CARBON_TIMESTAMP_DEFAULT_FORMAT))
+ carbonLoadModel.setDefaultDateFormat(CarbonProperties.getInstance().getProperty(
+ CarbonCommonConstants.CARBON_DATE_FORMAT,
+ CarbonCommonConstants.CARBON_DATE_DEFAULT_FORMAT))
carbonLoadModel.setCsvHeaderColumns(CommonUtil.getCsvHeaderColumns(carbonLoadModel))
carbonLoadModel
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ea04fce1/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 c45f5a1..6fba830 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
@@ -427,6 +427,9 @@ case class LoadTable(
carbonLoadModel.setDefaultTimestampFormat(CarbonProperties.getInstance().getProperty(
CarbonCommonConstants.CARBON_TIMESTAMP_FORMAT,
CarbonCommonConstants.CARBON_TIMESTAMP_DEFAULT_FORMAT))
+ carbonLoadModel.setDefaultDateFormat(CarbonProperties.getInstance().getProperty(
+ CarbonCommonConstants.CARBON_DATE_FORMAT,
+ CarbonCommonConstants.CARBON_DATE_DEFAULT_FORMAT))
carbonLoadModel
.setSerializationNullFormat(
TableOptionConstant.SERIALIZATION_NULL_FORMAT.getName + "," + serializationNullFormat)
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ea04fce1/processing/src/main/java/org/apache/carbondata/processing/model/CarbonLoadModel.java
----------------------------------------------------------------------
diff --git a/processing/src/main/java/org/apache/carbondata/processing/model/CarbonLoadModel.java b/processing/src/main/java/org/apache/carbondata/processing/model/CarbonLoadModel.java
index ca5acb8..a628971 100644
--- a/processing/src/main/java/org/apache/carbondata/processing/model/CarbonLoadModel.java
+++ b/processing/src/main/java/org/apache/carbondata/processing/model/CarbonLoadModel.java
@@ -74,7 +74,7 @@ public class CarbonLoadModel implements Serializable {
private String blocksID;
/**
- * Map from carbon dimension to pre defined dict file path
+ * Map from carbon dimension to pre defined dict file path
*/
private HashMap<CarbonDimension, String> predefDictMap;
@@ -112,6 +112,8 @@ public class CarbonLoadModel implements Serializable {
private String defaultTimestampFormat;
+ private String defaultDateFormat;
+
/**
* defines the string that should be treated as null while loadind data
*/
@@ -148,7 +150,7 @@ public class CarbonLoadModel implements Serializable {
}
/**
- * Use one pass to generate dictionary
+ * Use one pass to generate dictionary
*/
private boolean useOnePass;
@@ -169,6 +171,7 @@ public class CarbonLoadModel implements Serializable {
/**
* get escape char
+ *
* @return
*/
public String getEscapeChar() {
@@ -177,6 +180,7 @@ public class CarbonLoadModel implements Serializable {
/**
* set escape char
+ *
* @param escapeChar
*/
public void setEscapeChar(String escapeChar) {
@@ -330,7 +334,6 @@ public class CarbonLoadModel implements Serializable {
}
/**
- *
* @return external column dictionary file path
*/
public String getColDictFilePath() {
@@ -339,13 +342,13 @@ public class CarbonLoadModel implements Serializable {
/**
* set external column dictionary file path
+ *
* @param colDictFilePath
*/
public void setColDictFilePath(String colDictFilePath) {
this.colDictFilePath = colDictFilePath;
}
-
/**
* get copy with parition
*
@@ -529,6 +532,7 @@ public class CarbonLoadModel implements Serializable {
/**
* getSegmentUpdateDetails
+ *
* @return
*/
public List<SegmentUpdateDetails> getSegmentUpdateDetails() {
@@ -546,6 +550,7 @@ public class CarbonLoadModel implements Serializable {
/**
* getSegmentUpdateStatusManager
+ *
* @return
*/
public SegmentUpdateStatusManager getSegmentUpdateStatusManager() {
@@ -561,7 +566,6 @@ public class CarbonLoadModel implements Serializable {
this.segmentUpdateStatusManager = segmentUpdateStatusManager;
}
-
/**
* @return
*/
@@ -610,6 +614,7 @@ public class CarbonLoadModel implements Serializable {
/**
* the method returns the value to be treated as null while data load
+ *
* @return
*/
public String getSerializationNullFormat() {
@@ -618,6 +623,7 @@ public class CarbonLoadModel implements Serializable {
/**
* the method sets the value to be treated as null while data load
+ *
* @param serializationNullFormat
*/
public void setSerializationNullFormat(String serializationNullFormat) {
@@ -626,6 +632,7 @@ public class CarbonLoadModel implements Serializable {
/**
* returns the string to enable bad record logger
+ *
* @return
*/
public String getBadRecordsLoggerEnable() {
@@ -634,6 +641,7 @@ public class CarbonLoadModel implements Serializable {
/**
* method sets the string to specify whether to enable or dissable the badrecord logger.
+ *
* @param badRecordsLoggerEnable
*/
public void setBadRecordsLoggerEnable(String badRecordsLoggerEnable) {
@@ -656,9 +664,13 @@ public class CarbonLoadModel implements Serializable {
this.commentChar = commentChar;
}
- public String getDateFormat() { return dateFormat; }
+ public String getDateFormat() {
+ return dateFormat;
+ }
- public void setDateFormat(String dateFormat) { this.dateFormat = dateFormat; }
+ public void setDateFormat(String dateFormat) {
+ this.dateFormat = dateFormat;
+ }
public String getDefaultTimestampFormat() {
return defaultTimestampFormat;
@@ -683,7 +695,8 @@ public class CarbonLoadModel implements Serializable {
}
/**
- * returns option to specify the bad record logger action
+ * returns option to specify the bad record logger action
+ *
* @return
*/
public String getBadRecordsAction() {
@@ -692,6 +705,7 @@ public class CarbonLoadModel implements Serializable {
/**
* set option to specify the bad record logger action
+ *
* @param badRecordsAction
*/
public void setBadRecordsAction(String badRecordsAction) {
@@ -738,4 +752,12 @@ public class CarbonLoadModel implements Serializable {
public void setPreFetch(boolean preFetch) {
this.preFetch = preFetch;
}
+
+ public String getDefaultDateFormat() {
+ return defaultDateFormat;
+ }
+
+ public void setDefaultDateFormat(String defaultDateFormat) {
+ this.defaultDateFormat = defaultDateFormat;
+ }
}
[15/50] [abbrv] incubator-carbondata git commit: Update documents and
readme This closes #556
Posted by ra...@apache.org.
Update documents and readme This closes #556
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/3374aeb7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/3374aeb7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/3374aeb7
Branch: refs/heads/branch-1.0
Commit: 3374aeb74e106cadfbab917569a273a0ddbed552
Parents: 10703cf acb9d22
Author: ravipesala <ra...@gmail.com>
Authored: Thu Jan 19 16:28:09 2017 +0530
Committer: ravipesala <ra...@gmail.com>
Committed: Thu Jan 19 16:28:09 2017 +0530
----------------------------------------------------------------------
README.md | 37 +++-----
docs/overview-of-carbondata.md | 178 -----------------------------------
docs/quick-start-guide.md | 71 ++++----------
docs/table-of-content.md | 47 ---------
docs/use-cases-of-carbondata.md | 77 ---------------
docs/user-guide-toc.md | 47 ---------
docs/using-carbondata.md | 35 -------
7 files changed, 32 insertions(+), 460 deletions(-)
----------------------------------------------------------------------
[03/50] [abbrv] incubator-carbondata git commit:
[CARBONDATA-476][CARBONDATA-644]Added support file:// for using local file
with fs.defaultFS configured This closes #545
Posted by ra...@apache.org.
[CARBONDATA-476][CARBONDATA-644]Added support file:// for using local file with fs.defaultFS configured This closes #545
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/7f8401d7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/7f8401d7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/7f8401d7
Branch: refs/heads/branch-1.0
Commit: 7f8401d7fbbcb1d0e81158c9bad998e1fb1c22c2
Parents: 3a596f6 9587515
Author: chenliang613 <ch...@huawei.com>
Authored: Wed Jan 18 14:06:15 2017 +0800
Committer: chenliang613 <ch...@huawei.com>
Committed: Wed Jan 18 14:06:15 2017 +0800
----------------------------------------------------------------------
.../core/constants/CarbonCommonConstants.java | 2 +
.../core/datastore/impl/DFSFileHolderImpl.java | 2 +-
.../core/datastore/impl/FileFactory.java | 51 +++++++++++++++-----
.../core/metadata/AbsoluteTableIdentifier.java | 12 +++++
.../carbondata/hadoop/CarbonInputFormat.java | 11 +++--
.../carbondata/spark/rdd/CarbonScanRDD.scala | 2 +-
6 files changed, 61 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
[02/50] [abbrv] incubator-carbondata git commit: Added support
file:// for using local file
Posted by ra...@apache.org.
Added support file:// for using local file
Added support file:// for using local file with fs.defaultFS is configured
Fixed testcase
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/95875151
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/95875151
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/95875151
Branch: refs/heads/branch-1.0
Commit: 9587515136c373896c0c748777dc693f4ee2984c
Parents: 3a596f6
Author: ravipesala <ra...@gmail.com>
Authored: Tue Jan 17 18:57:44 2017 +0530
Committer: chenliang613 <ch...@huawei.com>
Committed: Wed Jan 18 14:05:14 2017 +0800
----------------------------------------------------------------------
.../core/constants/CarbonCommonConstants.java | 2 +
.../core/datastore/impl/DFSFileHolderImpl.java | 2 +-
.../core/datastore/impl/FileFactory.java | 51 +++++++++++++++-----
.../core/metadata/AbsoluteTableIdentifier.java | 12 +++++
.../carbondata/hadoop/CarbonInputFormat.java | 11 +++--
.../carbondata/spark/rdd/CarbonScanRDD.scala | 2 +-
6 files changed, 61 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/95875151/core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java b/core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java
index 6a30bd4..c134f3b 100644
--- a/core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java
+++ b/core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java
@@ -1127,6 +1127,8 @@ public final class CarbonCommonConstants {
public static final String MAJOR = "major";
+ public static final String LOCAL_FILE_PREFIX = "file://";
+
private CarbonCommonConstants() {
}
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/95875151/core/src/main/java/org/apache/carbondata/core/datastore/impl/DFSFileHolderImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/impl/DFSFileHolderImpl.java b/core/src/main/java/org/apache/carbondata/core/datastore/impl/DFSFileHolderImpl.java
index c657fc9..8a97cbf 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/impl/DFSFileHolderImpl.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/impl/DFSFileHolderImpl.java
@@ -58,7 +58,7 @@ public class DFSFileHolderImpl implements FileHolder {
FSDataInputStream fileChannel = fileNameAndStreamCache.get(filePath);
if (null == fileChannel) {
Path pt = new Path(filePath);
- FileSystem fs = FileSystem.get(FileFactory.getConfiguration());
+ FileSystem fs = pt.getFileSystem(FileFactory.getConfiguration());
fileChannel = fs.open(pt);
fileNameAndStreamCache.put(filePath, fileChannel);
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/95875151/core/src/main/java/org/apache/carbondata/core/datastore/impl/FileFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/impl/FileFactory.java b/core/src/main/java/org/apache/carbondata/core/datastore/impl/FileFactory.java
index b4a5d0d..27931fe 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/impl/FileFactory.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/impl/FileFactory.java
@@ -29,11 +29,7 @@ import java.io.InputStream;
import java.util.zip.GZIPInputStream;
import org.apache.carbondata.core.datastore.FileHolder;
-import org.apache.carbondata.core.datastore.filesystem.AlluxioCarbonFile;
-import org.apache.carbondata.core.datastore.filesystem.CarbonFile;
-import org.apache.carbondata.core.datastore.filesystem.HDFSCarbonFile;
-import org.apache.carbondata.core.datastore.filesystem.LocalCarbonFile;
-import org.apache.carbondata.core.datastore.filesystem.ViewFSCarbonFile;
+import org.apache.carbondata.core.datastore.filesystem.*;
import org.apache.carbondata.core.util.CarbonUtil;
import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream;
@@ -91,7 +87,7 @@ public final class FileFactory {
public static CarbonFile getCarbonFile(String path, FileType fileType) {
switch (fileType) {
case LOCAL:
- return new LocalCarbonFile(path);
+ return new LocalCarbonFile(getUpdatedFilePath(path, fileType));
case HDFS:
return new HDFSCarbonFile(path);
case ALLUXIO:
@@ -99,7 +95,7 @@ public final class FileFactory {
case VIEWFS:
return new ViewFSCarbonFile(path);
default:
- return new LocalCarbonFile(path);
+ return new LocalCarbonFile(getUpdatedFilePath(path, fileType));
}
}
@@ -116,6 +112,7 @@ public final class FileFactory {
InputStream stream;
switch (fileType) {
case LOCAL:
+ path = getUpdatedFilePath(path, fileType);
if (gzip) {
stream = new GZIPInputStream(new FileInputStream(path));
} else if (bzip2) {
@@ -171,6 +168,7 @@ public final class FileFactory {
stream.seek(offset);
return new DataInputStream(new BufferedInputStream(stream));
default:
+ path = getUpdatedFilePath(path, fileType);
FileInputStream fis = new FileInputStream(path);
long actualSkipSize = 0;
long skipSize = offset;
@@ -205,6 +203,7 @@ public final class FileFactory {
path = path.replace("\\", "/");
switch (fileType) {
case LOCAL:
+ path = getUpdatedFilePath(path, fileType);
return new DataOutputStream(
new BufferedOutputStream(new FileOutputStream(path, append), bufferSize));
case HDFS:
@@ -226,6 +225,7 @@ public final class FileFactory {
}
return stream;
default:
+ path = getUpdatedFilePath(path, fileType);
return new DataOutputStream(
new BufferedOutputStream(new FileOutputStream(path), bufferSize));
}
@@ -236,6 +236,7 @@ public final class FileFactory {
path = path.replace("\\", "/");
switch (fileType) {
case LOCAL:
+ path = getUpdatedFilePath(path, fileType);
return new DataOutputStream(
new BufferedOutputStream(new FileOutputStream(path), bufferSize));
case HDFS:
@@ -247,6 +248,7 @@ public final class FileFactory {
fs.create(pt, true, bufferSize, fs.getDefaultReplication(pt), blockSize);
return stream;
default:
+ path = getUpdatedFilePath(path, fileType);
return new DataOutputStream(
new BufferedOutputStream(new FileOutputStream(path), bufferSize));
}
@@ -277,6 +279,7 @@ public final class FileFactory {
case LOCAL:
default:
+ filePath = getUpdatedFilePath(filePath, fileType);
File defaultFile = new File(filePath);
if (performFileCheck) {
@@ -306,6 +309,7 @@ public final class FileFactory {
case LOCAL:
default:
+ filePath = getUpdatedFilePath(filePath, fileType);
File defaultFile = new File(filePath);
return defaultFile.exists();
}
@@ -323,6 +327,7 @@ public final class FileFactory {
case LOCAL:
default:
+ filePath = getUpdatedFilePath(filePath, fileType);
File file = new File(filePath);
return file.createNewFile();
}
@@ -340,6 +345,7 @@ public final class FileFactory {
case LOCAL:
default:
+ filePath = getUpdatedFilePath(filePath, fileType);
File file = new File(filePath);
return deleteAllFilesOfDir(file);
}
@@ -370,6 +376,7 @@ public final class FileFactory {
return fs.mkdirs(path);
case LOCAL:
default:
+ filePath = getUpdatedFilePath(filePath, fileType);
File file = new File(filePath);
return file.mkdirs();
}
@@ -388,6 +395,7 @@ public final class FileFactory {
path = path.replace("\\", "/");
switch (fileType) {
case LOCAL:
+ path = getUpdatedFilePath(path, fileType);
return new DataOutputStream(new BufferedOutputStream(new FileOutputStream(path, true)));
case HDFS:
case ALLUXIO:
@@ -425,6 +433,7 @@ public final class FileFactory {
return false;
case LOCAL:
default:
+ filePath = getUpdatedFilePath(filePath, fileType);
File file = new File(filePath);
return file.createNewFile();
}
@@ -440,10 +449,10 @@ public final class FileFactory {
* it removes the file:/ from the path
*
* @param filePath
+ * @param fileType
* @return updated file path without url for local
*/
- public static String getUpdatedFilePath(String filePath) {
- FileType fileType = getFileType(filePath);
+ private static String getUpdatedFilePath(String filePath, FileType fileType) {
switch (fileType) {
case HDFS:
case ALLUXIO:
@@ -451,13 +460,30 @@ public final class FileFactory {
return filePath;
case LOCAL:
default:
- Path pathWithoutSchemeAndAuthority =
- Path.getPathWithoutSchemeAndAuthority(new Path(filePath));
- return pathWithoutSchemeAndAuthority.toString();
+ if (filePath != null && !filePath.isEmpty()) {
+ Path pathWithoutSchemeAndAuthority =
+ Path.getPathWithoutSchemeAndAuthority(new Path(filePath));
+ return pathWithoutSchemeAndAuthority.toString();
+ } else {
+ return filePath;
+ }
}
}
/**
+ * below method will be used to update the file path
+ * for local type
+ * it removes the file:/ from the path
+ *
+ * @param filePath
+ * @return updated file path without url for local
+ */
+ public static String getUpdatedFilePath(String filePath) {
+ FileType fileType = getFileType(filePath);
+ return getUpdatedFilePath(filePath, fileType);
+ }
+
+ /**
* It computes size of directory
*
* @param filePath
@@ -475,6 +501,7 @@ public final class FileFactory {
return fs.getContentSummary(path).getLength();
case LOCAL:
default:
+ filePath = getUpdatedFilePath(filePath, fileType);
File file = new File(filePath);
return FileUtils.sizeOfDirectory(file);
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/95875151/core/src/main/java/org/apache/carbondata/core/metadata/AbsoluteTableIdentifier.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/metadata/AbsoluteTableIdentifier.java b/core/src/main/java/org/apache/carbondata/core/metadata/AbsoluteTableIdentifier.java
index f6263f4..aed248c 100644
--- a/core/src/main/java/org/apache/carbondata/core/metadata/AbsoluteTableIdentifier.java
+++ b/core/src/main/java/org/apache/carbondata/core/metadata/AbsoluteTableIdentifier.java
@@ -38,6 +38,9 @@ public class AbsoluteTableIdentifier implements Serializable {
*/
private String storePath;
+
+ private boolean isLocalPath;
+
/**
* carbon table identifier which will have table name and table database
* name
@@ -47,6 +50,7 @@ public class AbsoluteTableIdentifier implements Serializable {
public AbsoluteTableIdentifier(String storePath, CarbonTableIdentifier carbonTableIdentifier) {
//TODO this should be moved to common place where path handling will be handled
this.storePath = FileFactory.getUpdatedFilePath(storePath);
+ isLocalPath = storePath.startsWith(CarbonCommonConstants.LOCAL_FILE_PREFIX);
this.carbonTableIdentifier = carbonTableIdentifier;
}
@@ -91,6 +95,14 @@ public class AbsoluteTableIdentifier implements Serializable {
File.separator + getCarbonTableIdentifier().getTableName();
}
+ public String appendWithLocalPrefix(String path) {
+ if (isLocalPath) {
+ return CarbonCommonConstants.LOCAL_FILE_PREFIX + path;
+ } else {
+ return path;
+ }
+ }
+
/**
* to get the hash code
*/
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/95875151/hadoop/src/main/java/org/apache/carbondata/hadoop/CarbonInputFormat.java
----------------------------------------------------------------------
diff --git a/hadoop/src/main/java/org/apache/carbondata/hadoop/CarbonInputFormat.java b/hadoop/src/main/java/org/apache/carbondata/hadoop/CarbonInputFormat.java
index b320204..5acd1d5 100644
--- a/hadoop/src/main/java/org/apache/carbondata/hadoop/CarbonInputFormat.java
+++ b/hadoop/src/main/java/org/apache/carbondata/hadoop/CarbonInputFormat.java
@@ -175,8 +175,7 @@ public class CarbonInputFormat<T> extends FileInputFormat<Void, T> {
}
}
- public static CarbonTablePath getTablePath(Configuration configuration) {
- AbsoluteTableIdentifier absIdentifier = getAbsoluteTableIdentifier(configuration);
+ private static CarbonTablePath getTablePath(AbsoluteTableIdentifier absIdentifier) {
return CarbonStorePath.getCarbonTablePath(absIdentifier);
}
@@ -677,7 +676,8 @@ public class CarbonInputFormat<T> extends FileInputFormat<Void, T> {
}
PathFilter inputFilter = getDataFileFilter();
- CarbonTablePath tablePath = getTablePath(job.getConfiguration());
+ AbsoluteTableIdentifier absIdentifier = getAbsoluteTableIdentifier(job.getConfiguration());
+ CarbonTablePath tablePath = getTablePath(absIdentifier);
// get tokens for all the required FileSystem for table path
TokenCache.obtainTokensForNamenodes(job.getCredentials(), new Path[] { tablePath },
@@ -689,9 +689,10 @@ public class CarbonInputFormat<T> extends FileInputFormat<Void, T> {
for (int j = 0; j < segmentsToConsider.length; ++j) {
String segmentId = segmentsToConsider[j];
- Path segmentPath = new Path(tablePath.getCarbonDataDirectoryPath(partition, segmentId));
+ String dataDirectoryPath = absIdentifier
+ .appendWithLocalPrefix(tablePath.getCarbonDataDirectoryPath(partition, segmentId));
+ Path segmentPath = new Path(dataDirectoryPath);
FileSystem fs = segmentPath.getFileSystem(job.getConfiguration());
-
RemoteIterator<LocatedFileStatus> iter = fs.listLocatedStatus(segmentPath);
while (iter.hasNext()) {
LocatedFileStatus stat = iter.next();
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/95875151/integration/spark-common/src/main/scala/org/apache/carbondata/spark/rdd/CarbonScanRDD.scala
----------------------------------------------------------------------
diff --git a/integration/spark-common/src/main/scala/org/apache/carbondata/spark/rdd/CarbonScanRDD.scala b/integration/spark-common/src/main/scala/org/apache/carbondata/spark/rdd/CarbonScanRDD.scala
index b06fe14..3415a81 100644
--- a/integration/spark-common/src/main/scala/org/apache/carbondata/spark/rdd/CarbonScanRDD.scala
+++ b/integration/spark-common/src/main/scala/org/apache/carbondata/spark/rdd/CarbonScanRDD.scala
@@ -250,7 +250,7 @@ class CarbonScanRDD(
private def createInputFormat(conf: Configuration): CarbonInputFormat[Object] = {
val format = new CarbonInputFormat[Object]
- CarbonInputFormat.setTablePath(conf, identifier.getTablePath)
+ CarbonInputFormat.setTablePath(conf, identifier.appendWithLocalPrefix(identifier.getTablePath))
CarbonInputFormat.setFilterPredicates(conf, filterExpression)
CarbonInputFormat.setColumnProjection(conf, columnProjection)
format
[07/50] [abbrv] incubator-carbondata git commit:
[CARBONDATA-561]Merge the two CarbonOption.scala into one under spark-common
This closes #549
Posted by ra...@apache.org.
[CARBONDATA-561]Merge the two CarbonOption.scala into one under spark-common This closes #549
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/678530e7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/678530e7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/678530e7
Branch: refs/heads/branch-1.0
Commit: 678530e7a26eb1686d29b4a0a79623190700802c
Parents: e882aed 84b0ca3
Author: chenliang613 <ch...@huawei.com>
Authored: Wed Jan 18 21:36:19 2017 +0800
Committer: chenliang613 <ch...@huawei.com>
Committed: Wed Jan 18 21:36:19 2017 +0800
----------------------------------------------------------------------
.../apache/carbondata/spark/CarbonOption.scala | 57 --------------------
1 file changed, 57 deletions(-)
----------------------------------------------------------------------
[37/50] [abbrv] incubator-carbondata git commit: [CARBONDATA-668]
Dataloads fail when no. of column in load query is greater than the no. of
column in create table This closes #562
Posted by ra...@apache.org.
[CARBONDATA-668] Dataloads fail when no. of column in load query is greater than the no. of column in create table This closes #562
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/1fb5391f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/1fb5391f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/1fb5391f
Branch: refs/heads/branch-1.0
Commit: 1fb5391ff0b74562997b4418f5679b8b9cab4493
Parents: 28abe7e 1cd0450
Author: ravipesala <ra...@gmail.com>
Authored: Fri Jan 20 18:18:55 2017 +0530
Committer: ravipesala <ra...@gmail.com>
Committed: Fri Jan 20 18:18:55 2017 +0530
----------------------------------------------------------------------
.../src/test/resources/seq_500Records.csv | 500 +++++++++++++++++++
.../TestDataLoadWithColumnsMoreThanSchema.scala | 12 +
.../newflow/parser/impl/RowParserImpl.java | 3 +-
3 files changed, 514 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[45/50] [abbrv] incubator-carbondata git commit: Reverting big
decimal compression as it has below issue when big decimal scale value is
more then 18 then result is not accurate
Posted by ra...@apache.org.
Reverting big decimal compression as it has below issue
when big decimal scale value is more then 18 then result is not accurate
Fixed big decimal reader issue
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/9e24a3dd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/9e24a3dd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/9e24a3dd
Branch: refs/heads/branch-1.0
Commit: 9e24a3dd726a0aba87e00e1becff4cb8817519eb
Parents: 254af99
Author: ashok.blend <as...@gmail.com>
Authored: Fri Jan 20 07:15:16 2017 +0800
Committer: ravipesala <ra...@gmail.com>
Committed: Fri Jan 20 21:02:03 2017 +0530
----------------------------------------------------------------------
.../core/compression/BigDecimalCompressor.java | 74 --------
.../measure/AbstractMeasureChunkReader.java | 10 +-
...CompressedMeasureChunkFileBasedReaderV1.java | 4 +-
...CompressedMeasureChunkFileBasedReaderV2.java | 6 +-
.../chunk/store/MeasureChunkStoreFactory.java | 8 +-
.../safe/SafeBigDecimalMeasureChunkStore.java | 98 +++++++++++
.../UnsafeBigDecimalMeasureChunkStore.java | 140 +++++++++++++++
...afeVariableLengthDimesionDataChunkStore.java | 63 ++++---
.../compression/ValueCompressionHolder.java | 55 +++---
.../compression/decimal/CompressByteArray.java | 108 ++++++++++++
.../decimal/CompressionMaxMinByte.java | 32 ++--
.../decimal/CompressionMaxMinDefault.java | 29 ++--
.../decimal/CompressionMaxMinInt.java | 28 +--
.../decimal/CompressionMaxMinLong.java | 30 ++--
.../decimal/CompressionMaxMinShort.java | 27 +--
.../nondecimal/CompressionNonDecimalByte.java | 32 ++--
.../CompressionNonDecimalDefault.java | 29 ++--
.../nondecimal/CompressionNonDecimalInt.java | 30 ++--
.../nondecimal/CompressionNonDecimalLong.java | 31 ++--
.../CompressionNonDecimalMaxMinByte.java | 34 ++--
.../CompressionNonDecimalMaxMinDefault.java | 30 ++--
.../CompressionNonDecimalMaxMinInt.java | 26 ++-
.../CompressionNonDecimalMaxMinLong.java | 30 ++--
.../CompressionNonDecimalMaxMinShort.java | 27 +--
.../nondecimal/CompressionNonDecimalShort.java | 30 ++--
.../compression/none/CompressionNoneByte.java | 28 +--
.../none/CompressionNoneDefault.java | 29 ++--
.../compression/none/CompressionNoneInt.java | 28 +--
.../compression/none/CompressionNoneLong.java | 26 ++-
.../compression/none/CompressionNoneShort.java | 28 +--
.../compression/type/CompressionBigDecimal.java | 144 ----------------
.../dataholder/CarbonWriteDataHolder.java | 50 ------
...ractHeavyCompressedDoubleArrayDataStore.java | 3 +-
.../core/util/BigDecimalCompressionFinder.java | 92 ----------
.../carbondata/core/util/DataTypeUtil.java | 13 ++
.../core/util/ValueCompressionUtil.java | 59 +------
...mpressedMeasureChunkFileBasedReaderTest.java | 171 ++++++++-----------
.../store/CarbonFactDataHandlerColumnar.java | 71 +-------
38 files changed, 851 insertions(+), 902 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/9e24a3dd/core/src/main/java/org/apache/carbondata/core/compression/BigDecimalCompressor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/compression/BigDecimalCompressor.java b/core/src/main/java/org/apache/carbondata/core/compression/BigDecimalCompressor.java
deleted file mode 100644
index b3cfacc..0000000
--- a/core/src/main/java/org/apache/carbondata/core/compression/BigDecimalCompressor.java
+++ /dev/null
@@ -1,74 +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.compression;
-
-import org.apache.carbondata.core.datastore.dataholder.CarbonWriteDataHolder;
-import org.apache.carbondata.core.util.BigDecimalCompressionFinder;
-import org.apache.carbondata.core.util.CompressionFinder;
-import org.apache.carbondata.core.util.ValueCompressionUtil.DataType;
-
-/**
- * Big decimal data type compressor
- *
- */
-public class BigDecimalCompressor extends BigIntCompressor {
-
- private boolean readLeft = true;
-
- @Override
- public Object getCompressedValues(CompressionFinder compressionFinder,
- CarbonWriteDataHolder dataHolder, Object maxValue, int decimal) {
- BigDecimalCompressionFinder bigdCompressionFinder =
- (BigDecimalCompressionFinder) compressionFinder;
- Long[] maxValues = (Long[]) maxValue;
- Object leftCompressedValue = getCompressedValues(
- bigdCompressionFinder.getLeftCompType(), dataHolder,
- bigdCompressionFinder.getLeftConvertedDataType(), maxValues[0], 0);
- readLeft = false;
- Object rightCompressedValue = getCompressedValues(
- bigdCompressionFinder.getRightCompType(), dataHolder,
- bigdCompressionFinder.getRightConvertedDataType(), maxValues[1], 0);
- return new Object[] { leftCompressedValue, rightCompressedValue };
- }
-
- @Override
- protected Object compressMaxMin(DataType convertedDataType,
- CarbonWriteDataHolder dataHolder, Object max) {
- long maxValue = (long) max;
- long[][] writableBigDValues = dataHolder.getWritableBigDecimalValues();
- long[] value = null;
- if (readLeft) {
- value = writableBigDValues[0];
- } else {
- value = writableBigDValues[1];
- }
- return compressValue(convertedDataType, value, maxValue, true);
- }
-
- @Override
- protected Object compressAdaptive(DataType convertedDataType,
- CarbonWriteDataHolder dataHolder) {
- long[][] writableBigDValues = dataHolder.getWritableBigDecimalValues();
- long[] value = null;
- if (readLeft) {
- value = writableBigDValues[0];
- } else {
- value = writableBigDValues[1];
- }
- return compressValue(convertedDataType, value, 0, false);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/9e24a3dd/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/measure/AbstractMeasureChunkReader.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/measure/AbstractMeasureChunkReader.java b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/measure/AbstractMeasureChunkReader.java
index 656e677..611d01a 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/measure/AbstractMeasureChunkReader.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/measure/AbstractMeasureChunkReader.java
@@ -29,11 +29,17 @@ public abstract class AbstractMeasureChunkReader implements MeasureColumnChunkRe
protected String filePath;
/**
+ * number of rows for blocklet
+ */
+ protected int numberOfRows;
+
+ /**
* Constructor to get minimum parameter to create instance of this class
*
- * @param filePath file from which data will be read
+ * @param filePath file from which data will be read
*/
- public AbstractMeasureChunkReader(String filePath) {
+ public AbstractMeasureChunkReader(String filePath, int numberOfRows) {
this.filePath = filePath;
+ this.numberOfRows = numberOfRows;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/9e24a3dd/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/measure/v1/CompressedMeasureChunkFileBasedReaderV1.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/measure/v1/CompressedMeasureChunkFileBasedReaderV1.java b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/measure/v1/CompressedMeasureChunkFileBasedReaderV1.java
index 48e78d3..750da37 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/measure/v1/CompressedMeasureChunkFileBasedReaderV1.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/measure/v1/CompressedMeasureChunkFileBasedReaderV1.java
@@ -48,7 +48,7 @@ public class CompressedMeasureChunkFileBasedReaderV1 extends AbstractMeasureChun
*/
public CompressedMeasureChunkFileBasedReaderV1(final BlockletInfo blockletInfo,
final String filePath) {
- super(filePath);
+ super(filePath, blockletInfo.getNumberOfRows());
this.measureColumnChunks = blockletInfo.getMeasureColumnChunk();
}
@@ -90,7 +90,7 @@ public class CompressedMeasureChunkFileBasedReaderV1 extends AbstractMeasureChun
// unCompress data
values.uncompress(compressModel.getConvertedDataType(), dataPage, 0,
measureColumnChunks.get(blockIndex).getDataPageLength(), compressModel.getMantissa(),
- compressModel.getMaxValue());
+ compressModel.getMaxValue(), numberOfRows);
CarbonReadDataHolder measureDataHolder = new CarbonReadDataHolder(values);
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/9e24a3dd/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/measure/v2/CompressedMeasureChunkFileBasedReaderV2.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/measure/v2/CompressedMeasureChunkFileBasedReaderV2.java b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/measure/v2/CompressedMeasureChunkFileBasedReaderV2.java
index e8bdafd..d92da61 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/measure/v2/CompressedMeasureChunkFileBasedReaderV2.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/measure/v2/CompressedMeasureChunkFileBasedReaderV2.java
@@ -57,7 +57,7 @@ public class CompressedMeasureChunkFileBasedReaderV2 extends AbstractMeasureChun
*/
public CompressedMeasureChunkFileBasedReaderV2(final BlockletInfo blockletInfo,
final String filePath) {
- super(filePath);
+ super(filePath, blockletInfo.getNumberOfRows());
this.measureColumnChunkOffsets = blockletInfo.getMeasureChunkOffsets();
this.measureColumnChunkLength = blockletInfo.getMeasureChunksLength();
}
@@ -166,7 +166,7 @@ public class CompressedMeasureChunkFileBasedReaderV2 extends AbstractMeasureChun
// uncompress
values.uncompress(compressionModel.getConvertedDataType()[0], data,
copyPoint, measureColumnChunk.data_page_length, compressionModel.getMantissa()[0],
- compressionModel.getMaxValue()[0]);
+ compressionModel.getMaxValue()[0], numberOfRows);
CarbonReadDataHolder measureDataHolder = new CarbonReadDataHolder(values);
@@ -217,7 +217,7 @@ public class CompressedMeasureChunkFileBasedReaderV2 extends AbstractMeasureChun
// uncompress
values.uncompress(compressionModel.getConvertedDataType()[0], data, copyPoint,
measureColumnChunk.data_page_length, compressionModel.getMantissa()[0],
- compressionModel.getMaxValue()[0]);
+ compressionModel.getMaxValue()[0], numberOfRows);
CarbonReadDataHolder measureDataHolder = new CarbonReadDataHolder(values);
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/9e24a3dd/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/MeasureChunkStoreFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/MeasureChunkStoreFactory.java b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/MeasureChunkStoreFactory.java
index d5db61e..2a3a2a7 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/MeasureChunkStoreFactory.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/MeasureChunkStoreFactory.java
@@ -18,11 +18,13 @@
package org.apache.carbondata.core.datastore.chunk.store;
import org.apache.carbondata.core.constants.CarbonCommonConstants;
+import org.apache.carbondata.core.datastore.chunk.store.impl.safe.SafeBigDecimalMeasureChunkStore;
import org.apache.carbondata.core.datastore.chunk.store.impl.safe.SafeByteMeasureChunkStore;
import org.apache.carbondata.core.datastore.chunk.store.impl.safe.SafeDoubleMeasureChunkStore;
import org.apache.carbondata.core.datastore.chunk.store.impl.safe.SafeIntMeasureChunkStore;
import org.apache.carbondata.core.datastore.chunk.store.impl.safe.SafeLongMeasureChunkStore;
import org.apache.carbondata.core.datastore.chunk.store.impl.safe.SafeShortMeasureChunkStore;
+import org.apache.carbondata.core.datastore.chunk.store.impl.unsafe.UnsafeBigDecimalMeasureChunkStore;
import org.apache.carbondata.core.datastore.chunk.store.impl.unsafe.UnsafeByteMeasureChunkStore;
import org.apache.carbondata.core.datastore.chunk.store.impl.unsafe.UnsafeDoubleMeasureChunkStore;
import org.apache.carbondata.core.datastore.chunk.store.impl.unsafe.UnsafeIntMeasureChunkStore;
@@ -73,8 +75,9 @@ public class MeasureChunkStoreFactory {
return new SafeIntMeasureChunkStore(numberOfRows);
case DATA_LONG:
return new SafeLongMeasureChunkStore(numberOfRows);
+ case DATA_BIGDECIMAL:
+ return new SafeBigDecimalMeasureChunkStore(numberOfRows);
case DATA_DOUBLE:
- return new SafeDoubleMeasureChunkStore(numberOfRows);
default:
return new SafeDoubleMeasureChunkStore(numberOfRows);
}
@@ -88,8 +91,9 @@ public class MeasureChunkStoreFactory {
return new UnsafeIntMeasureChunkStore(numberOfRows);
case DATA_LONG:
return new UnsafeLongMeasureChunkStore(numberOfRows);
+ case DATA_BIGDECIMAL:
+ return new UnsafeBigDecimalMeasureChunkStore(numberOfRows);
case DATA_DOUBLE:
- return new UnsafeDoubleMeasureChunkStore(numberOfRows);
default:
return new UnsafeDoubleMeasureChunkStore(numberOfRows);
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/9e24a3dd/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/safe/SafeBigDecimalMeasureChunkStore.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/safe/SafeBigDecimalMeasureChunkStore.java b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/safe/SafeBigDecimalMeasureChunkStore.java
new file mode 100644
index 0000000..03f59fc
--- /dev/null
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/safe/SafeBigDecimalMeasureChunkStore.java
@@ -0,0 +1,98 @@
+/*
+ * 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.datastore.chunk.store.impl.safe;
+
+import java.math.BigDecimal;
+import java.nio.ByteBuffer;
+
+import org.apache.carbondata.core.constants.CarbonCommonConstants;
+import org.apache.carbondata.core.util.DataTypeUtil;
+
+/**
+ * Responsibility is store the big decimal measure data in memory,
+ */
+public class SafeBigDecimalMeasureChunkStore extends SafeAbstractMeasureDataChunkStore<byte[]> {
+
+ /**
+ * data chunk
+ */
+ private byte[] dataChunk;
+
+ /**
+ * offset of actual data
+ */
+ private int[] dataOffsets;
+
+ public SafeBigDecimalMeasureChunkStore(int numberOfRows) {
+ super(numberOfRows);
+ this.dataOffsets = new int[numberOfRows];
+ }
+
+ @Override public void putData(byte[] data) {
+ this.dataChunk = data;
+ // As data is of variable length and data format is
+ // <length in int><data><length in int><data>
+ // we need to store offset of each data so data can be accessed directly
+ // for example:
+ //data = {0,0,0,0,5,1,2,3,4,5,0,0,0,0,6,0,1,2,3,4,5,0,0,0,0,2,8,9}
+ //so value stored in offset will be position of actual data
+ // [5,14,24]
+ // to store this value we need to get the actual data length + 4 bytes used for storing the
+ // length
+
+ // start position will be used to store the current data position
+ int startOffset = 0;
+ // as first position will be start from 4 byte as data is stored first in the memory block
+ // we need to skip first two bytes this is because first two bytes will be length of the data
+ // which we have to skip
+ dataOffsets[0] = CarbonCommonConstants.INT_SIZE_IN_BYTE;
+ // creating a byte buffer which will wrap the length of the row
+ ByteBuffer buffer = ByteBuffer.allocate(CarbonCommonConstants.INT_SIZE_IN_BYTE);
+ for (int i = 1; i < numberOfRows; i++) {
+ buffer.put(data, startOffset, CarbonCommonConstants.INT_SIZE_IN_BYTE);
+ buffer.flip();
+ // so current row position will be
+ // previous row length + 4 bytes used for storing previous row data
+ startOffset += buffer.getInt() + CarbonCommonConstants.INT_SIZE_IN_BYTE;
+ // as same byte buffer is used to avoid creating many byte buffer for each row
+ // we need to clear the byte buffer
+ buffer.clear();
+ dataOffsets[i] = startOffset + CarbonCommonConstants.INT_SIZE_IN_BYTE;
+ }
+ }
+
+ /**
+ * to get the byte value
+ *
+ * @param index
+ * @return byte value based on index
+ */
+ @Override public BigDecimal getBigDecimal(int index) {
+ int currentDataOffset = dataOffsets[index];
+ int length = 0;
+ // calculating the length of data
+ if (index < numberOfRows - 1) {
+ length = (int) (dataOffsets[index + 1] - (currentDataOffset
+ + CarbonCommonConstants.INT_SIZE_IN_BYTE));
+ } else {
+ // for last record
+ length = (int) (this.dataChunk.length - currentDataOffset);
+ }
+ return DataTypeUtil.byteToBigDecimal(dataChunk, currentDataOffset, length);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/9e24a3dd/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/unsafe/UnsafeBigDecimalMeasureChunkStore.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/unsafe/UnsafeBigDecimalMeasureChunkStore.java b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/unsafe/UnsafeBigDecimalMeasureChunkStore.java
new file mode 100644
index 0000000..52bd74b
--- /dev/null
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/unsafe/UnsafeBigDecimalMeasureChunkStore.java
@@ -0,0 +1,140 @@
+/*
+ * 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.datastore.chunk.store.impl.unsafe;
+
+import java.math.BigDecimal;
+import java.nio.ByteBuffer;
+
+import org.apache.carbondata.core.constants.CarbonCommonConstants;
+import org.apache.carbondata.core.memory.CarbonUnsafe;
+import org.apache.carbondata.core.memory.MemoryAllocatorFactory;
+import org.apache.carbondata.core.util.DataTypeUtil;
+
+/**
+ * Responsible for storing big decimal array data to memory. memory can be on heap or
+ * offheap based on the user configuration using unsafe interface
+ */
+public class UnsafeBigDecimalMeasureChunkStore extends UnsafeAbstractMeasureDataChunkStore<byte[]> {
+
+ /**
+ * start position of data offsets
+ */
+ private long offsetStartPosition;
+
+ public UnsafeBigDecimalMeasureChunkStore(int numberOfRows) {
+ super(numberOfRows);
+ }
+
+ @Override public void putData(byte[] data) {
+ assert (!this.isMemoryOccupied);
+ this.dataPageMemoryBlock = MemoryAllocatorFactory.INSATANCE.getMemoryAllocator()
+ .allocate(data.length + (numberOfRows * CarbonCommonConstants.INT_SIZE_IN_BYTE));
+ this.offsetStartPosition = data.length;
+ // copy the data to memory
+ CarbonUnsafe.unsafe
+ .copyMemory(data, CarbonUnsafe.BYTE_ARRAY_OFFSET, dataPageMemoryBlock.getBaseObject(),
+ dataPageMemoryBlock.getBaseOffset(), dataPageMemoryBlock.size());
+ // As data is of variable length and data format is
+ // <length in short><data><length in short><data>
+ // we need to store offset of each data so data can be accessed directly
+ // for example:
+ //data = {0,0,0,0,5,1,2,3,4,5,0,0,0,0,6,0,1,2,3,4,5,0,0,0,0,2,8,9}
+ //so value stored in offset will be position of actual data
+ // [5,14,24]
+ // to store this value we need to get the actual data length + 4 bytes used for storing the
+ // length
+ // start position will be used to store the current data position
+ int startOffset = 0;
+ // position from where offsets will start
+ long pointerOffsets = this.offsetStartPosition;
+ // as first position will be start from 4 byte as data is stored first in the memory block
+ // we need to skip first two bytes this is because first two bytes will be length of the data
+ // which we have to skip
+ CarbonUnsafe.unsafe.putInt(dataPageMemoryBlock.getBaseObject(),
+ dataPageMemoryBlock.getBaseOffset() + pointerOffsets,
+ CarbonCommonConstants.INT_SIZE_IN_BYTE);
+ // incrementing the pointers as first value is already filled and as we are storing as int
+ // we need to increment the 4 bytes to set the position of the next value to set
+ pointerOffsets += CarbonCommonConstants.INT_SIZE_IN_BYTE;
+ // creating a byte buffer which will wrap the length of the row
+ // using byte buffer as unsafe will return bytes in little-endian encoding
+ ByteBuffer buffer = ByteBuffer.allocate(CarbonCommonConstants.INT_SIZE_IN_BYTE);
+ // store length of data
+ byte[] length = new byte[CarbonCommonConstants.INT_SIZE_IN_BYTE];
+ // as first offset is already stored, we need to start from the 2nd row in data array
+ for (int i = 1; i < numberOfRows; i++) {
+ // first copy the length of previous row
+ CarbonUnsafe.unsafe.copyMemory(dataPageMemoryBlock.getBaseObject(),
+ dataPageMemoryBlock.getBaseOffset() + startOffset, length, CarbonUnsafe.BYTE_ARRAY_OFFSET,
+ CarbonCommonConstants.INT_SIZE_IN_BYTE);
+ buffer.put(length);
+ buffer.flip();
+ // so current row position will be
+ // previous row length + 4 bytes used for storing previous row data
+ startOffset += CarbonCommonConstants.INT_SIZE_IN_BYTE + buffer.getInt();
+ // as same byte buffer is used to avoid creating many byte buffer for each row
+ // we need to clear the byte buffer
+ buffer.clear();
+ // now put the offset of current row, here we need to add 4 more bytes as current will
+ // also have length part so we have to skip length
+ CarbonUnsafe.unsafe.putInt(dataPageMemoryBlock.getBaseObject(),
+ dataPageMemoryBlock.getBaseOffset() + pointerOffsets,
+ startOffset + CarbonCommonConstants.INT_SIZE_IN_BYTE);
+ // incrementing the pointers as first value is already filled and as we are storing as int
+ // we need to increment the 4 bytes to set the position of the next value to set
+ pointerOffsets += CarbonCommonConstants.INT_SIZE_IN_BYTE;
+
+ this.isMemoryOccupied = true;
+ }
+ }
+
+ /**
+ * to get the byte value
+ *
+ * @param index
+ * @return byte value based on index
+ */
+ @Override public BigDecimal getBigDecimal(int index) {
+ // now to get the row from memory block we need to do following thing
+ // 1. first get the current offset
+ // 2. if it's not a last row- get the next row offset
+ // Subtract the current row offset + 4 bytes(to skip the data length) with next row offset
+ // else subtract the current row offset
+ // with complete data length get the offset of set of data
+ int currentDataOffset = CarbonUnsafe.unsafe.getInt(dataPageMemoryBlock.getBaseObject(),
+ dataPageMemoryBlock.getBaseOffset() + this.offsetStartPosition + (index
+ * CarbonCommonConstants.INT_SIZE_IN_BYTE));
+ int length = 0;
+ // calculating the length of data
+ if (index < numberOfRows - 1) {
+ int OffsetOfNextdata = CarbonUnsafe.unsafe.getInt(dataPageMemoryBlock.getBaseObject(),
+ dataPageMemoryBlock.getBaseOffset() + this.offsetStartPosition + ((index + 1)
+ * CarbonCommonConstants.INT_SIZE_IN_BYTE));
+ length =
+ (short) (OffsetOfNextdata - (currentDataOffset + CarbonCommonConstants.INT_SIZE_IN_BYTE));
+ } else {
+ // for last record we need to subtract with data length
+ length = (short) (this.offsetStartPosition - currentDataOffset);
+ }
+ byte[] row = new byte[length];
+ CarbonUnsafe.unsafe.copyMemory(dataPageMemoryBlock.getBaseObject(),
+ dataPageMemoryBlock.getBaseOffset() + currentDataOffset, row,
+ CarbonUnsafe.BYTE_ARRAY_OFFSET, length);
+ return DataTypeUtil.byteToBigDecimal(row);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/9e24a3dd/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/unsafe/UnsafeVariableLengthDimesionDataChunkStore.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/unsafe/UnsafeVariableLengthDimesionDataChunkStore.java b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/unsafe/UnsafeVariableLengthDimesionDataChunkStore.java
index 6d9ad31..10ac5cd 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/unsafe/UnsafeVariableLengthDimesionDataChunkStore.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/unsafe/UnsafeVariableLengthDimesionDataChunkStore.java
@@ -122,42 +122,37 @@ public class UnsafeVariableLengthDimesionDataChunkStore
* @return row
*/
@Override public byte[] getRow(int rowId) {
- byte[] data = null;
- try {
- // if column was explicitly sorted we need to get the rowid based inverted index reverse
- if (isExplicitSorted) {
- rowId = CarbonUnsafe.unsafe.getInt(dataPageMemoryBlock.getBaseObject(),
- dataPageMemoryBlock.getBaseOffset() + this.invertedIndexReverseOffset + (rowId
- * CarbonCommonConstants.INT_SIZE_IN_BYTE));
- }
- // now to get the row from memory block we need to do following thing
- // 1. first get the current offset
- // 2. if it's not a last row- get the next row offset
- // Subtract the current row offset + 2 bytes(to skip the data length) with next row offset
- // else subtract the current row offset + 2 bytes(to skip the data length)
- // with complete data length
- int currentDataOffset = CarbonUnsafe.unsafe.getInt(dataPageMemoryBlock.getBaseObject(),
- dataPageMemoryBlock.getBaseOffset() + this.dataPointersOffsets + (rowId
+ // if column was explicitly sorted we need to get the rowid based inverted index reverse
+ if (isExplicitSorted) {
+ rowId = CarbonUnsafe.unsafe.getInt(dataPageMemoryBlock.getBaseObject(),
+ dataPageMemoryBlock.getBaseOffset() + this.invertedIndexReverseOffset + (rowId
* CarbonCommonConstants.INT_SIZE_IN_BYTE));
- short length = 0;
- // calculating the length of data
- if (rowId < numberOfRows - 1) {
- int OffsetOfNextdata = CarbonUnsafe.unsafe.getInt(dataPageMemoryBlock.getBaseObject(),
- dataPageMemoryBlock.getBaseOffset() + this.dataPointersOffsets + ((rowId + 1)
- * CarbonCommonConstants.INT_SIZE_IN_BYTE));
- length = (short) (OffsetOfNextdata - (currentDataOffset
- + CarbonCommonConstants.SHORT_SIZE_IN_BYTE));
- } else {
- // for last record we need to subtract with data length
- length = (short) (this.dataLength - currentDataOffset);
- }
- data = new byte[length];
- CarbonUnsafe.unsafe.copyMemory(dataPageMemoryBlock.getBaseObject(),
- dataPageMemoryBlock.getBaseOffset() + currentDataOffset, data,
- CarbonUnsafe.BYTE_ARRAY_OFFSET, length);
- } catch (Throwable t) {
- System.out.println();
}
+ // now to get the row from memory block we need to do following thing
+ // 1. first get the current offset
+ // 2. if it's not a last row- get the next row offset
+ // Subtract the current row offset + 2 bytes(to skip the data length) with next row offset
+ // else subtract the current row offset + 2 bytes(to skip the data length)
+ // with complete data length
+ int currentDataOffset = CarbonUnsafe.unsafe.getInt(dataPageMemoryBlock.getBaseObject(),
+ dataPageMemoryBlock.getBaseOffset() + this.dataPointersOffsets + (rowId
+ * CarbonCommonConstants.INT_SIZE_IN_BYTE));
+ short length = 0;
+ // calculating the length of data
+ if (rowId < numberOfRows - 1) {
+ int OffsetOfNextdata = CarbonUnsafe.unsafe.getInt(dataPageMemoryBlock.getBaseObject(),
+ dataPageMemoryBlock.getBaseOffset() + this.dataPointersOffsets + ((rowId + 1)
+ * CarbonCommonConstants.INT_SIZE_IN_BYTE));
+ length = (short) (OffsetOfNextdata - (currentDataOffset
+ + CarbonCommonConstants.SHORT_SIZE_IN_BYTE));
+ } else {
+ // for last record we need to subtract with data length
+ length = (short) (this.dataLength - currentDataOffset);
+ }
+ byte[] data = new byte[length];
+ CarbonUnsafe.unsafe.copyMemory(dataPageMemoryBlock.getBaseObject(),
+ dataPageMemoryBlock.getBaseOffset() + currentDataOffset, data,
+ CarbonUnsafe.BYTE_ARRAY_OFFSET, length);
return data;
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/9e24a3dd/core/src/main/java/org/apache/carbondata/core/datastore/compression/ValueCompressionHolder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/compression/ValueCompressionHolder.java b/core/src/main/java/org/apache/carbondata/core/datastore/compression/ValueCompressionHolder.java
index 26cf236..9b3a18a 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/compression/ValueCompressionHolder.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/compression/ValueCompressionHolder.java
@@ -21,8 +21,6 @@ import java.math.BigDecimal;
import org.apache.carbondata.core.util.ValueCompressionUtil.DataType;
-
-
/**
* ValueCompressionHolder is the base class for handling
* compression / decompression of the measure data chunk
@@ -36,70 +34,80 @@ public abstract class ValueCompressionHolder<T> {
/**
* @param compressor the compressor used to decompress the data
- * @param dataType data type of the data
- * @param data compressed data
+ * @param dataType data type of the data
+ * @param data compressed data
*/
- public void unCompress(Compressor compressor, DataType dataType, byte[] data,
- int offset, int length) {
+ protected void unCompress(Compressor compressor, DataType dataType, byte[] data, int offset,
+ int length, int numberOfRows, Object maxValueObject, int decimalPlaces) {
switch (dataType) {
case DATA_BYTE:
- setValue((T)compressor.unCompressByte(data, offset, length));
+ setValue((T) compressor.unCompressByte(data, offset, length), numberOfRows, maxValueObject,
+ decimalPlaces);
break;
case DATA_SHORT:
- setValue((T)compressor.unCompressShort(data, offset, length));
+ setValue((T) compressor.unCompressShort(data, offset, length), numberOfRows, maxValueObject,
+ decimalPlaces);
break;
case DATA_INT:
- setValue((T)compressor.unCompressInt(data, offset, length));
+ setValue((T) compressor.unCompressInt(data, offset, length), numberOfRows, maxValueObject,
+ decimalPlaces);
break;
case DATA_LONG:
case DATA_BIGINT:
- setValue((T)compressor.unCompressLong(data, offset, length));
+ setValue((T) compressor.unCompressLong(data, offset, length), numberOfRows, maxValueObject,
+ decimalPlaces);
break;
case DATA_FLOAT:
- setValue((T)compressor.unCompressFloat(data, offset, length));
+ setValue((T) compressor.unCompressFloat(data, offset, length), numberOfRows, maxValueObject,
+ decimalPlaces);
break;
default:
- setValue((T)compressor.unCompressDouble(data, offset, length));
+ setValue((T) compressor.unCompressDouble(data, offset, length), numberOfRows,
+ maxValueObject, decimalPlaces);
break;
}
}
/**
* @param compressor the compressor used to compress the data
- * @param dataType data type of the data
- * @param data original data
+ * @param dataType data type of the data
+ * @param data original data
*/
public byte[] compress(Compressor compressor, DataType dataType, Object data) {
switch (dataType) {
case DATA_BYTE:
- return compressor.compressByte((byte[])data);
+ return compressor.compressByte((byte[]) data);
case DATA_SHORT:
- return compressor.compressShort((short[])data);
+ return compressor.compressShort((short[]) data);
case DATA_INT:
- return compressor.compressInt((int[])data);
+ return compressor.compressInt((int[]) data);
case DATA_LONG:
case DATA_BIGINT:
- return compressor.compressLong((long[])data);
+ return compressor.compressLong((long[]) data);
case DATA_FLOAT:
- return compressor.compressFloat((float[])data);
+ return compressor.compressFloat((float[]) data);
case DATA_DOUBLE:
default:
- return compressor.compressDouble((double[])data);
+ return compressor.compressDouble((double[]) data);
}
}
public abstract void setValue(T value);
+ public abstract void setValue(T data, int numberOfRows, Object maxValueObject, int decimalPlaces);
+
public abstract T getValue();
public abstract void setValueInBytes(byte[] value);
public abstract void compress();
- public abstract void uncompress(DataType dataType, byte[] compressData, int offset,
- int length, int decimal, Object maxValueObject);
+ public abstract void uncompress(DataType dataType, byte[] compressData, int offset, int length,
+ int decimal, Object maxValueObject, int numberOfRows);
- public byte[] getCompressedData() { return compressedValue; }
+ public byte[] getCompressedData() {
+ return compressedValue;
+ }
public abstract long getLongValue(int index);
@@ -109,5 +117,4 @@ public abstract class ValueCompressionHolder<T> {
public abstract void freeMemory();
-
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/9e24a3dd/core/src/main/java/org/apache/carbondata/core/datastore/compression/decimal/CompressByteArray.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/compression/decimal/CompressByteArray.java b/core/src/main/java/org/apache/carbondata/core/datastore/compression/decimal/CompressByteArray.java
new file mode 100644
index 0000000..b5e3a9d
--- /dev/null
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/compression/decimal/CompressByteArray.java
@@ -0,0 +1,108 @@
+/*
+ * 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.datastore.compression.decimal;
+
+import java.math.BigDecimal;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.carbondata.core.constants.CarbonCommonConstants;
+import org.apache.carbondata.core.datastore.chunk.store.MeasureChunkStoreFactory;
+import org.apache.carbondata.core.datastore.chunk.store.MeasureDataChunkStore;
+import org.apache.carbondata.core.datastore.compression.Compressor;
+import org.apache.carbondata.core.datastore.compression.CompressorFactory;
+import org.apache.carbondata.core.datastore.compression.ValueCompressionHolder;
+import org.apache.carbondata.core.util.ValueCompressionUtil.DataType;
+
+public class CompressByteArray extends ValueCompressionHolder<byte[]> {
+
+ /**
+ * compressor.
+ */
+ private static Compressor compressor = CompressorFactory.getInstance().getCompressor();
+
+ private MeasureDataChunkStore<byte[]> measureChunkStore;
+
+ /**
+ * value.
+ */
+ private byte[] value;
+
+ @Override public void setValue(byte[] value) {
+ this.value = value;
+
+ }
+
+ @Override public void setValueInBytes(byte[] value) {
+ this.value = value;
+
+ }
+
+ @Override public void compress() {
+ compressedValue = compressor.compressByte(value);
+ }
+
+ @Override public void uncompress(DataType dataType, byte[] compressedData, int offset, int length,
+ int decimal, Object maxValueObject, int numberOfRows) {
+ super.unCompress(compressor, dataType, compressedData, offset, length, numberOfRows,
+ maxValueObject, decimal);
+ }
+
+ @Override public byte[] getValue() {
+ List<byte[]> valsList = new ArrayList<byte[]>(CarbonCommonConstants.DEFAULT_COLLECTION_SIZE);
+ ByteBuffer buffer = ByteBuffer.wrap(value);
+ buffer.rewind();
+ int length = 0;
+ byte[] actualValue = null;
+ //CHECKSTYLE:OFF Approval No:Approval-367
+ while (buffer.hasRemaining()) {//CHECKSTYLE:ON
+ length = buffer.getInt();
+ actualValue = new byte[length];
+ buffer.get(actualValue);
+ valsList.add(actualValue);
+
+ }
+ return valsList.get(0);
+ }
+
+ @Override public long getLongValue(int index) {
+ throw new UnsupportedOperationException("Get long value is not defined for CompressByteArray");
+ }
+
+ @Override public double getDoubleValue(int index) {
+ throw new UnsupportedOperationException(
+ "Get double value is not defined for CompressByteArray");
+ }
+
+ @Override public BigDecimal getBigDecimalValue(int index) {
+ return this.measureChunkStore.getBigDecimal(index);
+ }
+
+ @Override public void freeMemory() {
+ this.measureChunkStore.freeMemory();
+ }
+
+ @Override
+ public void setValue(byte[] data, int numberOfRows, Object maxValueObject, int decimalPlaces) {
+ this.measureChunkStore = MeasureChunkStoreFactory.INSTANCE
+ .getMeasureDataChunkStore(DataType.DATA_BIGDECIMAL, numberOfRows);
+ this.measureChunkStore.putData(data);
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/9e24a3dd/core/src/main/java/org/apache/carbondata/core/datastore/compression/decimal/CompressionMaxMinByte.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/compression/decimal/CompressionMaxMinByte.java b/core/src/main/java/org/apache/carbondata/core/datastore/compression/decimal/CompressionMaxMinByte.java
index e5cbce9..ed50cd3 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/compression/decimal/CompressionMaxMinByte.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/compression/decimal/CompressionMaxMinByte.java
@@ -59,7 +59,9 @@ public class CompressionMaxMinByte extends ValueCompressionHolder<byte[]> {
this.actualDataType = actualDataType;
}
- @Override public byte[] getValue() {return this.value; }
+ @Override public byte[] getValue() {
+ return this.value;
+ }
@Override public void setValue(byte[] value) {
this.value = value;
@@ -69,12 +71,10 @@ public class CompressionMaxMinByte extends ValueCompressionHolder<byte[]> {
compressedValue = super.compress(compressor, DataType.DATA_BYTE, value);
}
- @Override
- public void uncompress(DataType dataType, byte[] compressedData, int offset, int length,
- int decimalPlaces, Object maxValueObject) {
- super.unCompress(compressor, dataType, compressedData, offset, length);
- setUncompressedValues(value, maxValueObject);
-
+ @Override public void uncompress(DataType dataType, byte[] compressedData, int offset, int length,
+ int decimalPlaces, Object maxValueObject, int numberOfRows) {
+ super.unCompress(compressor, dataType, compressedData, offset, length, numberOfRows,
+ maxValueObject, decimalPlaces);
}
@Override public void setValueInBytes(byte[] value) {
@@ -93,21 +93,23 @@ public class CompressionMaxMinByte extends ValueCompressionHolder<byte[]> {
@Override public BigDecimal getBigDecimalValue(int index) {
throw new UnsupportedOperationException(
- "Big decimal value is not defined for CompressionMaxMinByte");
+ "Big decimal value is not defined for CompressionMaxMinByte");
}
- private void setUncompressedValues(byte[] data, Object maxValueObject) {
- this.measureChunkStore =
- MeasureChunkStoreFactory.INSTANCE.getMeasureDataChunkStore(DataType.DATA_BYTE, data.length);
+ @Override public void freeMemory() {
+ this.measureChunkStore.freeMemory();
+ }
+
+ @Override
+ public void setValue(byte[] data, int numberOfRows, Object maxValueObject, int decimalPlaces) {
+ this.measureChunkStore = MeasureChunkStoreFactory.INSTANCE
+ .getMeasureDataChunkStore(DataType.DATA_BYTE, numberOfRows);
this.measureChunkStore.putData(data);
if (maxValueObject instanceof Long) {
- this.maxValue = (long)maxValueObject;
+ this.maxValue = (long) maxValueObject;
} else {
this.maxValue = (double) maxValueObject;
}
- }
- @Override public void freeMemory() {
- this.measureChunkStore.freeMemory();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/9e24a3dd/core/src/main/java/org/apache/carbondata/core/datastore/compression/decimal/CompressionMaxMinDefault.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/compression/decimal/CompressionMaxMinDefault.java b/core/src/main/java/org/apache/carbondata/core/datastore/compression/decimal/CompressionMaxMinDefault.java
index 2b1e6fc..6550c46 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/compression/decimal/CompressionMaxMinDefault.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/compression/decimal/CompressionMaxMinDefault.java
@@ -30,7 +30,6 @@ import org.apache.carbondata.core.datastore.compression.ValueCompressionHolder;
import org.apache.carbondata.core.util.ValueCompressionUtil;
import org.apache.carbondata.core.util.ValueCompressionUtil.DataType;
-
public class CompressionMaxMinDefault extends ValueCompressionHolder<double[]> {
/**
@@ -66,16 +65,18 @@ public class CompressionMaxMinDefault extends ValueCompressionHolder<double[]> {
this.value = value;
}
- @Override public double[] getValue() {return this.value; }
+ @Override public double[] getValue() {
+ return this.value;
+ }
@Override public void compress() {
compressedValue = super.compress(compressor, DataType.DATA_DOUBLE, value);
}
- @Override public void uncompress(DataType dataType, byte[] compressedData,
- int offset, int length, int decimalPlaces, Object maxValueObject) {
- super.unCompress(compressor, dataType, compressedData, offset, length);
- setUncompressedValues(value, maxValueObject);
+ @Override public void uncompress(DataType dataType, byte[] compressedData, int offset, int length,
+ int decimalPlaces, Object maxValueObject, int numberOfRows) {
+ super.unCompress(compressor, dataType, compressedData, offset, length, numberOfRows,
+ maxValueObject, decimalPlaces);
}
@Override public void setValueInBytes(byte[] value) {
@@ -85,7 +86,7 @@ public class CompressionMaxMinDefault extends ValueCompressionHolder<double[]> {
@Override public long getLongValue(int index) {
throw new UnsupportedOperationException(
- "Long value is not defined for CompressionMaxMinDefault");
+ "Long value is not defined for CompressionMaxMinDefault");
}
@Override public double getDoubleValue(int index) {
@@ -95,21 +96,23 @@ public class CompressionMaxMinDefault extends ValueCompressionHolder<double[]> {
@Override public BigDecimal getBigDecimalValue(int index) {
throw new UnsupportedOperationException(
- "Big decimal value is not defined for CompressionMaxMinDefault");
+ "Big decimal value is not defined for CompressionMaxMinDefault");
}
- private void setUncompressedValues(double[] data, Object maxValueObject) {
+ @Override public void freeMemory() {
+ this.measureChunkStore.freeMemory();
+ }
+
+ @Override
+ public void setValue(double[] data, int numberOfRows, Object maxValueObject, int decimalPlaces) {
this.measureChunkStore = MeasureChunkStoreFactory.INSTANCE
- .getMeasureDataChunkStore(DataType.DATA_DOUBLE, data.length);
+ .getMeasureDataChunkStore(DataType.DATA_DOUBLE, numberOfRows);
this.measureChunkStore.putData(data);
if (maxValueObject instanceof Long) {
this.maxValue = (long) maxValueObject;
} else {
this.maxValue = (double) maxValueObject;
}
- }
- @Override public void freeMemory() {
- this.measureChunkStore.freeMemory();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/9e24a3dd/core/src/main/java/org/apache/carbondata/core/datastore/compression/decimal/CompressionMaxMinInt.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/compression/decimal/CompressionMaxMinInt.java b/core/src/main/java/org/apache/carbondata/core/datastore/compression/decimal/CompressionMaxMinInt.java
index 22d3776..512cf2c 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/compression/decimal/CompressionMaxMinInt.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/compression/decimal/CompressionMaxMinInt.java
@@ -61,13 +61,14 @@ public class CompressionMaxMinInt extends ValueCompressionHolder<int[]> {
this.value = value;
}
- @Override public int[] getValue() { return this.value; }
+ @Override public int[] getValue() {
+ return this.value;
+ }
- @Override
- public void uncompress(DataType dataType, byte[] compressedData, int offset, int length,
- int decimalPlaces, Object maxValueObject) {
- super.unCompress(compressor, dataType, compressedData, offset, length);
- setUncompressedValues(value, maxValueObject);
+ @Override public void uncompress(DataType dataType, byte[] compressedData, int offset, int length,
+ int decimalPlaces, Object maxValueObject, int numberOfRows) {
+ super.unCompress(compressor, dataType, compressedData, offset, length, numberOfRows,
+ maxValueObject, decimalPlaces);
}
@Override public void compress() {
@@ -91,12 +92,17 @@ public class CompressionMaxMinInt extends ValueCompressionHolder<int[]> {
@Override public BigDecimal getBigDecimalValue(int index) {
throw new UnsupportedOperationException(
- "Big decimal value is not defined for CompressionMaxMinInt");
+ "Big decimal value is not defined for CompressionMaxMinInt");
+ }
+
+ @Override public void freeMemory() {
+ this.measureChunkStore.freeMemory();
}
- private void setUncompressedValues(int[] data, Object maxValueObject) {
+ @Override
+ public void setValue(int[] data, int numberOfRows, Object maxValueObject, int decimalPlaces) {
this.measureChunkStore =
- MeasureChunkStoreFactory.INSTANCE.getMeasureDataChunkStore(DataType.DATA_INT, data.length);
+ MeasureChunkStoreFactory.INSTANCE.getMeasureDataChunkStore(DataType.DATA_INT, numberOfRows);
this.measureChunkStore.putData(data);
if (maxValueObject instanceof Long) {
this.maxValue = (long) maxValueObject;
@@ -104,8 +110,4 @@ public class CompressionMaxMinInt extends ValueCompressionHolder<int[]> {
this.maxValue = (double) maxValueObject;
}
}
-
- @Override public void freeMemory() {
- this.measureChunkStore.freeMemory();
- }
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/9e24a3dd/core/src/main/java/org/apache/carbondata/core/datastore/compression/decimal/CompressionMaxMinLong.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/compression/decimal/CompressionMaxMinLong.java b/core/src/main/java/org/apache/carbondata/core/datastore/compression/decimal/CompressionMaxMinLong.java
index 16589e5..ca91d44 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/compression/decimal/CompressionMaxMinLong.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/compression/decimal/CompressionMaxMinLong.java
@@ -65,14 +65,15 @@ public class CompressionMaxMinLong extends ValueCompressionHolder<long[]> {
}
- @Override
- public void uncompress(DataType dataType, byte[] compressedData, int offset, int length,
- int decimalPlaces, Object maxValueObject) {
- super.unCompress(compressor, dataType, compressedData, offset, length);
- setUncompressValues(value, maxValueObject);
+ @Override public void uncompress(DataType dataType, byte[] compressedData, int offset, int length,
+ int decimalPlaces, Object maxValueObject, int numberOfRows) {
+ super.unCompress(compressor, dataType, compressedData, offset, length, numberOfRows,
+ maxValueObject, decimalPlaces);
}
- @Override public long[] getValue() {return this.value; }
+ @Override public long[] getValue() {
+ return this.value;
+ }
@Override public void setValueInBytes(byte[] value) {
ByteBuffer buffer = ByteBuffer.wrap(value);
@@ -91,12 +92,17 @@ public class CompressionMaxMinLong extends ValueCompressionHolder<long[]> {
@Override public BigDecimal getBigDecimalValue(int index) {
throw new UnsupportedOperationException(
- "Big decimal value is not defined for CompressionMaxMinLong");
+ "Big decimal value is not defined for CompressionMaxMinLong");
+ }
+
+ @Override public void freeMemory() {
+ this.measureChunkStore.freeMemory();
}
- private void setUncompressValues(long[] data, Object maxValueObject) {
- this.measureChunkStore =
- MeasureChunkStoreFactory.INSTANCE.getMeasureDataChunkStore(DataType.DATA_LONG, data.length);
+ @Override
+ public void setValue(long[] data, int numberOfRows, Object maxValueObject, int decimalPlaces) {
+ this.measureChunkStore = MeasureChunkStoreFactory.INSTANCE
+ .getMeasureDataChunkStore(DataType.DATA_LONG, numberOfRows);
this.measureChunkStore.putData(data);
if (maxValueObject instanceof Long) {
this.maxValue = (long) maxValueObject;
@@ -104,8 +110,4 @@ public class CompressionMaxMinLong extends ValueCompressionHolder<long[]> {
this.maxValue = (double) maxValueObject;
}
}
-
- @Override public void freeMemory() {
- this.measureChunkStore.freeMemory();
- }
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/9e24a3dd/core/src/main/java/org/apache/carbondata/core/datastore/compression/decimal/CompressionMaxMinShort.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/compression/decimal/CompressionMaxMinShort.java b/core/src/main/java/org/apache/carbondata/core/datastore/compression/decimal/CompressionMaxMinShort.java
index 8e2b889..d44875a 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/compression/decimal/CompressionMaxMinShort.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/compression/decimal/CompressionMaxMinShort.java
@@ -63,14 +63,15 @@ public class CompressionMaxMinShort extends ValueCompressionHolder<short[]> {
}
- @Override
- public void uncompress(DataType dataType, byte[] compressedData, int offset, int length,
- int decimalPlaces, Object maxValueObject) {
- super.unCompress(compressor, dataType, compressedData, offset, length);
- setUncompressedValues(value, maxValueObject);
+ @Override public void uncompress(DataType dataType, byte[] compressedData, int offset, int length,
+ int decimalPlaces, Object maxValueObject, int numberOfRows) {
+ super.unCompress(compressor, dataType, compressedData, offset, length, numberOfRows,
+ maxValueObject, decimalPlaces);
}
- @Override public short[] getValue() {return this.value; }
+ @Override public short[] getValue() {
+ return this.value;
+ }
@Override public void compress() {
compressedValue = super.compress(compressor, DataType.DATA_SHORT, value);
@@ -93,21 +94,23 @@ public class CompressionMaxMinShort extends ValueCompressionHolder<short[]> {
@Override public BigDecimal getBigDecimalValue(int index) {
throw new UnsupportedOperationException(
- "Big decimal value is not defined for CompressionMaxMinShort");
+ "Big decimal value is not defined for CompressionMaxMinShort");
+ }
+
+ @Override public void freeMemory() {
+ this.measureChunkStore.freeMemory();
}
- private void setUncompressedValues(short[] data, Object maxValueObject) {
+ @Override
+ public void setValue(short[] data, int numberOfRows, Object maxValueObject, int decimalPlaces) {
this.measureChunkStore = MeasureChunkStoreFactory.INSTANCE
- .getMeasureDataChunkStore(DataType.DATA_SHORT, data.length);
+ .getMeasureDataChunkStore(DataType.DATA_SHORT, numberOfRows);
this.measureChunkStore.putData(data);
if (maxValueObject instanceof Long) {
this.maxValue = (long) maxValueObject;
} else {
this.maxValue = (double) maxValueObject;
}
- }
- @Override public void freeMemory() {
- this.measureChunkStore.freeMemory();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/9e24a3dd/core/src/main/java/org/apache/carbondata/core/datastore/compression/nondecimal/CompressionNonDecimalByte.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/compression/nondecimal/CompressionNonDecimalByte.java b/core/src/main/java/org/apache/carbondata/core/datastore/compression/nondecimal/CompressionNonDecimalByte.java
index bc309a5..13f962f 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/compression/nondecimal/CompressionNonDecimalByte.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/compression/nondecimal/CompressionNonDecimalByte.java
@@ -53,17 +53,18 @@ public class CompressionNonDecimalByte extends ValueCompressionHolder<byte[]> {
this.value = value;
}
- @Override public byte[] getValue() {return this.value; }
+ @Override public byte[] getValue() {
+ return this.value;
+ }
@Override public void compress() {
compressedValue = super.compress(compressor, DataType.DATA_BYTE, value);
}
- @Override
- public void uncompress(DataType dataType, byte[] compressedData,
- int offset, int length, int decimalPlaces, Object maxValueObject) {
- super.unCompress(compressor, dataType, compressedData, offset, length);
- setUncompressedValues(value, decimalPlaces);
+ @Override public void uncompress(DataType dataType, byte[] compressedData, int offset, int length,
+ int decimalPlaces, Object maxValueObject, int numberOfRows) {
+ super.unCompress(compressor, dataType, compressedData, offset, length, numberOfRows,
+ maxValueObject, decimalPlaces);
}
@Override public void setValueInBytes(byte[] value) {
@@ -72,7 +73,7 @@ public class CompressionNonDecimalByte extends ValueCompressionHolder<byte[]> {
@Override public long getLongValue(int index) {
throw new UnsupportedOperationException(
- "Long value is not defined for CompressionNonDecimalByte");
+ "Long value is not defined for CompressionNonDecimalByte");
}
@Override public double getDoubleValue(int index) {
@@ -81,17 +82,18 @@ public class CompressionNonDecimalByte extends ValueCompressionHolder<byte[]> {
@Override public BigDecimal getBigDecimalValue(int index) {
throw new UnsupportedOperationException(
- "Big decimal value is not defined for CompressionNonDecimalByte");
- }
-
- private void setUncompressedValues(byte[] data, int decimalPlaces) {
- this.measureChunkStore =
- MeasureChunkStoreFactory.INSTANCE.getMeasureDataChunkStore(DataType.DATA_BYTE, data.length);
- this.measureChunkStore.putData(data);
- this.divisionFactory = Math.pow(10, decimalPlaces);
+ "Big decimal value is not defined for CompressionNonDecimalByte");
}
@Override public void freeMemory() {
this.measureChunkStore.freeMemory();
}
+
+ @Override
+ public void setValue(byte[] data, int numberOfRows, Object maxValueObject, int decimalPlaces) {
+ this.measureChunkStore = MeasureChunkStoreFactory.INSTANCE
+ .getMeasureDataChunkStore(DataType.DATA_BYTE, numberOfRows);
+ this.measureChunkStore.putData(data);
+ this.divisionFactory = Math.pow(10, decimalPlaces);
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/9e24a3dd/core/src/main/java/org/apache/carbondata/core/datastore/compression/nondecimal/CompressionNonDecimalDefault.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/compression/nondecimal/CompressionNonDecimalDefault.java b/core/src/main/java/org/apache/carbondata/core/datastore/compression/nondecimal/CompressionNonDecimalDefault.java
index aea48e9..15c7bb3 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/compression/nondecimal/CompressionNonDecimalDefault.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/compression/nondecimal/CompressionNonDecimalDefault.java
@@ -49,11 +49,10 @@ public class CompressionNonDecimalDefault extends ValueCompressionHolder<double[
private double divisionFactory;
- @Override
- public void uncompress(DataType dataType, byte[] compressedData, int offset, int length,
- int decimalPlaces, Object maxValueObject) {
- super.unCompress(compressor, dataType, compressedData, offset, length);
- setUncompressedValues(value, decimalPlaces);
+ @Override public void uncompress(DataType dataType, byte[] compressedData, int offset, int length,
+ int decimalPlaces, Object maxValueObject, int numberOfRows) {
+ super.unCompress(compressor, dataType, compressedData, offset, length, numberOfRows,
+ maxValueObject, decimalPlaces);
}
@Override public void compress() {
@@ -65,7 +64,9 @@ public class CompressionNonDecimalDefault extends ValueCompressionHolder<double[
}
- @Override public double[] getValue() {return this.value; }
+ @Override public double[] getValue() {
+ return this.value;
+ }
@Override public void setValueInBytes(byte[] value) {
ByteBuffer buffer = ByteBuffer.wrap(value);
@@ -74,7 +75,7 @@ public class CompressionNonDecimalDefault extends ValueCompressionHolder<double[
@Override public long getLongValue(int index) {
throw new UnsupportedOperationException(
- "Long value is not defined for CompressionNonDecimalDefault");
+ "Long value is not defined for CompressionNonDecimalDefault");
}
@Override public double getDoubleValue(int index) {
@@ -83,17 +84,19 @@ public class CompressionNonDecimalDefault extends ValueCompressionHolder<double[
@Override public BigDecimal getBigDecimalValue(int index) {
throw new UnsupportedOperationException(
- "Big decimal value is not defined for CompressionNonDecimalDefault");
+ "Big decimal value is not defined for CompressionNonDecimalDefault");
+ }
+
+ @Override public void freeMemory() {
+ this.measureChunkStore.freeMemory();
}
- private void setUncompressedValues(double[] data, int decimalPlaces) {
+ @Override
+ public void setValue(double[] data, int numberOfRows, Object maxValueObject, int decimalPlaces) {
this.measureChunkStore = MeasureChunkStoreFactory.INSTANCE
- .getMeasureDataChunkStore(DataType.DATA_DOUBLE, data.length);
+ .getMeasureDataChunkStore(DataType.DATA_DOUBLE, numberOfRows);
this.measureChunkStore.putData(data);
this.divisionFactory = Math.pow(10, decimalPlaces);
- }
- @Override public void freeMemory() {
- this.measureChunkStore.freeMemory();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/9e24a3dd/core/src/main/java/org/apache/carbondata/core/datastore/compression/nondecimal/CompressionNonDecimalInt.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/compression/nondecimal/CompressionNonDecimalInt.java b/core/src/main/java/org/apache/carbondata/core/datastore/compression/nondecimal/CompressionNonDecimalInt.java
index 2b27eff..7e3606e 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/compression/nondecimal/CompressionNonDecimalInt.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/compression/nondecimal/CompressionNonDecimalInt.java
@@ -53,7 +53,9 @@ public class CompressionNonDecimalInt extends ValueCompressionHolder<int[]> {
this.value = value;
}
- @Override public int[] getValue() { return this.value; }
+ @Override public int[] getValue() {
+ return this.value;
+ }
@Override public void compress() {
compressedValue = super.compress(compressor, DataType.DATA_INT, value);
@@ -64,16 +66,15 @@ public class CompressionNonDecimalInt extends ValueCompressionHolder<int[]> {
this.value = ValueCompressionUtil.convertToIntArray(buffer, bytesArr.length);
}
- @Override
- public void uncompress(DataType dataType, byte[] compressedData, int offset, int length,
- int decimalPlaces, Object maxValueObject) {
- super.unCompress(compressor, dataType, compressedData, offset, length);
- setUncompressedValues(value, decimalPlaces);
+ @Override public void uncompress(DataType dataType, byte[] compressedData, int offset, int length,
+ int decimalPlaces, Object maxValueObject, int numberOfRows) {
+ super.unCompress(compressor, dataType, compressedData, offset, length, numberOfRows,
+ maxValueObject, decimalPlaces);
}
@Override public long getLongValue(int index) {
throw new UnsupportedOperationException(
- "Long value is not defined for CompressionNonDecimalInt");
+ "Long value is not defined for CompressionNonDecimalInt");
}
@Override public double getDoubleValue(int index) {
@@ -82,17 +83,18 @@ public class CompressionNonDecimalInt extends ValueCompressionHolder<int[]> {
@Override public BigDecimal getBigDecimalValue(int index) {
throw new UnsupportedOperationException(
- "Big decimal value is not defined for CompressionNonDecmialInt");
+ "Big decimal value is not defined for CompressionNonDecmialInt");
+ }
+
+ @Override public void freeMemory() {
+ this.measureChunkStore.freeMemory();
}
- private void setUncompressedValues(int[] data, int decimalPlaces) {
+ @Override
+ public void setValue(int[] data, int numberOfRows, Object maxValueObject, int decimalPlaces) {
this.measureChunkStore =
- MeasureChunkStoreFactory.INSTANCE.getMeasureDataChunkStore(DataType.DATA_INT, data.length);
+ MeasureChunkStoreFactory.INSTANCE.getMeasureDataChunkStore(DataType.DATA_INT, numberOfRows);
this.measureChunkStore.putData(data);
this.divisionFactory = Math.pow(10, decimalPlaces);
}
-
- @Override public void freeMemory() {
- this.measureChunkStore.freeMemory();
- }
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/9e24a3dd/core/src/main/java/org/apache/carbondata/core/datastore/compression/nondecimal/CompressionNonDecimalLong.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/compression/nondecimal/CompressionNonDecimalLong.java b/core/src/main/java/org/apache/carbondata/core/datastore/compression/nondecimal/CompressionNonDecimalLong.java
index 55d250f..d810972 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/compression/nondecimal/CompressionNonDecimalLong.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/compression/nondecimal/CompressionNonDecimalLong.java
@@ -55,16 +55,18 @@ public class CompressionNonDecimalLong extends ValueCompressionHolder<long[]> {
this.value = value;
}
- @Override public long[] getValue() { return this.value; }
+ @Override public long[] getValue() {
+ return this.value;
+ }
@Override public void compress() {
compressedValue = super.compress(compressor, DataType.DATA_LONG, value);
}
- @Override public void uncompress(DataType dataType, byte[] compressedData, int offset,
- int length, int decimalPlaces, Object maxValueObject) {
- super.unCompress(compressor, dataType, compressedData, offset, length);
- setUncompressedValues(value, decimalPlaces);
+ @Override public void uncompress(DataType dataType, byte[] compressedData, int offset, int length,
+ int decimalPlaces, Object maxValueObject, int numberOfRows) {
+ super.unCompress(compressor, dataType, compressedData, offset, length, numberOfRows,
+ maxValueObject, decimalPlaces);
}
@Override public void setValueInBytes(byte[] bytes) {
@@ -74,7 +76,7 @@ public class CompressionNonDecimalLong extends ValueCompressionHolder<long[]> {
@Override public long getLongValue(int index) {
throw new UnsupportedOperationException(
- "Long value is not defined for CompressionNonDecimalLong");
+ "Long value is not defined for CompressionNonDecimalLong");
}
@Override public double getDoubleValue(int index) {
@@ -83,17 +85,18 @@ public class CompressionNonDecimalLong extends ValueCompressionHolder<long[]> {
@Override public BigDecimal getBigDecimalValue(int index) {
throw new UnsupportedOperationException(
- "Big decimal value is not defined for CompressionNonDecimalLong");
- }
-
- private void setUncompressedValues(long[] data, int decimalPlaces) {
- this.measureChunkStore =
- MeasureChunkStoreFactory.INSTANCE.getMeasureDataChunkStore(DataType.DATA_LONG, data.length);
- this.measureChunkStore.putData(data);
- this.divisionFactory = Math.pow(10, decimalPlaces);
+ "Big decimal value is not defined for CompressionNonDecimalLong");
}
@Override public void freeMemory() {
this.measureChunkStore.freeMemory();
}
+
+ @Override
+ public void setValue(long[] data, int numberOfRows, Object maxValueObject, int decimalPlaces) {
+ this.measureChunkStore = MeasureChunkStoreFactory.INSTANCE
+ .getMeasureDataChunkStore(DataType.DATA_LONG, numberOfRows);
+ this.measureChunkStore.putData(data);
+ this.divisionFactory = Math.pow(10, decimalPlaces);
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/9e24a3dd/core/src/main/java/org/apache/carbondata/core/datastore/compression/nondecimal/CompressionNonDecimalMaxMinByte.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/compression/nondecimal/CompressionNonDecimalMaxMinByte.java b/core/src/main/java/org/apache/carbondata/core/datastore/compression/nondecimal/CompressionNonDecimalMaxMinByte.java
index 80cf24e..83e8a1a 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/compression/nondecimal/CompressionNonDecimalMaxMinByte.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/compression/nondecimal/CompressionNonDecimalMaxMinByte.java
@@ -51,11 +51,10 @@ public class CompressionNonDecimalMaxMinByte extends ValueCompressionHolder<byte
private double divisionFactor;
- @Override
- public void uncompress(DataType dataType, byte[] compressedData,
- int offset, int length, int decimalPlaces, Object maxValueObject) {
- super.unCompress(compressor, dataType, compressedData, offset, length);
- setUncompressedValues(value, decimalPlaces, maxValueObject );
+ @Override public void uncompress(DataType dataType, byte[] compressedData, int offset, int length,
+ int decimalPlaces, Object maxValueObject, int numberOfRows) {
+ super.unCompress(compressor, dataType, compressedData, offset, length, numberOfRows,
+ maxValueObject, decimalPlaces);
}
@Override public void compress() {
@@ -72,7 +71,7 @@ public class CompressionNonDecimalMaxMinByte extends ValueCompressionHolder<byte
@Override public long getLongValue(int index) {
throw new UnsupportedOperationException(
- "Long value is not defined for CompressionNonDecimalMaxMinByte");
+ "Long value is not defined for CompressionNonDecimalMaxMinByte");
}
@Override public double getDoubleValue(int index) {
@@ -84,20 +83,23 @@ public class CompressionNonDecimalMaxMinByte extends ValueCompressionHolder<byte
@Override public BigDecimal getBigDecimalValue(int index) {
throw new UnsupportedOperationException(
- "Big decimal value is not defined for CompressionNonDecimalMaxMinByte");
- }
-
- private void setUncompressedValues(byte[] data, int decimalPlaces, Object maxValueObject) {
- this.measureChunkStore =
- MeasureChunkStoreFactory.INSTANCE.getMeasureDataChunkStore(DataType.DATA_BYTE, data.length);
- this.measureChunkStore.putData(data);
- this.maxValue = BigDecimal.valueOf((double) maxValueObject);
- this.divisionFactor = Math.pow(10, decimalPlaces);
+ "Big decimal value is not defined for CompressionNonDecimalMaxMinByte");
}
@Override public void freeMemory() {
this.measureChunkStore.freeMemory();
}
- @Override public byte[] getValue() { return this.value; }
+ @Override public byte[] getValue() {
+ return this.value;
+ }
+
+ @Override
+ public void setValue(byte[] data, int numberOfRows, Object maxValueObject, int decimalPlaces) {
+ this.measureChunkStore = MeasureChunkStoreFactory.INSTANCE
+ .getMeasureDataChunkStore(DataType.DATA_BYTE, numberOfRows);
+ this.measureChunkStore.putData(data);
+ this.maxValue = BigDecimal.valueOf((double) maxValueObject);
+ this.divisionFactor = Math.pow(10, decimalPlaces);
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/9e24a3dd/core/src/main/java/org/apache/carbondata/core/datastore/compression/nondecimal/CompressionNonDecimalMaxMinDefault.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/compression/nondecimal/CompressionNonDecimalMaxMinDefault.java b/core/src/main/java/org/apache/carbondata/core/datastore/compression/nondecimal/CompressionNonDecimalMaxMinDefault.java
index d228836..c408d9a 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/compression/nondecimal/CompressionNonDecimalMaxMinDefault.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/compression/nondecimal/CompressionNonDecimalMaxMinDefault.java
@@ -57,7 +57,9 @@ public class CompressionNonDecimalMaxMinDefault extends ValueCompressionHolder<d
this.value = value;
}
- @Override public double[] getValue() { return this.value; }
+ @Override public double[] getValue() {
+ return this.value;
+ }
@Override public void compress() {
compressedValue = super.compress(compressor, DataType.DATA_DOUBLE, value);
@@ -68,16 +70,15 @@ public class CompressionNonDecimalMaxMinDefault extends ValueCompressionHolder<d
this.value = ValueCompressionUtil.convertToDoubleArray(buffer, value.length);
}
- @Override
- public void uncompress(DataType dataType, byte[] compressedData,
- int offset, int length, int decimalPlaces, Object maxValueObject) {
- super.unCompress(compressor,dataType,compressedData, offset, length);
- setUncompressedValues(value, decimalPlaces, maxValueObject);
+ @Override public void uncompress(DataType dataType, byte[] compressedData, int offset, int length,
+ int decimalPlaces, Object maxValueObject, int numberOfRows) {
+ super.unCompress(compressor, dataType, compressedData, offset, length, numberOfRows,
+ maxValueObject, decimalPlaces);
}
@Override public long getLongValue(int index) {
throw new UnsupportedOperationException(
- "Long value is not defined for CompressionNonDecimalMaxMinDefault");
+ "Long value is not defined for CompressionNonDecimalMaxMinDefault");
}
@Override public double getDoubleValue(int index) {
@@ -88,18 +89,19 @@ public class CompressionNonDecimalMaxMinDefault extends ValueCompressionHolder<d
@Override public BigDecimal getBigDecimalValue(int index) {
throw new UnsupportedOperationException(
- "Big decimal value is not defined for CompressionNonDecimalMaxMinDefault");
+ "Big decimal value is not defined for CompressionNonDecimalMaxMinDefault");
+ }
+
+ @Override public void freeMemory() {
+ this.measureChunkStore.freeMemory();
}
- private void setUncompressedValues(double[] data, int decimalPlaces, Object maxValueObject) {
+ @Override
+ public void setValue(double[] data, int numberOfRows, Object maxValueObject, int decimalPlaces) {
this.measureChunkStore = MeasureChunkStoreFactory.INSTANCE
- .getMeasureDataChunkStore(DataType.DATA_DOUBLE, data.length);
+ .getMeasureDataChunkStore(DataType.DATA_DOUBLE, numberOfRows);
this.measureChunkStore.putData(data);
this.maxValue = BigDecimal.valueOf((double) maxValueObject);
this.divisionFactor = Math.pow(10, decimalPlaces);
}
-
- @Override public void freeMemory() {
- this.measureChunkStore.freeMemory();
- }
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/9e24a3dd/core/src/main/java/org/apache/carbondata/core/datastore/compression/nondecimal/CompressionNonDecimalMaxMinInt.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/compression/nondecimal/CompressionNonDecimalMaxMinInt.java b/core/src/main/java/org/apache/carbondata/core/datastore/compression/nondecimal/CompressionNonDecimalMaxMinInt.java
index 2b40d60..3df2948 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/compression/nondecimal/CompressionNonDecimalMaxMinInt.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/compression/nondecimal/CompressionNonDecimalMaxMinInt.java
@@ -55,7 +55,9 @@ public class CompressionNonDecimalMaxMinInt extends ValueCompressionHolder<int[]
this.value = value;
}
- @Override public int[] getValue() {return this.value; }
+ @Override public int[] getValue() {
+ return this.value;
+ }
@Override public void compress() {
compressedValue = super.compress(compressor, DataType.DATA_INT, value);
@@ -66,16 +68,16 @@ public class CompressionNonDecimalMaxMinInt extends ValueCompressionHolder<int[]
this.value = ValueCompressionUtil.convertToIntArray(buffer, value.length);
}
- @Override
- public void uncompress(DataType dataType, byte[] compressedData,
- int offset, int length, int decimalPlaces, Object maxValueObject) {
- super.unCompress(compressor, dataType, compressedData, offset, length);
+ @Override public void uncompress(DataType dataType, byte[] compressedData, int offset, int length,
+ int decimalPlaces, Object maxValueObject, int numberOfRows) {
+ super.unCompress(compressor, dataType, compressedData, offset, length, numberOfRows,
+ maxValueObject, decimalPlaces);
setUncompressedValues(value, decimalPlaces, maxValueObject);
}
@Override public long getLongValue(int index) {
throw new UnsupportedOperationException(
- "Long value is not defined for CompressionNonDecimalMaxMinInt");
+ "Long value is not defined for CompressionNonDecimalMaxMinInt");
}
@Override public double getDoubleValue(int index) {
@@ -86,7 +88,7 @@ public class CompressionNonDecimalMaxMinInt extends ValueCompressionHolder<int[]
@Override public BigDecimal getBigDecimalValue(int index) {
throw new UnsupportedOperationException(
- "Big decimal value is not defined for CompressionNonDecimalMaxMinInt");
+ "Big decimal value is not defined for CompressionNonDecimalMaxMinInt");
}
private void setUncompressedValues(int[] data, int decimalPlaces, Object maxValueObject) {
@@ -100,4 +102,14 @@ public class CompressionNonDecimalMaxMinInt extends ValueCompressionHolder<int[]
@Override public void freeMemory() {
this.measureChunkStore.freeMemory();
}
+
+ @Override
+ public void setValue(int[] data, int numberOfRows, Object maxValueObject, int decimalPlaces) {
+ this.measureChunkStore =
+ MeasureChunkStoreFactory.INSTANCE.getMeasureDataChunkStore(DataType.DATA_INT, numberOfRows);
+ this.measureChunkStore.putData(data);
+ this.maxValue = BigDecimal.valueOf((double) maxValueObject);
+ this.divisionFactor = Math.pow(10, decimalPlaces);
+
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/9e24a3dd/core/src/main/java/org/apache/carbondata/core/datastore/compression/nondecimal/CompressionNonDecimalMaxMinLong.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/compression/nondecimal/CompressionNonDecimalMaxMinLong.java b/core/src/main/java/org/apache/carbondata/core/datastore/compression/nondecimal/CompressionNonDecimalMaxMinLong.java
index 60ac51d..f8d8ed5 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/compression/nondecimal/CompressionNonDecimalMaxMinLong.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/compression/nondecimal/CompressionNonDecimalMaxMinLong.java
@@ -57,13 +57,14 @@ public class CompressionNonDecimalMaxMinLong extends ValueCompressionHolder<long
}
- @Override public long[] getValue() { return this.value; }
+ @Override public long[] getValue() {
+ return this.value;
+ }
- @Override
- public void uncompress(DataType dataType, byte[] compressedData,
- int offset, int length, int decimalPlaces, Object maxValueObject) {
- super.unCompress(compressor, dataType, compressedData, offset, length);
- setUncompressedValues(value, decimalPlaces, maxValueObject);
+ @Override public void uncompress(DataType dataType, byte[] compressedData, int offset, int length,
+ int decimalPlaces, Object maxValueObject, int numberOfRows) {
+ super.unCompress(compressor, dataType, compressedData, offset, length, numberOfRows,
+ maxValueObject, decimalPlaces);
}
@Override public void compress() {
@@ -77,7 +78,7 @@ public class CompressionNonDecimalMaxMinLong extends ValueCompressionHolder<long
@Override public long getLongValue(int index) {
throw new UnsupportedOperationException(
- "Long value is not defined for CompressionNonDecimalMaxMinLong");
+ "Long value is not defined for CompressionNonDecimalMaxMinLong");
}
@Override public double getDoubleValue(int index) {
@@ -90,15 +91,16 @@ public class CompressionNonDecimalMaxMinLong extends ValueCompressionHolder<long
throw new UnsupportedOperationException("Big decimal value is not supported");
}
- private void setUncompressedValues(long[] data, int decimalPlaces, Object maxValueObject) {
- this.measureChunkStore =
- MeasureChunkStoreFactory.INSTANCE.getMeasureDataChunkStore(DataType.DATA_LONG, data.length);
+ @Override public void freeMemory() {
+ this.measureChunkStore.freeMemory();
+ }
+
+ @Override
+ public void setValue(long[] data, int numberOfRows, Object maxValueObject, int decimalPlaces) {
+ this.measureChunkStore = MeasureChunkStoreFactory.INSTANCE
+ .getMeasureDataChunkStore(DataType.DATA_LONG, numberOfRows);
this.measureChunkStore.putData(data);
this.maxValue = BigDecimal.valueOf((double) maxValueObject);
this.divisionFactor = Math.pow(10, decimalPlaces);
}
-
- @Override public void freeMemory() {
- this.measureChunkStore.freeMemory();
- }
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/9e24a3dd/core/src/main/java/org/apache/carbondata/core/datastore/compression/nondecimal/CompressionNonDecimalMaxMinShort.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/compression/nondecimal/CompressionNonDecimalMaxMinShort.java b/core/src/main/java/org/apache/carbondata/core/datastore/compression/nondecimal/CompressionNonDecimalMaxMinShort.java
index b22ec65..14648ba 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/compression/nondecimal/CompressionNonDecimalMaxMinShort.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/compression/nondecimal/CompressionNonDecimalMaxMinShort.java
@@ -55,13 +55,14 @@ public class CompressionNonDecimalMaxMinShort extends ValueCompressionHolder<sho
this.value = value;
}
- @Override public short[] getValue() { return this.value; }
+ @Override public short[] getValue() {
+ return this.value;
+ }
- @Override
- public void uncompress(DataType dataType, byte[] compressedData,
- int offset, int length, int decimalPlaces, Object maxValueObject) {
- super.unCompress(compressor, dataType, compressedData, offset, length);
- setUncompressedValues(value, decimalPlaces, maxValueObject);
+ @Override public void uncompress(DataType dataType, byte[] compressedData, int offset, int length,
+ int decimalPlaces, Object maxValueObject, int numberOfRows) {
+ super.unCompress(compressor, dataType, compressedData, offset, length, numberOfRows,
+ maxValueObject, decimalPlaces);
}
@Override public void compress() {
@@ -75,7 +76,7 @@ public class CompressionNonDecimalMaxMinShort extends ValueCompressionHolder<sho
@Override public long getLongValue(int index) {
throw new UnsupportedOperationException(
- "Long value is not defined for CompressionNonDecimalMaxMinShort");
+ "Long value is not defined for CompressionNonDecimalMaxMinShort");
}
@Override public double getDoubleValue(int index) {
@@ -88,15 +89,17 @@ public class CompressionNonDecimalMaxMinShort extends ValueCompressionHolder<sho
throw new UnsupportedOperationException("Get big decimal value is not supported");
}
- private void setUncompressedValues(short[] data, int decimalPlaces, Object maxValueObject) {
+ @Override public void freeMemory() {
+ this.measureChunkStore.freeMemory();
+ }
+
+ @Override
+ public void setValue(short[] data, int numberOfRows, Object maxValueObject, int decimalPlaces) {
this.measureChunkStore = MeasureChunkStoreFactory.INSTANCE
- .getMeasureDataChunkStore(DataType.DATA_SHORT, data.length);
+ .getMeasureDataChunkStore(DataType.DATA_SHORT, numberOfRows);
this.measureChunkStore.putData(data);
this.maxValue = BigDecimal.valueOf((double) maxValueObject);
this.divisionFactor = Math.pow(10, decimalPlaces);
- }
- @Override public void freeMemory() {
- this.measureChunkStore.freeMemory();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/9e24a3dd/core/src/main/java/org/apache/carbondata/core/datastore/compression/nondecimal/CompressionNonDecimalShort.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/compression/nondecimal/CompressionNonDecimalShort.java b/core/src/main/java/org/apache/carbondata/core/datastore/compression/nondecimal/CompressionNonDecimalShort.java
index 65e2d93..8536630 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/compression/nondecimal/CompressionNonDecimalShort.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/compression/nondecimal/CompressionNonDecimalShort.java
@@ -53,17 +53,18 @@ public class CompressionNonDecimalShort extends ValueCompressionHolder<short[]>
this.value = value;
}
- @Override public short[] getValue() { return this.value; }
+ @Override public short[] getValue() {
+ return this.value;
+ }
@Override public void compress() {
compressedValue = super.compress(compressor, DataType.DATA_SHORT, value);
}
- @Override
- public void uncompress(DataType dataType, byte[] compressedData,
- int offset, int length, int decimalPlaces, Object maxValueObject) {
- super.unCompress(compressor,dataType,compressedData, offset, length);
- setUncompressedValues(value, decimalPlaces);
+ @Override public void uncompress(DataType dataType, byte[] compressedData, int offset, int length,
+ int decimalPlaces, Object maxValueObject, int numberOfRows) {
+ super.unCompress(compressor, dataType, compressedData, offset, length, numberOfRows,
+ maxValueObject, decimalPlaces);
}
@Override public void setValueInBytes(byte[] value) {
@@ -73,7 +74,7 @@ public class CompressionNonDecimalShort extends ValueCompressionHolder<short[]>
@Override public long getLongValue(int index) {
throw new UnsupportedOperationException(
- "Long value is not defined for CompressionNonDecimalShort");
+ "Long value is not defined for CompressionNonDecimalShort");
}
@Override public double getDoubleValue(int index) {
@@ -82,17 +83,18 @@ public class CompressionNonDecimalShort extends ValueCompressionHolder<short[]>
@Override public BigDecimal getBigDecimalValue(int index) {
throw new UnsupportedOperationException(
- "Big decimal value is not defined for CompressionNonDecimalShort");
+ "Big decimal value is not defined for CompressionNonDecimalShort");
+ }
+
+ @Override public void freeMemory() {
+ this.measureChunkStore.freeMemory();
}
- private void setUncompressedValues(short[] data, int decimalPlaces) {
+ @Override
+ public void setValue(short[] data, int numberOfRows, Object maxValueObject, int decimalPlaces) {
this.measureChunkStore = MeasureChunkStoreFactory.INSTANCE
- .getMeasureDataChunkStore(DataType.DATA_SHORT, data.length);
+ .getMeasureDataChunkStore(DataType.DATA_SHORT, numberOfRows);
this.measureChunkStore.putData(data);
this.divisionFactory = Math.pow(10, decimalPlaces);
}
-
- @Override public void freeMemory() {
- this.measureChunkStore.freeMemory();
- }
}
[09/50] [abbrv] incubator-carbondata git commit:
[CARBONDATA-656]Simplify the carbon session creation This closes #547
Posted by ra...@apache.org.
[CARBONDATA-656]Simplify the carbon session creation This closes #547
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/e6fa4ad9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/e6fa4ad9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/e6fa4ad9
Branch: refs/heads/branch-1.0
Commit: e6fa4ad98f730a24b61c967d42437818322d2e32
Parents: 678530e 5f75a8a
Author: chenliang613 <ch...@huawei.com>
Authored: Wed Jan 18 23:12:45 2017 +0800
Committer: chenliang613 <ch...@huawei.com>
Committed: Wed Jan 18 23:12:45 2017 +0800
----------------------------------------------------------------------
.../examples/CarbonSessionExample.scala | 19 ++---------
.../examples/SparkSessionExample.scala | 2 +-
.../spark/sql/test/TestQueryExecutor.scala | 2 +-
.../org/apache/spark/sql/CarbonSession.scala | 33 +++++++++++++++++---
.../sql/test/Spark2TestQueryExecutor.scala | 7 ++---
5 files changed, 35 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
[13/50] [abbrv] incubator-carbondata git commit: [CARBONDATA-624]
Complete CarbonData document in md files This closes #550
Posted by ra...@apache.org.
[CARBONDATA-624] Complete CarbonData document in md files This closes #550
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/10703cf6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/10703cf6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/10703cf6
Branch: refs/heads/branch-1.0
Commit: 10703cf60efb43c52596c462c022b29d4a231935
Parents: e6fa4ad 276a611
Author: ravipesala <ra...@gmail.com>
Authored: Wed Jan 18 21:21:46 2017 +0530
Committer: ravipesala <ra...@gmail.com>
Committed: Wed Jan 18 21:21:46 2017 +0530
----------------------------------------------------------------------
...Building-CarbonData-And-IDE-Configuartion.md | 73 -
docs/Carbon-Packaging-and-Interfaces.md | 91 --
docs/Carbondata-File-Structure-and-Format.md | 55 -
docs/DDL-Operations-on-Carbon.md | 187 ---
docs/DML-Operations-on-Carbon.md | 197 ---
docs/Data-Management.md | 255 ++--
docs/Quick-Start.md | 89 --
docs/configuration-parameters.md | 149 ++
docs/ddl-operation-on-carbondata.md | 193 +++
docs/dml-operation-on-carbondata.md | 429 ++++++
docs/faq.md | 47 +
docs/images/CarbonData_logo.png | Bin 0 -> 10971 bytes
docs/images/carbon_data_file_structure_new.png | Bin 0 -> 78374 bytes
docs/images/carbon_data_format_new.png | Bin 0 -> 73708 bytes
docs/images/carbon_data_full_scan.png | Bin 0 -> 35710 bytes
docs/images/carbon_data_motivation.png | Bin 0 -> 25388 bytes
docs/images/carbon_data_olap_scan.png | Bin 0 -> 45235 bytes
docs/images/carbon_data_random_scan.png | Bin 0 -> 46317 bytes
docs/images/format/CarbonData_logo.png | Bin 10971 -> 0 bytes
.../format/carbon_data_file_structure_new.png | Bin 78374 -> 0 bytes
docs/images/format/carbon_data_format_new.png | Bin 73708 -> 0 bytes
docs/images/format/carbon_data_full_scan.png | Bin 35710 -> 0 bytes
docs/images/format/carbon_data_motivation.png | Bin 25388 -> 0 bytes
docs/images/format/carbon_data_olap_scan.png | Bin 45235 -> 0 bytes
docs/images/format/carbon_data_random_scan.png | Bin 46317 -> 0 bytes
docs/installation-guide.md | 187 +++
docs/overview-of-carbondata.md | 178 +++
docs/quick-start-guide.md | 178 +++
docs/table-of-content.md | 47 +
docs/troubleshooting.md | 30 +
docs/use-cases-of-carbondata.md | 77 +
docs/useful-tips-on-carbondata.md | 180 +++
docs/user-guide-toc.md | 47 +
docs/using-carbondata.md | 35 +
log.txt | 1363 ++++++++++++++++++
35 files changed, 3271 insertions(+), 816 deletions(-)
----------------------------------------------------------------------
[25/50] [abbrv] incubator-carbondata git commit: [CARBONDATA-562]
Supporting Spark 1.6.3 Version in CarbonData This closes #558
Posted by ra...@apache.org.
[CARBONDATA-562] Supporting Spark 1.6.3 Version in CarbonData This closes #558
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/913d2666
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/913d2666
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/913d2666
Branch: refs/heads/branch-1.0
Commit: 913d266635343abb0b4a826cf22a39711b3e439d
Parents: ee95624 75a94c0
Author: ravipesala <ra...@gmail.com>
Authored: Fri Jan 20 12:51:36 2017 +0530
Committer: ravipesala <ra...@gmail.com>
Committed: Fri Jan 20 12:51:36 2017 +0530
----------------------------------------------------------------------
build/README.md | 1 +
.../main/scala/org/apache/spark/sql/CodeGenerateFactory.scala | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[47/50] [abbrv] incubator-carbondata git commit: Fix Insert into
query when used different names.
Posted by ra...@apache.org.
Fix Insert into query when used different names.
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/3b9671ff
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/3b9671ff
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/3b9671ff
Branch: refs/heads/branch-1.0
Commit: 3b9671ff256f1a5e25824fae3752f25241845cea
Parents: 4a1f6ae
Author: ravipesala <ra...@gmail.com>
Authored: Fri Jan 20 20:38:09 2017 +0530
Committer: Venkata Ramana G <ra...@huawei.com>
Committed: Fri Jan 20 21:05:56 2017 +0530
----------------------------------------------------------------------
.../allqueries/InsertIntoCarbonTableTestCase.scala | 15 +++++++++++++++
.../sql/execution/CarbonLateDecodeStrategy.scala | 17 +++++++++++++++++
2 files changed, 32 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/3b9671ff/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/allqueries/InsertIntoCarbonTableTestCase.scala
----------------------------------------------------------------------
diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/allqueries/InsertIntoCarbonTableTestCase.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/allqueries/InsertIntoCarbonTableTestCase.scala
index db85393..776e531 100644
--- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/allqueries/InsertIntoCarbonTableTestCase.scala
+++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/allqueries/InsertIntoCarbonTableTestCase.scala
@@ -165,6 +165,21 @@ class InsertIntoCarbonTableTestCase extends QueryTest with BeforeAndAfterAll {
""").show
}
+ test("insert->insert with different names and aliases") {
+ sql("DROP TABLE IF EXISTS uniqdata")
+ sql("DROP TABLE IF EXISTS student")
+
+ // Create table
+ sql(
+ s"""
+ CREATE TABLE uniqdata (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 BY 'org.apache.carbondata.format' TBLPROPERTIES ("TABLE_BLOCKSIZE"= "256 MB")
+ """.stripMargin)
+ sql(s"""CREATE TABLE student (CUST_ID2 int,CUST_ADDR 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 BY 'org.apache.carbondata.format' TBLPROPERTIES ("TABLE_BLOCKSIZE"= "256 MB")""")
+
+ sql(s"""LOAD DATA inpath '${resourcesPath + "/data_with_all_types.csv"}' INTO table uniqdata options('DELIMITER'=',', 'FILEHEADER'='CUST_ID, CUST_NAME, ACTIVE_EMUI_VERSION, DOB, DOJ, BIGINT_COLUMN1, BIGINT_COLUMN2, DECIMAL_COLUMN1, DECIMAL_COLUMN2, Double_COLUMN1, Double_COLUMN2, INTEGER_COLUMN1')""")
+ sql("""insert into student select * from uniqdata""")
+ }
+
test("insert into existing load-pass") {
val timeStampPropOrig = CarbonProperties.getInstance().getProperty(CarbonCommonConstants.CARBON_TIMESTAMP_FORMAT)
CarbonProperties.getInstance()
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/3b9671ff/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 11166bf..3e0e9c0 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
@@ -292,6 +292,23 @@ private[sql] class CarbonLateDecodeStrategy extends SparkStrategy {
attr
}
}
+ case alias @ Alias(attr: AttributeReference, name) =>
+ if (needDecoder.exists(_.name.equalsIgnoreCase(attr.name))) {
+ alias
+ } else {
+ val dict = map.get(attr.name)
+ if (dict.isDefined && dict.get) {
+ alias.transform {
+ case attrLocal: AttributeReference =>
+ AttributeReference(attr.name,
+ IntegerType,
+ attr.nullable,
+ attr.metadata)(attr.exprId, attr.qualifier)
+ }
+ } else {
+ alias
+ }
+ }
case others => others
}
}
[28/50] [abbrv] incubator-carbondata git commit: Fixed
ALL_DICTIONARY_PATH null pointer exception issue.
Posted by ra...@apache.org.
Fixed ALL_DICTIONARY_PATH null pointer exception issue.
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/1f0535f2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/1f0535f2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/1f0535f2
Branch: refs/heads/branch-1.0
Commit: 1f0535f2a66c39686e5a2bfa31d67be6d2009ce8
Parents: af30254
Author: Manohar <ma...@gmail.com>
Authored: Thu Jan 19 12:51:45 2017 +0530
Committer: ravipesala <ra...@gmail.com>
Committed: Fri Jan 20 16:15:58 2017 +0530
----------------------------------------------------------------------
.../spark/util/GlobalDictionaryUtil.scala | 21 +++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/1f0535f2/integration/spark-common/src/main/scala/org/apache/carbondata/spark/util/GlobalDictionaryUtil.scala
----------------------------------------------------------------------
diff --git a/integration/spark-common/src/main/scala/org/apache/carbondata/spark/util/GlobalDictionaryUtil.scala b/integration/spark-common/src/main/scala/org/apache/carbondata/spark/util/GlobalDictionaryUtil.scala
index 867a374..09c049d 100644
--- a/integration/spark-common/src/main/scala/org/apache/carbondata/spark/util/GlobalDictionaryUtil.scala
+++ b/integration/spark-common/src/main/scala/org/apache/carbondata/spark/util/GlobalDictionaryUtil.scala
@@ -28,6 +28,7 @@ import scala.util.control.Breaks.{break, breakable}
import org.apache.commons.lang3.{ArrayUtils, StringUtils}
import org.apache.hadoop.conf.Configuration
+import org.apache.hadoop.fs.Path
import org.apache.hadoop.io.NullWritable
import org.apache.hadoop.mapreduce.lib.input.FileInputFormat
import org.apache.spark.Accumulator
@@ -648,12 +649,14 @@ object GlobalDictionaryUtil {
*/
private def validateAllDictionaryPath(allDictionaryPath: String): Boolean = {
val fileType = FileFactory.getFileType(allDictionaryPath)
- val filePath = FileFactory.getCarbonFile(allDictionaryPath, fileType)
+ val filePath = new Path(allDictionaryPath)
+ val file = FileFactory.getCarbonFile(filePath.toString, fileType)
+ val parentFile = FileFactory.getCarbonFile(filePath.getParent.toString, fileType)
// filepath regex, look like "/path/*.dictionary"
if (filePath.getName.startsWith("*")) {
val dictExt = filePath.getName.substring(1)
- if (filePath.getParentFile.exists()) {
- val listFiles = filePath.getParentFile.listFiles()
+ if (parentFile.exists()) {
+ val listFiles = parentFile.listFiles()
if (listFiles.exists(file =>
file.getName.endsWith(dictExt) && file.getSize > 0)) {
true
@@ -663,12 +666,12 @@ object GlobalDictionaryUtil {
false
}
} else {
- throw new FileNotFoundException(
- "The given dictionary file path is not found!")
+ throw new DataLoadingException(
+ s"The given dictionary file path is not found : $allDictionaryPath")
}
} else {
- if (filePath.exists()) {
- if (filePath.getSize > 0) {
+ if (file.exists()) {
+ if (file.getSize > 0) {
true
} else {
LOGGER.warn("No dictionary files found or empty dictionary files! " +
@@ -676,8 +679,8 @@ object GlobalDictionaryUtil {
false
}
} else {
- throw new FileNotFoundException(
- "The given dictionary file path is not found!")
+ throw new DataLoadingException(
+ s"The given dictionary file path is not found : $allDictionaryPath")
}
}
}
[11/50] [abbrv] incubator-carbondata git commit: [CARBONDATA-624]
Complete CarbonData document in md files
Posted by ra...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/276a6111/docs/dml-operation-on-carbondata.md
----------------------------------------------------------------------
diff --git a/docs/dml-operation-on-carbondata.md b/docs/dml-operation-on-carbondata.md
new file mode 100644
index 0000000..0523d95
--- /dev/null
+++ b/docs/dml-operation-on-carbondata.md
@@ -0,0 +1,429 @@
+<!--
+ 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.
+-->
+
+# DML Operations on CarbonData
+This tutorial guides you through the data manipulation language support provided by CarbonData.
+
+## Overview
+The following DML operations are supported in CarbonData :
+
+* [LOAD DATA](#load-data)
+* [INSERT DATA INTO A CARBONDATA TABLE](#insert-data-into-a-carbondata-table)
+* [SHOW SEGMENTS](#show-segments)
+* [DELETE SEGMENT BY ID](#delete-segment-by-id)
+* [DELETE SEGMENT BY DATE](#delete-segment-by-date)
+* [UPDATE CARBONDATA TABLE](#update-carbondata-table)
+* [DELETE RECORDS FROM CARBONDATA TABLE](#delete-records-from-carbondata-table)
+
+## LOAD DATA
+
+This command loads the user data in raw format to the CarbonData specific data format store, this allows CarbonData to provide good performance while querying the data.
+Please visit [Data Management](data-management.md) for more details on LOAD.
+
+### Syntax
+
+```
+LOAD DATA [LOCAL] INPATH 'folder_path'
+INTO TABLE [db_name.]table_name
+OPTIONS(property_name=property_value, ...)
+```
+
+OPTIONS are not mandatory for data loading process. Inside OPTIONS user can provide either of any options like DELIMITER, QUOTECHAR, ESCAPECHAR, MULTILINE as per requirement.
+
+NOTE: The path shall be canonical path.
+
+### Parameter Description
+
+| Parameter | Description | Optional |
+| ------------- | ---------------------------------------------------------------------| -------- |
+| folder_path | Path of raw csv data folder or file. | NO |
+| db_name | Database name, if it is not specified then it uses the current database. | YES |
+| table_name | The name of the table in provided database. | NO |
+| OPTIONS | Extra options provided to Load | YES |
+
+
+### Usage Guidelines
+
+You can use the following options to load data:
+
+- **DELIMITER:** Delimiters can be provided in the load command.
+
+ ```
+ OPTIONS('DELIMITER'=',')
+ ```
+
+- **QUOTECHAR:** Quote Characters can be provided in the load command.
+
+ ```
+ OPTIONS('QUOTECHAR'='"')
+ ```
+
+- **COMMENTCHAR:** Comment Characters can be provided in the load command if user want to comment lines.
+
+ ```
+ OPTIONS('COMMENTCHAR'='#')
+ ```
+
+- **FILEHEADER:** Headers can be provided in the LOAD DATA command if headers are missing in the source files.
+
+ ```
+ OPTIONS('FILEHEADER'='column1,column2')
+ ```
+
+- **MULTILINE:** CSV with new line character in quotes.
+
+ ```
+ OPTIONS('MULTILINE'='true')
+ ```
+
+- **ESCAPECHAR:** Escape char can be provided if user want strict validation of escape character on CSV.
+
+ ```
+ OPTIONS('ESCAPECHAR'='\')
+ ```
+
+- **COMPLEX_DELIMITER_LEVEL_1:** Split the complex type data column in a row (eg., a$b$c --> Array = {a,b,c}).
+
+ ```
+ OPTIONS('COMPLEX_DELIMITER_LEVEL_1'='$')
+ ```
+
+- **COMPLEX_DELIMITER_LEVEL_2:** Split the complex type nested data column in a row. Applies level_1 delimiter & applies level_2 based on complex data type (eg., a:b$c:d --> Array> = {{a,b},{c,d}}).
+
+ ```
+ OPTIONS('COMPLEX_DELIMITER_LEVEL_2'=':')
+ ```
+
+- **ALL_DICTIONARY_PATH:** All dictionary files path.
+
+ ```
+ OPTIONS('ALL_DICTIONARY_PATH'='/opt/alldictionary/data.dictionary')
+ ```
+
+- **COLUMNDICT:** Dictionary file path for specified column.
+
+ ```
+ OPTIONS('COLUMNDICT'='column1:dictionaryFilePath1,
+ column2:dictionaryFilePath2')
+ ```
+
+ NOTE: ALL_DICTIONARY_PATH and COLUMNDICT can't be used together.
+
+- **DATEFORMAT:** Date format for specified column.
+
+ ```
+ OPTIONS('DATEFORMAT'='column1:dateFormat1, column2:dateFormat2')
+ ```
+
+ NOTE: Date formats are specified by date pattern strings. The date pattern letters in CarbonData are same as in JAVA. Refer to [SimpleDateFormat](http://docs.oracle.com/javase/7/docs/api/java/text/SimpleDateFormat.html).
+
+
+### Example:
+
+```
+LOAD DATA local inpath '/opt/rawdata/data.csv' INTO table carbontable
+options('DELIMITER'=',', 'QUOTECHAR'='"','COMMENTCHAR'='#',
+'FILEHEADER'='empno,empname,designation,doj,workgroupcategory,
+ workgroupcategoryname,deptno,deptname,projectcode,
+ projectjoindate,projectenddate,attendance,utilization,salary',
+'MULTILINE'='true','ESCAPECHAR'='\','COMPLEX_DELIMITER_LEVEL_1'='$',
+'COMPLEX_DELIMITER_LEVEL_2'=':',
+'ALL_DICTIONARY_PATH'='/opt/alldictionary/data.dictionary'
+)
+```
+
+
+## INSERT DATA INTO A CARBONDATA TABLE
+
+This command inserts data into a CarbonData table. It is defined as a combination of two queries Insert and Select query respectively. It inserts records from a source table into a target CarbonData table. The source table can be a Hive table, Parquet table or a CarbonData table itself. It comes with the functionality to aggregate the records of a table by performing Select query on source table and load its corresponding resultant records into a CarbonData table.
+
+**NOTE** : The client node where the INSERT command is executing, must be part of the cluster.
+
+### Syntax
+
+```
+INSERT INTO TABLE <CARBONDATA TABLE> SELECT * FROM sourceTableName
+[ WHERE { <filter_condition> } ];
+```
+
+You can also omit the `table` keyword and write your query as:
+
+```
+INSERT INTO <CARBONDATA TABLE> SELECT * FROM sourceTableName
+[ WHERE { <filter_condition> } ];
+```
+
+### Parameter Description
+
+| Parameter | Description |
+|--------------|---------------------------------------------------------------------------------|
+| CARBON TABLE | The name of the Carbon table in which you want to perform the insert operation. |
+| sourceTableName | The table from which the records are read and inserted into destination CarbonData table. |
+
+### Usage Guidelines
+The following condition must be met for successful insert operation :
+
+- The source table and the CarbonData table must have the same table schema.
+- The table must be created.
+- Overwrite is not supported for CarbonData table.
+- The data type of source and destination table columns should be same, else the data from source table will be treated as bad records and the INSERT command fails.
+- INSERT INTO command does not support partial success if bad records are found, it will fail.
+- Data cannot be loaded or updated in source table while insert from source table to target table is in progress.
+
+To enable data load or update during insert operation, configure the following property to true.
+
+```
+carbon.insert.persist.enable=true
+```
+
+By default the above configuration will be false.
+
+**NOTE**: Enabling this property will reduce the performance.
+
+### Examples
+```
+INSERT INTO table1 SELECT item1 ,sum(item2 + 1000) as result FROM
+table2 group by item1;
+```
+
+```
+INSERT INTO table1 SELECT item1, item2, item3 FROM table2
+where item2='xyz';
+```
+
+```
+INSERT INTO table1 SELECT * FROM table2
+where exists (select * from table3
+where table2.item1 = table3.item1);
+```
+
+**The Status Success/Failure shall be captured in the driver log.**
+
+## SHOW SEGMENTS
+
+This command is used to get the segments of CarbonData table.
+
+```
+SHOW SEGMENTS FOR TABLE [db_name.]table_name
+LIMIT number_of_segments;
+```
+
+### Parameter Description
+
+| Parameter | Description | Optional |
+| ------------------ | ---------------------------------------------------------------------| ---------|
+| db_name | Database name, if it is not specified then it uses the current database. | YES |
+| table_name | The name of the table in provided database. | NO |
+| number_of_segments | Limit the output to this number. | YES |
+
+### Example:
+
+```
+SHOW SEGMENTS FOR TABLE CarbonDatabase.CarbonTable LIMIT 4;
+```
+
+## DELETE SEGMENT BY ID
+
+This command is used to delete segment by using the segment ID. Each segment has a unique segment ID associated with it.
+Using this segment ID, you can remove the segment.
+
+The following command will get the segmentID.
+
+```
+SHOW SEGMENTS FOR Table dbname.tablename LIMIT number_of_segments
+```
+
+After you retrieve the segment ID of the segment that you want to delete, execute the following command to delete the selected segment.
+
+```
+DELETE SEGMENT segment_sequence_id1, segments_sequence_id2, ....
+FROM TABLE tableName
+```
+
+### Parameter Description
+| Parameter | Description | Optional |
+| -----------| ---------------------------------------------------------------------|----------|
+| segment_id | Segment Id of the load. | NO |
+| db_name | Database name, if it is not specified then it uses the current database. | YES |
+| table_name | The name of the table in provided database. | NO |
+
+### Example:
+
+```
+DELETE SEGMENT 0 FROM TABLE CarbonDatabase.CarbonTable;
+DELETE SEGMENT 0.1,5,8 FROM TABLE CarbonDatabase.CarbonTable;
+```
+ NOTE: Here 0.1 is compacted segment sequence id.
+
+## DELETE SEGMENT BY DATE
+
+This command will allow to delete the CarbonData segment(s) from the store based on the date provided by the user in the DML command.
+The segment created before the particular date will be removed from the specific stores.
+
+```
+DELETE FROM TABLE [schema_name.]table_name
+WHERE[DATE_FIELD]BEFORE [DATE_VALUE]
+```
+
+### Parameter Description
+
+| Parameter | Description | Optional |
+| ---------- | ---------------------------------------------------------------------------------------------------| -------- |
+| DATE_VALUE | Valid segment load start time value. All the segments before this specified date will be deleted. | NO |
+| db_name | Database name, if it is not specified then it uses the current database. | YES |
+| table_name | The name of the table in provided database. | NO |
+
+### Example:
+
+```
+ DELETE SEGMENTS FROM TABLE CarbonDatabase.CarbonTable
+ WHERE STARTTIME BEFORE '2017-06-01 12:05:06';
+```
+
+## Update CarbonData Table
+This command will allow to update the carbon table based on the column expression and optional filter conditions.
+
+### Syntax
+
+```
+ UPDATE <table_name>
+ SET (column_name1, column_name2, ... column_name n) =
+ (column1_expression , column2_expression . .. column n_expression )
+ [ WHERE { <filter_condition> } ];
+```
+
+alternatively the following the command can also be used for updating the CarbonData Table :
+
+```
+UPDATE <table_name>
+SET (column_name1, column_name2,) =
+(select sourceColumn1, sourceColumn2 from sourceTable
+[ WHERE { <filter_condition> } ] )
+[ WHERE { <filter_condition> } ];
+```
+
+### Parameter Description
+
+| Parameter | Description |
+|--------------|---------------------------------------------------------------------------------|
+| table_name | The name of the Carbon table in which you want to perform the update operation. |
+| column_name | The destination columns to be updated. |
+| sourceColumn | The source table column values to be updated in destination table. |
+| sourceTable | The table from which the records are updated into destination Carbon table. |
+
+### Usage Guidelines
+The following conditions must be met for successful updation :
+
+- The update command fails if multiple input rows in source table are matched with single row in destination table.
+- If the source table generates empty records, the update operation will complete successfully without updating the table.
+- If a source table row does not correspond to any of the existing rows in a destination table, the update operation will complete successfully without updating the table.
+- In sub-query, if the source table and the target table are same, then the update operation fails.
+- If the sub-query used in UPDATE statement contains aggregate method or group by query, then the UPDATE operation fails.
+
+### Examples
+
+ Update is not supported for queries that contain aggregate or group by.
+
+```
+ UPDATE t_carbn01 a
+ SET (a.item_type_code, a.profit) = ( SELECT b.item_type_cd,
+ sum(b.profit) from t_carbn01b b
+ WHERE item_type_cd =2 group by item_type_code);
+```
+
+Here the Update Operation fails as the query contains aggregate function sum(b.profit) and group by clause in the sub-query.
+
+
+```
+UPDATE carbonTable1 d
+SET(d.column3,d.column5 ) = (SELECT s.c33 ,s.c55
+FROM sourceTable1 s WHERE d.column1 = s.c11)
+WHERE d.column1 = 'china' EXISTS( SELECT * from table3 o where o.c2 > 1);
+```
+
+
+```
+UPDATE carbonTable1 d SET (c3) = (SELECT s.c33 from sourceTable1 s
+WHERE d.column1 = s.c11)
+WHERE exists( select * from iud.other o where o.c2 > 1);
+```
+
+
+```
+UPDATE carbonTable1 SET (c2, c5 ) = (c2 + 1, concat(c5 , "y" ));
+```
+
+
+```
+UPDATE carbonTable1 d SET (c2, c5 ) = (c2 + 1, "xyx")
+WHERE d.column1 = 'india';
+```
+
+
+```
+UPDATE carbonTable1 d SET (c2, c5 ) = (c2 + 1, "xyx")
+WHERE d.column1 = 'india'
+and EXISTS( SELECT * FROM table3 o WHERE o.column2 > 1);
+```
+
+**The Status Success/Failure shall be captured in the driver log and the client.**
+
+
+## Delete Records from CarbonData Table
+This command allows us to delete records from CarbonData table.
+
+### Syntax
+
+```
+DELETE FROM table_name [WHERE expression];
+```
+
+### Parameter Description
+
+| Parameter | Description |
+|--------------|-----------------------------------------------------------------------|
+| table_name | The name of the Carbon table in which you want to perform the delete. |
+
+
+### Examples
+
+```
+DELETE FROM columncarbonTable1 d WHERE d.column1 = 'china';
+```
+
+```
+DELETE FROM dest WHERE column1 IN ('china', 'USA');
+```
+
+```
+DELETE FROM columncarbonTable1
+WHERE column1 IN (SELECT column11 FROM sourceTable2);
+```
+
+```
+DELETE FROM columncarbonTable1
+WHERE column1 IN (SELECT column11 FROM sourceTable2 WHERE
+column1 = 'USA');
+```
+
+```
+DELETE FROM columncarbonTable1 WHERE column2 >= 4
+```
+
+**The Status Success/Failure shall be captured in the driver log and the client.**
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/276a6111/docs/faq.md
----------------------------------------------------------------------
diff --git a/docs/faq.md b/docs/faq.md
new file mode 100644
index 0000000..a72a96f
--- /dev/null
+++ b/docs/faq.md
@@ -0,0 +1,47 @@
+<!--
+ 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.
+-->
+
+# FAQs
+* **Auto Compaction not Working**
+
+ The Property carbon.enable.auto.load.merge in carbon.properties need to be set to true.
+
+* **Getting Abstract method error**
+
+ You need to specify the spark version while using Maven to build project.
+
+* **Getting NotImplementedException for subquery using IN and EXISTS**
+
+ Subquery with in and exists not supported in CarbonData.
+
+* **Getting Exceptions on creating a view**
+
+ View not supported in CarbonData.
+
+* **How to verify if ColumnGroups have been created as desired.**
+
+ Try using desc table query.
+
+* **Did anyone try to run CarbonData on windows? Is it supported on Windows?**
+
+ We may provide support for windows in future. You are welcome to contribute if you want to add the support :)
+
+
+
+
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/276a6111/docs/images/CarbonData_logo.png
----------------------------------------------------------------------
diff --git a/docs/images/CarbonData_logo.png b/docs/images/CarbonData_logo.png
new file mode 100644
index 0000000..bc09b23
Binary files /dev/null and b/docs/images/CarbonData_logo.png differ
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/276a6111/docs/images/carbon_data_file_structure_new.png
----------------------------------------------------------------------
diff --git a/docs/images/carbon_data_file_structure_new.png b/docs/images/carbon_data_file_structure_new.png
new file mode 100644
index 0000000..3f9241b
Binary files /dev/null and b/docs/images/carbon_data_file_structure_new.png differ
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/276a6111/docs/images/carbon_data_format_new.png
----------------------------------------------------------------------
diff --git a/docs/images/carbon_data_format_new.png b/docs/images/carbon_data_format_new.png
new file mode 100644
index 0000000..9d0b194
Binary files /dev/null and b/docs/images/carbon_data_format_new.png differ
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/276a6111/docs/images/carbon_data_full_scan.png
----------------------------------------------------------------------
diff --git a/docs/images/carbon_data_full_scan.png b/docs/images/carbon_data_full_scan.png
new file mode 100644
index 0000000..46715e7
Binary files /dev/null and b/docs/images/carbon_data_full_scan.png differ
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/276a6111/docs/images/carbon_data_motivation.png
----------------------------------------------------------------------
diff --git a/docs/images/carbon_data_motivation.png b/docs/images/carbon_data_motivation.png
new file mode 100644
index 0000000..6e454c6
Binary files /dev/null and b/docs/images/carbon_data_motivation.png differ
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/276a6111/docs/images/carbon_data_olap_scan.png
----------------------------------------------------------------------
diff --git a/docs/images/carbon_data_olap_scan.png b/docs/images/carbon_data_olap_scan.png
new file mode 100644
index 0000000..c1dfb18
Binary files /dev/null and b/docs/images/carbon_data_olap_scan.png differ
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/276a6111/docs/images/carbon_data_random_scan.png
----------------------------------------------------------------------
diff --git a/docs/images/carbon_data_random_scan.png b/docs/images/carbon_data_random_scan.png
new file mode 100644
index 0000000..7d44d34
Binary files /dev/null and b/docs/images/carbon_data_random_scan.png differ
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/276a6111/docs/images/format/CarbonData_logo.png
----------------------------------------------------------------------
diff --git a/docs/images/format/CarbonData_logo.png b/docs/images/format/CarbonData_logo.png
deleted file mode 100644
index bc09b23..0000000
Binary files a/docs/images/format/CarbonData_logo.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/276a6111/docs/images/format/carbon_data_file_structure_new.png
----------------------------------------------------------------------
diff --git a/docs/images/format/carbon_data_file_structure_new.png b/docs/images/format/carbon_data_file_structure_new.png
deleted file mode 100644
index 3f9241b..0000000
Binary files a/docs/images/format/carbon_data_file_structure_new.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/276a6111/docs/images/format/carbon_data_format_new.png
----------------------------------------------------------------------
diff --git a/docs/images/format/carbon_data_format_new.png b/docs/images/format/carbon_data_format_new.png
deleted file mode 100644
index 9d0b194..0000000
Binary files a/docs/images/format/carbon_data_format_new.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/276a6111/docs/images/format/carbon_data_full_scan.png
----------------------------------------------------------------------
diff --git a/docs/images/format/carbon_data_full_scan.png b/docs/images/format/carbon_data_full_scan.png
deleted file mode 100644
index 46715e7..0000000
Binary files a/docs/images/format/carbon_data_full_scan.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/276a6111/docs/images/format/carbon_data_motivation.png
----------------------------------------------------------------------
diff --git a/docs/images/format/carbon_data_motivation.png b/docs/images/format/carbon_data_motivation.png
deleted file mode 100644
index 6e454c6..0000000
Binary files a/docs/images/format/carbon_data_motivation.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/276a6111/docs/images/format/carbon_data_olap_scan.png
----------------------------------------------------------------------
diff --git a/docs/images/format/carbon_data_olap_scan.png b/docs/images/format/carbon_data_olap_scan.png
deleted file mode 100644
index c1dfb18..0000000
Binary files a/docs/images/format/carbon_data_olap_scan.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/276a6111/docs/images/format/carbon_data_random_scan.png
----------------------------------------------------------------------
diff --git a/docs/images/format/carbon_data_random_scan.png b/docs/images/format/carbon_data_random_scan.png
deleted file mode 100644
index 7d44d34..0000000
Binary files a/docs/images/format/carbon_data_random_scan.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/276a6111/docs/installation-guide.md
----------------------------------------------------------------------
diff --git a/docs/installation-guide.md b/docs/installation-guide.md
new file mode 100644
index 0000000..7c1f7eb
--- /dev/null
+++ b/docs/installation-guide.md
@@ -0,0 +1,187 @@
+<!--
+ 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.
+-->
+
+# Installation Guide
+This tutorial guides you through the installation and configuration of CarbonData in the following two modes :
+
+* [Installing and Configuring CarbonData on Standalone Spark Cluster](#installing-and-configuring-carbondata-on-standalone-spark-cluster)
+* [Installing and Configuring CarbonData on \u201cSpark on YARN\u201d Cluster](#installing-and-configuring-carbondata-on-spark-on-yarn-cluster)
+
+followed by :
+
+* [Query Execution using CarbonData Thrift Server](#query-execution-using-carbondata-thrift-server)
+
+## Installing and Configuring CarbonData on Standalone Spark Cluster
+
+### Prerequisites
+
+ - Hadoop HDFS and Yarn should be installed and running.
+
+ - Spark should be installed and running on all the cluster nodes.
+
+ - CarbonData user should have permission to access HDFS.
+
+
+### Procedure
+
+* [Build the CarbonData](https://cwiki.apache.org/confluence/display/CARBONDATA/Building+CarbonData+And+IDE+Configuration) project and get the assembly jar from "./assembly/target/scala-2.10/carbondata_xxx.jar" and put in the ``"<SPARK_HOME>/carbonlib"`` folder.
+
+ NOTE: Create the carbonlib folder if it does not exists inside ``"<SPARK_HOME>"`` path.
+
+* Add the carbonlib folder path in the Spark classpath. (Edit ``"<SPARK_HOME>/conf/spark-env.sh"`` file and modify the value of SPARK_CLASSPATH by appending ``"<SPARK_HOME>/carbonlib/*"`` to the existing value)
+
+* Copy the carbon.properties.template to ``"<SPARK_HOME>/conf/carbon.properties"`` folder from "./conf/" of CarbonData repository.
+
+* Copy the "carbonplugins" folder to ``"<SPARK_HOME>/carbonlib"`` folder from "./processing/" folder of CarbonData repository.
+
+ NOTE: carbonplugins will contain .kettle folder.
+
+* In Spark node, configure the properties mentioned in the following table in ``"<SPARK_HOME>/conf/spark-defaults.conf"`` file.
+
+| Property | Description | Value |
+|--------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------|
+| carbon.kettle.home | Path that will be used by CarbonData internally to create graph for loading the data | $SPARK_HOME /carbonlib/carbonplugins |
+| spark.driver.extraJavaOptions | A string of extra JVM options to pass to the driver. For instance, GC settings or other logging. | -Dcarbon.properties.filepath=$SPARK_HOME/conf/carbon.properties |
+| spark.executor.extraJavaOptions | A string of extra JVM options to pass to executors. For instance, GC settings or other logging. NOTE: You can enter multiple values separated by space. | -Dcarbon.properties.filepath=$SPARK_HOME/conf/carbon.properties |
+
+
+* Add the following properties in ``"<SPARK_HOME>/conf/" carbon.properties``:
+
+| Property | Required | Description | Example | Remark |
+|----------------------|----------|----------------------------------------------------------------------------------------|-------------------------------------|---------|
+| carbon.storelocation | NO | Location where data CarbonData will create the store and write the data in its own format. | hdfs://HOSTNAME:PORT/Opt/CarbonStore | Propose to set HDFS directory |
+| carbon.kettle.home | YES | Path that will be used by CarbonData internally to create graph for loading the data. | $SPARK_HOME/carbonlib/carbonplugins | |
+
+
+* Verify the installation. For example:
+
+```
+ ./spark-shell --master spark://HOSTNAME:PORT --total-executor-cores 2
+ --executor-memory 2G
+```
+
+NOTE: Make sure you have permissions for CarbonData JARs and files through which driver and executor will start.
+
+To get started with CarbonData : [Quick Start](quick-start-guide.md) , [DDL Operations on CarbonData](ddl-operation-on-carbondata.md)
+
+## Installing and Configuring CarbonData on "Spark on YARN" Cluster
+
+ This section provides the procedure to install CarbonData on "Spark on YARN" cluster.
+
+### Prerequisites
+ * Hadoop HDFS and Yarn should be installed and running.
+ * Spark should be installed and running in all the clients.
+ * CarbonData user should have permission to access HDFS.
+
+### Procedure
+
+ The following steps are only for Driver Nodes. (Driver nodes are the one which starts the spark context.)
+
+* [Build the CarbonData](https://cwiki.apache.org/confluence/display/CARBONDATA/Building+CarbonData+And+IDE+Configuration) project and get the assembly jar from "./assembly/target/scala-2.10/carbondata_xxx.jar" and put in the ``"<SPARK_HOME>/carbonlib"`` folder.
+
+ NOTE: Create the carbonlib folder if it does not exists inside ``"<SPARK_HOME>"`` path.
+
+* Copy "carbonplugins" folder to ``"<SPARK_HOME>/carbonlib"`` folder from "./processing/" folder of CarbonData repository.
+ carbonplugins will contain .kettle folder.
+
+* Copy the "carbon.properties.template" to ``"<SPARK_HOME>/conf/carbon.properties"`` folder from conf folder of CarbonData repository.
+* Modify the parameters in "spark-default.conf" located in the ``"<SPARK_HOME>/conf``"
+
+| Property | Description | Value |
+|---------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------|
+| spark.master | Set this value to run the Spark in yarn cluster mode. | Set "yarn-client" to run the Spark in yarn cluster mode. |
+| spark.yarn.dist.files | Comma-separated list of files to be placed in the working directory of each executor. |``"<YOUR_SPARK_HOME_PATH>"/conf/carbon.properties`` |
+| spark.yarn.dist.archives | Comma-separated list of archives to be extracted into the working directory of each executor. |``"<YOUR_SPARK_HOME_PATH>"/carbonlib/carbondata_xxx.jar`` |
+| spark.executor.extraJavaOptions | A string of extra JVM options to pass to executors. For instance NOTE: You can enter multiple values separated by space. |``-Dcarbon.properties.filepath="<YOUR_SPARK_HOME_PATH>"/conf/carbon.properties`` |
+| spark.executor.extraClassPath | Extra classpath entries to prepend to the classpath of executors. NOTE: If SPARK_CLASSPATH is defined in spark-env.sh, then comment it and append the values in below parameter spark.driver.extraClassPath |``"<YOUR_SPARK_HOME_PATH>"/carbonlib/carbonlib/carbondata_xxx.jar`` |
+| spark.driver.extraClassPath | Extra classpath entries to prepend to the classpath of the driver. NOTE: If SPARK_CLASSPATH is defined in spark-env.sh, then comment it and append the value in below parameter spark.driver.extraClassPath. |``"<YOUR_SPARK_HOME_PATH>"/carbonlib/carbonlib/carbondata_xxx.jar`` |
+| spark.driver.extraJavaOptions | A string of extra JVM options to pass to the driver. For instance, GC settings or other logging. |``-Dcarbon.properties.filepath="<YOUR_SPARK_HOME_PATH>"/conf/carbon.properties`` |
+| carbon.kettle.home | Path that will be used by CarbonData internally to create graph for loading the data. |``"<YOUR_SPARK_HOME_PATH>"/carbonlib/carbonplugins`` |
+
+* Add the following properties in ``<SPARK_HOME>/conf/ carbon.properties``:
+
+| Property | Required | Description | Example | Default Value |
+|----------------------|----------|----------------------------------------------------------------------------------------|-------------------------------------|---------------|
+| carbon.storelocation | NO | Location where CarbonData will create the store and write the data in its own format. | hdfs://HOSTNAME:PORT/Opt/CarbonStore | Propose to set HDFS directory|
+| carbon.kettle.home | YES | Path that will be used by CarbonData internally to create graph for loading the data. | $SPARK_HOME/carbonlib/carbonplugins | |
+
+
+* Verify the installation.
+
+```
+ ./bin/spark-shell --master yarn-client --driver-memory 1g
+ --executor-cores 2 --executor-memory 2G
+```
+ NOTE: Make sure you have permissions for CarbonData JARs and files through which driver and executor will start.
+
+ Getting started with CarbonData : [Quick Start](quick-start-guide.md) , [DDL Operations on CarbonData](ddl-operation-on-carbondata.md)
+
+## Query Execution Using CarbonData Thrift Server
+
+### Starting CarbonData Thrift Server
+
+ a. cd ``<SPARK_HOME>``
+
+ b. Run the following command to start the CarbonData thrift server.
+
+```
+./bin/spark-submit --conf spark.sql.hive.thriftServer.singleSession=true
+--class org.apache.carbondata.spark.thriftserver.CarbonThriftServer
+$SPARK_HOME/carbonlib/$CARBON_ASSEMBLY_JAR <carbon_store_path>
+```
+
+| Parameter | Description | Example |
+|---------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------|
+| CARBON_ASSEMBLY_JAR | CarbonData assembly jar name present in the ``"<SPARK_HOME>"/carbonlib/`` folder. | carbondata_2.10-0.1.0-incubating-SNAPSHOT-shade-hadoop2.7.2.jar |
+| carbon_store_path | This is a parameter to the CarbonThriftServer class. This a HDFS path where CarbonData files will be kept. Strongly Recommended to put same as carbon.storelocation parameter of carbon.properties. | hdfs//<host_name>:54310/user/hive/warehouse/carbon.store |
+
+### Examples
+
+ * Start with default memory and executors
+
+```
+./bin/spark-submit --conf spark.sql.hive.thriftServer.singleSession=true
+--class org.apache.carbondata.spark.thriftserver.CarbonThriftServer
+$SPARK_HOME/carbonlib
+/carbondata_2.10-0.1.0-incubating-SNAPSHOT-shade-hadoop2.7.2.jar
+hdfs://hacluster/user/hive/warehouse/carbon.store
+```
+
+ * Start with Fixed executors and resources
+
+```
+./bin/spark-submit --conf spark.sql.hive.thriftServer.singleSession=true
+--class org.apache.carbondata.spark.thriftserver.CarbonThriftServer
+--num-executors 3 --driver-memory 20g --executor-memory 250g
+--executor-cores 32
+/srv/OSCON/BigData/HACluster/install/spark/sparkJdbc/lib
+/carbondata_2.10-0.1.0-incubating-SNAPSHOT-shade-hadoop2.7.2.jar
+hdfs://hacluster/user/hive/warehouse/carbon.store
+```
+
+### Connecting to CarbonData Thrift Server Using Beeline
+
+```
+ cd <SPARK_HOME>
+ ./bin/beeline jdbc:hive2://<thrftserver_host>:port
+
+ Example
+ ./bin/beeline jdbc:hive2://10.10.10.10:10000
+```
+
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/276a6111/docs/overview-of-carbondata.md
----------------------------------------------------------------------
diff --git a/docs/overview-of-carbondata.md b/docs/overview-of-carbondata.md
new file mode 100644
index 0000000..5e983cb
--- /dev/null
+++ b/docs/overview-of-carbondata.md
@@ -0,0 +1,178 @@
+<!--
+ 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.
+-->
+# Overview
+This tutorial provides a detailed overview about :
+
+* [Introduction](#introduction)
+* [CarbonData File Structure](#carbondata-file-structure)
+* [Features](#features)
+* [Data Types](#data-types)
+* [Interfaces](#interfaces)
+
+## Introduction
+
+CarbonData is a fully indexed columnar and Hadoop native data-store for processing heavy analytical workloads and detailed queries on big data. CarbonData allows faster interactive query using advanced columnar storage, index, compression and encoding techniques to improve computing efficiency, which helps in speeding up queries by an order of magnitude faster over PetaBytes of data.
+
+In customer benchmarks, CarbonData has proven to manage Petabyte of data running on extraordinarily low-cost hardware and answers queries around 10 times faster than the current open source solutions (column-oriented SQL on Hadoop data-stores).
+
+Some of the salient features of CarbonData are :
+
+* Low-Latency for various types of data access patterns like Sequential, Random and OLAP.
+* Fast query on fast data.
+* Space efficiency.
+* General format available on Hadoop-ecosystem.
+
+## CarbonData File Structure
+
+CarbonData files contain groups of data called blocklets, along with all required information like schema, offsets and indices etc, in a file footer, co-located in HDFS.
+
+The file footer can be read once to build the indices in memory, which can be utilized for optimizing the scans and processing for all subsequent queries.
+
+Each blocklet in the file is further divided into chunks of data called data chunks. Each data chunk is organized either in columnar format or row format, and stores the data of either a single column or a set of columns. All blocklets in a file contain the same number and type of data chunks.
+
+
+
+Each data chunk contains multiple groups of data called as pages. There are three types of pages.
+
+* Data Page: Contains the encoded data of a column/group of columns.
+* Row ID Page (optional): Contains the row ID mappings used when the data page is stored as an inverted index.
+* RLE Page (optional): Contains additional metadata used when the data page is RLE coded.
+
+
+
+## Features
+
+CarbonData file format is a columnar store in HDFS. It has many features that a modern columnar format has, such as splittable, compression schema, complex data type etc and CarbonData has following unique features:
+
+* Unique Data Organization: Though CarbonData stores data in Columnar format, it differs from traditional Columnar formats as the columns in each row-group(Data Block) is sorted independent of the other columns. Though this arrangement requires CarbonData to store the row-number mapping against each column value, it makes it possible to use binary search for faster filtering and since the values are sorted, same/similar values come together which yields better compression and offsets the storage overhead required by the row number mapping.
+
+* Advanced Push Down Optimizations: CarbonData pushes as much of query processing as possible close to the data to minimize the amount of data being read, processed, converted and transmitted/shuffled. Using projections and filters it reads only the required columns form the store and also reads only the rows that match the filter conditions provided in the query.
+
+* Multi Level Indexing: CarbonData uses multiple indices at various levels to enable faster search and speed up query processing.
+
+* Global Multi Dimensional Keys(MDK) based B+Tree Index for all non- measure columns: Aids in quickly locating the row groups(Data Blocks) that contain the data matching search/filter criteria.
+
+* Min-Max Index for all columns: Aids in quickly locating the row groups(Data Blocks) that contain the data matching search/filter criteria.
+
+* Data Block level Inverted Index for all columns: Aids in quickly locating the rows that contain the data matching search/filter criteria within a row group(Data Blocks).
+
+* Dictionary Encoding: Most databases and big data SQL data stores employ columnar encoding to achieve data compression by storing small integers numbers (surrogate value) instead of full string values. However, almost all existing databases and data stores divide the data into row groups containing anywhere from few thousand to a million rows and employ dictionary encoding only within each row group. Hence, the same column value can have different surrogate values in different row groups. So, while reading the data, conversion from surrogate value to actual value needs to be done immediately after the data is read from the disk. But CarbonData employs global surrogate key which means that a common dictionary is maintained for the full store on one machine/node. So CarbonData can perform all the query processing work such as grouping/aggregation, sorting etc on light weight surrogate values. The conversion from surrogate to actual values needs to be done only on the final result. Th
is procedure improves performance on two aspects. Conversion from surrogate values to actual values is done only for the final result rows which are much less than the actual rows read from the store. All query processing and computation such as grouping/aggregation, sorting, and so on is done on lightweight surrogate values which requires less memory and CPU time compared to actual values.
+
+* Deep Spark Integration: It has built-in spark integration for Spark 1.5, 1.6 and interfaces for Spark SQL, DataFrame API and query optimization. It supports bulk data ingestion and allows saving of spark dataframes as CarbonData files.
+
+* Update Delete Support: It supports batch updates like daily update scenarios for OLAP and Base+Delta file based design.
+
+* Store data along with index: Significantly accelerates query performance and reduces the I/O scans and CPU resources, when there are filters in the query. CarbonData index consists of multiple levels of indices. A processing framework can leverage this index to reduce the task it needs to schedule and process. It can also do skip scan in more finer grain units (called blocklet) in task side scanning instead of scanning the whole file.
+
+* Operable encoded data: It supports efficient compression and global encoding schemes and can query on compressed/encoded data. The data can be converted just before returning the results to the users, which is "late materialized".
+
+* Column group: Allows multiple columns to form a column group that would be stored as row format. This reduces the row reconstruction cost at query time.
+
+* Support for various use cases with one single Data format: Examples are interactive OLAP-style query, Sequential Access (big scan) and Random Access (narrow scan).
+
+## Data Types
+
+#### CarbonData supports the following data types:
+
+ * Numeric Types
+ * SMALLINT
+ * INT/INTEGER
+ * BIGINT
+ * DOUBLE
+ * DECIMAL
+
+ * Date/Time Types
+ * TIMESTAMP
+
+ * String Types
+ * STRING
+
+ * Complex Types
+ * arrays: ARRAY``<data_type>``
+ * structs: STRUCT``<col_name : data_type COMMENT col_comment, ...>``
+
+## Interfaces
+
+#### API
+CarbonData can be used in following scenarios:
+
+* For MapReduce application user
+
+ This User API is provided by carbon-hadoop. In this scenario, user can process CarbonData files in his MapReduce application by choosing CarbonInput/OutputFormat, and is responsible for using it correctly. Currently only CarbonInputFormat is provided and OutputFormat will be provided soon.
+
+* For Spark user
+
+ This User API is provided by Spark itself. There are two levels of APIs
+
+ * **CarbonData File**
+
+ Similar to parquet, json, or other data source in Spark, CarbonData can be used with data source API. For example (please refer to DataFrameAPIExample for more detail):
+
+```
+ // User can create a DataFrame from any data source
+ // or transformation.
+ val df = ...
+
+ // Write data
+ // User can write a DataFrame to a CarbonData file
+ df.write
+ .format("carbondata")
+ .option("tableName", "carbontable")
+ .mode(SaveMode.Overwrite)
+ .save()
+
+
+ // read CarbonData by data source API
+ df = carbonContext.read
+ .format("carbondata")
+ .option("tableName", "carbontable")
+ .load("/path")
+
+ // User can then use DataFrame for analysis
+ df.count
+ SVMWithSGD.train(df, numIterations)
+
+ // User can also register the DataFrame with a table name,
+ // and use SQL for analysis
+ df.registerTempTable("t1") // register temporary table
+ // in SparkSQL catalog
+ df.registerHiveTable("t2") // Or, use a implicit funtion
+ // to register to Hive metastore
+ sqlContext.sql("select count(*) from t1").show
+```
+
+ * **Managed CarbonData Table**
+
+ CarbonData has in built support for high level concept like Table, Database, and supports full data lifecycle management, instead of dealing with just files user can use CarbonData specific DDL to manipulate data in Table and Database level. Please refer [DDL](https://github.com/HuaweiBigData/carbondata/wiki/Language-Manual:-DDL) and [DML](https://github.com/HuaweiBigData/carbondata/wiki/Language-Manual:-DML).
+
+```
+ // Use SQL to manage table and query data
+ create database db1;
+ use database db1;
+ show databases;
+ create table tbl1 using org.apache.carbondata.spark;
+ load data into table tlb1 path 'some_files';
+ select count(*) from tbl1;
+```
+
+* For developer who want to integrate CarbonData into processing engines like spark, hive or flink, use API provided by carbon-hadoop and carbon-processing:
+ - **Query** : Integrate carbon-hadoop with engine specific API, like spark data source API.
+
+ - **Data life cycle management** : CarbonData provides utility functions in carbon-processing to manage data life cycle, like data loading, compact, retention, schema evolution. Developer can implement DDLs of their choice and leverage these utility function to do data life cycle management.
+
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/276a6111/docs/quick-start-guide.md
----------------------------------------------------------------------
diff --git a/docs/quick-start-guide.md b/docs/quick-start-guide.md
new file mode 100644
index 0000000..8800ca6
--- /dev/null
+++ b/docs/quick-start-guide.md
@@ -0,0 +1,178 @@
+<!--
+ 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.
+-->
+
+# Quick Start
+This tutorial provides a quick introduction to using CarbonData.
+
+## Getting started with Apache CarbonData
+
+* [Installation](#installation)
+* [Prerequisites](#prerequisites)
+* [Interactive Analysis with Spark Shell Version 2.1](#interactive-analysis-with-spark-shell)
+ - Basics
+ - Executing Queries
+ * Creating a Table
+ * Loading Data to a Table
+ * Query Data from a Table
+* Interactive Analysis with Spark Shell Version 1.6
+ - Basics
+ - Executing Queries
+ * Creating a Table
+ * Loading Data to a Table
+ * Query Data from a Table
+* [Building CarbonData](#building-carbondata)
+
+
+## Installation
+* Download a released package of [Spark 1.6.2 or 2.1.0](http://spark.apache.org/downloads.html).
+* Download and install [Apache Thrift 0.9.3](http://thrift-tutorial.readthedocs.io/en/latest/installation.html), make sure Thrift is added to system path.
+* Download [Apache CarbonData code](https://github.com/apache/incubator-carbondata) and build it. Please visit [Building CarbonData And IDE Configuration](https://github.com/apache/incubator-carbondata/blob/master/build/README.md) for more information.
+
+## Prerequisites
+
+* Create a sample.csv file using the following commands. The CSV file is required for loading data into CarbonData.
+
+```
+$ cd carbondata
+$ cat > sample.csv << EOF
+ id,name,city,age
+ 1,david,shenzhen,31
+ 2,eason,shenzhen,27
+ 3,jarry,wuhan,35
+ EOF
+```
+
+
+## Interactive Analysis with Spark Shell
+
+## Version 2.1
+
+Apache Spark Shell provides a simple way to learn the API, as well as a powerful tool to analyze data interactively. Please visit [Apache Spark Documentation](http://spark.apache.org/docs/latest/) for more details on Spark shell.
+
+#### Basics
+
+Start Spark shell by running the following command in the Spark directory:
+
+```
+./bin/spark-shell --jars <carbondata jar path>
+```
+
+In this shell, SparkSession is readily available as 'spark' and Spark context is readily available as 'sc'.
+
+In order to create a CarbonSession we will have to configure it explicitly in the following manner :
+
+* Import the following :
+
+```
+import org.apache.spark.sql.SparkSession
+import org.apache.spark.sql.CarbonSession._
+```
+
+* Create a CarbonSession :
+
+```
+val carbon = SparkSession.builder().config(sc.getConf).getOrCreateCarbonSession()
+```
+
+#### Executing Queries
+
+##### Creating a Table
+
+```
+scala>carbon.sql("create table if not exists test_table
+ (id string, name string, city string, age Int)
+ STORED BY 'carbondata'")
+```
+
+##### Loading Data to a Table
+
+```
+scala>carbon.sql(s"load data inpath '${new java.io.File("../carbondata/sample.csv").getCanonicalPath}' into table test_table")
+```
+
+###### Query Data from a Table
+
+```
+scala>spark.sql("select * from test_table").show
+
+scala>spark.sql("select city, avg(age),
+sum(age) from test_table group by city").show
+```
+
+
+## Interactive Analysis with Spark Shell
+## Version 1.6
+
+
+#### Basics
+
+Start Spark shell by running the following command in the Spark directory:
+
+```
+./bin/spark-shell --jars <carbondata jar path>
+```
+
+NOTE: In this shell, SparkContext is readily available as sc.
+
+* In order to execute the Queries we need to import CarbonContext:
+
+```
+import org.apache.spark.sql.CarbonContext
+```
+
+* Create an instance of CarbonContext in the following manner :
+
+```
+val cc = new CarbonContext(sc)
+```
+
+NOTE: By default store location is pointed to "../carbon.store", user can provide own store location to CarbonContext like new CarbonContext(sc, storeLocation).
+
+#### Executing Queries
+
+##### Creating a Table
+
+```
+scala>cc.sql("create table if not exists test_table (id string, name string, city string, age Int) STORED BY 'carbondata'")
+```
+To see the table created :
+
+```
+scala>cc.sql("show tables").show
+```
+
+##### Loading Data to a Table
+
+```
+scala>cc.sql(s"load data inpath '${new java.io.File("../carbondata/sample.csv").getCanonicalPath}' into table test_table")
+```
+
+##### Query Data from a Table
+
+```
+scala>cc.sql("select * from test_table").show
+scala>cc.sql("select city, avg(age), sum(age) from test_table group by city").show
+```
+
+## Building CarbonData
+
+To get started, get CarbonData from the [downloads](http://carbondata.incubator.apache.org/) section on the [http://carbondata.incubator.apache.org.](http://carbondata.incubator.apache.org.)
+CarbonData uses Hadoop\u2019s client libraries for HDFS and YARN and Spark's libraries. Downloads are pre-packaged for a handful of popular Spark versions.
+
+If you\u2019d like to build CarbonData from source, visit [Building CarbonData And IDE Configuration](https://github.com/apache/incubator-carbondata/blob/master/build/README.md).
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/276a6111/docs/table-of-content.md
----------------------------------------------------------------------
diff --git a/docs/table-of-content.md b/docs/table-of-content.md
new file mode 100644
index 0000000..cbec50b
--- /dev/null
+++ b/docs/table-of-content.md
@@ -0,0 +1,47 @@
+<!--
+ 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.
+-->
+# Table of Contents
+
+* [Quick Start](quick-start-guide.md)
+ * [Getting started with Apache CarbonData]()
+* [User Guide](user-guide-toc.md)
+ * [Overview](overview-of-carbondata.md)
+ * Introduction
+ * CarbonData File Structure
+ * Features
+ * Data Types
+ * Interfaces
+ * [Installation Guide](installation-guide.md)
+ * Installing and Configuring CarbonData on Standalone Spark Cluster
+ * Installing and Configuring CarbonData on \u201cSpark on YARN\u201d Cluster
+ * [Configuring CarbonData](configuration-parameters.md)
+ * System Configuration
+ * Performance Configuration
+ * Miscellaneous Configuration
+ * Spark Configuration
+ * [Using CarbonData](using-carbondata.md)
+ * [Data Management](data-management.md)
+ * [DDL Operations on CarbonData](ddl-operation-on-carbondata.md )
+ * [DML Operations on CarbonData](dml-operation-on-carbondata.md )
+* [Useful Tips](useful-tips-on-carbondata.md)
+ * Suggestion to create CarbonData Table
+ * Configurations for Optimizing CarbonData Performance
+* [CarbonData Use Cases](use-cases-of-carbondata.md)
+* [Troubleshooting](troubleshooting.md)
+* [FAQs](faq.md)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/276a6111/docs/troubleshooting.md
----------------------------------------------------------------------
diff --git a/docs/troubleshooting.md b/docs/troubleshooting.md
new file mode 100644
index 0000000..21d3db6
--- /dev/null
+++ b/docs/troubleshooting.md
@@ -0,0 +1,30 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+# Troubleshooting
+This tutorial is designed to provide troubleshooting for end users and developers
+who are building, deploying, and using CarbonData.
+
+### General Prevention and Best Practices
+ * When trying to create a table with a single numeric column, table creation fails:
+ One column that can be considered as dimension is mandatory for table creation.
+
+ * "Files locked for updation" when same table is accessed from two or more instances:
+ Remove metastore_db from the examples folder.
+
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/276a6111/docs/use-cases-of-carbondata.md
----------------------------------------------------------------------
diff --git a/docs/use-cases-of-carbondata.md b/docs/use-cases-of-carbondata.md
new file mode 100644
index 0000000..112b6bc
--- /dev/null
+++ b/docs/use-cases-of-carbondata.md
@@ -0,0 +1,77 @@
+<!--
+ 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.
+-->
+
+# CarbonData Use Cases
+This tutorial discusses about the problems that CarbonData addresses. It shall take you through the identified top use cases of CarbonData.
+
+## Introduction
+For big data interactive analysis scenarios, many customers expect sub-second response to query TB-PB level data on general hardware clusters with just a few nodes.
+
+In the current big data ecosystem, there are few columnar storage formats such as ORC and Parquet that are designed for SQL on Big Data. Apache Hive\u2019s ORC format is a columnar storage format with basic indexing capability. However, ORC cannot meet the sub-second query response expectation on TB level data, as it performs only stride level dictionary encoding and all analytical operations such as filtering and aggregation is done on the actual data. Apache Parquet is a columnar storage format that can improve performance in comparison to ORC due to its more efficient storage organization. Though Parquet can provide query response on TB level data in a few seconds, it is still far from the sub-second expectation of interactive analysis users. Cloudera Kudu can effectively solve some query performance issues, but kudu is not hadoop native, can\u2019t seamlessly integrate historic HDFS data into new kudu system.
+
+However, CarbonData uses specially engineered optimizations targeted to improve performance of analytical queries which can include filters, aggregation and distinct counts,
+the required data to be stored in an indexed, well organized, read-optimized format, CarbonData\u2019s query performance can achieve sub-second response.
+
+## Motivation: Single Format to provide Low Latency Response for all Use Cases
+The main motivation behind CarbonData is to provide a single storage format for all the usecases of querying big data on Hadoop. Thus CarbonData is able to cover all use-cases
+into a single storage format.
+
+ 
+
+## Use Cases
+### Sequential Access
+ - Supports queries that select only a few columns with a group by clause but do not contain any filters.
+ This results in full scan over the complete store for the selected columns.
+
+ 
+
+ **Scenario**
+
+ - ETL jobs
+ - Log Analysis
+
+### Random Access
+ - Supports Point Query. These are queries used from operational applications and usually select all or most of the columns and involves a large number of
+ filters which reduce the result to a small size. Such queries generally do not involve any aggregation or group by clause.
+ - Row-key query(like HBase)
+ - Narrow Scan
+ - Requires second/sub-second level low latency
+
+ 
+
+ **Scenario**
+
+ - Operational Query
+ - User Profiling
+
+### Olap Style Query
+ - Supports Interactive data analysis for any dimensions. These are queries which are typically fired from Interactive Analysis tools.
+ Such queries often select a few columns and involves filters and group by on a column or a grouping expression.
+ It also supports queries that :
+ - Involves aggregation/join
+ - Roll-up,Drill-down,Slicing and Dicing
+ - Low-latency ad-hoc query
+
+ 
+
+ **Scenario**
+
+ - Dash-board reporting
+ - Fraud & Ad-hoc Analysis
+
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/276a6111/docs/useful-tips-on-carbondata.md
----------------------------------------------------------------------
diff --git a/docs/useful-tips-on-carbondata.md b/docs/useful-tips-on-carbondata.md
new file mode 100644
index 0000000..b1ff903
--- /dev/null
+++ b/docs/useful-tips-on-carbondata.md
@@ -0,0 +1,180 @@
+<!--
+ 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.
+-->
+
+# Useful Tips
+This tutorial guides you to create CarbonData Tables and optimize performance.
+The following sections will elaborate on the above topics :
+
+* [Suggestions to create CarbonData Table](#suggestions-to-create-carbondata-table)
+* [Configurations For Optimizing CarbonData Performance](#configurations-for-optimizing-carbondata-performance)
+
+## Suggestions to Create CarbonData Table
+
+Recently CarbonData was used to analyze performance of Telecommunication field.
+The results of the analysis for table creation with dimensions ranging from
+10 thousand to 10 billion rows and 100 to 300 columns have been summarized below.
+
+The following table describes some of the columns from the table used.
+
+
+**Table Column Description**
+
+| Column Name | Data Type | Cardinality | Attribution |
+|-------------|---------------|-------------|-------------|
+| msisdn | String | 30 million | Dimension |
+| BEGIN_TIME | BigInt | 10 Thousand | Dimension |
+| HOST | String | 1 million | Dimension |
+| Dime_1 | String | 1 Thousand | Dimension |
+| counter_1 | Numeric(20,0) | NA | Measure |
+| ... | ... | NA | Measure |
+| counter_100 | Numeric(20,0) | NA | Measure |
+
+CarbonData has more than 50 test cases, on the basis of these we have following suggestions to enhance the query performance :
+
+
+
+* **Put the frequently-used column filter in the beginning**
+
+ For example, MSISDN filter is used in most of the query then we must put the MSISDN in the first column.
+The create table command can be modified as suggested below :
+
+```
+ create table carbondata_table(
+ msisdn String,
+ ...
+ )STORED BY 'org.apache.carbondata.format'
+ TBLPROPERTIES ( 'DICTIONARY_EXCLUDE'='MSISDN,..',
+ 'DICTIONARY_INCLUDE'='...');
+```
+
+ Now the query with MSISDN in the filter will be more efficient.
+
+
+* **Put the frequently-used columns in the order of low to high cardinality**
+
+ If the table in the specified query has multiple columns which are frequently used to filter the results, it is suggested to put
+ the columns in the order of cardinality low to high. This ordering of frequently used columns improves the compression ratio and
+ enhances the performance of queries with filter on these columns.
+
+ For example if MSISDN, HOST and Dime_1 are frequently-used columns, then the column order of table is suggested as
+ Dime_1>HOST>MSISDN as Dime_1 has the lowest cardinality.
+ The create table command can be modified as suggested below :
+
+```
+ create table carbondata_table(
+ Dime_1 String,
+ HOST String,
+ MSISDN String,
+ ...
+ )STORED BY 'org.apache.carbondata.format'
+ TBLPROPERTIES ( 'DICTIONARY_EXCLUDE'='MSISDN,HOST..',
+ 'DICTIONARY_INCLUDE'='Dime_1..');
+```
+
+
+* **Put the Dimension type columns in order of low to high cardinality**
+
+ If the columns used to filter are not frequently used, then it is suggested to order all the columns of dimension type in order of low to high cardinality.
+The create table command can be modified as below :
+
+```
+ create table carbondata_table(
+ Dime_1 String,
+ BEGIN_TIME bigint
+ HOST String,
+ MSISDN String,
+ ...
+ )STORED BY 'org.apache.carbondata.format'
+ TBLPROPERTIES ( 'DICTIONARY_EXCLUDE'='MSISDN,HOST,IMSI..',
+ 'DICTIONARY_INCLUDE'='Dime_1,END_TIME,BEGIN_TIME..');
+```
+
+
+* **For measure type columns with non high accuracy, replace Numeric(20,0) data type with Double data type**
+
+ For columns of measure type, not requiring high accuracy, it is suggested to replace Numeric data type with Double to enhance
+query performance. The create table command can be modified as below :
+
+```
+ create table carbondata_table(
+ Dime_1 String,
+ BEGIN_TIME bigint
+ HOST String,
+ MSISDN String,
+ counter_1 double,
+ counter_2 double,
+ ...
+ counter_100 double
+ )STORED BY 'org.apache.carbondata.format'
+ TBLPROPERTIES ( 'DICTIONARY_EXCLUDE'='MSISDN,HOST,IMSI',
+ 'DICTIONARY_INCLUDE'='Dime_1,END_TIME,BEGIN_TIME');
+```
+ The result of performance analysis of test-case shows reduction in query execution time from 15 to 3 seconds, thereby improving performance by nearly 5 times.
+
+
+* **Columns of incremental character should be re-arranged at the end of dimensions**
+
+ Consider the following scenario where data is loaded each day and the start_time is incremental for each load, it is
+suggested to put start_time at the end of dimensions.
+
+ Incremental values are efficient in using min/max index. The create table command can be modified as below :
+
+```
+ create table carbondata_table(
+ Dime_1 String,
+ HOST String,
+ MSISDN String,
+ counter_1 double,
+ counter_2 double,
+ BEGIN_TIME bigint,
+ ...
+ counter_100 double
+ )STORED BY 'org.apache.carbondata.format'
+ TBLPROPERTIES ( 'DICTIONARY_EXCLUDE'='MSISDN,HOST,IMSI',
+ 'DICTIONARY_INCLUDE'='Dime_1,END_TIME,BEGIN_TIME');
+```
+
+
+* **Avoid adding high cardinality columns to dictionary**
+
+ If the system has low memory configuration, then it is suggested to exclude high cardinality columns from the dictionary to
+enhance load performance. Creation of dictionary for high cardinality columns at time of load will degrade load performance due to
+excessive memory usage.
+
+ By default CarbonData determines the cardinality at the first data load and allows for dictionary creation only if the cardinality is less than
+1 million.
+
+
+## Configurations for Optimizing CarbonData Performance
+
+Recently we did some performance POC on CarbonData for Finance and telecommunication Field. It involved detailed queries and aggregation
+scenarios. After the completion of POC, some of the configurations impacting the performance have been identified and tabulated below :
+
+| Parameter | Location | Used For | Description | Tuning |
+|----------------------------------------------|-----------------------------------|---------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| carbon.sort.intermediate.files.limit | spark/carbonlib/carbon.properties | Data loading | During the loading of data, local temp is used to sort the data. This number specifies the minimum number of intermediate files after which the merge sort has to be initiated. | Increasing the parameter to a higher value will improve the load performance. For example, when we increase the value from 20 to 100, it increases the data load performance from 35MB/S to more than 50MB/S. Higher values of this parameter consumes more memory during the load. |
+| carbon.number.of.cores.while.loading | spark/carbonlib/carbon.properties | Data loading | Specifies the number of cores used for data processing during data loading in CarbonData. | If you have more number of CPUs, then you can increase the number of CPUs, which will increase the performance. For example if we increase the value from 2 to 4 then the CSV reading performance can increase about 1 times |
+| carbon.compaction.level.threshold | spark/carbonlib/carbon.properties | Data loading and Querying | For minor compaction, specifies the number of segments to be merged in stage 1 and number of compacted segments to be merged in stage 2. | Each CarbonData load will create one segment, if every load is small in size it will generate many small file over a period of time impacting the query performance. Configuring this parameter will merge the small segment to one big segment which will sort the data and improve the performance. For Example in one telecommunication scenario, the performance improves about 2 times after minor compaction. |
+| spark.sql.shuffle.partitions | spark/con/spark-defaults.conf | Querying | The number of task started when spark shuffle. | The value can be 1 to 2 times as much as the executor cores. In an aggregation scenario, reducing the number from 200 to 32 reduced the query time from 17 to 9 seconds. |
+| num-executors/executor-cores/executor-memory | spark/con/spark-defaults.conf | Querying | The number of executors, CPU cores, and memory used for CarbonData query. | In the bank scenario, we provide the 4 CPUs cores and 15 GB for each executor which can get good performance. This 2 value does not mean more the better. It needs to be configured properly in case of limited resources. For example, In the bank scenario, it has enough CPU 32 cores each node but less memory 64 GB each node. So we cannot give more CPU but less memory. For example, when 4 cores and 12GB for each executor. It sometimes happens GC during the query which impact the query performance very much from the 3 second to more than 15 seconds. In this scenario need to increase the memory or decrease the CPU cores. |
+| carbon.detail.batch.size | spark/carbonlib/carbon.properties | Data loading | The buffer size to store records, returned from the block scan. | In limit scenario this parameter is very important. For example your query limit is 1000. But if we set this value to 3000 that means we get 3000 records from scan but spark will only take 1000 rows. So the 2000 remaining are useless. In one Finance test case after we set it to 100, in the limit 1000 scenario the performance increase about 2 times in comparison to if we set this value to 12000. |
+| carbon.use.local.dir | spark/carbonlib/carbon.properties | Data loading | Whether use YARN local directories for multi-table load disk load balance | If this is set it to true CarbonData will use YARN local directories for multi-table load disk load balance, that will improve the data load performance. |
+
+
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/276a6111/docs/user-guide-toc.md
----------------------------------------------------------------------
diff --git a/docs/user-guide-toc.md b/docs/user-guide-toc.md
new file mode 100644
index 0000000..c05fb09
--- /dev/null
+++ b/docs/user-guide-toc.md
@@ -0,0 +1,47 @@
+<!--
+ 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.
+-->
+# User Guide
+Welcome to Apache CarbonData. Apache CarbonData(incubating) is a new big data file format for faster interactive query using advanced columnar storage, index, compression and encoding techniques to improve computing efficiency, which helps in speeding up queries by an order of magnitude faster over PetaBytes of data.
+This user guide provides a detailed description about the CarbonData and its features.
+
+Let's get started !
+
+* [Overview](overview-of-carbondata.md)
+ * Introduction
+ * CarbonData File Structure
+ * Features
+ * Data Types
+ * Interfaces
+* [Installation Guide](installation-guide.md)
+ * Installing and Configuring CarbonData on Standalone Spark Cluster
+ * Installing and Configuring CarbonData on "Spark on YARN Cluster
+* [Configuring CarbonData](configuration-parameters.md)
+ * System Configuration
+ * Performance Configuration
+ * Miscellaneous Configuration
+ * Spark Configuration
+* [Using CarbonData](using-carbondata.md)
+ * [Data Management](data-management.md)
+ * [DDL Operations on CarbonData](ddl-operation-on-carbondata.md )
+ * [DML Operations on CarbonData](dml-operation-on-carbondata.md )
+
+
+
+
+
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/276a6111/docs/using-carbondata.md
----------------------------------------------------------------------
diff --git a/docs/using-carbondata.md b/docs/using-carbondata.md
new file mode 100644
index 0000000..83a3655
--- /dev/null
+++ b/docs/using-carbondata.md
@@ -0,0 +1,35 @@
+# Using CarbonData
+This tutorial discusses the disciplines related to management of data in Apache CarbonData.
+Following below each section is a brief introduction to respective disciplines related to data
+management.
+
+## Data Management
+This section shall be dealing with the disciplines related to managing data in the application,
+focusing on conceptual details related to operations like load data, delete data, update data
+and Compacting Data.
+
+For complete details refer to [Data Management](data-management.md)
+
+## Data Definition Language Support
+This section deals with the aspects related to creation and modification of the structure of database.
+It shall discuss in detail about
+
+* Table creation
+* Table deletion
+* Table description
+* Compaction
+
+For complete details refer to [DDL Operations on CarbonData](ddl-operation-on-carbondata.md )
+
+## Data Manipulation Language Support
+This section deals with the aspects related to data manipulation in database. It shall discuss in detail about selecting, loading and deleting in a database.
+This manipulation comprises of
+
+* Loading data into database tables
+* Retrieving existing data
+* Deleting data from existing tables
+* Deleting segments from existing tables
+* Updating data in existing tables
+
+For complete details refer to [DML Operations on CarbonData](dml-operation-on-carbondata.md)
+
[17/50] [abbrv] incubator-carbondata git commit:
[CARBONDATA-655][CARBONDATA-604]Make no kettle dataload flow as default This
closes #546
Posted by ra...@apache.org.
[CARBONDATA-655][CARBONDATA-604]Make no kettle dataload flow as default This closes #546
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/4ad8090a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/4ad8090a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/4ad8090a
Branch: refs/heads/branch-1.0
Commit: 4ad8090a39461da7b847356a4ead3b4721e5405e
Parents: 3374aeb 7d5a031
Author: jackylk <ja...@huawei.com>
Authored: Thu Jan 19 22:06:17 2017 +0800
Committer: jackylk <ja...@huawei.com>
Committed: Thu Jan 19 22:06:17 2017 +0800
----------------------------------------------------------------------
.../core/constants/CarbonCommonConstants.java | 4 ++++
.../carbondata/examples/util/ExampleUtils.scala | 2 +-
.../org/apache/carbondata/spark/CarbonOption.scala | 2 +-
.../carbondata/spark/CarbonDataFrameWriter.scala | 2 +-
.../sql/execution/command/carbonTableSchema.scala | 14 +++++++++++---
.../org/apache/carbondata/spark/CarbonOption.scala | 0
.../org/apache/spark/sql/CarbonDataFrameWriter.scala | 2 +-
.../sql/execution/command/carbonTableSchema.scala | 14 +++++++++++---
8 files changed, 30 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
[18/50] [abbrv] incubator-carbondata git commit: fix docs issues
Posted by ra...@apache.org.
fix docs issues
fix docs issues
fix docs issues
fix docs issues
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/9edb2b9f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/9edb2b9f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/9edb2b9f
Branch: refs/heads/branch-1.0
Commit: 9edb2b9f1912d9be23b63d2bd2a14c3a481df348
Parents: 4ad8090
Author: chenliang613 <ch...@huawei.com>
Authored: Thu Jan 19 21:50:52 2017 +0800
Committer: chenliang613 <ch...@huawei.com>
Committed: Thu Jan 19 22:38:20 2017 +0800
----------------------------------------------------------------------
README.md | 1 -
docs/Data-Management.md | 166 ---------------------------
docs/data-management.md | 166 +++++++++++++++++++++++++++
docs/images/carbon_data_full_scan.png | Bin 35710 -> 0 bytes
docs/images/carbon_data_motivation.png | Bin 25388 -> 0 bytes
docs/images/carbon_data_olap_scan.png | Bin 45235 -> 0 bytes
docs/images/carbon_data_random_scan.png | Bin 46317 -> 0 bytes
7 files changed, 166 insertions(+), 167 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/9edb2b9f/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index afd3061..07f7ebf 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,6 @@ You can find the latest CarbonData document and learn more at:
## Status
[](https://travis-ci.org/apache/incubator-carbondata)
-[](https://www.apache.org/licenses/LICENSE-2.0.html)
## Features
CarbonData file format is a columnar store in HDFS, it has many features that a modern columnar format has, such as splittable, compression schema ,complex data type etc, and CarbonData has following unique features:
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/9edb2b9f/docs/Data-Management.md
----------------------------------------------------------------------
diff --git a/docs/Data-Management.md b/docs/Data-Management.md
deleted file mode 100644
index 70f4d28..0000000
--- a/docs/Data-Management.md
+++ /dev/null
@@ -1,166 +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.
--->
-
-# Data Management
-This tutorial is going to introduce you to the conceptual details of data management like:
-
-* [Loading Data](#loading-data)
-* [Deleting Data](#deleting-data)
-* [Compacting Data](#compacting-data)
-* [Updating Data](#updating-data)
-
-## Loading Data
-
-* **Scenario**
-
- After creating a table, you can load data to the table using the [LOAD DATA](dml-operation-on-carbondata.md) command. The loaded data is available for querying.
- When data load is triggered, the data is encoded in CarbonData format and copied into HDFS CarbonData store path (specified in carbon.properties file)
- in compressed, multi dimensional columnar format for quick analysis queries. The same command can be used to load new data or to
- update the existing data. Only one data load can be triggered for one table. The high cardinality columns of the dictionary encoding are
- automatically recognized and these columns will not be used for dictionary encoding.
-
-* **Procedure**
-
- Data loading is a process that involves execution of multiple steps to read, sort and encode the data in CarbonData store format.
- Each step is executed on different threads. After data loading process is complete, the status (success/partial success) is updated to
- CarbonData store metadata. The table below lists the possible load status.
-
-
-| Status | Description |
-|-----------------|------------------------------------------------------------------------------------------------------------|
-| Success | All the data is loaded into table and no bad records found. |
-| Partial Success | Data is loaded into table and bad records are found. Bad records are stored at carbon.badrecords.location. |
-
- In case of failure, the error will be logged in error log. Details of loads can be seen with [SHOW SEGMENTS](dml-operation-on-carbondata.md) command. The show segment command output consists of :
-
- - SegmentSequenceID
- - START_TIME OF LOAD
- - END_TIME OF LOAD
- - LOAD STATUS
-
- The latest load will be displayed first in the output.
-
- Refer to [DML operations on CarbonData](dml-operation-on-carbondata.md) for load commands.
-
-
-## Deleting Data
-
-* **Scenario**
-
- If you have loaded wrong data into the table, or too many bad records are present and you want to modify and reload the data, you can delete required data loads.
- The load can be deleted using the Segment Sequence Id or if the table contains date field then the data can be deleted using the date field.
- If there are some specific records that need to be deleted based on some filter condition(s) we can delete by records.
-
-* **Procedure**
-
- The loaded data can be deleted in the following ways:
-
- * Delete by Segment ID
-
- After you get the segment ID of the segment that you want to delete, execute the [DELETE](dml-operation-on-carbondata.md ) command for the selected segment.
- The status of deleted segment is updated to Marked for delete / Marked for Update.
-
-| SegmentSequenceId | Status | Load Start Time | Load End Time |
-|-------------------|-------------------|----------------------|----------------------|
-| 0 | Success | 2015-11-19 19:14:... | 2015-11-19 19:14:... |
-| 1 | Marked for Update | 2015-11-19 19:54:... | 2015-11-19 20:08:... |
-| 2 | Marked for Delete | 2015-11-19 20:25:... | 2015-11-19 20:49:... |
-
- * Delete by Date Field
-
- If the table contains date field, you can delete the data based on a specific date.
-
- * Delete by Record
-
- To delete records from CarbonData table based on some filter Condition(s).
-
- For delete commands refer to [DML operations on CarbonData](dml-operation-on-carbondata.md).
-
- * **NOTE**:
-
- - When the delete segment DML is called, segment will not be deleted physically from the file system. Instead the segment status will be marked as "Marked for Delete". For the query execution, this deleted segment will be excluded.
-
- - The deleted segment will be deleted physically during the next load operation and only after the maximum query execution time configured using "max.query.execution.time". By default it is 60 minutes.
-
- - If the user wants to force delete the segment physically then he can use CLEAN FILES Command.
-
-Example :
-
-```
-CLEAN FILES FOR TABLE table1
-```
-
- This DML will physically delete the segment which are "Marked for delete" immediately.
-
-## Compacting Data
-
-* **Scenario**
-
- Frequent data ingestion results in several fragmented CarbonData files in the store directory. Since data is sorted only within each load, the indices perform only within each
- load. This means that there will be one index for each load and as number of data load increases, the number of indices also increases. As each index works only on one load,
- the performance of indices is reduced. CarbonData provides provision for compacting the loads. Compaction process combines several segments into one large segment by merge sorting the data from across the segments.
-
-* **Procedure**
-
- There are two types of compaction Minor and Major compaction.
-
- - **Minor Compaction**
-
- In minor compaction the user can specify how many loads to be merged. Minor compaction triggers for every data load if the parameter carbon.enable.auto.load.merge is set. If any segments are available to be merged, then compaction will
- run parallel with data load. There are 2 levels in minor compaction.
-
- - Level 1: Merging of the segments which are not yet compacted.
- - Level 2: Merging of the compacted segments again to form a bigger segment.
- - **Major Compaction**
-
- In Major compaction, many segments can be merged into one big segment. User will specify the compaction size until which segments can be merged. Major compaction is usually done during the off-peak time.
-
- There are number of parameters related to Compaction that can be set in carbon.properties file
-
-| Parameter | Default | Application | Description | Valid Values |
-|-----------------------------------------|---------|-------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------|
-| carbon.compaction.level.threshold | 4, 3 | Minor | This property is for minor compaction which decides how many segments to be merged. Example: If it is set as 2, 3 then minor compaction will be triggered for every 2 segments. 3 is the number of level 1 compacted segment which is further compacted to new segment. | NA |
-| carbon.major.compaction.size | 1024 MB | Major | Major compaction size can be configured using this parameter. Sum of the segments which is below this threshold will be merged. | NA |
-| carbon.numberof.preserve.segments | 0 | Minor/Major | If the user wants to preserve some number of segments from being compacted then he can set this property. Example: carbon.numberof.preserve.segments=2 then 2 latest segments will always be excluded from the compaction. No segments will be preserved by default. | 0-100 |
-| carbon.allowed.compaction.days | 0 | Minor/Major | Compaction will merge the segments which are loaded within the specific number of days configured. Example: If the configuration is 2, then the segments which are loaded in the time frame of 2 days only will get merged. Segments which are loaded 2 days apart will not be merged. This is disabled by default. | 0-100 |
-| carbon.number.of.cores.while.compacting | 2 | Minor/Major | Number of cores which is used to write data during compaction. | 0-100 |
-
- For compaction commands refer to [DDL operations on CarbonData](ddl-operation-on-carbondata.md)
-
-## Updating Data
-
-* **Scenario**
-
- Sometimes after the data has been ingested into the System, it is required to be updated. Also there may be situations where some specific columns need to be updated
- on the basis of column expression and optional filter conditions.
-
-* **Procedure**
-
- To update we need to specify the column expression with an optional filter condition(s).
-
- For update commands refer to [DML operations on CarbonData](dml-operation-on-carbondata.md).
-
-
-
-
-
-
-
-
-
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/9edb2b9f/docs/data-management.md
----------------------------------------------------------------------
diff --git a/docs/data-management.md b/docs/data-management.md
new file mode 100644
index 0000000..70f4d28
--- /dev/null
+++ b/docs/data-management.md
@@ -0,0 +1,166 @@
+<!--
+ 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.
+-->
+
+# Data Management
+This tutorial is going to introduce you to the conceptual details of data management like:
+
+* [Loading Data](#loading-data)
+* [Deleting Data](#deleting-data)
+* [Compacting Data](#compacting-data)
+* [Updating Data](#updating-data)
+
+## Loading Data
+
+* **Scenario**
+
+ After creating a table, you can load data to the table using the [LOAD DATA](dml-operation-on-carbondata.md) command. The loaded data is available for querying.
+ When data load is triggered, the data is encoded in CarbonData format and copied into HDFS CarbonData store path (specified in carbon.properties file)
+ in compressed, multi dimensional columnar format for quick analysis queries. The same command can be used to load new data or to
+ update the existing data. Only one data load can be triggered for one table. The high cardinality columns of the dictionary encoding are
+ automatically recognized and these columns will not be used for dictionary encoding.
+
+* **Procedure**
+
+ Data loading is a process that involves execution of multiple steps to read, sort and encode the data in CarbonData store format.
+ Each step is executed on different threads. After data loading process is complete, the status (success/partial success) is updated to
+ CarbonData store metadata. The table below lists the possible load status.
+
+
+| Status | Description |
+|-----------------|------------------------------------------------------------------------------------------------------------|
+| Success | All the data is loaded into table and no bad records found. |
+| Partial Success | Data is loaded into table and bad records are found. Bad records are stored at carbon.badrecords.location. |
+
+ In case of failure, the error will be logged in error log. Details of loads can be seen with [SHOW SEGMENTS](dml-operation-on-carbondata.md) command. The show segment command output consists of :
+
+ - SegmentSequenceID
+ - START_TIME OF LOAD
+ - END_TIME OF LOAD
+ - LOAD STATUS
+
+ The latest load will be displayed first in the output.
+
+ Refer to [DML operations on CarbonData](dml-operation-on-carbondata.md) for load commands.
+
+
+## Deleting Data
+
+* **Scenario**
+
+ If you have loaded wrong data into the table, or too many bad records are present and you want to modify and reload the data, you can delete required data loads.
+ The load can be deleted using the Segment Sequence Id or if the table contains date field then the data can be deleted using the date field.
+ If there are some specific records that need to be deleted based on some filter condition(s) we can delete by records.
+
+* **Procedure**
+
+ The loaded data can be deleted in the following ways:
+
+ * Delete by Segment ID
+
+ After you get the segment ID of the segment that you want to delete, execute the [DELETE](dml-operation-on-carbondata.md ) command for the selected segment.
+ The status of deleted segment is updated to Marked for delete / Marked for Update.
+
+| SegmentSequenceId | Status | Load Start Time | Load End Time |
+|-------------------|-------------------|----------------------|----------------------|
+| 0 | Success | 2015-11-19 19:14:... | 2015-11-19 19:14:... |
+| 1 | Marked for Update | 2015-11-19 19:54:... | 2015-11-19 20:08:... |
+| 2 | Marked for Delete | 2015-11-19 20:25:... | 2015-11-19 20:49:... |
+
+ * Delete by Date Field
+
+ If the table contains date field, you can delete the data based on a specific date.
+
+ * Delete by Record
+
+ To delete records from CarbonData table based on some filter Condition(s).
+
+ For delete commands refer to [DML operations on CarbonData](dml-operation-on-carbondata.md).
+
+ * **NOTE**:
+
+ - When the delete segment DML is called, segment will not be deleted physically from the file system. Instead the segment status will be marked as "Marked for Delete". For the query execution, this deleted segment will be excluded.
+
+ - The deleted segment will be deleted physically during the next load operation and only after the maximum query execution time configured using "max.query.execution.time". By default it is 60 minutes.
+
+ - If the user wants to force delete the segment physically then he can use CLEAN FILES Command.
+
+Example :
+
+```
+CLEAN FILES FOR TABLE table1
+```
+
+ This DML will physically delete the segment which are "Marked for delete" immediately.
+
+## Compacting Data
+
+* **Scenario**
+
+ Frequent data ingestion results in several fragmented CarbonData files in the store directory. Since data is sorted only within each load, the indices perform only within each
+ load. This means that there will be one index for each load and as number of data load increases, the number of indices also increases. As each index works only on one load,
+ the performance of indices is reduced. CarbonData provides provision for compacting the loads. Compaction process combines several segments into one large segment by merge sorting the data from across the segments.
+
+* **Procedure**
+
+ There are two types of compaction Minor and Major compaction.
+
+ - **Minor Compaction**
+
+ In minor compaction the user can specify how many loads to be merged. Minor compaction triggers for every data load if the parameter carbon.enable.auto.load.merge is set. If any segments are available to be merged, then compaction will
+ run parallel with data load. There are 2 levels in minor compaction.
+
+ - Level 1: Merging of the segments which are not yet compacted.
+ - Level 2: Merging of the compacted segments again to form a bigger segment.
+ - **Major Compaction**
+
+ In Major compaction, many segments can be merged into one big segment. User will specify the compaction size until which segments can be merged. Major compaction is usually done during the off-peak time.
+
+ There are number of parameters related to Compaction that can be set in carbon.properties file
+
+| Parameter | Default | Application | Description | Valid Values |
+|-----------------------------------------|---------|-------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------|
+| carbon.compaction.level.threshold | 4, 3 | Minor | This property is for minor compaction which decides how many segments to be merged. Example: If it is set as 2, 3 then minor compaction will be triggered for every 2 segments. 3 is the number of level 1 compacted segment which is further compacted to new segment. | NA |
+| carbon.major.compaction.size | 1024 MB | Major | Major compaction size can be configured using this parameter. Sum of the segments which is below this threshold will be merged. | NA |
+| carbon.numberof.preserve.segments | 0 | Minor/Major | If the user wants to preserve some number of segments from being compacted then he can set this property. Example: carbon.numberof.preserve.segments=2 then 2 latest segments will always be excluded from the compaction. No segments will be preserved by default. | 0-100 |
+| carbon.allowed.compaction.days | 0 | Minor/Major | Compaction will merge the segments which are loaded within the specific number of days configured. Example: If the configuration is 2, then the segments which are loaded in the time frame of 2 days only will get merged. Segments which are loaded 2 days apart will not be merged. This is disabled by default. | 0-100 |
+| carbon.number.of.cores.while.compacting | 2 | Minor/Major | Number of cores which is used to write data during compaction. | 0-100 |
+
+ For compaction commands refer to [DDL operations on CarbonData](ddl-operation-on-carbondata.md)
+
+## Updating Data
+
+* **Scenario**
+
+ Sometimes after the data has been ingested into the System, it is required to be updated. Also there may be situations where some specific columns need to be updated
+ on the basis of column expression and optional filter conditions.
+
+* **Procedure**
+
+ To update we need to specify the column expression with an optional filter condition(s).
+
+ For update commands refer to [DML operations on CarbonData](dml-operation-on-carbondata.md).
+
+
+
+
+
+
+
+
+
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/9edb2b9f/docs/images/carbon_data_full_scan.png
----------------------------------------------------------------------
diff --git a/docs/images/carbon_data_full_scan.png b/docs/images/carbon_data_full_scan.png
deleted file mode 100644
index 46715e7..0000000
Binary files a/docs/images/carbon_data_full_scan.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/9edb2b9f/docs/images/carbon_data_motivation.png
----------------------------------------------------------------------
diff --git a/docs/images/carbon_data_motivation.png b/docs/images/carbon_data_motivation.png
deleted file mode 100644
index 6e454c6..0000000
Binary files a/docs/images/carbon_data_motivation.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/9edb2b9f/docs/images/carbon_data_olap_scan.png
----------------------------------------------------------------------
diff --git a/docs/images/carbon_data_olap_scan.png b/docs/images/carbon_data_olap_scan.png
deleted file mode 100644
index c1dfb18..0000000
Binary files a/docs/images/carbon_data_olap_scan.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/9edb2b9f/docs/images/carbon_data_random_scan.png
----------------------------------------------------------------------
diff --git a/docs/images/carbon_data_random_scan.png b/docs/images/carbon_data_random_scan.png
deleted file mode 100644
index 7d44d34..0000000
Binary files a/docs/images/carbon_data_random_scan.png and /dev/null differ
[31/50] [abbrv] incubator-carbondata git commit: [CACRBONDATA-669]
InsertIntoCarbonTableTestCase.insert into carbon table test failure.This
closes #669
Posted by ra...@apache.org.
[CACRBONDATA-669] InsertIntoCarbonTableTestCase.insert into carbon table test failure.This closes #669
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/a32632ef
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/a32632ef
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/a32632ef
Branch: refs/heads/branch-1.0
Commit: a32632efa84a67841c2709b82631f50ce3e32f01
Parents: 1160b57 4543de6
Author: Venkata Ramana G <ra...@huawei.com>
Authored: Fri Jan 20 16:50:02 2017 +0530
Committer: Venkata Ramana G <ra...@huawei.com>
Committed: Fri Jan 20 16:50:02 2017 +0530
----------------------------------------------------------------------
.../datastore/AbstractBlockIndexStoreCache.java | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
[04/50] [abbrv] incubator-carbondata git commit: [CARBONDATA-634]
Load Query options invalid values are not consistent behavior.
Posted by ra...@apache.org.
[CARBONDATA-634] Load Query options invalid values are not consistent behavior.
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/80319548
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/80319548
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/80319548
Branch: refs/heads/branch-1.0
Commit: 80319548a2afb7a485a2401e117a3164f760da46
Parents: 7f8401d
Author: mohammadshahidkhan <mo...@gmail.com>
Authored: Wed Jan 18 12:01:23 2017 +0530
Committer: mohammadshahidkhan <mo...@gmail.com>
Committed: Wed Jan 18 12:02:26 2017 +0530
----------------------------------------------------------------------
.../badrecordloger/BadRecordLoggerTest.scala | 18 ++++++++++++++++++
.../spark/sql/catalyst/CarbonDDLSqlParser.scala | 13 +++++++++++++
2 files changed, 31 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/80319548/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/badrecordloger/BadRecordLoggerTest.scala
----------------------------------------------------------------------
diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/badrecordloger/BadRecordLoggerTest.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/badrecordloger/BadRecordLoggerTest.scala
index 8ef2fdd..005a6eb 100644
--- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/badrecordloger/BadRecordLoggerTest.scala
+++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/badrecordloger/BadRecordLoggerTest.scala
@@ -46,6 +46,7 @@ class BadRecordLoggerTest extends QueryTest with BeforeAndAfterAll {
sql("drop table IF EXISTS emptyColumnValues_false")
sql("drop table IF EXISTS empty_timestamp")
sql("drop table IF EXISTS empty_timestamp_false")
+ sql("drop table IF EXISTS dataloadOptionTests")
sql(
"""CREATE TABLE IF NOT EXISTS sales(ID BigInt, date Timestamp, country String,
actual_price Double, Quantity int, sold_price Decimal(19,2)) STORED BY 'carbondata'""")
@@ -237,6 +238,22 @@ class BadRecordLoggerTest extends QueryTest with BeforeAndAfterAll {
)
}
+ test("test load ddl command") {
+ sql(
+ """CREATE TABLE IF NOT EXISTS dataloadOptionTests(ID BigInt, date Timestamp, country
+ String,
+ actual_price Double, Quantity int, sold_price Decimal(19,2)) STORED BY 'carbondata'
+ """)
+ val csvFilePath = s"$resourcesPath/badrecords/emptyTimeStampValue.csv"
+ try {
+ sql("LOAD DATA local inpath '" + csvFilePath + "' INTO TABLE dataloadOptionTests OPTIONS"
+ + "('bad_records_action'='FORCA', 'DELIMITER'= ',', 'QUOTECHAR'= '\"')");
+ } catch {
+ case ex: Exception =>
+ assert("option BAD_RECORDS_ACTION can have only either FORCE or IGNORE or REDIRECT"
+ .equals(ex.getMessage))
+ }
+ }
override def afterAll {
sql("drop table sales")
@@ -248,6 +265,7 @@ class BadRecordLoggerTest extends QueryTest with BeforeAndAfterAll {
sql("drop table emptyColumnValues_false")
sql("drop table empty_timestamp")
sql("drop table empty_timestamp_false")
+ sql("drop table dataloadOptionTests")
CarbonProperties.getInstance()
.addProperty(CarbonCommonConstants.CARBON_TIMESTAMP_FORMAT, "dd-MM-yyyy")
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/80319548/integration/spark-common/src/main/scala/org/apache/spark/sql/catalyst/CarbonDDLSqlParser.scala
----------------------------------------------------------------------
diff --git a/integration/spark-common/src/main/scala/org/apache/spark/sql/catalyst/CarbonDDLSqlParser.scala b/integration/spark-common/src/main/scala/org/apache/spark/sql/catalyst/CarbonDDLSqlParser.scala
index 166534f..742a145 100644
--- a/integration/spark-common/src/main/scala/org/apache/spark/sql/catalyst/CarbonDDLSqlParser.scala
+++ b/integration/spark-common/src/main/scala/org/apache/spark/sql/catalyst/CarbonDDLSqlParser.scala
@@ -34,6 +34,7 @@ import org.apache.carbondata.common.logging.LogServiceFactory
import org.apache.carbondata.core.constants.CarbonCommonConstants
import org.apache.carbondata.core.metadata.datatype.DataType
import org.apache.carbondata.core.util.DataTypeUtil
+import org.apache.carbondata.processing.constants.LoggerAction
import org.apache.carbondata.spark.exception.MalformedCarbonCommandException
import org.apache.carbondata.spark.util.CommonUtil
@@ -782,6 +783,18 @@ abstract class CarbonDDLSqlParser extends AbstractCarbonSparkSQLParser {
}
}
+ if (options.exists(_._1.equalsIgnoreCase("BAD_RECORDS_ACTION"))) {
+ val optionValue: String = options.get("bad_records_action").get.head._2
+ try {
+ LoggerAction.valueOf(optionValue.toUpperCase)
+ }
+ catch {
+ case e: IllegalArgumentException =>
+ throw new MalformedCarbonCommandException(
+ "option BAD_RECORDS_ACTION can have only either FORCE or IGNORE or REDIRECT")
+ }
+ }
+
// check for duplicate options
val duplicateOptions = options filter {
case (_, optionlist) => optionlist.size > 1
[10/50] [abbrv] incubator-carbondata git commit: [CARBONDATA-624]
Complete CarbonData document in md files
Posted by ra...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/276a6111/log.txt
----------------------------------------------------------------------
diff --git a/log.txt b/log.txt
new file mode 100644
index 0000000..16cfef3
--- /dev/null
+++ b/log.txt
@@ -0,0 +1,1363 @@
+[INFO] Scanning for projects...
+[WARNING]
+[WARNING] Some problems were encountered while building the effective model for org.apache.carbondata:carbondata-core:jar:0.1.1-incubating-SNAPSHOT
+[WARNING] 'dependencies.dependency.(groupId:artifactId:type:classifier)' must be unique: org.apache.carbondata:carbondata-format:jar -> duplicate declaration of version ${project.version} @ org.apache.carbondata:carbondata-core:[unknown-version], /home/root1/carbon-merge/incubator-carbondata/core/pom.xml, line 99, column 17
+[WARNING]
+[WARNING] Some problems were encountered while building the effective model for org.apache.carbondata:carbondata-assembly:pom:0.1.1-incubating-SNAPSHOT
+[WARNING] 'build.plugins.plugin.version' for org.apache.maven.plugins:maven-shade-plugin is missing. @ org.apache.carbondata:carbondata-assembly:[unknown-version], /home/root1/carbon-merge/incubator-carbondata/assembly/pom.xml, line 79, column 15
+[WARNING]
+[WARNING] It is highly recommended to fix these problems because they threaten the stability of your build.
+[WARNING]
+[WARNING] For this reason, future Maven versions might no longer support building such malformed projects.
+[WARNING]
+[INFO] ------------------------------------------------------------------------
+[INFO] Reactor Build Order:
+[INFO]
+[INFO] Apache CarbonData :: Parent
+[INFO] Apache CarbonData :: Common
+[INFO] Apache CarbonData :: Format
+[INFO] Apache CarbonData :: Core
+[INFO] Apache CarbonData :: Processing
+[INFO] Apache CarbonData :: Hadoop
+[INFO] Apache CarbonData :: Spark
+[INFO] Apache CarbonData :: Assembly
+[INFO] Apache CarbonData :: Examples
+[INFO]
+[INFO] ------------------------------------------------------------------------
+[INFO] Building Apache CarbonData :: Parent 0.1.1-incubating-SNAPSHOT
+[INFO] ------------------------------------------------------------------------
+[INFO]
+[INFO] --- maven-dependency-plugin:2.8:tree (default-cli) @ carbondata-parent ---
+[INFO] org.apache.carbondata:carbondata-parent:pom:0.1.1-incubating-SNAPSHOT
+[INFO]
+[INFO] ------------------------------------------------------------------------
+[INFO] Building Apache CarbonData :: Common 0.1.1-incubating-SNAPSHOT
+[INFO] ------------------------------------------------------------------------
+[INFO]
+[INFO] --- maven-dependency-plugin:2.8:tree (default-cli) @ carbondata-common ---
+[INFO] org.apache.carbondata:carbondata-common:jar:0.1.1-incubating-SNAPSHOT
+[INFO] +- log4j:log4j:jar:1.2.12:compile
+[INFO] +- junit:junit:jar:4.11:test
+[INFO] | \- org.hamcrest:hamcrest-core:jar:1.3:test
+[INFO] +- org.jmockit:jmockit:jar:1.10:test
+[INFO] \- org.apache.hadoop:hadoop-common:jar:2.2.0:compile
+[INFO] +- org.apache.hadoop:hadoop-annotations:jar:2.2.0:compile
+[INFO] | \- jdk.tools:jdk.tools:jar:1.6:system
+[INFO] +- com.google.guava:guava:jar:11.0.2:compile
+[INFO] | \- com.google.code.findbugs:jsr305:jar:1.3.9:compile
+[INFO] +- commons-cli:commons-cli:jar:1.2:compile
+[INFO] +- org.apache.commons:commons-math:jar:2.1:compile
+[INFO] +- xmlenc:xmlenc:jar:0.52:compile
+[INFO] +- commons-httpclient:commons-httpclient:jar:3.1:compile
+[INFO] +- commons-codec:commons-codec:jar:1.4:compile
+[INFO] +- commons-io:commons-io:jar:2.1:compile
+[INFO] +- commons-net:commons-net:jar:3.1:compile
+[INFO] +- javax.servlet:servlet-api:jar:2.5:compile
+[INFO] +- org.mortbay.jetty:jetty:jar:6.1.26:compile
+[INFO] +- org.mortbay.jetty:jetty-util:jar:6.1.26:compile
+[INFO] +- com.sun.jersey:jersey-core:jar:1.9:compile
+[INFO] +- com.sun.jersey:jersey-json:jar:1.9:compile
+[INFO] | +- org.codehaus.jettison:jettison:jar:1.1:compile
+[INFO] | | \- stax:stax-api:jar:1.0.1:compile
+[INFO] | +- com.sun.xml.bind:jaxb-impl:jar:2.2.3-1:compile
+[INFO] | | \- javax.xml.bind:jaxb-api:jar:2.2.2:compile
+[INFO] | | \- javax.activation:activation:jar:1.1:compile
+[INFO] | +- org.codehaus.jackson:jackson-jaxrs:jar:1.8.3:compile
+[INFO] | \- org.codehaus.jackson:jackson-xc:jar:1.8.3:compile
+[INFO] +- com.sun.jersey:jersey-server:jar:1.9:compile
+[INFO] | \- asm:asm:jar:3.1:compile
+[INFO] +- tomcat:jasper-compiler:jar:5.5.23:runtime
+[INFO] +- tomcat:jasper-runtime:jar:5.5.23:runtime
+[INFO] +- javax.servlet.jsp:jsp-api:jar:2.1:runtime
+[INFO] +- commons-el:commons-el:jar:1.0:runtime
+[INFO] +- commons-logging:commons-logging:jar:1.1.1:compile
+[INFO] +- net.java.dev.jets3t:jets3t:jar:0.6.1:compile
+[INFO] +- commons-lang:commons-lang:jar:2.5:compile
+[INFO] +- commons-configuration:commons-configuration:jar:1.6:compile
+[INFO] | +- commons-collections:commons-collections:jar:3.2.1:compile
+[INFO] | +- commons-digester:commons-digester:jar:1.8:compile
+[INFO] | | \- commons-beanutils:commons-beanutils:jar:1.7.0:compile
+[INFO] | \- commons-beanutils:commons-beanutils-core:jar:1.8.0:compile
+[INFO] +- org.slf4j:slf4j-api:jar:1.7.5:compile
+[INFO] +- org.slf4j:slf4j-log4j12:jar:1.7.5:compile
+[INFO] +- org.codehaus.jackson:jackson-core-asl:jar:1.8.8:compile
+[INFO] +- org.codehaus.jackson:jackson-mapper-asl:jar:1.8.8:compile
+[INFO] +- org.apache.avro:avro:jar:1.7.4:compile
+[INFO] | +- com.thoughtworks.paranamer:paranamer:jar:2.3:compile
+[INFO] | \- org.xerial.snappy:snappy-java:jar:1.0.4.1:compile
+[INFO] +- com.google.protobuf:protobuf-java:jar:2.5.0:compile
+[INFO] +- org.apache.hadoop:hadoop-auth:jar:2.2.0:compile
+[INFO] +- com.jcraft:jsch:jar:0.1.42:compile
+[INFO] +- org.apache.zookeeper:zookeeper:jar:3.4.5:compile
+[INFO] \- org.apache.commons:commons-compress:jar:1.4.1:compile
+[INFO] \- org.tukaani:xz:jar:1.0:compile
+[INFO]
+[INFO] ------------------------------------------------------------------------
+[INFO] Building Apache CarbonData :: Format 0.1.1-incubating-SNAPSHOT
+[INFO] ------------------------------------------------------------------------
+[INFO]
+[INFO] --- maven-dependency-plugin:2.8:tree (default-cli) @ carbondata-format ---
+[INFO] org.apache.carbondata:carbondata-format:jar:0.1.1-incubating-SNAPSHOT
+[INFO] \- org.apache.thrift:libthrift:jar:0.9.3:compile
+[INFO] +- org.slf4j:slf4j-api:jar:1.7.12:compile
+[INFO] +- org.apache.httpcomponents:httpclient:jar:4.4.1:compile
+[INFO] | +- commons-logging:commons-logging:jar:1.2:compile
+[INFO] | \- commons-codec:commons-codec:jar:1.9:compile
+[INFO] \- org.apache.httpcomponents:httpcore:jar:4.4.1:compile
+[INFO]
+[INFO] ------------------------------------------------------------------------
+[INFO] Building Apache CarbonData :: Core 0.1.1-incubating-SNAPSHOT
+[INFO] ------------------------------------------------------------------------
+[INFO]
+[INFO] --- maven-dependency-plugin:2.8:tree (default-cli) @ carbondata-core ---
+[INFO] org.apache.carbondata:carbondata-core:jar:0.1.1-incubating-SNAPSHOT
+[INFO] +- org.apache.carbondata:carbondata-format:jar:0.1.1-incubating-SNAPSHOT:compile
+[INFO] | \- org.apache.thrift:libthrift:jar:0.9.3:compile
+[INFO] | +- org.apache.httpcomponents:httpclient:jar:4.4.1:compile
+[INFO] | \- org.apache.httpcomponents:httpcore:jar:4.4.1:compile
+[INFO] +- org.apache.carbondata:carbondata-common:jar:0.1.1-incubating-SNAPSHOT:compile
+[INFO] | \- log4j:log4j:jar:1.2.12:compile
+[INFO] +- pentaho-kettle:kettle-engine:jar:4.4.0-stable:compile
+[INFO] | \- xerces:xercesImpl:jar:2.9.1:compile
+[INFO] | \- xml-apis:xml-apis:jar:1.3.04:compile
+[INFO] +- pentaho-kettle:kettle-core:jar:4.4.0-stable:compile
+[INFO] +- pentaho-kettle:kettle-db:jar:4.4.0-stable:compile
+[INFO] +- com.google.code.gson:gson:jar:2.3.1:compile
+[INFO] +- org.apache.hadoop:hadoop-common:jar:2.2.0:compile
+[INFO] | +- org.apache.hadoop:hadoop-annotations:jar:2.2.0:compile
+[INFO] | | \- jdk.tools:jdk.tools:jar:1.6:system
+[INFO] | +- com.google.guava:guava:jar:11.0.2:compile
+[INFO] | | \- com.google.code.findbugs:jsr305:jar:1.3.9:compile
+[INFO] | +- commons-cli:commons-cli:jar:1.2:compile
+[INFO] | +- org.apache.commons:commons-math:jar:2.1:compile
+[INFO] | +- xmlenc:xmlenc:jar:0.52:compile
+[INFO] | +- commons-httpclient:commons-httpclient:jar:3.1:compile
+[INFO] | +- commons-codec:commons-codec:jar:1.4:compile
+[INFO] | +- commons-io:commons-io:jar:2.1:compile
+[INFO] | +- commons-net:commons-net:jar:3.1:compile
+[INFO] | +- javax.servlet:servlet-api:jar:2.5:compile
+[INFO] | +- org.mortbay.jetty:jetty:jar:6.1.26:compile
+[INFO] | +- org.mortbay.jetty:jetty-util:jar:6.1.26:compile
+[INFO] | +- com.sun.jersey:jersey-core:jar:1.9:compile
+[INFO] | +- com.sun.jersey:jersey-json:jar:1.9:compile
+[INFO] | | +- org.codehaus.jettison:jettison:jar:1.1:compile
+[INFO] | | | \- stax:stax-api:jar:1.0.1:compile
+[INFO] | | +- com.sun.xml.bind:jaxb-impl:jar:2.2.3-1:compile
+[INFO] | | | \- javax.xml.bind:jaxb-api:jar:2.2.2:compile
+[INFO] | | | \- javax.activation:activation:jar:1.1:compile
+[INFO] | | +- org.codehaus.jackson:jackson-jaxrs:jar:1.8.3:compile
+[INFO] | | \- org.codehaus.jackson:jackson-xc:jar:1.8.3:compile
+[INFO] | +- com.sun.jersey:jersey-server:jar:1.9:compile
+[INFO] | | \- asm:asm:jar:3.1:compile
+[INFO] | +- tomcat:jasper-compiler:jar:5.5.23:runtime
+[INFO] | +- tomcat:jasper-runtime:jar:5.5.23:compile
+[INFO] | +- javax.servlet.jsp:jsp-api:jar:2.1:compile
+[INFO] | +- commons-el:commons-el:jar:1.0:compile
+[INFO] | +- commons-logging:commons-logging:jar:1.1.1:compile
+[INFO] | +- net.java.dev.jets3t:jets3t:jar:0.6.1:compile
+[INFO] | +- commons-lang:commons-lang:jar:2.5:compile
+[INFO] | +- commons-configuration:commons-configuration:jar:1.6:compile
+[INFO] | | +- commons-collections:commons-collections:jar:3.2.1:compile
+[INFO] | | +- commons-digester:commons-digester:jar:1.8:compile
+[INFO] | | | \- commons-beanutils:commons-beanutils:jar:1.7.0:compile
+[INFO] | | \- commons-beanutils:commons-beanutils-core:jar:1.8.0:compile
+[INFO] | +- org.slf4j:slf4j-api:jar:1.7.5:compile
+[INFO] | +- org.slf4j:slf4j-log4j12:jar:1.7.5:compile
+[INFO] | +- org.codehaus.jackson:jackson-core-asl:jar:1.8.8:compile
+[INFO] | +- org.codehaus.jackson:jackson-mapper-asl:jar:1.8.8:compile
+[INFO] | +- org.apache.avro:avro:jar:1.7.4:compile
+[INFO] | | \- com.thoughtworks.paranamer:paranamer:jar:2.3:compile
+[INFO] | +- com.google.protobuf:protobuf-java:jar:2.5.0:compile
+[INFO] | +- org.apache.hadoop:hadoop-auth:jar:2.2.0:compile
+[INFO] | +- com.jcraft:jsch:jar:0.1.42:compile
+[INFO] | \- org.apache.commons:commons-compress:jar:1.4.1:compile
+[INFO] | \- org.tukaani:xz:jar:1.0:compile
+[INFO] +- org.apache.hadoop:hadoop-hdfs:jar:2.2.0:compile
+[INFO] | \- commons-daemon:commons-daemon:jar:1.0.13:compile
+[INFO] +- org.xerial.snappy:snappy-java:jar:1.1.2.6:compile
+[INFO] +- org.jmockit:jmockit:jar:1.10:test
+[INFO] +- junit:junit:jar:4.11:test
+[INFO] | \- org.hamcrest:hamcrest-core:jar:1.3:test
+[INFO] +- org.apache.spark:spark-sql_2.10:jar:1.5.2:compile
+[INFO] | +- org.apache.spark:spark-core_2.10:jar:1.5.2:compile
+[INFO] | | +- org.apache.avro:avro-mapred:jar:hadoop2:1.7.7:compile
+[INFO] | | | +- org.apache.avro:avro-ipc:jar:1.7.7:compile
+[INFO] | | | \- org.apache.avro:avro-ipc:jar:tests:1.7.7:compile
+[INFO] | | +- com.twitter:chill_2.10:jar:0.5.0:compile
+[INFO] | | | \- com.esotericsoftware.kryo:kryo:jar:2.21:compile
+[INFO] | | | +- com.esotericsoftware.reflectasm:reflectasm:jar:shaded:1.07:compile
+[INFO] | | | +- com.esotericsoftware.minlog:minlog:jar:1.2:compile
+[INFO] | | | \- org.objenesis:objenesis:jar:1.2:compile
+[INFO] | | +- com.twitter:chill-java:jar:0.5.0:compile
+[INFO] | | +- org.apache.hadoop:hadoop-client:jar:2.2.0:compile
+[INFO] | | | +- org.apache.hadoop:hadoop-mapreduce-client-app:jar:2.2.0:compile
+[INFO] | | | | +- org.apache.hadoop:hadoop-mapreduce-client-common:jar:2.2.0:compile
+[INFO] | | | | | +- org.apache.hadoop:hadoop-yarn-client:jar:2.2.0:compile
+[INFO] | | | | | | +- com.google.inject:guice:jar:3.0:compile
+[INFO] | | | | | | | +- javax.inject:javax.inject:jar:1:compile
+[INFO] | | | | | | | \- aopalliance:aopalliance:jar:1.0:compile
+[INFO] | | | | | | +- com.sun.jersey.jersey-test-framework:jersey-test-framework-grizzly2:jar:1.9:compile
+[INFO] | | | | | | | +- com.sun.jersey.jersey-test-framework:jersey-test-framework-core:jar:1.9:compile
+[INFO] | | | | | | | | +- javax.servlet:javax.servlet-api:jar:3.0.1:compile
+[INFO] | | | | | | | | \- com.sun.jersey:jersey-client:jar:1.9:compile
+[INFO] | | | | | | | \- com.sun.jersey:jersey-grizzly2:jar:1.9:compile
+[INFO] | | | | | | | +- org.glassfish.grizzly:grizzly-http:jar:2.1.2:compile
+[INFO] | | | | | | | | \- org.glassfish.grizzly:grizzly-framework:jar:2.1.2:compile
+[INFO] | | | | | | | | \- org.glassfish.gmbal:gmbal-api-only:jar:3.0.0-b023:compile
+[INFO] | | | | | | | | \- org.glassfish.external:management-api:jar:3.0.0-b012:compile
+[INFO] | | | | | | | +- org.glassfish.grizzly:grizzly-http-server:jar:2.1.2:compile
+[INFO] | | | | | | | | \- org.glassfish.grizzly:grizzly-rcm:jar:2.1.2:compile
+[INFO] | | | | | | | +- org.glassfish.grizzly:grizzly-http-servlet:jar:2.1.2:compile
+[INFO] | | | | | | | \- org.glassfish:javax.servlet:jar:3.1:compile
+[INFO] | | | | | | \- com.sun.jersey.contribs:jersey-guice:jar:1.9:compile
+[INFO] | | | | | \- org.apache.hadoop:hadoop-yarn-server-common:jar:2.2.0:compile
+[INFO] | | | | \- org.apache.hadoop:hadoop-mapreduce-client-shuffle:jar:2.2.0:compile
+[INFO] | | | +- org.apache.hadoop:hadoop-yarn-api:jar:2.2.0:compile
+[INFO] | | | +- org.apache.hadoop:hadoop-mapreduce-client-core:jar:2.2.0:compile
+[INFO] | | | | \- org.apache.hadoop:hadoop-yarn-common:jar:2.2.0:compile
+[INFO] | | | \- org.apache.hadoop:hadoop-mapreduce-client-jobclient:jar:2.2.0:compile
+[INFO] | | +- org.apache.spark:spark-launcher_2.10:jar:1.5.2:compile
+[INFO] | | +- org.apache.spark:spark-network-common_2.10:jar:1.5.2:compile
+[INFO] | | +- org.apache.spark:spark-network-shuffle_2.10:jar:1.5.2:compile
+[INFO] | | +- org.apache.spark:spark-unsafe_2.10:jar:1.5.2:compile
+[INFO] | | +- org.apache.curator:curator-recipes:jar:2.4.0:compile
+[INFO] | | | \- org.apache.curator:curator-framework:jar:2.4.0:compile
+[INFO] | | +- org.eclipse.jetty.orbit:javax.servlet:jar:3.0.0.v201112011016:compile
+[INFO] | | +- org.apache.commons:commons-lang3:jar:3.3.2:compile
+[INFO] | | +- org.apache.commons:commons-math3:jar:3.4.1:compile
+[INFO] | | +- org.slf4j:jul-to-slf4j:jar:1.7.10:compile
+[INFO] | | +- org.slf4j:jcl-over-slf4j:jar:1.7.10:compile
+[INFO] | | +- com.ning:compress-lzf:jar:1.0.3:compile
+[INFO] | | +- net.jpountz.lz4:lz4:jar:1.3.0:compile
+[INFO] | | +- org.roaringbitmap:RoaringBitmap:jar:0.4.5:compile
+[INFO] | | +- com.typesafe.akka:akka-remote_2.10:jar:2.3.11:compile
+[INFO] | | | +- com.typesafe.akka:akka-actor_2.10:jar:2.3.11:compile
+[INFO] | | | | \- com.typesafe:config:jar:1.2.1:compile
+[INFO] | | | \- org.uncommons.maths:uncommons-maths:jar:1.2.2a:compile
+[INFO] | | +- com.typesafe.akka:akka-slf4j_2.10:jar:2.3.11:compile
+[INFO] | | +- org.scala-lang:scala-library:jar:2.10.4:compile
+[INFO] | | +- org.json4s:json4s-jackson_2.10:jar:3.2.10:compile
+[INFO] | | | \- org.json4s:json4s-core_2.10:jar:3.2.10:compile
+[INFO] | | | +- org.json4s:json4s-ast_2.10:jar:3.2.10:compile
+[INFO] | | | \- org.scala-lang:scalap:jar:2.10.0:compile
+[INFO] | | | \- org.scala-lang:scala-compiler:jar:2.10.4:compile
+[INFO] | | +- org.apache.mesos:mesos:jar:shaded-protobuf:0.21.1:compile
+[INFO] | | +- io.netty:netty-all:jar:4.0.29.Final:compile
+[INFO] | | +- com.clearspring.analytics:stream:jar:2.7.0:compile
+[INFO] | | +- io.dropwizard.metrics:metrics-core:jar:3.1.2:compile
+[INFO] | | +- io.dropwizard.metrics:metrics-jvm:jar:3.1.2:compile
+[INFO] | | +- io.dropwizard.metrics:metrics-json:jar:3.1.2:compile
+[INFO] | | +- io.dropwizard.metrics:metrics-graphite:jar:3.1.2:compile
+[INFO] | | +- com.fasterxml.jackson.module:jackson-module-scala_2.10:jar:2.4.4:compile
+[INFO] | | +- org.apache.ivy:ivy:jar:2.4.0:compile
+[INFO] | | +- oro:oro:jar:2.0.8:compile
+[INFO] | | +- org.tachyonproject:tachyon-client:jar:0.7.1:compile
+[INFO] | | | +- org.apache.curator:curator-client:jar:2.1.0-incubating:compile
+[INFO] | | | +- org.tachyonproject:tachyon-underfs-hdfs:jar:0.7.1:compile
+[INFO] | | | \- org.tachyonproject:tachyon-underfs-local:jar:0.7.1:compile
+[INFO] | | +- net.razorvine:pyrolite:jar:4.4:compile
+[INFO] | | \- net.sf.py4j:py4j:jar:0.8.2.1:compile
+[INFO] | +- org.apache.spark:spark-catalyst_2.10:jar:1.5.2:compile
+[INFO] | | +- org.scala-lang:scala-reflect:jar:2.10.4:compile
+[INFO] | | \- org.codehaus.janino:janino:jar:2.7.8:compile
+[INFO] | | \- org.codehaus.janino:commons-compiler:jar:2.7.8:compile
+[INFO] | +- org.apache.parquet:parquet-column:jar:1.7.0:compile
+[INFO] | | +- org.apache.parquet:parquet-common:jar:1.7.0:compile
+[INFO] | | \- org.apache.parquet:parquet-encoding:jar:1.7.0:compile
+[INFO] | | \- org.apache.parquet:parquet-generator:jar:1.7.0:compile
+[INFO] | +- org.apache.parquet:parquet-hadoop:jar:1.7.0:compile
+[INFO] | | +- org.apache.parquet:parquet-format:jar:2.3.0-incubating:compile
+[INFO] | | \- org.apache.parquet:parquet-jackson:jar:1.7.0:compile
+[INFO] | +- com.fasterxml.jackson.core:jackson-databind:jar:2.4.4:compile
+[INFO] | | +- com.fasterxml.jackson.core:jackson-annotations:jar:2.4.0:compile
+[INFO] | | \- com.fasterxml.jackson.core:jackson-core:jar:2.4.4:compile
+[INFO] | \- org.spark-project.spark:unused:jar:1.0.0:compile
+[INFO] \- org.apache.zookeeper:zookeeper:jar:3.4.7:compile
+[INFO] \- io.netty:netty:jar:3.7.0.Final:compile
+[INFO]
+[INFO] ------------------------------------------------------------------------
+[INFO] Building Apache CarbonData :: Processing 0.1.1-incubating-SNAPSHOT
+[INFO] ------------------------------------------------------------------------
+[INFO]
+[INFO] --- maven-dependency-plugin:2.8:tree (default-cli) @ carbondata-processing ---
+[INFO] org.apache.carbondata:carbondata-processing:jar:0.1.1-incubating-SNAPSHOT
+[INFO] +- org.apache.carbondata:carbondata-common:jar:0.1.1-incubating-SNAPSHOT:compile
+[INFO] | \- log4j:log4j:jar:1.2.12:compile
+[INFO] +- org.apache.carbondata:carbondata-core:jar:0.1.1-incubating-SNAPSHOT:compile
+[INFO] | +- org.apache.carbondata:carbondata-format:jar:0.1.1-incubating-SNAPSHOT:compile
+[INFO] | | \- org.apache.thrift:libthrift:jar:0.9.3:compile
+[INFO] | | +- org.apache.httpcomponents:httpclient:jar:4.4.1:compile
+[INFO] | | \- org.apache.httpcomponents:httpcore:jar:4.4.1:compile
+[INFO] | +- com.google.code.gson:gson:jar:2.3.1:compile
+[INFO] | +- org.xerial.snappy:snappy-java:jar:1.1.2.6:compile
+[INFO] | +- org.apache.spark:spark-sql_2.10:jar:1.5.2:compile
+[INFO] | | +- org.apache.spark:spark-core_2.10:jar:1.5.2:compile
+[INFO] | | | +- org.apache.avro:avro-mapred:jar:hadoop2:1.7.7:compile
+[INFO] | | | | +- org.apache.avro:avro-ipc:jar:1.7.7:compile
+[INFO] | | | | \- org.apache.avro:avro-ipc:jar:tests:1.7.7:compile
+[INFO] | | | +- com.twitter:chill_2.10:jar:0.5.0:compile
+[INFO] | | | | \- com.esotericsoftware.kryo:kryo:jar:2.21:compile
+[INFO] | | | | +- com.esotericsoftware.reflectasm:reflectasm:jar:shaded:1.07:compile
+[INFO] | | | | +- com.esotericsoftware.minlog:minlog:jar:1.2:compile
+[INFO] | | | | \- org.objenesis:objenesis:jar:1.2:compile
+[INFO] | | | +- com.twitter:chill-java:jar:0.5.0:compile
+[INFO] | | | +- org.apache.hadoop:hadoop-client:jar:2.2.0:compile
+[INFO] | | | | +- org.apache.hadoop:hadoop-mapreduce-client-app:jar:2.2.0:compile
+[INFO] | | | | | +- org.apache.hadoop:hadoop-mapreduce-client-common:jar:2.2.0:compile
+[INFO] | | | | | | +- org.apache.hadoop:hadoop-yarn-client:jar:2.2.0:compile
+[INFO] | | | | | | | +- com.google.inject:guice:jar:3.0:compile
+[INFO] | | | | | | | | +- javax.inject:javax.inject:jar:1:compile
+[INFO] | | | | | | | | \- aopalliance:aopalliance:jar:1.0:compile
+[INFO] | | | | | | | +- com.sun.jersey.jersey-test-framework:jersey-test-framework-grizzly2:jar:1.9:compile
+[INFO] | | | | | | | | +- com.sun.jersey.jersey-test-framework:jersey-test-framework-core:jar:1.9:compile
+[INFO] | | | | | | | | | +- javax.servlet:javax.servlet-api:jar:3.0.1:compile
+[INFO] | | | | | | | | | \- com.sun.jersey:jersey-client:jar:1.9:compile
+[INFO] | | | | | | | | \- com.sun.jersey:jersey-grizzly2:jar:1.9:compile
+[INFO] | | | | | | | | +- org.glassfish.grizzly:grizzly-http:jar:2.1.2:compile
+[INFO] | | | | | | | | | \- org.glassfish.grizzly:grizzly-framework:jar:2.1.2:compile
+[INFO] | | | | | | | | | \- org.glassfish.gmbal:gmbal-api-only:jar:3.0.0-b023:compile
+[INFO] | | | | | | | | | \- org.glassfish.external:management-api:jar:3.0.0-b012:compile
+[INFO] | | | | | | | | +- org.glassfish.grizzly:grizzly-http-server:jar:2.1.2:compile
+[INFO] | | | | | | | | | \- org.glassfish.grizzly:grizzly-rcm:jar:2.1.2:compile
+[INFO] | | | | | | | | +- org.glassfish.grizzly:grizzly-http-servlet:jar:2.1.2:compile
+[INFO] | | | | | | | | \- org.glassfish:javax.servlet:jar:3.1:compile
+[INFO] | | | | | | | \- com.sun.jersey.contribs:jersey-guice:jar:1.9:compile
+[INFO] | | | | | | \- org.apache.hadoop:hadoop-yarn-server-common:jar:2.2.0:compile
+[INFO] | | | | | \- org.apache.hadoop:hadoop-mapreduce-client-shuffle:jar:2.2.0:compile
+[INFO] | | | | +- org.apache.hadoop:hadoop-yarn-api:jar:2.2.0:compile
+[INFO] | | | | +- org.apache.hadoop:hadoop-mapreduce-client-core:jar:2.2.0:compile
+[INFO] | | | | | \- org.apache.hadoop:hadoop-yarn-common:jar:2.2.0:compile
+[INFO] | | | | \- org.apache.hadoop:hadoop-mapreduce-client-jobclient:jar:2.2.0:compile
+[INFO] | | | +- org.apache.spark:spark-launcher_2.10:jar:1.5.2:compile
+[INFO] | | | +- org.apache.spark:spark-network-common_2.10:jar:1.5.2:compile
+[INFO] | | | +- org.apache.spark:spark-network-shuffle_2.10:jar:1.5.2:compile
+[INFO] | | | +- org.apache.spark:spark-unsafe_2.10:jar:1.5.2:compile
+[INFO] | | | +- org.apache.curator:curator-recipes:jar:2.4.0:compile
+[INFO] | | | | \- org.apache.curator:curator-framework:jar:2.4.0:compile
+[INFO] | | | +- org.eclipse.jetty.orbit:javax.servlet:jar:3.0.0.v201112011016:compile
+[INFO] | | | +- org.apache.commons:commons-lang3:jar:3.3.2:compile
+[INFO] | | | +- org.apache.commons:commons-math3:jar:3.4.1:compile
+[INFO] | | | +- org.slf4j:jul-to-slf4j:jar:1.7.10:compile
+[INFO] | | | +- org.slf4j:jcl-over-slf4j:jar:1.7.10:compile
+[INFO] | | | +- com.ning:compress-lzf:jar:1.0.3:compile
+[INFO] | | | +- net.jpountz.lz4:lz4:jar:1.3.0:compile
+[INFO] | | | +- org.roaringbitmap:RoaringBitmap:jar:0.4.5:compile
+[INFO] | | | +- com.typesafe.akka:akka-remote_2.10:jar:2.3.11:compile
+[INFO] | | | | +- com.typesafe.akka:akka-actor_2.10:jar:2.3.11:compile
+[INFO] | | | | | \- com.typesafe:config:jar:1.2.1:compile
+[INFO] | | | | \- org.uncommons.maths:uncommons-maths:jar:1.2.2a:compile
+[INFO] | | | +- com.typesafe.akka:akka-slf4j_2.10:jar:2.3.11:compile
+[INFO] | | | +- org.scala-lang:scala-library:jar:2.10.4:compile
+[INFO] | | | +- org.json4s:json4s-jackson_2.10:jar:3.2.10:compile
+[INFO] | | | | \- org.json4s:json4s-core_2.10:jar:3.2.10:compile
+[INFO] | | | | +- org.json4s:json4s-ast_2.10:jar:3.2.10:compile
+[INFO] | | | | \- org.scala-lang:scalap:jar:2.10.0:compile
+[INFO] | | | | \- org.scala-lang:scala-compiler:jar:2.10.4:compile
+[INFO] | | | +- org.apache.mesos:mesos:jar:shaded-protobuf:0.21.1:compile
+[INFO] | | | +- io.netty:netty-all:jar:4.0.29.Final:compile
+[INFO] | | | +- com.clearspring.analytics:stream:jar:2.7.0:compile
+[INFO] | | | +- io.dropwizard.metrics:metrics-core:jar:3.1.2:compile
+[INFO] | | | +- io.dropwizard.metrics:metrics-jvm:jar:3.1.2:compile
+[INFO] | | | +- io.dropwizard.metrics:metrics-json:jar:3.1.2:compile
+[INFO] | | | +- io.dropwizard.metrics:metrics-graphite:jar:3.1.2:compile
+[INFO] | | | +- com.fasterxml.jackson.module:jackson-module-scala_2.10:jar:2.4.4:compile
+[INFO] | | | +- org.apache.ivy:ivy:jar:2.4.0:compile
+[INFO] | | | +- oro:oro:jar:2.0.8:compile
+[INFO] | | | +- org.tachyonproject:tachyon-client:jar:0.7.1:compile
+[INFO] | | | | +- org.apache.curator:curator-client:jar:2.1.0-incubating:compile
+[INFO] | | | | +- org.tachyonproject:tachyon-underfs-hdfs:jar:0.7.1:compile
+[INFO] | | | | \- org.tachyonproject:tachyon-underfs-local:jar:0.7.1:compile
+[INFO] | | | +- net.razorvine:pyrolite:jar:4.4:compile
+[INFO] | | | \- net.sf.py4j:py4j:jar:0.8.2.1:compile
+[INFO] | | +- org.apache.spark:spark-catalyst_2.10:jar:1.5.2:compile
+[INFO] | | | +- org.scala-lang:scala-reflect:jar:2.10.4:compile
+[INFO] | | | \- org.codehaus.janino:janino:jar:2.7.8:compile
+[INFO] | | | \- org.codehaus.janino:commons-compiler:jar:2.7.8:compile
+[INFO] | | +- org.apache.parquet:parquet-column:jar:1.7.0:compile
+[INFO] | | | +- org.apache.parquet:parquet-common:jar:1.7.0:compile
+[INFO] | | | \- org.apache.parquet:parquet-encoding:jar:1.7.0:compile
+[INFO] | | | \- org.apache.parquet:parquet-generator:jar:1.7.0:compile
+[INFO] | | +- org.apache.parquet:parquet-hadoop:jar:1.7.0:compile
+[INFO] | | | +- org.apache.parquet:parquet-format:jar:2.3.0-incubating:compile
+[INFO] | | | \- org.apache.parquet:parquet-jackson:jar:1.7.0:compile
+[INFO] | | +- com.fasterxml.jackson.core:jackson-databind:jar:2.4.4:compile
+[INFO] | | | +- com.fasterxml.jackson.core:jackson-annotations:jar:2.4.0:compile
+[INFO] | | | \- com.fasterxml.jackson.core:jackson-core:jar:2.4.4:compile
+[INFO] | | \- org.spark-project.spark:unused:jar:1.0.0:compile
+[INFO] | \- org.apache.zookeeper:zookeeper:jar:3.4.7:compile
+[INFO] | \- io.netty:netty:jar:3.7.0.Final:compile
+[INFO] +- pentaho-kettle:kettle-engine:jar:4.4.0-stable:compile
+[INFO] | \- xerces:xercesImpl:jar:2.9.1:compile
+[INFO] | \- xml-apis:xml-apis:jar:1.3.04:compile
+[INFO] +- com.univocity:univocity-parsers:jar:1.5.6:compile
+[INFO] +- pentaho-kettle:kettle-core:jar:4.4.0-stable:compile
+[INFO] +- pentaho-kettle:kettle-db:jar:4.4.0-stable:compile
+[INFO] +- commons-vfs:commons-vfs:jar:1.0:compile
+[INFO] +- org.jmockit:jmockit:jar:1.10:test
+[INFO] +- org.apache.hadoop:hadoop-common:jar:2.2.0:compile
+[INFO] | +- org.apache.hadoop:hadoop-annotations:jar:2.2.0:compile
+[INFO] | | \- jdk.tools:jdk.tools:jar:1.6:system
+[INFO] | +- com.google.guava:guava:jar:11.0.2:compile
+[INFO] | | \- com.google.code.findbugs:jsr305:jar:1.3.9:compile
+[INFO] | +- commons-cli:commons-cli:jar:1.2:compile
+[INFO] | +- org.apache.commons:commons-math:jar:2.1:compile
+[INFO] | +- xmlenc:xmlenc:jar:0.52:compile
+[INFO] | +- commons-httpclient:commons-httpclient:jar:3.1:compile
+[INFO] | +- commons-codec:commons-codec:jar:1.4:compile
+[INFO] | +- commons-io:commons-io:jar:2.1:compile
+[INFO] | +- commons-net:commons-net:jar:3.1:compile
+[INFO] | +- javax.servlet:servlet-api:jar:2.5:compile
+[INFO] | +- org.mortbay.jetty:jetty:jar:6.1.26:compile
+[INFO] | +- org.mortbay.jetty:jetty-util:jar:6.1.26:compile
+[INFO] | +- com.sun.jersey:jersey-core:jar:1.9:compile
+[INFO] | +- com.sun.jersey:jersey-json:jar:1.9:compile
+[INFO] | | +- org.codehaus.jettison:jettison:jar:1.1:compile
+[INFO] | | | \- stax:stax-api:jar:1.0.1:compile
+[INFO] | | +- com.sun.xml.bind:jaxb-impl:jar:2.2.3-1:compile
+[INFO] | | | \- javax.xml.bind:jaxb-api:jar:2.2.2:compile
+[INFO] | | | \- javax.activation:activation:jar:1.1:compile
+[INFO] | | +- org.codehaus.jackson:jackson-jaxrs:jar:1.8.3:compile
+[INFO] | | \- org.codehaus.jackson:jackson-xc:jar:1.8.3:compile
+[INFO] | +- com.sun.jersey:jersey-server:jar:1.9:compile
+[INFO] | | \- asm:asm:jar:3.1:compile
+[INFO] | +- tomcat:jasper-compiler:jar:5.5.23:runtime
+[INFO] | +- tomcat:jasper-runtime:jar:5.5.23:compile
+[INFO] | +- javax.servlet.jsp:jsp-api:jar:2.1:compile
+[INFO] | +- commons-el:commons-el:jar:1.0:compile
+[INFO] | +- commons-logging:commons-logging:jar:1.1.1:compile
+[INFO] | +- net.java.dev.jets3t:jets3t:jar:0.6.1:compile
+[INFO] | +- commons-lang:commons-lang:jar:2.5:compile
+[INFO] | +- commons-configuration:commons-configuration:jar:1.6:compile
+[INFO] | | +- commons-collections:commons-collections:jar:3.2.1:compile
+[INFO] | | +- commons-digester:commons-digester:jar:1.8:compile
+[INFO] | | | \- commons-beanutils:commons-beanutils:jar:1.7.0:compile
+[INFO] | | \- commons-beanutils:commons-beanutils-core:jar:1.8.0:compile
+[INFO] | +- org.slf4j:slf4j-api:jar:1.7.5:compile
+[INFO] | +- org.slf4j:slf4j-log4j12:jar:1.7.5:compile
+[INFO] | +- org.codehaus.jackson:jackson-core-asl:jar:1.8.8:compile
+[INFO] | +- org.codehaus.jackson:jackson-mapper-asl:jar:1.8.8:compile
+[INFO] | +- org.apache.avro:avro:jar:1.7.4:compile
+[INFO] | | \- com.thoughtworks.paranamer:paranamer:jar:2.3:compile
+[INFO] | +- com.google.protobuf:protobuf-java:jar:2.5.0:compile
+[INFO] | +- org.apache.hadoop:hadoop-auth:jar:2.2.0:compile
+[INFO] | +- com.jcraft:jsch:jar:0.1.42:compile
+[INFO] | \- org.apache.commons:commons-compress:jar:1.4.1:compile
+[INFO] | \- org.tukaani:xz:jar:1.0:compile
+[INFO] +- org.apache.hadoop:hadoop-hdfs:jar:2.2.0:compile
+[INFO] | \- commons-daemon:commons-daemon:jar:1.0.13:compile
+[INFO] \- junit:junit:jar:4.11:test
+[INFO] \- org.hamcrest:hamcrest-core:jar:1.3:test
+[INFO]
+[INFO] ------------------------------------------------------------------------
+[INFO] Building Apache CarbonData :: Hadoop 0.1.1-incubating-SNAPSHOT
+[INFO] ------------------------------------------------------------------------
+[INFO]
+[INFO] --- maven-dependency-plugin:2.8:tree (default-cli) @ carbondata-hadoop ---
+[INFO] org.apache.carbondata:carbondata-hadoop:jar:0.1.1-incubating-SNAPSHOT
+[INFO] +- org.apache.carbondata:carbondata-common:jar:0.1.1-incubating-SNAPSHOT:compile
+[INFO] | \- log4j:log4j:jar:1.2.12:compile
+[INFO] +- org.apache.carbondata:carbondata-core:jar:0.1.1-incubating-SNAPSHOT:compile
+[INFO] | +- pentaho-kettle:kettle-engine:jar:4.4.0-stable:compile
+[INFO] | | \- xerces:xercesImpl:jar:2.9.1:compile
+[INFO] | | \- xml-apis:xml-apis:jar:1.3.04:compile
+[INFO] | +- pentaho-kettle:kettle-core:jar:4.4.0-stable:compile
+[INFO] | +- pentaho-kettle:kettle-db:jar:4.4.0-stable:compile
+[INFO] | +- com.google.code.gson:gson:jar:2.3.1:compile
+[INFO] | +- org.xerial.snappy:snappy-java:jar:1.1.2.6:compile
+[INFO] | +- org.apache.spark:spark-sql_2.10:jar:1.5.2:compile
+[INFO] | | +- org.apache.spark:spark-core_2.10:jar:1.5.2:compile
+[INFO] | | | +- org.apache.avro:avro-mapred:jar:hadoop2:1.7.7:compile
+[INFO] | | | | +- org.apache.avro:avro-ipc:jar:1.7.7:compile
+[INFO] | | | | \- org.apache.avro:avro-ipc:jar:tests:1.7.7:compile
+[INFO] | | | +- com.twitter:chill_2.10:jar:0.5.0:compile
+[INFO] | | | | \- com.esotericsoftware.kryo:kryo:jar:2.21:compile
+[INFO] | | | | +- com.esotericsoftware.reflectasm:reflectasm:jar:shaded:1.07:compile
+[INFO] | | | | +- com.esotericsoftware.minlog:minlog:jar:1.2:compile
+[INFO] | | | | \- org.objenesis:objenesis:jar:1.2:compile
+[INFO] | | | +- com.twitter:chill-java:jar:0.5.0:compile
+[INFO] | | | +- org.apache.hadoop:hadoop-client:jar:2.2.0:compile
+[INFO] | | | | +- org.apache.hadoop:hadoop-mapreduce-client-app:jar:2.2.0:compile
+[INFO] | | | | | +- org.apache.hadoop:hadoop-mapreduce-client-common:jar:2.2.0:compile
+[INFO] | | | | | | +- org.apache.hadoop:hadoop-yarn-client:jar:2.2.0:compile
+[INFO] | | | | | | | +- com.google.inject:guice:jar:3.0:compile
+[INFO] | | | | | | | | +- javax.inject:javax.inject:jar:1:compile
+[INFO] | | | | | | | | \- aopalliance:aopalliance:jar:1.0:compile
+[INFO] | | | | | | | +- com.sun.jersey.jersey-test-framework:jersey-test-framework-grizzly2:jar:1.9:compile
+[INFO] | | | | | | | | +- com.sun.jersey.jersey-test-framework:jersey-test-framework-core:jar:1.9:compile
+[INFO] | | | | | | | | | +- javax.servlet:javax.servlet-api:jar:3.0.1:compile
+[INFO] | | | | | | | | | \- com.sun.jersey:jersey-client:jar:1.9:compile
+[INFO] | | | | | | | | \- com.sun.jersey:jersey-grizzly2:jar:1.9:compile
+[INFO] | | | | | | | | +- org.glassfish.grizzly:grizzly-http:jar:2.1.2:compile
+[INFO] | | | | | | | | | \- org.glassfish.grizzly:grizzly-framework:jar:2.1.2:compile
+[INFO] | | | | | | | | | \- org.glassfish.gmbal:gmbal-api-only:jar:3.0.0-b023:compile
+[INFO] | | | | | | | | | \- org.glassfish.external:management-api:jar:3.0.0-b012:compile
+[INFO] | | | | | | | | +- org.glassfish.grizzly:grizzly-http-server:jar:2.1.2:compile
+[INFO] | | | | | | | | | \- org.glassfish.grizzly:grizzly-rcm:jar:2.1.2:compile
+[INFO] | | | | | | | | +- org.glassfish.grizzly:grizzly-http-servlet:jar:2.1.2:compile
+[INFO] | | | | | | | | \- org.glassfish:javax.servlet:jar:3.1:compile
+[INFO] | | | | | | | \- com.sun.jersey.contribs:jersey-guice:jar:1.9:compile
+[INFO] | | | | | | \- org.apache.hadoop:hadoop-yarn-server-common:jar:2.2.0:compile
+[INFO] | | | | | \- org.apache.hadoop:hadoop-mapreduce-client-shuffle:jar:2.2.0:compile
+[INFO] | | | | +- org.apache.hadoop:hadoop-yarn-api:jar:2.2.0:compile
+[INFO] | | | | +- org.apache.hadoop:hadoop-mapreduce-client-core:jar:2.2.0:compile
+[INFO] | | | | | \- org.apache.hadoop:hadoop-yarn-common:jar:2.2.0:compile
+[INFO] | | | | \- org.apache.hadoop:hadoop-mapreduce-client-jobclient:jar:2.2.0:compile
+[INFO] | | | +- org.apache.spark:spark-launcher_2.10:jar:1.5.2:compile
+[INFO] | | | +- org.apache.spark:spark-network-common_2.10:jar:1.5.2:compile
+[INFO] | | | +- org.apache.spark:spark-network-shuffle_2.10:jar:1.5.2:compile
+[INFO] | | | +- org.apache.spark:spark-unsafe_2.10:jar:1.5.2:compile
+[INFO] | | | +- org.apache.curator:curator-recipes:jar:2.4.0:compile
+[INFO] | | | | \- org.apache.curator:curator-framework:jar:2.4.0:compile
+[INFO] | | | +- org.eclipse.jetty.orbit:javax.servlet:jar:3.0.0.v201112011016:compile
+[INFO] | | | +- org.apache.commons:commons-math3:jar:3.4.1:compile
+[INFO] | | | +- org.slf4j:jul-to-slf4j:jar:1.7.10:compile
+[INFO] | | | +- org.slf4j:jcl-over-slf4j:jar:1.7.10:compile
+[INFO] | | | +- com.ning:compress-lzf:jar:1.0.3:compile
+[INFO] | | | +- net.jpountz.lz4:lz4:jar:1.3.0:compile
+[INFO] | | | +- org.roaringbitmap:RoaringBitmap:jar:0.4.5:compile
+[INFO] | | | +- com.typesafe.akka:akka-remote_2.10:jar:2.3.11:compile
+[INFO] | | | | +- com.typesafe.akka:akka-actor_2.10:jar:2.3.11:compile
+[INFO] | | | | | \- com.typesafe:config:jar:1.2.1:compile
+[INFO] | | | | \- org.uncommons.maths:uncommons-maths:jar:1.2.2a:compile
+[INFO] | | | +- com.typesafe.akka:akka-slf4j_2.10:jar:2.3.11:compile
+[INFO] | | | +- org.scala-lang:scala-library:jar:2.10.4:compile
+[INFO] | | | +- org.json4s:json4s-jackson_2.10:jar:3.2.10:compile
+[INFO] | | | | \- org.json4s:json4s-core_2.10:jar:3.2.10:compile
+[INFO] | | | | +- org.json4s:json4s-ast_2.10:jar:3.2.10:compile
+[INFO] | | | | \- org.scala-lang:scalap:jar:2.10.0:compile
+[INFO] | | | | \- org.scala-lang:scala-compiler:jar:2.10.4:compile
+[INFO] | | | +- org.apache.mesos:mesos:jar:shaded-protobuf:0.21.1:compile
+[INFO] | | | +- io.netty:netty-all:jar:4.0.29.Final:compile
+[INFO] | | | +- com.clearspring.analytics:stream:jar:2.7.0:compile
+[INFO] | | | +- io.dropwizard.metrics:metrics-core:jar:3.1.2:compile
+[INFO] | | | +- io.dropwizard.metrics:metrics-jvm:jar:3.1.2:compile
+[INFO] | | | +- io.dropwizard.metrics:metrics-json:jar:3.1.2:compile
+[INFO] | | | +- io.dropwizard.metrics:metrics-graphite:jar:3.1.2:compile
+[INFO] | | | +- com.fasterxml.jackson.module:jackson-module-scala_2.10:jar:2.4.4:compile
+[INFO] | | | +- org.apache.ivy:ivy:jar:2.4.0:compile
+[INFO] | | | +- oro:oro:jar:2.0.8:compile
+[INFO] | | | +- org.tachyonproject:tachyon-client:jar:0.7.1:compile
+[INFO] | | | | +- org.apache.curator:curator-client:jar:2.1.0-incubating:compile
+[INFO] | | | | +- org.tachyonproject:tachyon-underfs-hdfs:jar:0.7.1:compile
+[INFO] | | | | \- org.tachyonproject:tachyon-underfs-local:jar:0.7.1:compile
+[INFO] | | | +- net.razorvine:pyrolite:jar:4.4:compile
+[INFO] | | | \- net.sf.py4j:py4j:jar:0.8.2.1:compile
+[INFO] | | +- org.apache.spark:spark-catalyst_2.10:jar:1.5.2:compile
+[INFO] | | | +- org.scala-lang:scala-reflect:jar:2.10.4:compile
+[INFO] | | | \- org.codehaus.janino:janino:jar:2.7.8:compile
+[INFO] | | | \- org.codehaus.janino:commons-compiler:jar:2.7.8:compile
+[INFO] | | +- org.apache.parquet:parquet-column:jar:1.7.0:compile
+[INFO] | | | +- org.apache.parquet:parquet-common:jar:1.7.0:compile
+[INFO] | | | \- org.apache.parquet:parquet-encoding:jar:1.7.0:compile
+[INFO] | | | \- org.apache.parquet:parquet-generator:jar:1.7.0:compile
+[INFO] | | +- org.apache.parquet:parquet-hadoop:jar:1.7.0:compile
+[INFO] | | | +- org.apache.parquet:parquet-format:jar:2.3.0-incubating:compile
+[INFO] | | | \- org.apache.parquet:parquet-jackson:jar:1.7.0:compile
+[INFO] | | +- com.fasterxml.jackson.core:jackson-databind:jar:2.4.4:compile
+[INFO] | | | +- com.fasterxml.jackson.core:jackson-annotations:jar:2.4.0:compile
+[INFO] | | | \- com.fasterxml.jackson.core:jackson-core:jar:2.4.4:compile
+[INFO] | | \- org.spark-project.spark:unused:jar:1.0.0:compile
+[INFO] | \- org.apache.zookeeper:zookeeper:jar:3.4.7:compile
+[INFO] | \- io.netty:netty:jar:3.7.0.Final:compile
+[INFO] +- org.apache.carbondata:carbondata-format:jar:0.1.1-incubating-SNAPSHOT:compile
+[INFO] | \- org.apache.thrift:libthrift:jar:0.9.3:compile
+[INFO] | +- org.apache.httpcomponents:httpclient:jar:4.4.1:compile
+[INFO] | \- org.apache.httpcomponents:httpcore:jar:4.4.1:compile
+[INFO] +- org.apache.carbondata:carbondata-processing:jar:0.1.1-incubating-SNAPSHOT:compile
+[INFO] | +- com.univocity:univocity-parsers:jar:1.5.6:compile
+[INFO] | \- commons-vfs:commons-vfs:jar:1.0:compile
+[INFO] +- org.apache.hadoop:hadoop-common:jar:2.2.0:compile
+[INFO] | +- org.apache.hadoop:hadoop-annotations:jar:2.2.0:compile
+[INFO] | | \- jdk.tools:jdk.tools:jar:1.6:system
+[INFO] | +- com.google.guava:guava:jar:11.0.2:compile
+[INFO] | | \- com.google.code.findbugs:jsr305:jar:1.3.9:compile
+[INFO] | +- commons-cli:commons-cli:jar:1.2:compile
+[INFO] | +- org.apache.commons:commons-math:jar:2.1:compile
+[INFO] | +- xmlenc:xmlenc:jar:0.52:compile
+[INFO] | +- commons-httpclient:commons-httpclient:jar:3.1:compile
+[INFO] | +- commons-codec:commons-codec:jar:1.4:compile
+[INFO] | +- commons-io:commons-io:jar:2.1:compile
+[INFO] | +- commons-net:commons-net:jar:3.1:compile
+[INFO] | +- javax.servlet:servlet-api:jar:2.5:compile
+[INFO] | +- org.mortbay.jetty:jetty:jar:6.1.26:compile
+[INFO] | +- org.mortbay.jetty:jetty-util:jar:6.1.26:compile
+[INFO] | +- com.sun.jersey:jersey-core:jar:1.9:compile
+[INFO] | +- com.sun.jersey:jersey-json:jar:1.9:compile
+[INFO] | | +- org.codehaus.jettison:jettison:jar:1.1:compile
+[INFO] | | | \- stax:stax-api:jar:1.0.1:compile
+[INFO] | | +- com.sun.xml.bind:jaxb-impl:jar:2.2.3-1:compile
+[INFO] | | | \- javax.xml.bind:jaxb-api:jar:2.2.2:compile
+[INFO] | | | \- javax.activation:activation:jar:1.1:compile
+[INFO] | | +- org.codehaus.jackson:jackson-jaxrs:jar:1.8.3:compile
+[INFO] | | \- org.codehaus.jackson:jackson-xc:jar:1.8.3:compile
+[INFO] | +- com.sun.jersey:jersey-server:jar:1.9:compile
+[INFO] | | \- asm:asm:jar:3.1:compile
+[INFO] | +- tomcat:jasper-compiler:jar:5.5.23:runtime
+[INFO] | +- tomcat:jasper-runtime:jar:5.5.23:compile
+[INFO] | +- javax.servlet.jsp:jsp-api:jar:2.1:compile
+[INFO] | +- commons-el:commons-el:jar:1.0:compile
+[INFO] | +- commons-logging:commons-logging:jar:1.1.1:compile
+[INFO] | +- net.java.dev.jets3t:jets3t:jar:0.6.1:compile
+[INFO] | +- commons-lang:commons-lang:jar:2.5:compile
+[INFO] | +- commons-configuration:commons-configuration:jar:1.6:compile
+[INFO] | | +- commons-collections:commons-collections:jar:3.2.1:compile
+[INFO] | | +- commons-digester:commons-digester:jar:1.8:compile
+[INFO] | | | \- commons-beanutils:commons-beanutils:jar:1.7.0:compile
+[INFO] | | \- commons-beanutils:commons-beanutils-core:jar:1.8.0:compile
+[INFO] | +- org.slf4j:slf4j-api:jar:1.7.5:compile
+[INFO] | +- org.slf4j:slf4j-log4j12:jar:1.7.5:compile
+[INFO] | +- org.codehaus.jackson:jackson-core-asl:jar:1.8.8:compile
+[INFO] | +- org.codehaus.jackson:jackson-mapper-asl:jar:1.8.8:compile
+[INFO] | +- org.apache.avro:avro:jar:1.7.4:compile
+[INFO] | | \- com.thoughtworks.paranamer:paranamer:jar:2.3:compile
+[INFO] | +- com.google.protobuf:protobuf-java:jar:2.5.0:compile
+[INFO] | +- org.apache.hadoop:hadoop-auth:jar:2.2.0:compile
+[INFO] | +- com.jcraft:jsch:jar:0.1.42:compile
+[INFO] | \- org.apache.commons:commons-compress:jar:1.4.1:compile
+[INFO] | \- org.tukaani:xz:jar:1.0:compile
+[INFO] +- org.apache.hadoop:hadoop-hdfs:jar:2.2.0:compile
+[INFO] | \- commons-daemon:commons-daemon:jar:1.0.13:compile
+[INFO] +- org.apache.commons:commons-lang3:jar:3.3.2:compile
+[INFO] \- junit:junit:jar:4.11:test
+[INFO] \- org.hamcrest:hamcrest-core:jar:1.3:test
+[INFO]
+[INFO] ------------------------------------------------------------------------
+[INFO] Building Apache CarbonData :: Spark 0.1.1-incubating-SNAPSHOT
+[INFO] ------------------------------------------------------------------------
+[INFO]
+[INFO] --- maven-dependency-plugin:2.8:tree (default-cli) @ carbondata-spark ---
+[INFO] org.apache.carbondata:carbondata-spark:jar:0.1.1-incubating-SNAPSHOT
+[INFO] +- com.databricks:spark-csv_2.10:jar:1.2.0:compile
+[INFO] | +- org.apache.commons:commons-csv:jar:1.1:compile
+[INFO] | \- com.univocity:univocity-parsers:jar:1.5.1:compile
+[INFO] +- org.apache.carbondata:carbondata-common:jar:0.1.1-incubating-SNAPSHOT:compile
+[INFO] | +- log4j:log4j:jar:1.2.12:compile
+[INFO] | \- org.apache.hadoop:hadoop-common:jar:2.2.0:compile
+[INFO] | +- org.apache.hadoop:hadoop-annotations:jar:2.2.0:compile
+[INFO] | | \- jdk.tools:jdk.tools:jar:1.6:system
+[INFO] | +- com.google.guava:guava:jar:11.0.2:compile
+[INFO] | +- commons-cli:commons-cli:jar:1.2:compile
+[INFO] | +- org.apache.commons:commons-math:jar:2.1:compile
+[INFO] | +- xmlenc:xmlenc:jar:0.52:compile
+[INFO] | +- commons-httpclient:commons-httpclient:jar:3.1:compile
+[INFO] | +- commons-codec:commons-codec:jar:1.4:compile
+[INFO] | +- commons-io:commons-io:jar:2.1:compile
+[INFO] | +- commons-net:commons-net:jar:3.1:compile
+[INFO] | +- javax.servlet:servlet-api:jar:2.5:compile
+[INFO] | +- org.mortbay.jetty:jetty:jar:6.1.26:compile
+[INFO] | +- org.mortbay.jetty:jetty-util:jar:6.1.26:compile
+[INFO] | +- tomcat:jasper-compiler:jar:5.5.23:runtime
+[INFO] | +- tomcat:jasper-runtime:jar:5.5.23:compile
+[INFO] | +- javax.servlet.jsp:jsp-api:jar:2.1:compile
+[INFO] | +- commons-el:commons-el:jar:1.0:compile
+[INFO] | +- commons-logging:commons-logging:jar:1.1.1:compile
+[INFO] | +- net.java.dev.jets3t:jets3t:jar:0.6.1:compile
+[INFO] | +- commons-lang:commons-lang:jar:2.5:compile
+[INFO] | +- commons-configuration:commons-configuration:jar:1.6:compile
+[INFO] | | +- commons-collections:commons-collections:jar:3.2.1:compile
+[INFO] | | +- commons-digester:commons-digester:jar:1.8:compile
+[INFO] | | | \- commons-beanutils:commons-beanutils:jar:1.7.0:compile
+[INFO] | | \- commons-beanutils:commons-beanutils-core:jar:1.8.0:compile
+[INFO] | +- org.slf4j:slf4j-api:jar:1.7.5:compile
+[INFO] | +- org.slf4j:slf4j-log4j12:jar:1.7.5:compile
+[INFO] | +- org.codehaus.jackson:jackson-core-asl:jar:1.8.8:compile
+[INFO] | +- org.codehaus.jackson:jackson-mapper-asl:jar:1.8.8:compile
+[INFO] | +- org.apache.avro:avro:jar:1.7.4:compile
+[INFO] | | \- com.thoughtworks.paranamer:paranamer:jar:2.3:compile
+[INFO] | +- com.google.protobuf:protobuf-java:jar:2.5.0:compile
+[INFO] | +- org.apache.hadoop:hadoop-auth:jar:2.2.0:compile
+[INFO] | +- com.jcraft:jsch:jar:0.1.42:compile
+[INFO] | \- org.apache.commons:commons-compress:jar:1.4.1:compile
+[INFO] | \- org.tukaani:xz:jar:1.0:compile
+[INFO] +- org.apache.carbondata:carbondata-core:jar:0.1.1-incubating-SNAPSHOT:compile
+[INFO] | +- org.apache.carbondata:carbondata-format:jar:0.1.1-incubating-SNAPSHOT:compile
+[INFO] | | \- org.apache.thrift:libthrift:jar:0.9.3:compile
+[INFO] | | \- org.apache.httpcomponents:httpcore:jar:4.4.1:compile
+[INFO] | +- pentaho-kettle:kettle-engine:jar:4.4.0-stable:compile
+[INFO] | | \- xerces:xercesImpl:jar:2.9.1:compile
+[INFO] | | \- xml-apis:xml-apis:jar:1.3.04:compile
+[INFO] | +- pentaho-kettle:kettle-core:jar:4.4.0-stable:compile
+[INFO] | +- pentaho-kettle:kettle-db:jar:4.4.0-stable:compile
+[INFO] | +- com.google.code.gson:gson:jar:2.3.1:compile
+[INFO] | +- org.apache.hadoop:hadoop-hdfs:jar:2.2.0:compile
+[INFO] | | \- commons-daemon:commons-daemon:jar:1.0.13:compile
+[INFO] | +- org.xerial.snappy:snappy-java:jar:1.1.2.6:compile
+[INFO] | +- org.apache.spark:spark-sql_2.10:jar:1.5.2:compile
+[INFO] | | +- org.apache.spark:spark-catalyst_2.10:jar:1.5.2:compile
+[INFO] | | | \- org.codehaus.janino:janino:jar:2.7.8:compile
+[INFO] | | +- org.apache.parquet:parquet-column:jar:1.7.0:compile
+[INFO] | | | +- org.apache.parquet:parquet-common:jar:1.7.0:compile
+[INFO] | | | \- org.apache.parquet:parquet-encoding:jar:1.7.0:compile
+[INFO] | | | \- org.apache.parquet:parquet-generator:jar:1.7.0:compile
+[INFO] | | +- org.apache.parquet:parquet-hadoop:jar:1.7.0:compile
+[INFO] | | | +- org.apache.parquet:parquet-format:jar:2.3.0-incubating:compile
+[INFO] | | | \- org.apache.parquet:parquet-jackson:jar:1.7.0:compile
+[INFO] | | \- com.fasterxml.jackson.core:jackson-databind:jar:2.4.4:compile
+[INFO] | | +- com.fasterxml.jackson.core:jackson-annotations:jar:2.4.0:compile
+[INFO] | | \- com.fasterxml.jackson.core:jackson-core:jar:2.4.4:compile
+[INFO] | \- org.apache.zookeeper:zookeeper:jar:3.4.7:compile
+[INFO] | \- io.netty:netty:jar:3.7.0.Final:compile
+[INFO] +- org.apache.carbondata:carbondata-processing:jar:0.1.1-incubating-SNAPSHOT:compile
+[INFO] | \- commons-vfs:commons-vfs:jar:1.0:compile
+[INFO] +- org.apache.carbondata:carbondata-hadoop:jar:0.1.1-incubating-SNAPSHOT:compile
+[INFO] | \- org.apache.commons:commons-lang3:jar:3.3.2:compile
+[INFO] +- org.scala-lang:scala-compiler:jar:2.10.4:compile
+[INFO] +- org.scala-lang:scala-reflect:jar:2.10.4:compile
+[INFO] +- org.scala-lang:scala-library:jar:2.10.4:compile
+[INFO] +- org.apache.spark:spark-hive-thriftserver_2.10:jar:1.5.2:compile
+[INFO] | +- org.apache.spark:spark-hive_2.10:jar:1.5.2:compile
+[INFO] | | +- com.twitter:parquet-hadoop-bundle:jar:1.6.0:compile
+[INFO] | | +- org.spark-project.hive:hive-exec:jar:1.2.1.spark:compile
+[INFO] | | | +- javolution:javolution:jar:5.5.1:compile
+[INFO] | | | +- log4j:apache-log4j-extras:jar:1.2.17:compile
+[INFO] | | | +- org.antlr:antlr-runtime:jar:3.4:compile
+[INFO] | | | | +- org.antlr:stringtemplate:jar:3.2.1:compile
+[INFO] | | | | \- antlr:antlr:jar:2.7.7:compile
+[INFO] | | | +- org.antlr:ST4:jar:4.0.4:compile
+[INFO] | | | +- org.codehaus.groovy:groovy-all:jar:2.1.6:compile
+[INFO] | | | +- com.googlecode.javaewah:JavaEWAH:jar:0.3.2:compile
+[INFO] | | | +- org.iq80.snappy:snappy:jar:0.2:compile
+[INFO] | | | +- org.json:json:jar:20090211:compile
+[INFO] | | | +- stax:stax-api:jar:1.0.1:compile
+[INFO] | | | \- net.sf.opencsv:opencsv:jar:2.3:compile
+[INFO] | | +- org.spark-project.hive:hive-metastore:jar:1.2.1.spark:compile
+[INFO] | | | +- com.jolbox:bonecp:jar:0.8.0.RELEASE:compile
+[INFO] | | | +- org.apache.derby:derby:jar:10.10.2.0:compile
+[INFO] | | | +- org.datanucleus:datanucleus-api-jdo:jar:3.2.6:compile
+[INFO] | | | +- org.datanucleus:datanucleus-rdbms:jar:3.2.9:compile
+[INFO] | | | +- commons-pool:commons-pool:jar:1.5.4:compile
+[INFO] | | | +- commons-dbcp:commons-dbcp:jar:1.4:compile
+[INFO] | | | \- javax.jdo:jdo-api:jar:3.0.1:compile
+[INFO] | | | \- javax.transaction:jta:jar:1.1:compile
+[INFO] | | +- org.apache.avro:avro-mapred:jar:hadoop2:1.7.7:compile
+[INFO] | | | +- org.apache.avro:avro-ipc:jar:1.7.7:compile
+[INFO] | | | \- org.apache.avro:avro-ipc:jar:tests:1.7.7:compile
+[INFO] | | +- org.apache.calcite:calcite-avatica:jar:1.2.0-incubating:compile
+[INFO] | | +- org.apache.calcite:calcite-core:jar:1.2.0-incubating:compile
+[INFO] | | | +- org.apache.calcite:calcite-linq4j:jar:1.2.0-incubating:compile
+[INFO] | | | +- net.hydromatic:eigenbase-properties:jar:1.1.5:compile
+[INFO] | | | \- org.codehaus.janino:commons-compiler:jar:2.7.6:compile
+[INFO] | | +- org.apache.httpcomponents:httpclient:jar:4.3.2:compile
+[INFO] | | +- joda-time:joda-time:jar:2.5:compile
+[INFO] | | +- org.jodd:jodd-core:jar:3.5.2:compile
+[INFO] | | +- com.google.code.findbugs:jsr305:jar:1.3.9:compile
+[INFO] | | +- org.datanucleus:datanucleus-core:jar:3.2.10:compile
+[INFO] | | \- org.apache.thrift:libfb303:jar:0.9.2:compile
+[INFO] | +- org.spark-project.hive:hive-cli:jar:1.2.1.spark:compile
+[INFO] | | \- jline:jline:jar:2.12:compile
+[INFO] | +- org.spark-project.hive:hive-jdbc:jar:1.2.1.spark:compile
+[INFO] | +- org.spark-project.hive:hive-service:jar:1.2.1.spark:compile
+[INFO] | | +- net.sf.jpam:jpam:jar:1.1:compile
+[INFO] | | \- org.eclipse.jetty.aggregate:jetty-all:jar:7.6.0.v20120127:compile
+[INFO] | | +- org.apache.geronimo.specs:geronimo-jta_1.1_spec:jar:1.1.1:compile
+[INFO] | | +- javax.mail:mail:jar:1.4.1:compile
+[INFO] | | +- javax.activation:activation:jar:1.1:compile
+[INFO] | | +- org.apache.geronimo.specs:geronimo-jaspic_1.0_spec:jar:1.0:compile
+[INFO] | | +- org.apache.geronimo.specs:geronimo-annotation_1.0_spec:jar:1.1.1:compile
+[INFO] | | \- asm:asm-commons:jar:3.1:compile
+[INFO] | | \- asm:asm-tree:jar:3.1:compile
+[INFO] | +- org.spark-project.hive:hive-beeline:jar:1.2.1.spark:compile
+[INFO] | | \- net.sf.supercsv:super-csv:jar:2.2.0:compile
+[INFO] | +- com.sun.jersey:jersey-core:jar:1.9:compile
+[INFO] | +- com.sun.jersey:jersey-json:jar:1.9:compile
+[INFO] | | +- org.codehaus.jettison:jettison:jar:1.1:compile
+[INFO] | | +- com.sun.xml.bind:jaxb-impl:jar:2.2.3-1:compile
+[INFO] | | | \- javax.xml.bind:jaxb-api:jar:2.2.2:compile
+[INFO] | | | \- javax.xml.stream:stax-api:jar:1.0-2:compile
+[INFO] | | +- org.codehaus.jackson:jackson-jaxrs:jar:1.8.3:compile
+[INFO] | | \- org.codehaus.jackson:jackson-xc:jar:1.8.3:compile
+[INFO] | +- com.sun.jersey:jersey-server:jar:1.9:compile
+[INFO] | | \- asm:asm:jar:3.1:compile
+[INFO] | \- org.spark-project.spark:unused:jar:1.0.0:compile
+[INFO] +- org.apache.spark:spark-repl_2.10:jar:1.5.2:compile
+[INFO] | +- org.apache.spark:spark-core_2.10:jar:1.5.2:compile
+[INFO] | | +- com.twitter:chill_2.10:jar:0.5.0:compile
+[INFO] | | | \- com.esotericsoftware.kryo:kryo:jar:2.21:compile
+[INFO] | | | +- com.esotericsoftware.reflectasm:reflectasm:jar:shaded:1.07:compile
+[INFO] | | | +- com.esotericsoftware.minlog:minlog:jar:1.2:compile
+[INFO] | | | \- org.objenesis:objenesis:jar:1.2:compile
+[INFO] | | +- com.twitter:chill-java:jar:0.5.0:compile
+[INFO] | | +- org.apache.hadoop:hadoop-client:jar:2.2.0:compile
+[INFO] | | | +- org.apache.hadoop:hadoop-mapreduce-client-app:jar:2.2.0:compile
+[INFO] | | | | +- org.apache.hadoop:hadoop-mapreduce-client-common:jar:2.2.0:compile
+[INFO] | | | | | +- org.apache.hadoop:hadoop-yarn-client:jar:2.2.0:compile
+[INFO] | | | | | | +- com.google.inject:guice:jar:3.0:compile
+[INFO] | | | | | | | +- javax.inject:javax.inject:jar:1:compile
+[INFO] | | | | | | | \- aopalliance:aopalliance:jar:1.0:compile
+[INFO] | | | | | | +- com.sun.jersey.jersey-test-framework:jersey-test-framework-grizzly2:jar:1.9:compile
+[INFO] | | | | | | | +- com.sun.jersey.jersey-test-framework:jersey-test-framework-core:jar:1.9:compile
+[INFO] | | | | | | | | +- javax.servlet:javax.servlet-api:jar:3.0.1:compile
+[INFO] | | | | | | | | \- com.sun.jersey:jersey-client:jar:1.9:compile
+[INFO] | | | | | | | \- com.sun.jersey:jersey-grizzly2:jar:1.9:compile
+[INFO] | | | | | | | +- org.glassfish.grizzly:grizzly-http:jar:2.1.2:compile
+[INFO] | | | | | | | | \- org.glassfish.grizzly:grizzly-framework:jar:2.1.2:compile
+[INFO] | | | | | | | | \- org.glassfish.gmbal:gmbal-api-only:jar:3.0.0-b023:compile
+[INFO] | | | | | | | | \- org.glassfish.external:management-api:jar:3.0.0-b012:compile
+[INFO] | | | | | | | +- org.glassfish.grizzly:grizzly-http-server:jar:2.1.2:compile
+[INFO] | | | | | | | | \- org.glassfish.grizzly:grizzly-rcm:jar:2.1.2:compile
+[INFO] | | | | | | | +- org.glassfish.grizzly:grizzly-http-servlet:jar:2.1.2:compile
+[INFO] | | | | | | | \- org.glassfish:javax.servlet:jar:3.1:compile
+[INFO] | | | | | | \- com.sun.jersey.contribs:jersey-guice:jar:1.9:compile
+[INFO] | | | | | \- org.apache.hadoop:hadoop-yarn-server-common:jar:2.2.0:compile
+[INFO] | | | | \- org.apache.hadoop:hadoop-mapreduce-client-shuffle:jar:2.2.0:compile
+[INFO] | | | +- org.apache.hadoop:hadoop-yarn-api:jar:2.2.0:compile
+[INFO] | | | +- org.apache.hadoop:hadoop-mapreduce-client-core:jar:2.2.0:compile
+[INFO] | | | | \- org.apache.hadoop:hadoop-yarn-common:jar:2.2.0:compile
+[INFO] | | | \- org.apache.hadoop:hadoop-mapreduce-client-jobclient:jar:2.2.0:compile
+[INFO] | | +- org.apache.spark:spark-launcher_2.10:jar:1.5.2:compile
+[INFO] | | +- org.apache.spark:spark-network-common_2.10:jar:1.5.2:compile
+[INFO] | | +- org.apache.spark:spark-network-shuffle_2.10:jar:1.5.2:compile
+[INFO] | | +- org.apache.spark:spark-unsafe_2.10:jar:1.5.2:compile
+[INFO] | | +- org.apache.curator:curator-recipes:jar:2.4.0:compile
+[INFO] | | | \- org.apache.curator:curator-framework:jar:2.4.0:compile
+[INFO] | | +- org.eclipse.jetty.orbit:javax.servlet:jar:3.0.0.v201112011016:compile
+[INFO] | | +- org.apache.commons:commons-math3:jar:3.4.1:compile
+[INFO] | | +- org.slf4j:jcl-over-slf4j:jar:1.7.10:compile
+[INFO] | | +- com.ning:compress-lzf:jar:1.0.3:compile
+[INFO] | | +- net.jpountz.lz4:lz4:jar:1.3.0:compile
+[INFO] | | +- org.roaringbitmap:RoaringBitmap:jar:0.4.5:compile
+[INFO] | | +- com.typesafe.akka:akka-remote_2.10:jar:2.3.11:compile
+[INFO] | | | +- com.typesafe.akka:akka-actor_2.10:jar:2.3.11:compile
+[INFO] | | | | \- com.typesafe:config:jar:1.2.1:compile
+[INFO] | | | \- org.uncommons.maths:uncommons-maths:jar:1.2.2a:compile
+[INFO] | | +- com.typesafe.akka:akka-slf4j_2.10:jar:2.3.11:compile
+[INFO] | | +- org.json4s:json4s-jackson_2.10:jar:3.2.10:compile
+[INFO] | | | \- org.json4s:json4s-core_2.10:jar:3.2.10:compile
+[INFO] | | | +- org.json4s:json4s-ast_2.10:jar:3.2.10:compile
+[INFO] | | | \- org.scala-lang:scalap:jar:2.10.0:compile
+[INFO] | | +- org.apache.mesos:mesos:jar:shaded-protobuf:0.21.1:compile
+[INFO] | | +- io.netty:netty-all:jar:4.0.29.Final:compile
+[INFO] | | +- com.clearspring.analytics:stream:jar:2.7.0:compile
+[INFO] | | +- io.dropwizard.metrics:metrics-core:jar:3.1.2:compile
+[INFO] | | +- io.dropwizard.metrics:metrics-jvm:jar:3.1.2:compile
+[INFO] | | +- io.dropwizard.metrics:metrics-json:jar:3.1.2:compile
+[INFO] | | +- io.dropwizard.metrics:metrics-graphite:jar:3.1.2:compile
+[INFO] | | +- com.fasterxml.jackson.module:jackson-module-scala_2.10:jar:2.4.4:compile
+[INFO] | | +- org.apache.ivy:ivy:jar:2.4.0:compile
+[INFO] | | +- oro:oro:jar:2.0.8:compile
+[INFO] | | +- org.tachyonproject:tachyon-client:jar:0.7.1:compile
+[INFO] | | | +- org.apache.curator:curator-client:jar:2.1.0-incubating:compile
+[INFO] | | | +- org.tachyonproject:tachyon-underfs-hdfs:jar:0.7.1:compile
+[INFO] | | | \- org.tachyonproject:tachyon-underfs-local:jar:0.7.1:compile
+[INFO] | | +- net.razorvine:pyrolite:jar:4.4:compile
+[INFO] | | \- net.sf.py4j:py4j:jar:0.8.2.1:compile
+[INFO] | +- org.apache.spark:spark-bagel_2.10:jar:1.5.2:runtime
+[INFO] | +- org.apache.spark:spark-mllib_2.10:jar:1.5.2:runtime
+[INFO] | | +- org.apache.spark:spark-streaming_2.10:jar:1.5.2:runtime
+[INFO] | | +- org.apache.spark:spark-graphx_2.10:jar:1.5.2:runtime
+[INFO] | | | +- com.github.fommil.netlib:core:jar:1.1.2:runtime
+[INFO] | | | \- net.sourceforge.f2j:arpack_combined_all:jar:0.1:runtime
+[INFO] | | +- org.scalanlp:breeze_2.10:jar:0.11.2:runtime
+[INFO] | | | +- org.scalanlp:breeze-macros_2.10:jar:0.11.2:runtime
+[INFO] | | | | \- org.scalamacros:quasiquotes_2.10:jar:2.0.0-M8:runtime
+[INFO] | | | +- com.github.rwl:jtransforms:jar:2.4.0:runtime
+[INFO] | | | \- org.spire-math:spire_2.10:jar:0.7.4:runtime
+[INFO] | | | \- org.spire-math:spire-macros_2.10:jar:0.7.4:runtime
+[INFO] | | \- org.jpmml:pmml-model:jar:1.1.15:runtime
+[INFO] | | +- org.jpmml:pmml-agent:jar:1.1.15:runtime
+[INFO] | | \- org.jpmml:pmml-schema:jar:1.1.15:runtime
+[INFO] | +- org.slf4j:jul-to-slf4j:jar:1.7.10:compile
+[INFO] | \- org.scala-lang:jline:jar:2.10.4:compile
+[INFO] | \- org.fusesource.jansi:jansi:jar:1.4:compile
+[INFO] +- junit:junit:jar:4.11:test
+[INFO] | \- org.hamcrest:hamcrest-core:jar:1.3:test
+[INFO] \- org.scalatest:scalatest_2.10:jar:2.2.1:test
+[INFO]
+[INFO] ------------------------------------------------------------------------
+[INFO] Building Apache CarbonData :: Assembly 0.1.1-incubating-SNAPSHOT
+[INFO] ------------------------------------------------------------------------
+[INFO]
+[INFO] --- maven-dependency-plugin:2.8:tree (default-cli) @ carbondata-assembly ---
+[INFO] org.apache.carbondata:carbondata-assembly:pom:0.1.1-incubating-SNAPSHOT
+[INFO] +- org.apache.carbondata:carbondata-common:jar:0.1.1-incubating-SNAPSHOT:compile
+[INFO] | +- log4j:log4j:jar:1.2.12:compile
+[INFO] | \- org.apache.hadoop:hadoop-common:jar:2.2.0:provided
+[INFO] | +- org.apache.hadoop:hadoop-annotations:jar:2.2.0:provided
+[INFO] | | \- jdk.tools:jdk.tools:jar:1.6:system
+[INFO] | +- com.google.guava:guava:jar:11.0.2:provided
+[INFO] | | \- com.google.code.findbugs:jsr305:jar:1.3.9:provided
+[INFO] | +- commons-cli:commons-cli:jar:1.2:provided
+[INFO] | +- org.apache.commons:commons-math:jar:2.1:provided
+[INFO] | +- xmlenc:xmlenc:jar:0.52:provided
+[INFO] | +- commons-httpclient:commons-httpclient:jar:3.1:provided
+[INFO] | +- commons-codec:commons-codec:jar:1.4:compile
+[INFO] | +- commons-io:commons-io:jar:2.1:provided
+[INFO] | +- commons-net:commons-net:jar:3.1:provided
+[INFO] | +- javax.servlet:servlet-api:jar:2.5:provided
+[INFO] | +- org.mortbay.jetty:jetty:jar:6.1.26:provided
+[INFO] | +- org.mortbay.jetty:jetty-util:jar:6.1.26:provided
+[INFO] | +- com.sun.jersey:jersey-core:jar:1.9:provided
+[INFO] | +- com.sun.jersey:jersey-json:jar:1.9:provided
+[INFO] | | +- org.codehaus.jettison:jettison:jar:1.1:provided
+[INFO] | | | \- stax:stax-api:jar:1.0.1:provided
+[INFO] | | +- com.sun.xml.bind:jaxb-impl:jar:2.2.3-1:provided
+[INFO] | | | \- javax.xml.bind:jaxb-api:jar:2.2.2:provided
+[INFO] | | +- org.codehaus.jackson:jackson-jaxrs:jar:1.8.3:provided
+[INFO] | | \- org.codehaus.jackson:jackson-xc:jar:1.8.3:provided
+[INFO] | +- com.sun.jersey:jersey-server:jar:1.9:provided
+[INFO] | | \- asm:asm:jar:3.1:provided
+[INFO] | +- tomcat:jasper-compiler:jar:5.5.23:provided
+[INFO] | +- tomcat:jasper-runtime:jar:5.5.23:provided
+[INFO] | +- javax.servlet.jsp:jsp-api:jar:2.1:provided
+[INFO] | +- commons-el:commons-el:jar:1.0:provided
+[INFO] | +- commons-logging:commons-logging:jar:1.1.1:compile
+[INFO] | +- net.java.dev.jets3t:jets3t:jar:0.6.1:provided
+[INFO] | +- commons-lang:commons-lang:jar:2.5:provided
+[INFO] | +- commons-configuration:commons-configuration:jar:1.6:provided
+[INFO] | | +- commons-collections:commons-collections:jar:3.2.1:provided
+[INFO] | | +- commons-digester:commons-digester:jar:1.8:provided
+[INFO] | | | \- commons-beanutils:commons-beanutils:jar:1.7.0:provided
+[INFO] | | \- commons-beanutils:commons-beanutils-core:jar:1.8.0:provided
+[INFO] | +- org.slf4j:slf4j-api:jar:1.7.5:compile
+[INFO] | +- org.slf4j:slf4j-log4j12:jar:1.7.5:compile
+[INFO] | +- org.codehaus.jackson:jackson-core-asl:jar:1.8.8:provided
+[INFO] | +- org.codehaus.jackson:jackson-mapper-asl:jar:1.8.8:provided
+[INFO] | +- org.apache.avro:avro:jar:1.7.4:provided
+[INFO] | | \- com.thoughtworks.paranamer:paranamer:jar:2.3:provided
+[INFO] | +- com.google.protobuf:protobuf-java:jar:2.5.0:provided
+[INFO] | +- org.apache.hadoop:hadoop-auth:jar:2.2.0:provided
+[INFO] | +- com.jcraft:jsch:jar:0.1.42:provided
+[INFO] | \- org.apache.commons:commons-compress:jar:1.4.1:provided
+[INFO] | \- org.tukaani:xz:jar:1.0:provided
+[INFO] +- org.apache.carbondata:carbondata-core:jar:0.1.1-incubating-SNAPSHOT:compile
+[INFO] | +- org.apache.carbondata:carbondata-format:jar:0.1.1-incubating-SNAPSHOT:compile
+[INFO] | | \- org.apache.thrift:libthrift:jar:0.9.3:compile
+[INFO] | | +- org.apache.httpcomponents:httpclient:jar:4.4.1:compile
+[INFO] | | \- org.apache.httpcomponents:httpcore:jar:4.4.1:compile
+[INFO] | +- pentaho-kettle:kettle-engine:jar:4.4.0-stable:compile
+[INFO] | | \- xerces:xercesImpl:jar:2.9.1:compile
+[INFO] | | \- xml-apis:xml-apis:jar:1.3.04:compile
+[INFO] | +- pentaho-kettle:kettle-core:jar:4.4.0-stable:compile
+[INFO] | +- pentaho-kettle:kettle-db:jar:4.4.0-stable:compile
+[INFO] | +- com.google.code.gson:gson:jar:2.3.1:compile
+[INFO] | +- org.apache.hadoop:hadoop-hdfs:jar:2.2.0:provided
+[INFO] | | \- commons-daemon:commons-daemon:jar:1.0.13:provided
+[INFO] | +- org.xerial.snappy:snappy-java:jar:1.1.2.6:compile
+[INFO] | +- org.apache.spark:spark-sql_2.10:jar:1.5.2:provided
+[INFO] | | +- org.apache.spark:spark-core_2.10:jar:1.5.2:provided
+[INFO] | | | +- org.apache.avro:avro-mapred:jar:hadoop2:1.7.7:provided
+[INFO] | | | | +- org.apache.avro:avro-ipc:jar:1.7.7:provided
+[INFO] | | | | \- org.apache.avro:avro-ipc:jar:tests:1.7.7:provided
+[INFO] | | | +- com.twitter:chill_2.10:jar:0.5.0:provided
+[INFO] | | | | \- com.esotericsoftware.kryo:kryo:jar:2.21:provided
+[INFO] | | | | +- com.esotericsoftware.reflectasm:reflectasm:jar:shaded:1.07:provided
+[INFO] | | | | +- com.esotericsoftware.minlog:minlog:jar:1.2:provided
+[INFO] | | | | \- org.objenesis:objenesis:jar:1.2:provided
+[INFO] | | | +- com.twitter:chill-java:jar:0.5.0:provided
+[INFO] | | | +- org.apache.hadoop:hadoop-client:jar:2.2.0:provided
+[INFO] | | | | +- org.apache.hadoop:hadoop-mapreduce-client-app:jar:2.2.0:provided
+[INFO] | | | | | +- org.apache.hadoop:hadoop-mapreduce-client-common:jar:2.2.0:provided
+[INFO] | | | | | | +- org.apache.hadoop:hadoop-yarn-client:jar:2.2.0:provided
+[INFO] | | | | | | | +- com.google.inject:guice:jar:3.0:provided
+[INFO] | | | | | | | | +- javax.inject:javax.inject:jar:1:provided
+[INFO] | | | | | | | | \- aopalliance:aopalliance:jar:1.0:provided
+[INFO] | | | | | | | +- com.sun.jersey.jersey-test-framework:jersey-test-framework-grizzly2:jar:1.9:provided
+[INFO] | | | | | | | | +- com.sun.jersey.jersey-test-framework:jersey-test-framework-core:jar:1.9:provided
+[INFO] | | | | | | | | | +- javax.servlet:javax.servlet-api:jar:3.0.1:provided
+[INFO] | | | | | | | | | \- com.sun.jersey:jersey-client:jar:1.9:provided
+[INFO] | | | | | | | | \- com.sun.jersey:jersey-grizzly2:jar:1.9:provided
+[INFO] | | | | | | | | +- org.glassfish.grizzly:grizzly-http:jar:2.1.2:provided
+[INFO] | | | | | | | | | \- org.glassfish.grizzly:grizzly-framework:jar:2.1.2:provided
+[INFO] | | | | | | | | | \- org.glassfish.gmbal:gmbal-api-only:jar:3.0.0-b023:provided
+[INFO] | | | | | | | | | \- org.glassfish.external:management-api:jar:3.0.0-b012:provided
+[INFO] | | | | | | | | +- org.glassfish.grizzly:grizzly-http-server:jar:2.1.2:provided
+[INFO] | | | | | | | | | \- org.glassfish.grizzly:grizzly-rcm:jar:2.1.2:provided
+[INFO] | | | | | | | | +- org.glassfish.grizzly:grizzly-http-servlet:jar:2.1.2:provided
+[INFO] | | | | | | | | \- org.glassfish:javax.servlet:jar:3.1:provided
+[INFO] | | | | | | | \- com.sun.jersey.contribs:jersey-guice:jar:1.9:provided
+[INFO] | | | | | | \- org.apache.hadoop:hadoop-yarn-server-common:jar:2.2.0:provided
+[INFO] | | | | | \- org.apache.hadoop:hadoop-mapreduce-client-shuffle:jar:2.2.0:provided
+[INFO] | | | | +- org.apache.hadoop:hadoop-yarn-api:jar:2.2.0:provided
+[INFO] | | | | +- org.apache.hadoop:hadoop-mapreduce-client-core:jar:2.2.0:provided
+[INFO] | | | | | \- org.apache.hadoop:hadoop-yarn-common:jar:2.2.0:provided
+[INFO] | | | | \- org.apache.hadoop:hadoop-mapreduce-client-jobclient:jar:2.2.0:provided
+[INFO] | | | +- org.apache.spark:spark-launcher_2.10:jar:1.5.2:provided
+[INFO] | | | +- org.apache.spark:spark-network-common_2.10:jar:1.5.2:provided
+[INFO] | | | +- org.apache.spark:spark-network-shuffle_2.10:jar:1.5.2:provided
+[INFO] | | | +- org.apache.spark:spark-unsafe_2.10:jar:1.5.2:provided
+[INFO] | | | +- org.apache.curator:curator-recipes:jar:2.4.0:provided
+[INFO] | | | | \- org.apache.curator:curator-framework:jar:2.4.0:provided
+[INFO] | | | +- org.eclipse.jetty.orbit:javax.servlet:jar:3.0.0.v201112011016:provided
+[INFO] | | | +- org.apache.commons:commons-math3:jar:3.4.1:provided
+[INFO] | | | +- org.slf4j:jcl-over-slf4j:jar:1.7.10:provided
+[INFO] | | | +- com.ning:compress-lzf:jar:1.0.3:provided
+[INFO] | | | +- net.jpountz.lz4:lz4:jar:1.3.0:provided
+[INFO] | | | +- org.roaringbitmap:RoaringBitmap:jar:0.4.5:provided
+[INFO] | | | +- com.typesafe.akka:akka-remote_2.10:jar:2.3.11:provided
+[INFO] | | | | +- com.typesafe.akka:akka-actor_2.10:jar:2.3.11:provided
+[INFO] | | | | | \- com.typesafe:config:jar:1.2.1:provided
+[INFO] | | | | \- org.uncommons.maths:uncommons-maths:jar:1.2.2a:provided
+[INFO] | | | +- com.typesafe.akka:akka-slf4j_2.10:jar:2.3.11:provided
+[INFO] | | | +- org.json4s:json4s-jackson_2.10:jar:3.2.10:provided
+[INFO] | | | | \- org.json4s:json4s-core_2.10:jar:3.2.10:provided
+[INFO] | | | | +- org.json4s:json4s-ast_2.10:jar:3.2.10:provided
+[INFO] | | | | \- org.scala-lang:scalap:jar:2.10.0:provided
+[INFO] | | | +- org.apache.mesos:mesos:jar:shaded-protobuf:0.21.1:provided
+[INFO] | | | +- io.netty:netty-all:jar:4.0.29.Final:provided
+[INFO] | | | +- com.clearspring.analytics:stream:jar:2.7.0:provided
+[INFO] | | | +- io.dropwizard.metrics:metrics-core:jar:3.1.2:provided
+[INFO] | | | +- io.dropwizard.metrics:metrics-jvm:jar:3.1.2:provided
+[INFO] | | | +- io.dropwizard.metrics:metrics-json:jar:3.1.2:provided
+[INFO] | | | +- io.dropwizard.metrics:metrics-graphite:jar:3.1.2:provided
+[INFO] | | | +- com.fasterxml.jackson.module:jackson-module-scala_2.10:jar:2.4.4:provided
+[INFO] | | | +- org.apache.ivy:ivy:jar:2.4.0:provided
+[INFO] | | | +- oro:oro:jar:2.0.8:provided
+[INFO] | | | +- org.tachyonproject:tachyon-client:jar:0.7.1:provided
+[INFO] | | | | +- org.apache.curator:curator-client:jar:2.1.0-incubating:provided
+[INFO] | | | | +- org.tachyonproject:tachyon-underfs-hdfs:jar:0.7.1:provided
+[INFO] | | | | \- org.tachyonproject:tachyon-underfs-local:jar:0.7.1:provided
+[INFO] | | | +- net.razorvine:pyrolite:jar:4.4:provided
+[INFO] | | | \- net.sf.py4j:py4j:jar:0.8.2.1:provided
+[INFO] | | +- org.apache.spark:spark-catalyst_2.10:jar:1.5.2:provided
+[INFO] | | | \- org.codehaus.janino:janino:jar:2.7.8:provided
+[INFO] | | | \- org.codehaus.janino:commons-compiler:jar:2.7.8:provided
+[INFO] | | +- org.apache.parquet:parquet-column:jar:1.7.0:provided
+[INFO] | | | +- org.apache.parquet:parquet-common:jar:1.7.0:provided
+[INFO] | | | \- org.apache.parquet:parquet-encoding:jar:1.7.0:provided
+[INFO] | | | \- org.apache.parquet:parquet-generator:jar:1.7.0:provided
+[INFO] | | +- org.apache.parquet:parquet-hadoop:jar:1.7.0:provided
+[INFO] | | | +- org.apache.parquet:parquet-format:jar:2.3.0-incubating:provided
+[INFO] | | | \- org.apache.parquet:parquet-jackson:jar:1.7.0:provided
+[INFO] | | +- com.fasterxml.jackson.core:jackson-databind:jar:2.4.4:provided
+[INFO] | | | +- com.fasterxml.jackson.core:jackson-annotations:jar:2.4.0:provided
+[INFO] | | | \- com.fasterxml.jackson.core:jackson-core:jar:2.4.4:provided
+[INFO] | | \- org.spark-project.spark:unused:jar:1.0.0:provided
+[INFO] | \- org.apache.zookeeper:zookeeper:jar:3.4.7:compile
+[INFO] | \- io.netty:netty:jar:3.7.0.Final:compile
+[INFO] +- org.apache.carbondata:carbondata-processing:jar:0.1.1-incubating-SNAPSHOT:compile
+[INFO] | +- com.univocity:univocity-parsers:jar:1.5.6:compile
+[INFO] | \- commons-vfs:commons-vfs:jar:1.0:compile
+[INFO] \- org.apache.carbondata:carbondata-spark:jar:0.1.1-incubating-SNAPSHOT:compile
+[INFO] +- com.databricks:spark-csv_2.10:jar:1.2.0:compile
+[INFO] | \- org.apache.commons:commons-csv:jar:1.1:compile
+[INFO] +- org.apache.carbondata:carbondata-hadoop:jar:0.1.1-incubating-SNAPSHOT:compile
+[INFO] | \- org.apache.commons:commons-lang3:jar:3.3.2:compile
+[INFO] +- org.scala-lang:scala-compiler:jar:2.10.4:provided
+[INFO] +- org.scala-lang:scala-reflect:jar:2.10.4:provided
+[INFO] +- org.scala-lang:scala-library:jar:2.10.4:provided
+[INFO] +- org.apache.spark:spark-hive-thriftserver_2.10:jar:1.5.2:provided
+[INFO] | +- org.apache.spark:spark-hive_2.10:jar:1.5.2:provided
+[INFO] | | +- com.twitter:parquet-hadoop-bundle:jar:1.6.0:provided
+[INFO] | | +- org.spark-project.hive:hive-exec:jar:1.2.1.spark:provided
+[INFO] | | | +- javolution:javolution:jar:5.5.1:provided
+[INFO] | | | +- log4j:apache-log4j-extras:jar:1.2.17:provided
+[INFO] | | | +- org.antlr:antlr-runtime:jar:3.4:provided
+[INFO] | | | | +- org.antlr:stringtemplate:jar:3.2.1:provided
+[INFO] | | | | \- antlr:antlr:jar:2.7.7:provided
+[INFO] | | | +- org.antlr:ST4:jar:4.0.4:provided
+[INFO] | | | +- org.codehaus.groovy:groovy-all:jar:2.1.6:provided
+[INFO] | | | +- com.googlecode.javaewah:JavaEWAH:jar:0.3.2:provided
+[INFO] | | | +- org.iq80.snappy:snappy:jar:0.2:provided
+[INFO] | | | +- org.json:json:jar:20090211:provided
+[INFO] | | | \- net.sf.opencsv:opencsv:jar:2.3:provided
+[INFO] | | +- org.spark-project.hive:hive-metastore:jar:1.2.1.spark:provided
+[INFO] | | | +- com.jolbox:bonecp:jar:0.8.0.RELEASE:provided
+[INFO] | | | +- org.apache.derby:derby:jar:10.10.2.0:provided
+[INFO] | | | +- org.datanucleus:datanucleus-api-jdo:jar:3.2.6:provided
+[INFO] | | | +- org.datanucleus:datanucleus-rdbms:jar:3.2.9:provided
+[INFO] | | | +- commons-pool:commons-pool:jar:1.5.4:provided
+[INFO] | | | +- commons-dbcp:commons-dbcp:jar:1.4:provided
+[INFO] | | | \- javax.jdo:jdo-api:jar:3.0.1:provided
+[INFO] | | | \- javax.transaction:jta:jar:1.1:provided
+[INFO] | | +- org.apache.calcite:calcite-avatica:jar:1.2.0-incubating:provided
+[INFO] | | +- org.apache.calcite:calcite-core:jar:1.2.0-incubating:provided
+[INFO] | | | +- org.apache.calcite:calcite-linq4j:jar:1.2.0-incubating:provided
+[INFO] | | | \- net.hydromatic:eigenbase-properties:jar:1.1.5:provided
+[INFO] | | +- joda-time:joda-time:jar:2.5:provided
+[INFO] | | +- org.jodd:jodd-core:jar:3.5.2:provided
+[INFO] | | +- org.datanucleus:datanucleus-core:jar:3.2.10:provided
+[INFO] | | \- org.apache.thrift:libfb303:jar:0.9.2:provided
+[INFO] | +- org.spark-project.hive:hive-cli:jar:1.2.1.spark:provided
+[INFO] | | \- jline:jline:jar:2.12:provided
+[INFO] | +- org.spark-project.hive:hive-jdbc:jar:1.2.1.spark:provided
+[INFO] | +- org.spark-project.hive:hive-service:jar:1.2.1.spark:provided
+[INFO] | | +- net.sf.jpam:jpam:jar:1.1:provided
+[INFO] | | \- org.eclipse.jetty.aggregate:jetty-all:jar:7.6.0.v20120127:provided
+[INFO] | | +- org.apache.geronimo.specs:geronimo-jta_1.1_spec:jar:1.1.1:provided
+[INFO] | | +- javax.mail:mail:jar:1.4.1:provided
+[INFO] | | +- javax.activation:activation:jar:1.1:provided
+[INFO] | | +- org.apache.geronimo.specs:geronimo-jaspic_1.0_spec:jar:1.0:provided
+[INFO] | | +- org.apache.geronimo.specs:geronimo-annotation_1.0_spec:jar:1.1.1:provided
+[INFO] | | \- asm:asm-commons:jar:3.1:provided
+[INFO] | | \- asm:asm-tree:jar:3.1:provided
+[INFO] | \- org.spark-project.hive:hive-beeline:jar:1.2.1.spark:provided
+[INFO] | \- net.sf.supercsv:super-csv:jar:2.2.0:provided
+[INFO] \- org.apache.spark:spark-repl_2.10:jar:1.5.2:provided
+[INFO] +- org.apache.spark:spark-bagel_2.10:jar:1.5.2:provided
+[INFO] +- org.apache.spark:spark-mllib_2.10:jar:1.5.2:provided
+[INFO] | +- org.apache.spark:spark-streaming_2.10:jar:1.5.2:provided
+[INFO] | +- org.apache.spark:spark-graphx_2.10:jar:1.5.2:provided
+[INFO] | | +- com.github.fommil.netlib:core:jar:1.1.2:provided
+[INFO] | | \- net.sourceforge.f2j:arpack_combined_all:jar:0.1:provided
+[INFO] | +- org.scalanlp:breeze_2.10:jar:0.11.2:provided
+[INFO] | | +- org.scalanlp:breeze-macros_2.10:jar:0.11.2:provided
+[INFO] | | | \- org.scalamacros:quasiquotes_2.10:jar:2.0.0-M8:provided
+[INFO] | | +- com.github.rwl:jtransforms:jar:2.4.0:provided
+[INFO] | | \- org.spire-math:spire_2.10:jar:0.7.4:provided
+[INFO] | | \- org.spire-math:spire-macros_2.10:jar:0.7.4:provided
+[INFO] | \- org.jpmml:pmml-model:jar:1.1.15:provided
+[INFO] | +- org.jpmml:pmml-agent:jar:1.1.15:provided
+[INFO] | \- org.jpmml:pmml-schema:jar:1.1.15:provided
+[INFO] +- org.slf4j:jul-to-slf4j:jar:1.7.10:provided
+[INFO] \- org.scala-lang:jline:jar:2.10.4:provided
+[INFO] \- org.fusesource.jansi:jansi:jar:1.4:provided
+[INFO]
+[INFO] ------------------------------------------------------------------------
+[INFO] Building Apache CarbonData :: Examples 0.1.1-incubating-SNAPSHOT
+[INFO] ------------------------------------------------------------------------
+[INFO]
+[INFO] --- maven-dependency-plugin:2.8:tree (default-cli) @ carbondata-examples ---
+[INFO] org.apache.carbondata:carbondata-examples:jar:0.1.1-incubating-SNAPSHOT
+[INFO] +- org.apache.carbondata:carbondata-common:jar:0.1.1-incubating-SNAPSHOT:compile
+[INFO] | +- log4j:log4j:jar:1.2.12:compile
+[INFO] | \- org.apache.hadoop:hadoop-common:jar:2.2.0:compile
+[INFO] | +- org.apache.hadoop:hadoop-annotations:jar:2.2.0:compile
+[INFO] | | \- jdk.tools:jdk.tools:jar:1.6:system
+[INFO] | +- com.google.guava:guava:jar:11.0.2:compile
+[INFO] | +- commons-cli:commons-cli:jar:1.2:compile
+[INFO] | +- org.apache.commons:commons-math:jar:2.1:compile
+[INFO] | +- xmlenc:xmlenc:jar:0.52:compile
+[INFO] | +- commons-httpclient:commons-httpclient:jar:3.1:compile
+[INFO] | +- commons-codec:commons-codec:jar:1.4:compile
+[INFO] | +- commons-io:commons-io:jar:2.1:compile
+[INFO] | +- commons-net:commons-net:jar:3.1:compile
+[INFO] | +- javax.servlet:servlet-api:jar:2.5:compile
+[INFO] | +- org.mortbay.jetty:jetty:jar:6.1.26:compile
+[INFO] | +- org.mortbay.jetty:jetty-util:jar:6.1.26:compile
+[INFO] | +- tomcat:jasper-compiler:jar:5.5.23:runtime
+[INFO] | +- tomcat:jasper-runtime:jar:5.5.23:compile
+[INFO] | +- javax.servlet.jsp:jsp-api:jar:2.1:compile
+[INFO] | +- commons-el:commons-el:jar:1.0:compile
+[INFO] | +- commons-logging:commons-logging:jar:1.1.1:compile
+[INFO] | +- net.java.dev.jets3t:jets3t:jar:0.6.1:compile
+[INFO] | +- commons-lang:commons-lang:jar:2.5:compile
+[INFO] | +- commons-configuration:commons-configuration:jar:1.6:compile
+[INFO] | | +- commons-collections:commons-collections:jar:3.2.1:compile
+[INFO] | | +- commons-digester:commons-digester:jar:1.8:compile
+[INFO] | | | \- commons-beanutils:commons-beanutils:jar:1.7.0:compile
+[INFO] | | \- commons-beanutils:commons-beanutils-core:jar:1.8.0:compile
+[INFO] | +- org.slf4j:slf4j-api:jar:1.7.5:compile
+[INFO] | +- org.slf4j:slf4j-log4j12:jar:1.7.5:compile
+[INFO] | +- org.codehaus.jackson:jackson-core-asl:jar:1.8.8:compile
+[INFO] | +- org.codehaus.jackson:jackson-mapper-asl:jar:1.8.8:compile
+[INFO] | +- org.apache.avro:avro:jar:1.7.4:compile
+[INFO] | | \- com.thoughtworks.paranamer:paranamer:jar:2.3:compile
+[INFO] | +- com.google.protobuf:protobuf-java:jar:2.5.0:compile
+[INFO] | +- org.apache.hadoop:hadoop-auth:jar:2.2.0:compile
+[INFO] | +- com.jcraft:jsch:jar:0.1.42:compile
+[INFO] | \- org.apache.commons:commons-compress:jar:1.4.1:compile
+[INFO] | \- org.tukaani:xz:jar:1.0:compile
+[INFO] +- org.apache.carbondata:carbondata-core:jar:0.1.1-incubating-SNAPSHOT:compile
+[INFO] | +- org.apache.carbondata:carbondata-format:jar:0.1.1-incubating-SNAPSHOT:compile
+[INFO] | | \- org.apache.thrift:libthrift:jar:0.9.3:compile
+[INFO] | | \- org.apache.httpcomponents:httpcore:jar:4.4.1:compile
+[INFO] | +- pentaho-kettle:kettle-engine:jar:4.4.0-stable:compile
+[INFO] | | \- xerces:xercesImpl:jar:2.9.1:compile
+[INFO] | | \- xml-apis:xml-apis:jar:1.3.04:compile
+[INFO] | +- pentaho-kettle:kettle-core:jar:4.4.0-stable:compile
+[INFO] | +- pentaho-kettle:kettle-db:jar:4.4.0-stable:compile
+[INFO] | +- com.google.code.gson:gson:jar:2.3.1:compile
+[INFO] | +- org.apache.hadoop:hadoop-hdfs:jar:2.2.0:compile
+[INFO] | | \- commons-daemon:commons-daemon:jar:1.0.13:compile
+[INFO] | +- org.xerial.snappy:snappy-java:jar:1.1.2.6:compile
+[INFO] | +- org.apache.spark:spark-sql_2.10:jar:1.5.2:compile
+[INFO] | | +- org.apache.spark:spark-core_2.10:jar:1.5.2:compile
+[INFO] | | | +- com.twitter:chill_2.10:jar:0.5.0:compile
+[INFO] | | | | \- com.esotericsoftware.kryo:kryo:jar:2.21:compile
+[INFO] | | | | +- com.esotericsoftware.reflectasm:reflectasm:jar:shaded:1.07:compile
+[INFO] | | | | +- com.esotericsoftware.minlog:minlog:jar:1.2:compile
+[INFO] | | | | \- org.objenesis:objenesis:jar:1.2:compile
+[INFO] | | | +- com.twitter:chill-java:jar:0.5.0:compile
+[INFO] | | | +- org.apache.hadoop:hadoop-client:jar:2.2.0:compile
+[INFO] | | | | +- org.apache.hadoop:hadoop-mapreduce-client-app:jar:2.2.0:compile
+[INFO] | | | | | +- org.apache.hadoop:hadoop-mapreduce-client-common:jar:2.2.0:compile
+[INFO] | | | | | | +- org.apache.hadoop:hadoop-yarn-client:jar:2.2.0:compile
+[INFO] | | | | | | | +- com.google.inject:guice:jar:3.0:compile
+[INFO] | | | | | | | | +- javax.inject:javax.inject:jar:1:compile
+[INFO] | | | | | | | | \- aopalliance:aopalliance:jar:1.0:compile
+[INFO] | | | | | | | +- com.sun.jersey.jersey-test-framework:jersey-test-framework-grizzly2:jar:1.9:compile
+[INFO] | | | | | | | | +- com.sun.jersey.jersey-test-framework:jersey-test-framework-core:jar:1.9:compile
+[INFO] | | | | | | | | | +- javax.servlet:javax.servlet-api:jar:3.0.1:compile
+[INFO] | | | | | | | | | \- com.sun.jersey:jersey-client:jar:1.9:compile
+[INFO] | | | | | | | | \- com.sun.jersey:jersey-grizzly2:jar:1.9:compile
+[INFO] | | | | | | | | +- org.glassfish.grizzly:grizzly-http:jar:2.1.2:compile
+[INFO] | | | | | | | | | \- org.glassfish.grizzly:grizzly-framework:jar:2.1.2:compile
+[INFO] | | | | | | | | | \- org.glassfish.gmbal:gmbal-api-only:jar:3.0.0-b023:compile
+[INFO] | | | | | | | | | \- org.glassfish.external:management-api:jar:3.0.0-b012:compile
+[INFO] | | | | | | | | +- org.glassfish.grizzly:grizzly-http-server:jar:2.1.2:compile
+[INFO] | | | | | | | | | \- org.glassfish.grizzly:grizzly-rcm:jar:2.1.2:compile
+[INFO] | | | | | | | | +- org.glassfish.grizzly:grizzly-http-servlet:jar:2.1.2:compile
+[INFO] | | | | | | | | \- org.glassfish:javax.servlet:jar:3.1:compile
+[INFO] | | | | | | | \- com.sun.jersey.contribs:jersey-guice:jar:1.9:compile
+[INFO] | | | | | | \- org.apache.hadoop:hadoop-yarn-server-common:jar:2.2.0:compile
+[INFO] | | | | | \- org.apache.hadoop:hadoop-mapreduce-client-shuffle:jar:2.2.0:compile
+[INFO] | | | | +- org.apache.hadoop:hadoop-yarn-api:jar:2.2.0:compile
+[INFO] | | | | +- org.apache.hadoop:hadoop-mapreduce-client-core:jar:2.2.0:compile
+[INFO] | | | | | \- org.apache.hadoop:hadoop-yarn-common:jar:2.2.0:compile
+[INFO] | | | | \- org.apache.hadoop:hadoop-mapreduce-client-jobclient:jar:2.2.0:compile
+[INFO] | | | +- org.apache.spark:spark-launcher_2.10:jar:1.5.2:compile
+[INFO] | | | +- org.apache.spark:spark-network-common_2.10:jar:1.5.2:compile
+[INFO] | | | +- org.apache.spark:spark-network-shuffle_2.10:jar:1.5.2:compile
+[INFO] | | | +- org.apache.spark:spark-unsafe_2.10:jar:1.5.2:compile
+[INFO] | | | +- org.apache.curator:curator-recipes:jar:2.4.0:compile
+[INFO] | | | | \- org.apache.curator:curator-framework:jar:2.4.0:compile
+[INFO] | | | +- org.eclipse.jetty.orbit:javax.servlet:jar:3.0.0.v201112011016:compile
+[INFO] | | | +- org.apache.commons:commons-math3:jar:3.4.1:compile
+[INFO] | | | +- org.slf4j:jcl-over-slf4j:jar:1.7.10:compile
+[INFO] | | | +- com.ning:compress-lzf:jar:1.0.3:compile
+[INFO] | | | +- net.jpountz.lz4:lz4:jar:1.3.0:compile
+[INFO] | | | +- org.roaringbitmap:RoaringBitmap:jar:0.4.5:compile
+[INFO] | | | +- com.typesafe.akka:akka-remote_2.10:jar:2.3.11:compile
+[INFO] | | | | +- com.typesafe.akka:akka-actor_2.10:jar:2.3.11:compile
+[INFO] | | | | | \- com.typesafe:config:jar:1.2.1:compile
+[INFO] | | | | \- org.uncommons.maths:uncommons-maths:jar:1.2.2a:compile
+[INFO] | | | +- com.typesafe.akka:akka-slf4j_2.10:jar:2.3.11:compile
+[INFO] | | | +- org.json4s:json4s-jackson_2.10:jar:3.2.10:compile
+[INFO] | | | | \- org.json4s:json4s-core_2.10:jar:3.2.10:compile
+[INFO] | | | | +- org.json4s:json4s-ast_2.10:jar:3.2.10:compile
+[INFO] | | | | \- org.scala-lang:scalap:jar:2.10.0:compile
+[INFO] | | | +- org.apache.mesos:mesos:jar:shaded-protobuf:0.21.1:compile
+[INFO] | | | +- io.netty:netty-all:jar:4.0.29.Final:compile
+[INFO] | | | +- com.clearspring.analytics:stream:jar:2.7.0:compile
+[INFO] | | | +- io.dropwizard.metrics:metrics-core:jar:3.1.2:compile
+[INFO] | | | +- io.dropwizard.metrics:metrics-jvm:jar:3.1.2:compile
+[INFO] | | | +- io.dropwizard.metrics:metrics-json:jar:3.1.2:compile
+[INFO] | | | +- io.dropwizard.metrics:metrics-graphite:jar:3.1.2:compile
+[INFO] | | | +- com.fasterxml.jackson.module:jackson-module-scala_2.10:jar:2.4.4:compile
+[INFO] | | | +- org.apache.ivy:ivy:jar:2.4.0:compile
+[INFO] | | | +- oro:oro:jar:2.0.8:compile
+[INFO] | | | +- org.tachyonproject:tachyon-client:jar:0.7.1:compile
+[INFO] | | | | +- org.apache.curator:curator-client:jar:2.1.0-incubating:compile
+[INFO] | | | | +- org.tachyonproject:tachyon-underfs-hdfs:jar:0.7.1:compile
+[INFO] | | | | \- org.tachyonproject:tachyon-underfs-local:jar:0.7.1:compile
+[INFO] | | | +- net.razorvine:pyrolite:jar:4.4:compile
+[INFO] | | | \- net.sf.py4j:py4j:jar:0.8.2.1:compile
+[INFO] | | +- org.apache.spark:spark-catalyst_2.10:jar:1.5.2:compile
+[INFO] | | | \- org.codehaus.janino:janino:jar:2.7.8:compile
+[INFO] | | +- org.apache.parquet:parquet-column:jar:1.7.0:compile
+[INFO] | | | +- org.apache.parquet:parquet-common:jar:1.7.0:compile
+[INFO] | | | \- org.apache.parquet:parquet-encoding:jar:1.7.0:compile
+[INFO] | | | \- org.apache.parquet:parquet-generator:jar:1.7.0:compile
+[INFO] | | +- org.apache.parquet:parquet-hadoop:jar:1.7.0:compile
+[INFO] | | | +- org.apache.parquet:parquet-format:jar:2.3.0-incubating:compile
+[INFO] | | | \- org.apache.parquet:parquet-jackson:jar:1.7.0:compile
+[INFO] | | \- com.fasterxml.jackson.core:jackson-databind:jar:2.4.4:compile
+[INFO] | | +- com.fasterxml.jackson.core:jackson-annotations:jar:2.4.0:compile
+[INFO] | | \- com.fasterxml.jackson.core:jackson-core:jar:2.4.4:compile
+[INFO] | \- org.apache.zookeeper:zookeeper:jar:3.4.7:compile
+[INFO] | \- io.netty:netty:jar:3.7.0.Final:compile
+[INFO] +- org.apache.carbondata:carbondata-processing:jar:0.1.1-incubating-SNAPSHOT:compile
+[INFO] | +- com.univocity:univocity-parsers:jar:1.5.6:compile
+[INFO] | \- commons-vfs:commons-vfs:jar:1.0:compile
+[INFO] +- org.apache.carbondata:carbondata-spark:jar:0.1.1-incubating-SNAPSHOT:compile
+[INFO] | +- com.databricks:spark-csv_2.10:jar:1.2.0:compile
+[INFO] | | \- org.apache.commons:commons-csv:jar:1.1:compile
+[INFO] | +- org.apache.carbondata:carbondata-hadoop:jar:0.1.1-incubating-SNAPSHOT:compile
+[INFO] | | \- org.apache.commons:commons-lang3:jar:3.3.2:compile
+[INFO] | \- org.apache.spark:spark-repl_2.10:jar:1.5.2:compile
+[INFO] | +- org.apache.spark:spark-bagel_2.10:jar:1.5.2:runtime
+[INFO] | +- org.apache.spark:spark-mllib_2.10:jar:1.5.2:runtime
+[INFO] | | +- org.apache.spark:spark-streaming_2.10:jar:1.5.2:runtime
+[INFO] | | +- org.apache.spark:spark-graphx_2.10:jar:1.5.2:runtime
+[INFO] | | | +- com.github.fommil.netlib:core:jar:1.1.2:runtime
+[INFO] | | | \- net.sourceforge.f2j:arpack_combined_all:jar:0.1:runtime
+[INFO] | | +- org.scalanlp:breeze_2.10:jar:0.11.2:runtime
+[INFO] | | | +- org.scalanlp:breeze-macros_2.10:jar:0.11.2:runtime
+[INFO] | | | | \- org.scalamacros:quasiquotes_2.10:jar:2.0.0-M8:runtime
+[INFO] | | | +- com.github.rwl:jtransforms:jar:2.4.0:runtime
+[INFO] | | | \- org.spire-math:spire_2.10:jar:0.7.4:runtime
+[INFO] | | | \- org.spire-math:spire-macros_2.10:jar:0.7.4:runtime
+[INFO] | | \- org.jpmml:pmml-model:jar:1.1.15:runtime
+[INFO] | | +- org.jpmml:pmml-agent:jar:1.1.15:runtime
+[INFO] | | \- org.jpmml:pmml-schema:jar:1.1.15:runtime
+[INFO] | +- org.slf4j:jul-to-slf4j:jar:1.7.10:compile
+[INFO] | \- org.scala-lang:jline:jar:2.10.4:compile
+[INFO] | \- org.fusesource.jansi:jansi:jar:1.4:compile
+[INFO] +- eigenbase:eigenbase-xom:jar:1.3.4:compile
+[INFO] +- org.scala-lang:scala-compiler:jar:2.10.4:compile
+[INFO] +- org.scala-lang:scala-reflect:jar:2.10.4:compile
+[INFO] +- org.scala-lang:scala-library:jar:2.10.4:compile
+[INFO] \- org.apache.spark:spark-hive-thriftserver_2.10:jar:1.5.2:compile
+[INFO] +- org.apache.spark:spark-hive_2.10:jar:1.5.2:compile
+[INFO] | +- com.twitter:parquet-hadoop-bundle:jar:1.6.0:compile
+[INFO] | +- org
<TRUNCATED>
[20/50] [abbrv] incubator-carbondata git commit: Fixed insert with
select query when functions are used in query
Posted by ra...@apache.org.
Fixed insert with select query when functions are used in query
reverted example
Fixed testcase
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/529c06d2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/529c06d2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/529c06d2
Branch: refs/heads/branch-1.0
Commit: 529c06d22d715249cf2e42db3420af698f0f917a
Parents: db2c5f9
Author: ravipesala <ra...@gmail.com>
Authored: Thu Jan 19 06:30:24 2017 +0530
Committer: jackylk <ja...@huawei.com>
Committed: Thu Jan 19 23:19:26 2017 +0800
----------------------------------------------------------------------
.../examples/CarbonSessionExample.scala | 19 +++++-
.../src/test/resources/data_with_all_types.csv | 10 ++++
.../InsertIntoCarbonTableTestCase.scala | 62 ++++++++++++++++----
.../execution/CarbonLateDecodeStrategy.scala | 45 +++++++-------
4 files changed, 102 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/529c06d2/examples/spark2/src/main/scala/org/apache/carbondata/examples/CarbonSessionExample.scala
----------------------------------------------------------------------
diff --git a/examples/spark2/src/main/scala/org/apache/carbondata/examples/CarbonSessionExample.scala b/examples/spark2/src/main/scala/org/apache/carbondata/examples/CarbonSessionExample.scala
index 1d485cd..0d9c43f 100644
--- a/examples/spark2/src/main/scala/org/apache/carbondata/examples/CarbonSessionExample.scala
+++ b/examples/spark2/src/main/scala/org/apache/carbondata/examples/CarbonSessionExample.scala
@@ -19,6 +19,7 @@ package org.apache.carbondata.examples
import java.io.File
+import org.apache.commons.io.FileUtils
import org.apache.spark.sql.SparkSession
import org.apache.carbondata.core.constants.CarbonCommonConstants
@@ -31,10 +32,19 @@ object CarbonSessionExample {
+ "../../../..").getCanonicalPath
val storeLocation = s"$rootPath/examples/spark2/target/store"
val warehouse = s"$rootPath/examples/spark2/target/warehouse"
- val metastoredb = s"$rootPath/examples/spark2/target"
+ val metastoredb = s"$rootPath/examples/spark2/target/metastore_db"
+
+ // clean data folder
+ if (true) {
+ val clean = (path: String) => FileUtils.deleteDirectory(new File(path))
+ clean(storeLocation)
+ clean(warehouse)
+ clean(metastoredb)
+ }
CarbonProperties.getInstance()
.addProperty("carbon.kettle.home", s"$rootPath/processing/carbonplugins")
+ .addProperty("carbon.storelocation", storeLocation)
.addProperty(CarbonCommonConstants.CARBON_TIMESTAMP_FORMAT, "yyyy/MM/dd")
import org.apache.spark.sql.CarbonSession._
@@ -42,9 +52,12 @@ object CarbonSessionExample {
val spark = SparkSession
.builder()
.master("local")
- .appName("CarbonSessionExample")
+ .appName("CarbonExample")
+ .enableHiveSupport()
.config("spark.sql.warehouse.dir", warehouse)
- .getOrCreateCarbonSession(storeLocation, metastoredb)
+ .config("javax.jdo.option.ConnectionURL",
+ s"jdbc:derby:;databaseName=$metastoredb;create=true")
+ .getOrCreateCarbonSession()
spark.sparkContext.setLogLevel("WARN")
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/529c06d2/integration/spark-common-test/src/test/resources/data_with_all_types.csv
----------------------------------------------------------------------
diff --git a/integration/spark-common-test/src/test/resources/data_with_all_types.csv b/integration/spark-common-test/src/test/resources/data_with_all_types.csv
new file mode 100644
index 0000000..5efff00
--- /dev/null
+++ b/integration/spark-common-test/src/test/resources/data_with_all_types.csv
@@ -0,0 +1,10 @@
+1,10,100,48.4,spark,2015/4/23 12:01:01,1.23,2015/4/23 11:01:01,aaa,2.5
+5,17,140,43.4,spark,2015/7/27 12:01:02,3.45,2015/7/27 11:01:02,bbb,2.5
+1,11,100,44.4,flink,2015/5/23 12:01:03,23.23,2015/5/23 11:01:03,ccc,2.5
+1,10,150,43.4,spark,2015/7/24 12:01:04,254.12,2015/7/24 11:01:04,ddd,2.5
+1,10,100,47.4,spark,2015/7/23 12:01:05,876.14,2015/7/23 11:01:05,eeee,3.5
+3,14,160,43.4,hive,2015/7/26 12:01:06,3454.32,2015/7/26 11:01:06,ff,2.5
+2,10,100,43.4,impala,2015/7/23 12:01:07,456.98,2015/7/23 11:01:07,ggg,2.5
+1,10,100,43.4,spark,2015/5/23 12:01:08,32.53,2015/5/23 11:01:08,hhh,2.5
+4,16,130,42.4,impala,2015/7/23 12:01:09,67.23,2015/7/23 11:01:09,iii,2.5
+1,10,100,43.4,spark,2015/7/23 12:01:10,832.23,2015/7/23 11:01:10,jjj,2.5
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/529c06d2/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/allqueries/InsertIntoCarbonTableTestCase.scala
----------------------------------------------------------------------
diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/allqueries/InsertIntoCarbonTableTestCase.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/allqueries/InsertIntoCarbonTableTestCase.scala
index 3cb3520..db85393 100644
--- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/allqueries/InsertIntoCarbonTableTestCase.scala
+++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/allqueries/InsertIntoCarbonTableTestCase.scala
@@ -113,16 +113,58 @@ class InsertIntoCarbonTableTestCase extends QueryTest with BeforeAndAfterAll {
sql("select imei,deviceInformationId,MAC from TCarbonLocal")
)
}
-// test("insert->insert empty data -pass") {
-// sql("drop table if exists TCarbon")
-// sql("create table TCarbon (imei string,deviceInformationId int,MAC string) STORED BY 'org.apache.carbondata.format'")
-// sql("insert into TCarbon select imei,deviceInformationId,MAC from THive where MAC='wrongdata'")
-// val result = sql("select imei,deviceInformationId,MAC from TCarbon where MAC='wrongdata'").collect()
-// checkAnswer(
-// sql("select imei,deviceInformationId,MAC from THive where MAC='wrongdata'"),
-// sql("select imei,deviceInformationId,MAC from TCarbon where MAC='wrongdata'")
-// )
-// }
+
+ test("insert->insert with functions") {
+ sql("DROP TABLE IF EXISTS carbon_table")
+ sql("DROP TABLE IF EXISTS carbon_table1")
+ // Create table
+ sql(
+ s"""
+ | CREATE TABLE carbon_table(
+ | shortField smallint,
+ | intField int,
+ | bigintField bigint,
+ | doubleField double,
+ | stringField string,
+ | timestampField timestamp,
+ | decimalField decimal(18,2),
+ | dateField date,
+ | charField string,
+ | floatField float
+ | )
+ | STORED BY 'carbondata'
+ | TBLPROPERTIES('DICTIONARY_INCLUDE'='dateField, charField')
+ """.stripMargin)
+
+ sql(
+ s"""
+ | CREATE TABLE carbon_table1(
+ | shortField smallint,
+ | intField int,
+ | bigintField bigint,
+ | doubleField double,
+ | stringField string,
+ | timestampField timestamp,
+ | decimalField decimal(18,2),
+ | dateField date,
+ | charField string,
+ | floatField float
+ | )
+ | STORED BY 'carbondata'
+ | TBLPROPERTIES('DICTIONARY_INCLUDE'='dateField, charField')
+ """.stripMargin)
+ sql(
+ s"""
+ | LOAD DATA LOCAL INPATH '${resourcesPath + "/data_with_all_types.csv"}'
+ | INTO TABLE carbon_table
+ | options('FILEHEADER'='shortField,intField,bigintField,doubleField,stringField,timestampField,decimalField,dateField,charField,floatField')
+ """.stripMargin)
+
+ sql("""insert into table carbon_table1 select shortField,intField,bigintField,doubleField,ASCII(stringField),
+ timestampField,decimalField,dateField,charField,floatField from carbon_table
+ """).show
+ }
+
test("insert into existing load-pass") {
val timeStampPropOrig = CarbonProperties.getInstance().getProperty(CarbonCommonConstants.CARBON_TIMESTAMP_FORMAT)
CarbonProperties.getInstance()
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/529c06d2/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 6f913a8..11166bf 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
@@ -223,7 +223,7 @@ private[sql] class CarbonLateDecodeStrategy extends SparkStrategy {
pushedFilters,
metadata,
needDecoder,
- updateRequestedColumns)
+ updateRequestedColumns.asInstanceOf[Seq[Attribute]])
filterCondition.map(execution.FilterExec(_, scan)).getOrElse(scan)
} else {
// Don't request columns that are only referenced by pushed filters.
@@ -231,15 +231,16 @@ private[sql] class CarbonLateDecodeStrategy extends SparkStrategy {
(projectSet ++ filterSet -- handledSet).map(relation.attributeMap).toSeq
val updateRequestedColumns = updateRequestedColumnsFunc(requestedColumns, table, needDecoder)
val scan = getDataSourceScan(relation,
- updateRequestedColumns,
+ updateRequestedColumns.asInstanceOf[Seq[Attribute]],
scanBuilder,
candidatePredicates,
pushedFilters,
metadata,
needDecoder,
- updateRequestedColumns)
+ updateRequestedColumns.asInstanceOf[Seq[Attribute]])
execution.ProjectExec(
- projects, filterCondition.map(execution.FilterExec(_, scan)).getOrElse(scan))
+ updateRequestedColumnsFunc(projects, table, needDecoder).asInstanceOf[Seq[NamedExpression]],
+ filterCondition.map(execution.FilterExec(_, scan)).getOrElse(scan))
}
}
@@ -251,7 +252,7 @@ private[sql] class CarbonLateDecodeStrategy extends SparkStrategy {
pushedFilters: Seq[Filter],
metadata: Map[String, String],
needDecoder: ArrayBuffer[AttributeReference],
- updateRequestedColumns: Seq[AttributeReference]): DataSourceScanExec = {
+ updateRequestedColumns: Seq[Attribute]): DataSourceScanExec = {
val table = relation.relation.asInstanceOf[CarbonDatasourceHadoopRelation]
if (supportBatchedDataSource(relation.relation.sqlContext, updateRequestedColumns) &&
needDecoder.isEmpty) {
@@ -272,29 +273,31 @@ private[sql] class CarbonLateDecodeStrategy extends SparkStrategy {
}
}
- def updateRequestedColumnsFunc(requestedColumns: Seq[AttributeReference],
+ def updateRequestedColumnsFunc(requestedColumns: Seq[Expression],
relation: CarbonDatasourceHadoopRelation,
- needDecoder: ArrayBuffer[AttributeReference]): Seq[AttributeReference] = {
+ needDecoder: ArrayBuffer[AttributeReference]): Seq[Expression] = {
val map = relation.carbonRelation.metaData.dictionaryMap
- requestedColumns.map { attr =>
- if (needDecoder.exists(_.name.equalsIgnoreCase(attr.name))) {
- attr
- } else {
- val dict = map.get(attr.name)
- if (dict.isDefined && dict.get) {
- AttributeReference(attr.name,
- IntegerType,
- attr.nullable,
- attr.metadata)(attr.exprId, attr.qualifier)
- } else {
+ requestedColumns.map {
+ case attr: AttributeReference =>
+ if (needDecoder.exists(_.name.equalsIgnoreCase(attr.name))) {
attr
+ } else {
+ val dict = map.get(attr.name)
+ if (dict.isDefined && dict.get) {
+ AttributeReference(attr.name,
+ IntegerType,
+ attr.nullable,
+ attr.metadata)(attr.exprId, attr.qualifier)
+ } else {
+ attr
+ }
}
- }
+ case others => others
}
}
private def getPartitioning(carbonTable: CarbonTable,
- output: Seq[AttributeReference]): Partitioning = {
+ output: Seq[Attribute]): Partitioning = {
val info: BucketingInfo = carbonTable.getBucketingInfo(carbonTable.getFactTableName)
if (info != null) {
val cols = info.getListOfColumns.asScala
@@ -304,7 +307,7 @@ private[sql] class CarbonLateDecodeStrategy extends SparkStrategy {
val bucketColumns = cols.flatMap { n =>
val attrRef = output.find(_.name.equalsIgnoreCase(n.getColumnName))
attrRef match {
- case Some(attr) =>
+ case Some(attr: AttributeReference) =>
Some(AttributeReference(attr.name,
CarbonScalaUtil.convertCarbonToSparkDataType(n.getDataType),
attr.nullable,
[50/50] [abbrv] incubator-carbondata git commit:
[CARBONDATA-674]Fixed Compatibility issue This closes #566
Posted by ra...@apache.org.
[CARBONDATA-674]Fixed Compatibility issue This closes #566
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/bd09f9bc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/bd09f9bc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/bd09f9bc
Branch: refs/heads/branch-1.0
Commit: bd09f9bc15118f47f37da5cdde1d54551d422bfd
Parents: 7ba906b f94bae5
Author: ravipesala <ra...@gmail.com>
Authored: Fri Jan 20 23:05:16 2017 +0530
Committer: ravipesala <ra...@gmail.com>
Committed: Fri Jan 20 23:05:16 2017 +0530
----------------------------------------------------------------------
.../core/constants/CarbonCommonConstants.java | 2 +-
.../compression/ReaderCompressModel.java | 2 +-
.../core/metadata/ValueEncoderMeta.java | 12 +++---
.../core/util/CarbonMetadataUtil.java | 4 +-
.../apache/carbondata/core/util/CarbonUtil.java | 2 +-
.../core/util/ValueCompressionUtil.java | 10 +++--
.../core/util/path/CarbonTablePath.java | 6 ++-
.../datastore/SegmentTaskIndexStoreTest.java | 42 --------------------
.../core/util/CarbonMetadataUtilTest.java | 2 +-
.../carbondata/core/util/DataTypeUtilTest.java | 4 +-
.../core/util/ValueCompressionUtilTest.java | 2 +-
11 files changed, 28 insertions(+), 60 deletions(-)
----------------------------------------------------------------------
[35/50] [abbrv] incubator-carbondata git commit: Problem: Dataloads
fail when no. of column in load query is greater than the no. of column in
create table
Posted by ra...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/1cd0450b/integration/spark-common-test/src/test/resources/seq_500Records.csv
----------------------------------------------------------------------
diff --git a/integration/spark-common-test/src/test/resources/seq_500Records.csv b/integration/spark-common-test/src/test/resources/seq_500Records.csv
new file mode 100644
index 0000000..4a56290
--- /dev/null
+++ b/integration/spark-common-test/src/test/resources/seq_500Records.csv
@@ -0,0 +1,500 @@
+461168626824984,1007,4,1026,100102,100041,,,1463483694712,132,1463483994712,52,9,230,1,0,17834249285,460075172594853,864394050284616,,1,1,10.28.135.26,192.26.209.4,16469,APN344,10.10.10.1,192.1.10.105,192.1.20.251,103,14,4,CACU,M92U,7MK7,OZWZ,3.141592654,2015-01-01 10:30:00,0,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735435.com,www.hua87/xyz,,,,,,,,,,,,,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,3,DI89,NL6G,,,,,192.1.100.172,EHP,15,,,,,,,,,,,,,,,,,,,0,176,102,110,,,,,,,,,1,,,,0,1253339,,,0,,,,,2,2,109274486,1253339,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1001,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,13,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,12548,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,430,248,460,230,139,144,0,9,570955,34716,2146,470,194
+461168637031098,1000,5,1007,100062,100075,,,1463483694712,132,1463483994712,52,10,231,2,0,17846712053,460075187421498,864394042118299,,,,10.28.135.27,192.26.209.5,10243,APN345,10.10.10.1,192.1.10.106,192.1.20.252,104,12,1,T5UZ,H762,GCUP,X0G5,4.141592654,2015-01-02 10:30:00,1,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735436.com,www.hua88/xyz,,,,,,,,,,,,,1,1,0,,,,,,,,,,,,,,,,,,,,,,,,,3,4KUM,FYXT,,,,,192.1.100.173,R89,31,,,,,,,,,,,,,,,,,,,0,231,103,104,,,,,,,,,,msg1,,,1,1159181,,,1,,,,,3,3,103198703,1159181,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1018,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,14,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,220,103,286,410,364,272,0,2,5521,566636,2094,490,88
+461168618326312,1007,1,1003,100080,100077,,,1463483694712,132,1463483994712,52,11,232,0,0,17823157828,460075175845034,864394033572229,,0,0,10.28.135.28,192.26.209.6,31103,APN346,10.10.10.1,192.1.10.107,192.1.20.253,100,12,1,BA8A,WLPF,3Y2B,VOBV,5.141592654,2015-01-03 10:30:00,0,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735437.com,www.hua89/xyz,,,,,,,,,,,,,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,3,TQWF,AJ5P,,,,,192.1.100.174,EXG,26,,,,,,,,,,,,,,,,,,,0,240,103,107,,,,,,,,,1,msg2,,,2,1339595,,,0,,,,,4,4,106144152,1339595,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1015,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,15,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2564,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,96,282,37,153,244,171,3,1,309542,499875,665,55,109
+461168634041524,1000,4,1010,100104,100084,,,1463483694712,132,1463483994712,52,12,233,1,0,17830205073,460075192871704,864394029260419,,1,1,10.28.135.29,192.26.209.7,14842,APN347,10.10.10.1,192.1.10.108,192.1.20.254,103,13,1,E85B,C2JX,WBL5,HZ1W,6.141592654,2015-01-04 10:30:00,1,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735438.com,www.hua90/xyz,,,,,,,,,,,,,1,1,0,,,,,,,,,,,,,,,,,,,,,,,,,3,CULL,UPO7,,,,,192.1.100.175,M8E,16,,,,,,,,,,,,,,,,,,,0,262,103,102,,,,,,,,,,msg3,,,3,1601515,,,1,,,,,5,5,108459866,1601515,5,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1011,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,666,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,242,48,329,57,327,38,5,4,159496,729976,2334,124,29
+461168639030698,1007,5,1005,100057,100008,,,1463483694712,132,1463483994712,52,13,234,2,0,17823115597,460075169159388,864394035098254,,,,10.28.135.30,192.26.209.8,67932,APN348,10.10.10.1,192.1.10.109,192.1.20.255,104,12,5,P9J2,OJRY,IN5D,H6CZ,7.141592654,2015-01-05 10:30:00,0,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735439.com,www.hua91/xyz,,,,,,,,,,,,,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,3,OFNR,A4N8,,,,,192.1.100.176,K22,24,,,,,,,,,,,,,,,,,,,0,322,103,105,,,,,,,,,1,msg4,,,4,1173980,,,0,,,,,6,6,115872845,1173980,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1013,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,17,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,12548,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,302,29,82,297,374,13,3,5,14968,284476,1748,500,186
+461168615214684,1002,1,1022,100059,100041,,,1463483694712,132,1463483994712,52,14,235,0,0,17818361265,460075171839753,864394031801785,,0,0,10.28.135.31,192.26.209.9,56733,APN349,10.10.10.1,192.1.10.110,192.1.21.1,101,11,2,TAS6,8G32,FUII,9KCY,8.141592654,2015-01-06 10:30:00,1,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735440.com,www.hua92/xyz,,,,,,,,,,,,,1,1,0,,,,,,,,,,,,,,,,,,,,,,,,,3,4817,PE20,,,,,192.1.100.177,3KK,10,,,,,,,,,,,,,,,,,,,0,123,102,101,,,,,,,,,,msg5,,,5,1220603,,,1,,,,,7,7,108019745,1220603,7,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1013,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,18,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,324,65,105,357,454,183,4,9,372421,644644,2697,373,39
+461168630512673,1002,2,1015,100045,100039,,,1463483694712,132,1463483994712,52,15,236,1,0,17817728127,460075175596717,864394050724672,,1,1,10.28.135.32,192.26.209.10,21993,APN350,10.10.10.1,192.1.10.111,192.1.21.2,103,13,1,7YBB,I95E,26WU,7ZFB,9.141592654,2015-01-07 10:30:00,0,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735441.com,www.hua93/xyz,,,,,,,,,,,,,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,3,VB2A,FFHA,,,,,192.1.100.178,IO1,17,,,,,,,,,,,,,,,,,,,0,173,101,101,,,,,,,,,1,msg6,,,6,1323176,,,0,,,,,8,8,112466420,1323176,8,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1015,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,19,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2564,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,284,137,72,252,310,331,8,4,217921,351060,3872,428,198
+461168615135652,1008,3,1018,100049,100059,,,1463483694712,132,1463483994712,52,16,237,2,0,17823648011,460075171612758,864394028938637,,,,10.28.135.33,192.26.209.11,35521,APN351,10.10.10.1,192.1.10.112,192.1.21.3,100,14,1,8LJZ,ITH2,FUYH,WX8L,10.14159265,2015-01-08 10:30:00,1,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735442.com,www.hua94/xyz,,,,,,,,,,,,,1,1,0,,,,,,,,,,,,,,,,,,,,,,,,,3,9KT6,JNFO,,,,,192.1.100.179,XUB,14,,,,,,,,,,,,,,,,,,,0,,104,102,,,,,,,,,,msg7,,,7,1541041,,,1,,,,,9,9,103782936,1541041,9,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1019,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,20,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,666,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,473,426,15,335,74,28,0,4,467889,129965,632,464,151
+461168625467992,1009,3,1010,100013,100050,,,1463483694712,132,1463483994712,52,0,238,0,0,17836447471,460075173484933,864394044098069,,0,0,10.28.135.34,192.26.209.12,64833,APN352,10.10.10.1,192.1.10.113,192.1.21.4,102,13,4,2S5X,AVHX,IK5T,TP0U,11.14159265,2015-01-09 10:30:00,0,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735443.com,www.hua95/xyz,,,,,,,,,,,,,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,3,EBJO,QILE,,,,,192.1.100.180,JQ4,26,,,,,,,,,,,,,,,,,,,0,282,104,103,,,,,,,,,1,msg8,,,8,1557067,,,0,,,,,10,10,115883790,1557067,10,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1014,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,12548,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,387,55,23,419,42,343,8,9,256639,584553,732,429,5
+461168623705467,1005,4,1002,100080,100029,,,1463483694712,132,1463483994712,52,1,239,1,0,17843800335,460075194592522,864394030127183,,1,1,10.28.135.35,192.26.209.13,58739,APN353,10.10.10.1,192.1.10.114,192.1.21.5,102,13,5,PN2V,S3TU,SB70,5X37,12.14159265,2015-01-10 10:30:00,1,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735444.com,www.hua96/xyz,,,,,,,,,,,,,1,1,0,,,,,,,,,,,,,,,,,,,,,,,,,3,P5E9,C7IV,,,,,192.1.100.181,H58,19,,,,,,,,,,,,,,,,,,,0,223,100,100,,,,,,,,,,msg9,,,9,1631351,,,1,,,,,0,0,102213869,1631351,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1000,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,264,360,56,188,53,55,2,4,26,385168,3965,350,46
+461168630679888,1009,5,1018,100091,100006,,,1463483694712,132,1463483994712,52,2,240,2,0,17840878974,460075186103965,864394026459963,,,,10.28.135.36,192.26.209.14,47590,APN354,10.10.10.1,192.1.10.115,192.1.21.6,104,11,3,3F41,1M6H,9VE4,6N8J,13.14159265,2015-01-11 10:30:00,0,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735445.com,www.hua97/xyz,,,,,,,,,,,,,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,3,BCMS,FK0N,,,,,192.1.100.182,OEH,12,,,,,,,,,,,,,,,,,,,0,150,103,109,,,,,,,,,1,msg10,,,10,1114754,,,0,,,,,1,1,110992144,1114754,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1011,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2564,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,141,119,478,200,92,342,9,9,461436,298130,5402,410,143
+461168636073044,1006,5,1025,100015,100080,,,1463483694712,132,1463483994712,52,3,241,0,0,17836725298,460075194884777,864394032592023,,0,0,10.28.135.37,192.26.209.15,72757,APN355,10.10.10.1,192.1.10.116,192.1.21.7,104,13,1,C3JF,FN39,PE1W,XNVM,14.14159265,2015-01-12 10:30:00,1,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735446.com,www.hua98/xyz,,,,,,,,,,,,,1,1,0,,,,,,,,,,,,,,,,,,,,,,,,,3,WU2R,NY2X,,,,,192.1.100.183,IVN,15,,,,,,,,,,,,,,,,,,,0,199,102,110,,,,,,,,,,msg11,,,11,1467597,,,1,,,,,2,2,103115667,1467597,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1012,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,666,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,248,438,26,284,388,393,1,8,572024,725434,32,204,33
+461168604263566,1007,2,1008,100078,100098,,,1463483694712,132,1463483994712,52,4,242,1,0,17843405236,460075188958821,864394021814651,,1,1,10.28.135.38,192.26.209.16,29898,APN356,10.10.10.1,192.1.10.117,192.1.21.8,101,13,2,XO0C,8981,42QF,YK2M,15.14159265,2015-01-13 10:30:00,0,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735447.com,www.hua99/xyz,,,,,,,,,,,,,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,3,KV56,B25Q,,,,,192.1.100.184,2T9,32,,,,,,,,,,,,,,,,,,,0,267,103,104,,,,,,,,,1,msg12,,,12,1320440,,,0,,,,,3,3,114963914,1320440,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1004,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,12548,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,448,5,216,454,247,93,5,8,367734,553073,1780,185,99
+461168629954899,1010,4,1009,100087,100024,,,1463483694712,132,1463483994712,52,5,243,2,0,17823034648,460075199200518,864394048523374,,,,10.28.135.39,192.26.209.17,12389,APN357,10.10.10.1,192.1.10.118,192.1.21.9,100,14,5,LEV3,SSVL,5VFO,6TBE,16.14159265,2015-01-14 10:30:00,1,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735448.com,www.hua0/xyz,,,,,,,,,,,,,1,1,0,,,,,,,,,,,,,,,,,,,,,,,,,3,HK3Z,9912,,,,,192.1.100.185,4LV,19,,,,,,,,,,,,,,,,,,,0,135,103,107,,,,,,,,,,msg13,,,13,1037372,,,1,,,,,4,4,110101752,1037372,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1006,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,5,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,173,19,130,449,480,16,8,5,497969,277863,1174,234,29
+461168607158028,1004,3,1006,100071,100057,,,1463483694712,132,1463483994712,52,6,244,0,0,17831380952,460075172930249,864394046135702,,0,0,10.28.135.40,192.26.209.18,15316,APN358,10.10.10.1,192.1.10.119,192.1.21.10,102,12,1,19NT,K21B,U62W,FS8W,17.14159265,2015-01-15 10:30:00,0,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735449.com,www.hua1/xyz,,,,,,,,,,,,,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,3,PDK3,JSRZ,,,,,192.1.100.186,UEC,18,,,,,,,,,,,,,,,,,,,0,120,103,102,,,,,,,,,1,msg14,,,14,1322341,,,0,,,,,5,5,105066514,1322341,5,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1013,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2564,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,140,197,401,345,442,197,9,9,535316,200748,4583,419,174
+461168613603827,1001,3,1014,100078,100057,,,1463483694712,132,1463483994712,52,7,245,1,0,17840104066,460075188673159,864394028805357,,1,1,10.28.135.41,192.26.209.19,62169,APN359,10.10.10.1,192.1.10.120,192.1.21.11,102,14,3,MKLD,06EA,E8S8,TA09,18.14159265,2015-01-16 10:30:00,1,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735450.com,www.hua2/xyz,,,,,,,,,,,,,1,1,0,,,,,,,,,,,,,,,,,,,,,,,,,3,X6TW,9W2V,,,,,192.1.100.187,E8U,29,,,,,,,,,,,,,,,,,,,0,111,103,105,,,,,,,,,,msg15,,,15,1494794,,,1,,,,,6,6,101584589,1494794,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1007,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,7,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,666,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,175,41,208,218,376,460,7,4,385900,232104,1161,379,167
+461168604506644,1000,2,1007,100027,100055,,,1463483694712,132,1463483994712,52,8,246,2,0,17833643314,460075176621083,864394051640513,,,,10.28.135.42,192.26.209.20,16296,APN360,10.10.10.1,192.1.10.121,192.1.21.12,102,11,2,YDTI,SBKD,S8Y2,UEQ0,19.14159265,2015-01-17 10:30:00,0,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735451.com,www.hua3/xyz,,,,,,,,,,,,,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,3,NM8Z,10IS,,,,,192.1.100.188,YQH,18,,,,,,,,,,,,,,,,,,,0,251,102,101,,,,,,,,,1,msg16,,,16,1408693,,,0,,,,,7,7,101530775,1408693,7,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1005,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,8,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,12548,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,26,74,171,37,448,397,5,6,43934,658629,4858,366,76
+461168605219187,1010,5,1006,100053,100010,,,1463483694712,132,1463483994712,52,9,247,0,0,17843018590,460075168980468,864394032794306,,0,0,10.28.135.43,192.26.209.21,34342,APN361,10.10.10.1,192.1.10.122,192.1.21.13,101,11,5,6J6B,KI87,2YQR,X4JP,20.14159265,2015-01-18 10:30:00,1,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735452.com,,,,,,,,,,,,,,1,1,0,,,,,,,,,,,,,,,,,,,,,,,,,3,5IH8,JIYU,,,,,192.1.100.189,8XU,31,,,,,,,,,,,,,,,,,,,0,144,101,101,,,,,,,,,,msg17,,,17,1230081,,,1,,,,,8,8,108158690,1230081,8,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1018,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,9,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,159,359,235,139,120,186,2,8,528215,709875,4335,116,90
+461168623088922,1000,5,1009,100042,100065,,,1463483694712,132,1463483994712,52,10,248,1,0,17818744371,460075195451161,864394028627769,,1,1,10.28.135.44,192.26.209.22,47199,APN362,10.10.10.1,192.1.10.123,192.1.21.14,101,14,2,ELPB,RDQU,FAXX,BAVW,21.14159265,2015-01-19 10:30:00,0,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735453.com,www.hua6/xyz,,,,,,,,,,,,,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,3,PCFK,5CIZ,,,,,192.1.100.190,76,32,,,,,,,,,,,,,,,,,,,0,250,104,102,,,,,,,,,1,msg18,,,18,1507867,,,0,,,,,9,9,100906219,1507867,9,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1013,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,10,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2564,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,401,181,200,185,361,42,3,8,698266,630981,448,445,92
+461168619437796,1009,5,1006,100085,100052,,,1463483694712,132,1463483994712,52,11,249,2,0,17839919067,460075171981992,864394038239124,,,,10.28.135.45,192.26.209.23,50498,APN363,10.10.10.1,192.1.10.124,192.1.21.15,104,13,5,MO1B,Y1FC,7NA2,M3PE,22.14159265,2015-01-20 10:30:00,1,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735454.com,www.hua7/xyz,,,,,,,,,,,,,1,1,0,,,,,,,,,,,,,,,,,,,,,,,,,3,EOGC,S7GY,,,,,192.1.100.191,RLR,26,,,,,,,,,,,,,,,,,,,0,101,104,103,,,,,,,,,,msg19,,,19,1062408,,,1,,,,,10,10,107480841,1062408,10,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1015,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,11,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,666,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,135,119,93,254,201,19,4,9,232619,321353,1432,239,174
+461168637313486,1008,2,1014,100016,100060,,,1463483694712,132,1463483994712,52,12,250,0,0,17817695431,460075179536064,864394035404034,,0,0,10.28.135.46,192.26.209.24,13535,APN364,10.10.10.1,192.1.10.125,192.1.21.16,101,14,2,N84B,SA9T,IPK9,WMKV,23.14159265,2015-01-21 10:30:00,0,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735455.com,www.hua8/xyz,,,,,,,,,,,,,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,3,JN03,DVF4,,,,,192.1.100.192,MLH,12,,,,,,,,,,,,,,,,,,,0,134,100,100,,,,,,,,,1,,,,20,1327085,,,0,,,,,0,0,101357467,1327085,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1001,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,12,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,12548,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,238,264,60,61,280,38,3,9,291919,288607,1351,448,76
+461168628743641,1006,1,1017,100011,100101,,,1463483694712,132,1463483994712,52,13,251,1,0,17823593627,460075187832201,864394023586047,,1,1,10.28.135.47,192.26.209.25,20979,APN365,10.10.10.1,192.1.10.126,192.1.21.17,102,11,3,VGLY,U7BN,RDAJ,BQ3B,24.14159265,2015-01-22 10:30:00,1,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735456.com,www.hua38/xyz,,,,,,,,,,,,,1,1,0,,,,,,,,,,,,,,,,,,,,,,,,,3,I1D6,TAE1,,,,,192.1.100.193,B1Z,12,,,,,,,,,,,,,,,,,,,0,152,103,109,,,,,,,,,,msg1,,,21,1456048,,,1,,,,,1,1,114987784,1456048,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1018,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,13,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,90,158,86,444,8,486,0,4,337653,304808,5384,204,177
+461168619731881,1005,4,1014,100010,100081,,,1463483694712,132,1463483994712,52,14,252,2,0,17820013160,460075175669977,864394039106416,,,,10.28.135.48,192.26.209.26,19989,APN366,10.10.10.1,192.1.10.127,192.1.21.18,101,14,3,CZRB,E1Z9,Q9D2,F3A0,25.14159265,2015-01-23 10:30:00,0,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735457.com,,,,,,,,,,,,,,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,3,R1LA,V1U4,,,,,192.1.100.194,AI1,19,,,,,,,,,,,,,,,,,,,0,299,102,110,,,,,,,,,1,msg2,,,22,1068963,,,0,,,,,2,2,111570699,1068963,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1015,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,14,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2564,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,287,289,457,398,100,169,4,6,12049,364771,320,118,74
+461168619947776,1003,1,1009,100086,100044,,,1463483694712,132,1463483994712,52,15,253,0,0,17825513386,460075169556685,864394039834857,,0,0,10.28.135.49,192.26.209.27,65532,APN367,10.10.10.1,192.1.10.128,192.1.21.19,102,12,1,KYM8,UBEY,TWGU,5PO5,26.14159265,2015-01-24 10:30:00,1,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735458.com,www.hua87/xyz,,,,,,,,,,,,,1,1,0,,,,,,,,,,,,,,,,,,,,,,,,,3,9A14,TO69,,,,,192.1.100.195,73,19,,,,,,,,,,,,,,,,,,,0,209,103,104,,,,,,,,,,msg3,,,23,1577285,,,1,,,,,3,3,103920568,1577285,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1011,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,15,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,666,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,202,95,193,212,354,133,8,5,436811,334152,451,200,114
+461168619524344,1006,3,1023,100028,100080,,,1463483694712,132,1463483994712,52,16,254,1,0,17838988210,460075180109498,864394051242326,,1,1,10.28.135.50,192.26.209.28,20740,APN368,10.10.10.1,192.1.10.129,192.1.21.20,104,11,4,N5BU,CPY8,IARA,J0SM,27.14159265,2015-01-25 10:30:00,0,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735459.com,www.hua88/xyz,,,,,,,,,,,,,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,3,K7GL,0CPY,,,,,192.1.100.196,LG8,13,,,,,,,,,,,,,,,,,,,0,218,103,107,,,,,,,,,1,msg4,,,24,1523020,,,0,,,,,4,4,115854264,1523020,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1013,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,12548,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,142,455,24,75,167,99,1,9,216994,57970,655,150,187
+461168606367696,1009,3,1013,100065,100029,,,1463483694712,132,1463483994712,52,0,255,2,0,17824946256,460075192605098,864394035199888,,,,10.28.135.51,192.26.209.29,19237,APN369,10.10.10.1,192.1.10.130,192.1.21.21,104,13,2,0YZQ,CQD0,5YE8,9PCX,28.14159265,2015-01-26 10:30:00,1,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735460.com,www.hua89/xyz,,,,,,,,,,,,,1,1,0,,,,,,,,,,,,,,,,,,,,,,,,,3,IZO6,8EKU,,,,,192.1.100.197,9H5,26,,,,,,,,,,,,,,,,,,,0,276,103,102,,,,,,,,,,msg5,,,25,1091817,,,1,,,,,5,5,115430626,1091817,5,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1013,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,17,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,268,251,83,302,197,273,6,0,534440,132546,2938,85,67
+461168629561759,1003,4,1000,100086,100003,,,1463483694712,132,1463483994712,52,1,256,0,0,17841693722,460075190013666,864394026362186,,0,0,10.28.135.52,192.26.209.30,17937,APN370,10.10.10.1,192.1.10.131,192.1.21.22,103,14,2,1I4D,DUD1,HL83,EA15,29.14159265,2015-01-27 10:30:00,0,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735461.com,www.hua90/xyz,,,,,,,,,,,,,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,3,S9IX,AFLY,,,,,192.1.100.198,BM0,12,,,,,,,,,,,,,,,,,,,0,252,103,105,,,,,,,,,1,msg6,,,26,1392292,,,0,,,,,6,6,106676307,1392292,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1015,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,18,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2564,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,138,225,224,134,275,91,7,8,37408,497737,634,387,112
+461168615402015,1004,4,1018,100100,100070,,,1463483694712,132,1463483994712,52,2,257,1,0,17830341107,460075169895720,864394032776384,,1,1,10.28.135.53,192.26.209.31,42455,APN371,10.10.10.1,192.1.10.132,192.1.21.23,104,10,2,T705,7VU3,Z6U4,CM63,30.14159265,2015-01-28 10:30:00,1,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735462.com,www.hua91/xyz,,,,,,,,,,,,,1,1,0,,,,,,,,,,,,,,,,,,,,,,,,,3,SUK2,ZUWK,,,,,192.1.100.199,B52,14,,,,,,,,,,,,,,,,,,,0,286,102,101,,,,,,,,,,msg7,,,27,1218459,,,1,,,,,7,7,103051718,1218459,7,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1019,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,19,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,666,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,320,39,494,195,454,114,9,5,90987,778482,1179,52,111
+461168617059402,1006,1,1021,100074,100052,,,1463483694712,132,1463483994712,52,3,258,2,0,17819815181,460075195305953,864394042058615,,,,10.28.135.54,192.26.209.32,60639,APN372,10.10.10.1,192.1.10.133,192.1.21.24,103,12,2,Z5U3,T0OU,7KV5,MLHU,31.14159265,2015-01-29 10:30:00,0,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735463.com,www.hua92/xyz,,,,,,,,,,,,,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,3,2BLB,Z4MQ,,,,,192.1.100.200,B53,16,,,,,,,,,,,,,,,,,,,0,172,101,101,,,,,,,,,1,msg8,,,28,1337541,,,0,,,,,8,8,100403313,1337541,8,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1014,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,20,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,12548,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,67,471,148,277,226,334,7,0,25445,655471,2200,211,55
+461168636860995,1001,3,1002,100084,100093,,,1463483694712,132,1463483994712,52,4,259,0,0,17822437965,460075187143675,864394031136239,,0,0,10.28.135.55,192.26.209.33,56961,APN373,10.10.10.1,192.1.10.134,192.1.21.25,102,10,2,A906,F877,Y2CV,YPIW,32.14159265,2015-01-30 10:30:00,1,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735464.com,www.hua93/xyz,,,,,,,,,,,,,1,1,0,,,,,,,,,,,,,,,,,,,,,,,,,3,O8FA,E6AB,,,,,192.1.100.201,IDU,12,,,,,,,,,,,,,,,,,,,0,270,104,102,,,,,,,,,,msg9,,,29,1096239,,,1,,,,,9,9,109167764,1096239,9,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1000,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,152,183,330,119,222,448,6,7,304846,238320,1384,344,124
+461168644173605,1010,3,1009,100065,100068,,,1463483694712,132,1463483994712,52,5,260,1,0,17820687254,460075181520192,864394049987484,,1,1,10.28.135.56,192.26.209.34,34696,APN374,10.10.10.1,192.1.10.135,192.1.21.26,102,14,2,QSSU,W3FN,69AM,3A6L,33.14159265,2015-01-31 10:30:00,0,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735465.com,www.hua94/xyz,,,,,,,,,,,,,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,3,O2QV,AKWO,,,,,192.1.100.202,B7E,25,,,,,,,,,,,,,,,,,,,0,128,104,103,,,,,,,,,1,msg10,,,30,1454344,,,0,,,,,10,10,103021712,1454344,10,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1011,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2564,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,168,345,479,121,441,132,7,2,334248,527441,2453,248,114
+461168625280354,1008,1,1016,100075,100037,,,1463483694712,132,1463483994712,52,6,261,2,0,17818212729,460075198933790,864394024014172,,,,10.28.135.57,192.26.209.35,49078,APN375,10.10.10.1,192.1.10.136,192.1.21.27,101,12,4,J36D,SNZF,LH6F,P76R,34.14159265,2015-02-01 10:30:00,1,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735466.com,www.hua95/xyz,,,,,,,,,,,,,1,1,0,,,,,,,,,,,,,,,,,,,,,,,,,3,5AK6,S4P9,,,,,192.1.100.203,QS2,20,,,,,,,,,,,,,,,,,,,0,294,100,100,,,,,,,,,,msg11,,,31,1632695,,,1,,,,,0,0,103650996,1632695,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1012,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,666,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,372,302,262,47,234,369,3,8,613761,258860,751,253,148
+461168642823770,1007,5,1003,100098,100061,,,1463483694712,132,1463483994712,52,7,262,0,0,17822612522,460075195319005,864394051356518,,0,0,10.28.135.58,192.26.209.36,42101,APN376,10.10.10.1,192.1.10.137,192.1.21.28,104,10,1,UDBP,7J0B,HM1J,IRI7,35.14159265,2015-02-02 10:30:00,0,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735467.com,www.hua96/xyz,,,,,,,,,,,,,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,3,LWEI,U13D,,,,,192.1.100.204,VTI,20,,,,,,,,,,,,,,,,,,,0,276,103,109,,,,,,,,,1,msg12,,,32,1160717,,,0,,,,,1,1,103342825,1160717,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1004,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,12548,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,385,390,308,9,207,125,9,8,584339,22795,2128,464,198
+461168621014444,1010,1,1019,100079,100011,,,1463483694712,132,1463483994712,52,8,263,1,0,17837041820,460075182763599,864394031918383,,1,1,10.28.135.59,192.26.209.37,72575,APN377,10.10.10.1,192.1.10.138,192.1.21.29,101,12,1,I8LY,2MRB,PWBX,IPIW,36.14159265,2015-02-03 10:30:00,1,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735468.com,www.hua97/xyz,,,,,,,,,,,,,1,1,0,,,,,,,,,,,,,,,,,,,,,,,,,3,TFN8,I61W,,,,,192.1.100.205,RPA,31,,,,,,,,,,,,,,,,,,,0,105,102,110,,,,,,,,,,msg13,,,33,1295567,,,1,,,,,2,2,116217283,1295567,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1006,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,349,150,423,316,245,259,4,7,13446,464463,1389,12,125
+461168622009752,1000,2,1023,100001,100023,,,1463483694712,132,1463483994712,52,9,264,2,0,17846888933,460075192647513,864394029330223,,,,10.28.135.60,192.26.209.38,49658,APN378,10.10.10.1,192.1.10.139,192.1.21.30,103,14,2,7D59,VE6I,0OT3,XOD6,37.14159265,2015-02-04 10:30:00,0,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735469.com,www.hua98/xyz,,,,,,,,,,,,,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,3,LKO0,UFZX,,,,,192.1.100.206,ZSY,26,,,,,,,,,,,,,,,,,,,0,135,103,104,,,,,,,,,1,msg14,,,34,1345676,,,0,,,,,3,3,109496845,1345676,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1013,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,5,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2564,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,154,414,200,349,256,165,5,1,61853,603786,790,290,152
+461168623440683,1001,3,1011,100045,100030,,,1463483694712,132,1463483994712,52,10,265,0,0,17830275694,460075181693119,864394040605447,,0,0,10.28.135.61,192.26.209.39,42235,APN379,10.10.10.1,192.1.10.140,192.1.21.31,104,13,4,9SQQ,5ZJP,OMUX,IHYD,38.14159265,2015-02-05 10:30:00,1,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735470.com,www.hua99/xyz,,,,,,,,,,,,,1,1,0,,,,,,,,,,,,,,,,,,,,,,,,,3,V9DY,TS06,,,,,192.1.100.207,UP4,28,,,,,,,,,,,,,,,,,,,0,278,103,107,,,,,,,,,,msg15,,,35,1261073,,,1,,,,,4,4,113727303,1261073,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1007,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,666,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,211,491,477,406,325,221,8,4,241731,739851,2433,330,118
+461168604848150,1000,3,1015,100069,100044,,,1463483694712,132,1463483994712,52,11,266,1,0,17821808033,460075178687403,864394033510190,,1,1,10.28.135.62,192.26.209.40,53590,APN380,10.10.10.1,192.1.10.141,192.1.21.32,103,10,5,C0G7,WO8J,3C3P,5GW9,39.14159265,2015-02-06 10:30:00,0,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735471.com,www.hua0/xyz,,,,,,,,,,,,,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,3,IXQ6,FEJE,,,,,192.1.100.208,S9F,21,,,,,,,,,,,,,,,,,,,0,230,103,102,,,,,,,,,1,msg16,,,36,1182699,,,0,,,,,5,5,107809591,1182699,5,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1005,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,7,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,12548,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,409,162,330,93,412,282,3,6,302805,623820,2244,341,116
+461168628472866,1008,3,1000,100021,100024,,,1463483694712,132,1463483994712,52,12,267,2,0,17831061616,460075176390439,864394029845026,,,,10.28.135.63,192.26.209.41,50314,CMWAP,10.10.10.1,192.1.10.142,192.1.21.33,101,11,4,XBQ2,0JOH,ISWR,G3OA,40.14159265,2015-02-07 10:30:00,1,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735472.com,www.hua1/xyz,,,,,,,,,,,,,1,1,0,,,,,,,,,,,,,,,,,,,,,,,,,3,WF9I,3ETS,,,,,192.1.100.209,2BW,11,,,,,,,,,,,,,,,,,,,0,166,103,105,,,,,,,,,,msg17,,,37,1343829,,,1,,,,,6,6,111946545,1343829,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1018,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,8,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,399,458,265,393,61,439,6,7,272791,117540,2913,32,147
+461168636562769,1009,5,1020,100071,100018,,,1463483694712,132,1463483994712,52,13,268,0,0,17835589971,460075183917999,864394029873022,,0,0,10.28.135.64,192.26.209.42,24206,CMNET,10.10.10.1,192.1.10.143,192.1.21.34,104,11,5,K2X8,J3CU,387E,E887,41.14159265,2015-02-08 10:30:00,0,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735473.com,www.hua2/xyz,,,,,,,,,,,,,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,3,IPH5,DBO9,,,,,192.1.100.210,8RX,10,,,,,,,,,,,,,,,,,,,0,203,102,101,,,,,,,,,1,msg18,,,38,1318085,,,0,,,,,7,7,116054281,1318085,7,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1013,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,9,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2564,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,224,398,434,376,393,199,3,2,674811,239828,111,242,64
+461168641174708,1005,1,1012,100092,100042,,,1463483694712,132,1463483994712,52,14,269,1,0,17830292528,460075186719932,864394035601264,,1,1,10.28.135.65,192.26.209.43,27646,,10.10.10.1,192.1.10.144,192.1.21.35,102,10,3,5UMJ,CQJ4,D0DC,XRIE,42.14159265,2015-02-09 10:30:00,1,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735474.com,www.hua3/xyz,,,,,,,,,,,,,1,1,0,,,,,,,,,,,,,,,,,,,,,,,,,3,V8IZ,BCTJ,,,,,192.1.100.211,6TL,28,,,,,,,,,,,,,,,,,,,0,238,101,101,,,,,,,,,,msg19,,,39,1591254,,,1,,,,,8,8,112026327,1591254,8,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1015,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,10,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,666,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,497,143,463,313,257,181,9,7,260528,480569,4693,318,91
+461168647321324,1005,4,1021,100097,100079,,,1463483694712,132,1463483994712,52,15,270,2,0,17825017154,460075173632764,864394049319647,,,,10.28.135.66,192.26.209.44,43827,APN1,10.10.10.1,192.1.10.145,192.1.21.36,102,11,2,E5W4,BIM8,RWIX,ACCM,43.14159265,2015-02-10 10:30:00,0,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735475.com,,,,,,,,,,,,,,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,3,6BB3,XSYI,,,,,192.1.100.212,EHP,15,,,,,,,,,,,,,,,,,,,0,278,104,102,,,,,,,,,1,,,,40,1564806,,,0,,,,,9,9,116230889,1564806,9,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1001,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,11,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,12548,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,288,469,173,418,366,405,1,9,262995,616573,2519,195,91
+461168607713556,1006,1,1015,100055,100070,,,1463483694712,132,1463483994712,52,16,271,0,0,17828004355,460075175297961,864394033728974,,0,0,10.28.135.67,192.26.209.45,45334,APN2,10.10.10.1,192.1.10.146,192.1.21.37,104,14,1,FP3T,6QHC,9889,80DE,44.14159265,2015-02-11 10:30:00,1,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735476.com,www.hua6/xyz,,,,,,,,,,,,,1,1,0,,,,,,,,,,,,,,,,,,,,,,,,,3,K41H,X8IQ,,,,,192.1.100.213,R89,31,,,,,,,,,,,,,,,,,,,0,312,104,103,,,,,,,,,,msg1,,,41,1161183,,,1,,,,,10,10,115648142,1161183,10,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1018,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,12,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,500,125,312,211,382,238,3,4,640084,726382,2600,419,52
+461168637908367,1001,2,1012,100017,100078,,,1463483694712,132,1463483994712,52,0,272,1,0,17831215015,460075179754064,864394048055703,,1,1,10.28.135.68,192.26.209.46,40486,APN3,10.10.10.1,192.1.10.147,192.1.21.38,101,13,2,GE5F,TN2C,7I6L,46ET,45.14159265,2015-02-12 10:30:00,0,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735477.com,www.hua7/xyz,,,,,,,,,,,,,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,3,CXDT,O89E,,,,,192.1.100.214,EXG,26,,,,,,,,,,,,,,,,,,,0,189,100,100,,,,,,,,,1,msg2,,,42,1189619,,,0,,,,,0,0,108915418,1189619,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1015,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,13,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2564,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,439,16,384,314,378,94,2,1,768128,56146,4703,43,177
+461168610422607,1007,1,1014,100035,100081,,,1463483694712,132,1463483994712,52,1,273,2,0,17839653039,460075171466471,864394026747130,,,,10.28.135.69,192.26.209.47,35014,APN4,10.10.10.1,192.1.10.148,192.1.21.39,103,12,4,WMKZ,VMPJ,PUTU,I8D7,46.14159265,2015-02-13 10:30:00,1,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735478.com,www.hua8/xyz,,,,,,,,,,,,,1,1,0,,,,,,,,,,,,,,,,,,,,,,,,,3,KXOV,0JD9,,,,,192.1.100.215,M8E,16,,,,,,,,,,,,,,,,,,,0,131,103,109,,,,,,,,,,msg3,,,43,1542378,,,1,,,,,1,1,114090429,1542378,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1011,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,14,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,666,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,493,302,466,123,450,214,1,9,67171,175746,718,99,19
+461168616992320,1007,2,1001,100069,100059,,,1463483694712,132,1463483994712,52,2,274,0,0,17835388444,460075169752474,864394035740763,,0,0,10.28.135.70,192.26.209.48,70072,APN5,10.10.10.1,192.1.10.149,192.1.21.40,100,14,1,0FGI,Z9ZM,74DM,X1TY,47.14159265,2015-02-14 10:30:00,0,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735479.com,www.hua38/xyz,,,,,,,,,,,,,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,3,ALAV,XTUE,,,,,192.1.100.216,K22,24,,,,,,,,,,,,,,,,,,,0,121,102,110,,,,,,,,,1,msg4,,,44,1209656,,,0,,,,,2,2,104800605,1209656,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1013,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,15,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,12548,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,444,61,329,345,477,226,8,2,589096,379435,2079,391,71
+461168638736642,1004,5,1012,100077,100072,,,1463483694712,132,1463483994712,52,3,275,1,0,17829527590,460075169533086,864394049519426,,1,1,10.28.135.71,192.26.209.49,52810,APN6,10.10.10.1,192.1.10.150,192.1.21.41,103,12,4,JL0M,QJN5,7U4Y,1VUF,48.14159265,2015-02-15 10:30:00,1,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735480.com,,,,,,,,,,,,,,1,1,0,,,,,,,,,,,,,,,,,,,,,,,,,3,A426,OLQ4,,,,,192.1.100.217,3KK,10,,,,,,,,,,,,,,,,,,,0,266,103,104,,,,,,,,,,msg5,,,45,1528104,,,1,,,,,3,3,109776510,1528104,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1013,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,277,163,160,194,347,424,0,9,133535,39305,1616,399,144
+461168645543719,1010,4,1004,100022,100016,,,1463483694712,132,1463483994712,52,4,276,2,0,17840183453,460075177268387,864394023121658,,,,10.28.135.72,192.26.209.50,31700,APN7,10.10.10.1,192.1.10.151,192.1.21.42,102,10,1,F626,0OXQ,7EST,1YUL,49.14159265,2015-02-16 10:30:00,0,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735481.com,www.hua87/xyz,,,,,,,,,,,,,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,3,N1M0,YCR9,,,,,192.1.100.218,IO1,17,,,,,,,,,,,,,,,,,,,0,318,103,107,,,,,,,,,1,msg6,,,46,1268801,,,0,,,,,4,4,113650438,1268801,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1015,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,17,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2564,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,263,466,239,199,193,474,1,9,681632,31221,4459,169,150
+461168625578512,1006,1,1021,100010,100014,,,1463483694712,132,1463483994712,52,5,277,0,0,17842475917,460075196965100,864394052255331,,0,0,10.28.135.73,192.26.209.51,68555,APN8,10.10.10.1,192.1.10.152,192.1.21.43,103,12,4,4ZJZ,WZVA,C4ZI,9ACN,50.14159265,2015-02-17 10:30:00,1,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735482.com,www.hua88/xyz,,,,,,,,,,,,,1,1,0,,,,,,,,,,,,,,,,,,,,,,,,,3,IUCA,0XZV,,,,,192.1.100.219,XUB,14,,,,,,,,,,,,,,,,,,,0,285,103,102,,,,,,,,,,msg7,,,47,1449330,,,1,,,,,5,5,105860738,1449330,5,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1019,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,18,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,666,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,182,187,500,460,287,351,2,3,729462,306369,3030,248,47
+461168615953688,1000,5,1016,100015,100061,,,1463483694712,132,1463483994712,52,6,278,1,0,17840272356,460075199337596,864394048419479,,1,1,10.28.135.74,192.26.209.52,66161,APN9,10.10.10.1,192.1.10.153,192.1.21.44,103,13,3,2P37,IK6A,YAGX,X122,51.14159265,2015-02-18 10:30:00,0,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735483.com,www.hua89/xyz,,,,,,,,,,,,,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,3,C9UV,A5YM,,,,,192.1.100.220,JQ4,26,,,,,,,,,,,,,,,,,,,0,164,103,105,,,,,,,,,1,msg8,,,48,1512306,,,0,,,,,6,6,109924325,1512306,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1014,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,19,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,12548,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,201,249,230,487,394,432,2,6,427160,285185,32,21,183
+461168606366731,1005,5,1020,100018,100033,,,1463483694712,132,1463483994712,52,7,279,2,0,17826083358,460075197289811,864394029169877,,,,10.28.135.75,192.26.209.53,62794,APN10,10.10.10.1,192.1.10.154,192.1.21.45,101,11,3,0DK2,SMMR,28JJ,UKBX,52.14159265,2015-02-19 10:30:00,1,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735484.com,www.hua90/xyz,,,,,,,,,,,,,1,1,0,,,,,,,,,,,,,,,,,,,,,,,,,3,MLP9,X687,,,,,192.1.100.221,H58,19,,,,,,,,,,,,,,,,,,,0,159,102,101,,,,,,,,,,msg9,,,49,1153117,,,1,,,,,7,7,101268928,1153117,7,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1000,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,20,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,203,192,413,125,111,276,8,8,582681,418849,4360,160,6
+461168611789638,1007,3,1022,100057,100089,,,1463483694712,132,1463483994712,52,8,280,0,0,17840498328,460075174025583,864394024497100,,0,0,10.28.135.76,192.26.209.54,64592,APN11,10.10.10.1,192.1.10.155,192.1.21.46,100,11,4,A7AP,O7XT,Z8NG,JWN5,53.14159265,2015-02-20 10:30:00,0,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735485.com,www.hua91/xyz,,,,,,,,,,,,,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,3,RD3W,HE16,,,,,192.1.100.222,OEH,12,,,,,,,,,,,,,,,,,,,0,229,101,101,,,,,,,,,1,msg10,,,50,1045983,,,0,,,,,8,8,110688676,1045983,8,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1011,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2564,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,138,143,322,68,457,3,6,8,371293,135141,4665,148,125
+461168634200128,1007,4,1013,100019,100029,,,1463483694712,132,1463483994712,52,9,281,1,0,17844712123,460075189002931,864394030095814,,1,1,10.28.135.77,192.26.209.55,72500,APN12,10.10.10.1,192.1.10.156,192.1.21.47,104,11,2,U9FB,PRRH,RO84,QHIJ,54.14159265,2015-02-21 10:30:00,1,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735486.com,www.hua92/xyz,,,,,,,,,,,,,1,1,0,,,,,,,,,,,,,,,,,,,,,,,,,3,CZ38,WKGH,,,,,192.1.100.223,IVN,15,,,,,,,,,,,,,,,,,,,0,137,104,102,,,,,,,,,,msg11,,,51,1450448,,,1,,,,,9,9,116117828,1450448,9,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1012,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,666,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,317,485,117,291,347,493,4,3,477916,542090,1876,244,181
+461168641243635,1000,1,1020,100044,100063,,,1463483694712,132,1463483994712,52,10,282,2,0,17837072851,460075180698450,864394032983490,,,,10.28.135.78,192.26.209.56,53175,APN13,10.10.10.1,192.1.10.157,192.1.21.48,104,12,3,9LJ4,NMI0,7P4L,VC7G,55.14159265,2015-02-22 10:30:00,0,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735487.com,www.hua93/xyz,,,,,,,,,,,,,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,3,9WV5,LI47,,,,,192.1.100.224,2T9,32,,,,,,,,,,,,,,,,,,,0,281,104,103,,,,,,,,,1,msg12,,,52,1022582,,,0,,,,,10,10,111965578,1022582,10,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1004,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,12548,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,432,387,24,389,33,350,4,1,764422,694511,2573,352,150
+461168637622542,1008,4,1023,100087,100013,,,1463483694712,132,1463483994712,52,11,283,0,0,17821376766,460075177238853,864394046666009,,0,0,10.28.135.79,192.26.209.57,26400,APN14,10.10.10.1,192.1.10.158,192.1.21.49,100,14,4,H38D,C23Y,RHFN,7D80,56.14159265,2015-02-23 10:30:00,1,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735488.com,www.hua94/xyz,,,,,,,,,,,,,1,1,0,,,,,,,,,,,,,,,,,,,,,,,,,3,HDBU,CSD4,,,,,192.1.100.225,4LV,19,,,,,,,,,,,,,,,,,,,0,186,100,100,,,,,,,,,,msg13,,,53,1217800,,,1,,,,,0,0,101878874,1217800,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1006,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,289,494,49,19,189,105,5,4,674913,672892,1151,72,99
+461168644243717,1006,5,1000,100000,100025,,,1463483694712,132,1463483994712,52,1,1,0,0,17835929261,460075184123724,864394039470648,,1,1,10.28.135.80,192.26.209.58,22405,APN15,10.10.10.1,192.1.10.159,192.1.21.50,101,10,2,QGJI,O1SN,OB1S,FJ26,57.14159265,2015-02-24 10:30:00,0,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735489.com,www.hua95/xyz,,,,,,,,,,,,,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,3,9O6C,JX1H,,,,,192.1.100.226,UEC,18,,,,,,,,,,,,,,,,,,,0,227,103,109,,,,,,,,,1,msg14,,,54,1093062,,,0,,,,,1,1,112027595,1093062,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1013,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2564,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,471,28,306,375,62,287,3,7,643663,373146,4707,8,67
+461168627997194,1005,5,1002,100055,100046,,,1463483694712,132,1463483994712,52,2,2,1,0,17820848669,460075197770428,864394030670562,,,,10.28.135.81,192.26.209.59,29388,APN16,10.10.10.1,192.1.10.160,192.1.21.51,100,14,4,KHE0,O049,I64B,0NH4,58.14159265,2015-02-25 10:30:00,1,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735490.com,www.hua96/xyz,,,,,,,,,,,,,1,1,0,,,,,,,,,,,,,,,,,,,,,,,,,3,GXFW,WKU7,,,,,192.1.100.227,E8U,29,,,,,,,,,,,,,,,,,,,0,277,102,110,,,,,,,,,,msg15,,,55,1042990,,,1,,,,,2,2,112308813,1042990,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1007,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,5,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,666,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,164,30,51,315,38,144,7,5,448981,325625,2415,350,52
+461168607610558,1004,3,1015,100098,100101,,,1463483694712,132,1463483994712,52,3,3,2,0,17819145869,460075198824224,864394034328669,,0,0,10.28.135.82,192.26.209.60,18938,APN17,10.10.10.1,192.1.10.161,192.1.21.52,103,13,4,JNPY,AD8T,A1NL,AD8L,59.14159265,2015-02-26 10:30:00,0,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735491.com,www.hua97/xyz,,,,,,,,,,,,,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,3,46,O19H,,,,,192.1.100.228,YQH,18,,,,,,,,,,,,,,,,,,,0,270,103,104,,,,,,,,,1,msg16,,,56,1557390,,,0,,,,,3,3,116024421,1557390,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1005,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,12548,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,134,25,356,387,20,109,6,7,794734,572478,1440,135,120
+461168627916823,1010,1,1010,100092,100066,,,1463483694712,132,1463483994712,52,4,4,0,0,17845730853,460075184183491,864394033023541,,1,1,10.28.135.83,192.26.209.61,52252,APN18,10.10.10.1,192.1.10.162,192.1.21.53,102,10,3,8RD6,QFOM,RZ52,0MT7,60.14159265,2015-02-27 10:30:00,1,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735492.com,www.hua98/xyz,,,,,,,,,,,,,1,1,0,,,,,,,,,,,,,,,,,,,,,,,,,3,5T6Y,4D55,,,,,192.1.100.229,8XU,31,,,,,,,,,,,,,,,,,,,0,188,103,107,,,,,,,,,,msg17,,,57,1637453,,,1,,,,,4,4,102959522,1637453,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1018,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,7,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,339,55,286,149,56,230,1,4,772400,478354,1714,399,174
+461168632926224,1003,2,1009,100017,100026,,,1463483694712,132,1463483994712,52,5,5,1,0,17843154806,460075199076374,864394039068473,,,,10.28.135.84,192.26.209.62,52034,APN19,10.10.10.1,192.1.10.163,192.1.21.54,103,11,2,220A,E9NT,NT7M,21NK,61.14159265,2015-02-28 10:30:00,0,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735493.com,www.hua99/xyz,,,,,,,,,,,,,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,3,GCLQ,H15P,,,,,192.1.100.230,76,32,,,,,,,,,,,,,,,,,,,0,295,103,102,,,,,,,,,1,msg18,,,58,1332190,,,0,,,,,5,5,100702868,1332190,5,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1013,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,8,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2564,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,272,470,482,404,168,224,8,7,264169,797668,2372,44,112
+461168611207249,1010,5,1016,100067,100049,,,1463483694712,132,1463483994712,52,6,6,2,0,17847396677,460075186779728,864394049831120,,0,0,10.28.135.85,192.26.209.63,49736,APN20,10.10.10.1,192.1.10.164,192.1.21.55,102,14,5,WD2P,IFTM,XGES,ZHX3,62.14159265,2015-03-01 10:30:00,1,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735494.com,www.hua0/xyz,,,,,,,,,,,,,1,1,0,,,,,,,,,,,,,,,,,,,,,,,,,3,5K3E,3LI3,,,,,192.1.100.231,RLR,26,,,,,,,,,,,,,,,,,,,0,245,103,105,,,,,,,,,,msg19,,,59,1117238,,,1,,,,,6,6,107466052,1117238,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1015,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,9,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,666,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,232,6,291,161,85,370,6,0,100642,51560,2431,301,133
+461168607681211,1001,4,1020,100078,100056,,,1463483694712,132,1463483994712,52,7,7,0,0,17824629835,460075189708955,864394049120203,,1,1,10.28.135.86,192.26.209.64,24110,APN21,10.10.10.1,192.1.10.165,192.1.21.56,104,12,2,B2U7,ARLX,PA69,53CS,63.14159265,2015-03-02 10:30:00,0,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735495.com,www.hua1/xyz,,,,,,,,,,,,,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,3,VRH1,NP1C,,,,,192.1.100.232,MLH,12,,,,,,,,,,,,,,,,,,,0,198,102,101,,,,,,,,,1,,,,60,1567201,,,0,,,,,7,7,101770015,1567201,7,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1001,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,10,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,12548,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,60,389,124,20,183,432,1,8,625616,497834,4353,27,10
+461168623949747,1003,4,1000,100086,100059,,,1463483694712,132,1463483994712,52,8,8,1,0,17822612723,460075180957456,864394040057906,,,,10.28.135.87,192.26.209.65,65912,APN22,10.10.10.1,192.1.10.166,192.1.21.57,101,10,3,0OYI,77UI,9CK7,ID85,64.14159265,2015-03-03 10:30:00,1,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735496.com,www.hua2/xyz,,,,,,,,,,,,,1,1,0,,,,,,,,,,,,,,,,,,,,,,,,,3,JUV5,NBOP,,,,,192.1.100.233,B1Z,12,,,,,,,,,,,,,,,,,,,0,305,101,101,,,,,,,,,,msg1,,,61,1447692,,,1,,,,,8,8,103805381,1447692,8,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1018,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,11,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,61,10,304,207,449,492,1,4,384769,768667,2235,239,54
+461168617629810,1009,5,1018,100021,100012,,,1463483694712,132,1463483994712,52,9,9,2,0,17833906217,460075193885747,864394021987485,,0,0,10.28.135.88,192.26.209.66,74207,APN23,10.10.10.1,192.1.10.167,192.1.21.58,101,13,2,2WFY,VOCX,I7US,XZT0,65.14159265,2015-03-04 10:30:00,0,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735497.com,www.hua3/xyz,,,,,,,,,,,,,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,3,FVED,QO6K,,,,,192.1.100.234,AI1,19,,,,,,,,,,,,,,,,,,,0,206,104,102,,,,,,,,,1,msg2,,,62,1523277,,,0,,,,,9,9,116439449,1523277,9,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1015,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,12,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2564,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,123,322,394,32,323,358,0,4,388444,250829,4965,310,109
+461168638094572,1002,4,1005,100008,100048,,,1463483694712,132,1463483994712,52,10,10,0,0,17837355978,460075179066057,864394031880379,,1,1,10.28.135.89,192.26.209.67,15034,APN24,10.10.10.1,192.1.10.168,192.1.21.59,100,11,2,KTNX,I67X,YHI8,JVBF,66.14159265,2015-03-05 10:30:00,1,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735498.com,,,,,,,,,,,,,,1,1,0,,,,,,,,,,,,,,,,,,,,,,,,,3,VVEH,PXQJ,,,,,192.1.100.235,73,19,,,,,,,,,,,,,,,,,,,0,128,104,103,,,,,,,,,,msg3,,,63,1275695,,,1,,,,,10,10,100108144,1275695,10,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1011,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,13,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,666,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,203,401,105,395,193,94,6,2,626207,564350,4317,227,79
+461168630689371,1009,4,1018,100056,100038,,,1463483694712,132,1463483994712,52,11,11,1,0,17819273217,460075170205325,864394039987355,,,,10.28.135.90,192.26.209.68,53780,APN25,10.10.10.1,192.1.10.169,192.1.21.60,102,12,5,Q1HE,VFSO,M1CX,4KCT,67.14159265,2015-03-06 10:30:00,0,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735499.com,www.hua6/xyz,,,,,,,,,,,,,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,3,OW1J,ZGIZ,,,,,192.1.100.236,LG8,13,,,,,,,,,,,,,,,,,,,0,167,100,100,,,,,,,,,1,msg4,,,64,1121834,,,0,,,,,0,0,111875740,1121834,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1013,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,14,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,12548,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,63,273,231,159,46,185,3,2,724920,434675,2745,338,134
+461168629146672,1008,2,1013,100053,100077,,,1463483694712,132,1463483994712,52,12,12,2,0,17821026183,460075196112875,864394039158071,,0,0,10.28.135.91,192.26.209.69,72306,APN26,10.10.10.1,192.1.10.170,192.1.21.61,100,11,3,1UY2,13KM,S1C8,661R,68.14159265,2015-03-07 10:30:00,1,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735500.com,www.hua7/xyz,,,,,,,,,,,,,1,1,0,,,,,,,,,,,,,,,,,,,,,,,,,3,SV5P,WHRX,,,,,192.1.100.237,9H5,26,,,,,,,,,,,,,,,,,,,0,207,103,109,,,,,,,,,,msg5,,,65,1321889,,,1,,,,,1,1,111639231,1321889,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1013,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,15,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,154,330,45,57,316,163,3,9,793942,128037,4303,160,33
+461168603896635,1008,5,1011,100096,100092,,,1463483694712,132,1463483994712,52,13,13,0,0,17825229977,460075184420025,864394030927798,,1,1,10.28.135.92,192.26.209.70,57233,APN27,10.10.10.1,192.1.10.171,192.1.21.62,100,10,2,QJLO,UJWK,XRO0,SUO0,69.14159265,2015-03-08 10:30:00,0,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735501.com,www.hua8/xyz,,,,,,,,,,,,,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,3,4PG5,Z01D,,,,,192.1.100.238,BM0,12,,,,,,,,,,,,,,,,,,,0,194,102,110,,,,,,,,,1,msg6,,,66,1439453,,,0,,,,,2,2,113969431,1439453,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1015,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2564,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,105,493,331,47,281,454,7,7,101582,793139,492,407,153
+461168633328606,1010,1,1003,100038,100020,,,1463483694712,132,1463483994712,52,14,14,1,0,17819365657,460075183995266,864394047745530,,,,10.28.135.93,192.26.209.71,72461,APN28,10.10.10.1,192.1.10.172,192.1.21.63,104,12,3,WT0F,KPSU,DZID,WFID,70.14159265,2015-03-09 10:30:00,1,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735502.com,www.hua38/xyz,,,,,,,,,,,,,1,1,0,,,,,,,,,,,,,,,,,,,,,,,,,3,R9F9,IAQB,,,,,192.1.100.239,B52,14,,,,,,,,,,,,,,,,,,,0,218,103,104,,,,,,,,,,msg7,,,67,1370430,,,1,,,,,3,3,103755995,1370430,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1019,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,17,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,666,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,166,86,200,365,318,189,3,7,285050,508434,666,321,59
+461168626262350,1005,3,1021,100000,100084,,,1463483694712,132,1463483994712,52,15,15,2,0,17823206072,460075186730506,864394049420645,,0,0,10.28.135.94,192.26.209.72,70856,APN29,10.10.10.1,192.1.10.173,192.1.21.64,104,12,4,ESUM,YH3F,PVDG,6TPC,71.14159265,2015-03-10 10:30:00,0,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735503.com,,,,,,,,,,,,,,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,3,JDNV,U14X,,,,,192.1.100.240,B53,16,,,,,,,,,,,,,,,,,,,0,268,103,107,,,,,,,,,1,msg8,,,68,1468751,,,0,,,,,4,4,100097207,1468751,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1014,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,18,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,12548,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,117,450,457,145,319,61,5,7,291435,429631,4458,124,62
+461168608015318,1009,3,1009,100064,100097,,,1463483694712,132,1463483994712,52,16,16,0,0,17846712487,460075195978766,864394026317889,,1,1,10.28.135.95,192.26.209.73,46096,APN30,10.10.10.1,192.1.10.174,192.1.21.65,101,11,4,JXIT,7X38,ORLA,B7L7,72.14159265,2015-03-11 10:30:00,1,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735504.com,www.hua87/xyz,,,,,,,,,,,,,1,1,0,,,,,,,,,,,,,,,,,,,,,,,,,3,63FQ,8ZSE,,,,,192.1.100.241,IDU,12,,,,,,,,,,,,,,,,,,,0,317,103,102,,,,,,,,,,msg9,,,69,1390652,,,1,,,,,5,5,107997922,1390652,5,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1000,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,19,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,165,351,470,441,389,135,6,6,653626,200961,1966,421,100
+461168645821521,1002,2,1002,100043,100030,,,1463483694712,132,1463483994712,52,0,17,1,0,17837715610,460075192893796,864394022342184,,,,10.28.135.96,192.26.209.74,16743,APN31,10.10.10.1,192.1.10.175,192.1.21.66,103,13,5,SH3F,6J4V,TWU4,DW8J,73.14159265,2015-03-12 10:30:00,0,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735505.com,www.hua88/xyz,,,,,,,,,,,,,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,3,OH7J,YVWH,,,,,192.1.100.242,B7E,25,,,,,,,,,,,,,,,,,,,0,291,103,105,,,,,,,,,1,msg10,,,70,1007115,,,0,,,,,6,6,102045796,1007115,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1011,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,20,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2564,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,341,74,66,123,83,373,8,6,596822,794127,5162,224,60
+461168607380461,1009,3,1000,100012,100100,,,1463483694712,132,1463483994712,52,1,18,2,0,17843854264,460075191953928,864394023271210,,0,0,10.28.135.97,192.26.209.75,27883,APN32,10.10.10.1,192.1.10.176,192.1.21.67,103,14,4,HGBE,AZZP,EK6A,WCR3,74.14159265,2015-03-13 10:30:00,1,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735506.com,www.hua89/xyz,,,,,,,,,,,,,1,1,0,,,,,,,,,,,,,,,,,,,,,,,,,3,N1IZ,LSEP,,,,,192.1.100.243,QS2,20,,,,,,,,,,,,,,,,,,,0,129,102,101,,,,,,,,,,msg11,,,71,1604994,,,1,,,,,7,7,112422006,1604994,7,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1012,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,666,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,379,319,226,361,31,258,2,8,234775,38614,1750,379,120
+461168602642576,1004,1,1025,100022,100008,,,1463483694712,132,1463483994712,52,2,19,0,0,17840663130,460075182425610,864394047406666,,1,1,10.28.135.98,192.26.209.76,54895,APN33,10.10.10.1,192.1.10.177,192.1.21.68,101,14,2,PGER,K9FL,X2BF,H1SV,75.14159265,2015-03-14 10:30:00,0,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735507.com,www.hua90/xyz,,,,,,,,,,,,,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,3,0MOT,NW71,,,,,192.1.100.244,VTI,20,,,,,,,,,,,,,,,,,,,0,110,101,101,,,,,,,,,1,msg12,,,72,1391918,,,0,,,,,8,8,102993629,1391918,8,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1004,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,12548,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,262,175,88,368,347,185,6,4,58953,677588,4797,494,76
+461168618000346,1004,1,1006,100080,100004,,,1463483694712,132,1463483994712,52,3,20,1,0,17830687576,460075169775942,864394034005577,,,,10.28.135.99,192.26.209.77,60050,APN34,10.10.10.1,192.1.10.178,192.1.21.69,101,10,4,7O23,L87L,1YWY,JPUU,76.14159265,2015-03-15 10:30:00,1,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735508.com,www.hua91/xyz,,,,,,,,,,,,,1,1,0,,,,,,,,,,,,,,,,,,,,,,,,,3,OLQX,Z4Q6,,,,,192.1.100.245,RPA,31,,,,,,,,,,,,,,,,,,,0,228,104,102,,,,,,,,,,msg13,,,73,1032218,,,1,,,,,9,9,103696994,1032218,9,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1006,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,139,310,294,402,359,426,6,0,503189,451806,4187,290,176
+461168617438594,1007,4,1005,100088,100083,,,1463483694712,132,1463483994712,52,4,21,2,0,17819804381,460075190854020,864394040045806,,0,0,10.28.135.100,192.26.209.78,31624,APN35,10.10.10.1,192.1.10.179,192.1.21.70,100,10,4,Z7U5,94QO,BQNV,QCXU,77.14159265,2015-03-16 10:30:00,0,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735509.com,www.hua92/xyz,,,,,,,,,,,,,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,3,JPNE,8JMC,,,,,192.1.100.246,ZSY,26,,,,,,,,,,,,,,,,,,,0,246,104,103,,,,,,,,,1,msg14,,,74,1489381,,,0,,,,,10,10,102065114,1489381,10,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1013,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2564,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,121,385,237,48,99,230,0,3,21398,9779,3486,127,186
+461168616367252,1003,1,1016,100072,100042,,,1463483694712,132,1463483994712,52,5,22,0,0,17840073216,460075185401253,864394031488890,,1,1,10.28.135.101,192.26.209.79,51039,APN36,10.10.10.1,192.1.10.180,192.1.21.71,102,14,2,BT63,FC91,X7PZ,HNHF,78.14159265,2015-03-17 10:30:00,1,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735510.com,www.hua93/xyz,,,,,,,,,,,,,1,1,0,,,,,,,,,,,,,,,,,,,,,,,,,3,F6PZ,T5Z5,,,,,192.1.100.247,UP4,28,,,,,,,,,,,,,,,,,,,0,215,100,100,,,,,,,,,,msg15,,,75,1052350,,,1,,,,,0,0,102147552,1052350,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1007,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,666,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,84,205,232,332,273,121,7,7,411624,67917,1408,401,93
+461168629573143,1000,5,1004,100093,100028,,,1463483694712,132,1463483994712,52,6,23,1,0,17842357093,460075170359241,864394023656783,,,,10.28.135.102,192.26.209.80,49375,APN37,10.10.10.1,192.1.10.181,192.1.21.72,104,12,1,OMZ0,8KD6,EJ36,WJSG,79.14159265,2015-03-18 10:30:00,0,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735511.com,www.hua94/xyz,,,,,,,,,,,,,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,3,CTTR,B60S,,,,,192.1.100.248,S9F,21,,,,,,,,,,,,,,,,,,,0,302,103,109,,,,,,,,,1,msg16,,,76,1669528,,,0,,,,,1,1,110652535,1669528,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1005,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,5,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,12548,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,414,168,297,435,7,308,0,1,725117,217894,3086,257,121
+461168612418695,1007,4,1004,100048,100095,,,1463483694712,132,1463483994712,52,7,24,2,0,17837209232,460075195809653,864394022242383,,0,0,10.28.135.103,192.26.209.81,57297,APN38,10.10.10.1,192.1.10.182,192.1.21.73,100,11,5,LG1S,53PQ,0CS9,O131,80.14159265,2015-03-19 10:30:00,1,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735512.com,www.hua95/xyz,,,,,,,,,,,,,1,1,0,,,,,,,,,,,,,,,,,,,,,,,,,3,0P79,NFWI,,,,,192.1.100.249,2BW,11,,,,,,,,,,,,,,,,,,,0,202,102,110,,,,,,,,,,msg17,,,77,1052188,,,1,,,,,2,2,105686318,1052188,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1018,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,71,397,193,262,494,382,3,6,559113,290808,482,277,72
+461168605057532,1003,1,1008,100010,100033,,,1463483694712,132,1463483994712,52,8,25,0,0,17827830025,460075173972541,864394048754728,,1,1,10.28.135.104,192.26.209.82,65077,APN39,10.10.10.1,192.1.10.183,192.1.21.74,100,12,5,ZE3O,OL4T,GLGR,ZJZ0,81.14159265,2015-03-20 10:30:00,0,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735513.com,www.hua96/xyz,,,,,,,,,,,,,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,3,HXVR,VUFP,,,,,192.1.100.250,8RX,10,,,,,,,,,,,,,,,,,,,0,179,103,104,,,,,,,,,1,msg18,,,78,1627409,,,0,,,,,3,3,100200041,1627409,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1013,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,7,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2564,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,366,85,326,219,326,72,2,1,408619,735760,3338,391,60
+461168639661093,1008,1,1000,100026,100098,,,1463483694712,132,1463483994712,52,9,26,1,0,17834209825,460075180577634,864394042183758,,,,10.28.135.105,192.26.209.83,63270,APN40,10.10.10.1,192.1.10.184,192.1.21.75,103,12,4,K4CI,KJ62,P43N,ZVAZ,82.14159265,2015-03-21 10:30:00,1,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735514.com,www.hua97/xyz,,,,,,,,,,,,,1,1,0,,,,,,,,,,,,,,,,,,,,,,,,,3,CCNR,5PL9,,,,,192.1.100.251,6TL,28,,,,,,,,,,,,,,,,,,,0,230,103,107,,,,,,,,,,msg19,,,79,1554546,,,1,,,,,4,4,108872790,1554546,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1015,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,8,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,666,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,400,478,338,282,61,303,9,0,476307,623185,3767,250,158
+461168618144890,1009,1,1019,100052,100056,,,1463483694712,132,1463483994712,52,10,27,2,0,17840692530,460075194487053,864394037879724,,0,0,10.28.135.106,192.26.209.84,11057,APN41,10.10.10.1,192.1.10.185,192.1.21.76,100,13,4,U9EE,U8CG,9Y30,6IXV,83.14159265,2015-03-22 10:30:00,0,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735515.com,www.hua98/xyz,,,,,,,,,,,,,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,3,VSA9,70AT,,,,,192.1.100.252,EHP,15,,,,,,,,,,,,,,,,,,,0,236,103,102,,,,,,,,,1,,,,80,1307632,,,0,,,,,5,5,109876305,1307632,5,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1001,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,9,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,12548,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,257,354,159,142,219,210,7,5,346720,361070,3023,267,20
+461168626433709,1009,2,1013,100004,100046,,,1463483694712,132,1463483994712,52,11,28,0,0,17831970777,460075191972236,864394043960031,,1,1,10.28.135.107,192.26.209.85,12292,APN42,10.10.10.1,192.1.10.186,192.1.21.77,101,11,3,SIHD,4CM4,EZY2,F9KT,84.14159265,2015-03-23 10:30:00,1,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735516.com,www.hua99/xyz,,,,,,,,,,,,,1,1,0,,,,,,,,,,,,,,,,,,,,,,,,,3,TT3Z,AC2J,,,,,192.1.100.253,R89,31,,,,,,,,,,,,,,,,,,,0,319,103,105,,,,,,,,,,msg1,,,81,1531733,,,1,,,,,6,6,102691744,1531733,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1018,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,10,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,375,212,350,128,354,60,0,8,542698,274661,697,483,71
+461168608862260,1002,3,1013,100038,100084,,,1463483694712,132,1463483994712,52,12,29,1,0,17830307784,460075192449673,864394037850683,,,,10.28.135.108,192.26.209.86,39777,APN43,10.10.10.1,192.1.10.187,192.1.21.78,104,14,5,3CYB,L1B4,FTAW,RQVT,85.14159265,2015-03-24 10:30:00,0,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735517.com,www.hua0/xyz,,,,,,,,,,,,,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,3,2J4P,YOT2,,,,,192.1.100.254,EXG,26,,,,,,,,,,,,,,,,,,,0,254,102,101,,,,,,,,,1,msg2,,,82,1107994,,,0,,,,,7,7,114275648,1107994,7,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1015,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,11,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2564,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,350,250,244,491,18,182,7,6,122091,589779,1213,238,28
+461168627307397,1002,4,1000,100078,100017,,,1463483694712,132,1463483994712,52,13,30,2,0,17817532123,460075172187520,864394032897425,,0,0,10.28.135.109,192.26.209.87,67189,APN44,10.10.10.1,192.1.10.188,192.1.21.79,104,13,1,7TGR,9R56,BJNW,JGUW,86.14159265,2015-03-25 10:30:00,1,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735518.com,www.hua1/xyz,,,,,,,,,,,,,1,1,0,,,,,,,,,,,,,,,,,,,,,,,,,3,NS3E,Y834,,,,,192.1.100.255,M8E,16,,,,,,,,,,,,,,,,,,,0,288,101,101,,,,,,,,,,msg3,,,83,1291347,,,1,,,,,8,8,113783431,1291347,8,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1011,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,12,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,666,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,24,242,450,72,430,355,5,1,313846,691535,4237,495,178
+461168615587274,1007,3,1002,100030,100078,,,1463483694712,132,1463483994712,52,14,31,0,0,17834052987,460075196051284,864394050899980,,1,1,10.28.135.110,192.26.209.88,40745,APN45,10.10.10.1,192.1.10.189,192.1.21.80,102,10,4,8YLT,FSGF,KDNX,9ET9,87.14159265,2015-03-26 10:30:00,0,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735519.com,www.hua2/xyz,,,,,,,,,,,,,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,3,9D2I,W9BO,,,,,192.1.101.1,K22,24,,,,,,,,,,,,,,,,,,,0,126,104,102,,,,,,,,,1,msg4,,,84,1096340,,,0,,,,,9,9,111385577,1096340,9,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1013,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,13,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,12548,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,42,217,47,473,155,291,5,2,258340,508343,3458,156,6
+461168648527376,1010,2,1026,100051,100052,,,1463483694712,132,1463483994712,52,15,32,1,0,17839558346,460075191613028,864394043314212,,,,10.28.135.111,192.26.209.89,61836,APN46,10.10.10.1,192.1.10.190,192.1.21.81,101,11,1,HAF7,WYQO,800000000000000000000000000000000000000000000000,JV8S,88.14159265,2015-03-27 10:30:00,1,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735520.com,www.hua3/xyz,,,,,,,,,,,,,1,1,0,,,,,,,,,,,,,,,,,,,,,,,,,3,ZNVV,Z46T,,,,,192.1.101.2,3KK,10,,,,,,,,,,,,,,,,,,,0,137,104,103,,,,,,,,,,msg5,,,85,1193938,,,1,,,,,10,10,106339591,1193938,10,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1013,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,14,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,201,212,96,381,462,358,5,6,360753,98485,3438,109,1
28
+461168640794123,1003,5,1020,100083,100090,,,1463483694712,132,1463483994712,52,16,33,2,0,17846618826,460075195273161,864394032540641,,0,0,10.28.135.112,192.26.209.90,42774,APN47,10.10.10.1,192.1.10.191,192.1.21.82,100,13,3,CAED,VW9D,EV6E,OZF3,89.14159265,2015-03-28 10:30:00,0,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735521.com,,,,,,,,,,,,,,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,3,I9ZW,YEW0,,,,,192.1.101.3,IO1,17,,,,,,,,,,,,,,,,,,,0,181,100,100,,,,,,,,,1,msg6,,,86,1183122,,,0,,,,,0,0,115673116,1183122,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1015,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,15,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2564,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,441,41,390,306,115,102,2,8,531064,135455,5221,322,147
+461168644906252,1004,3,1002,100058,100007,,,1463483694712,132,1463483994712,52,0,34,0,0,17839621109,460075193004941,864394048158051,,1,1,10.28.135.113,192.26.209.91,45789,APN48,10.10.10.1,192.1.10.192,192.1.21.83,103,11,2,0YJ7,94CB,8A6A,6PYG,90.14159265,2015-03-29 10:30:00,1,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735522.com,www.hua6/xyz,,,,,,,,,,,,,1,1,0,,,,,,,,,,,,,,,,,,,,,,,,,3,Y5NS,V0E8,,,,,192.1.101.4,XUB,14,,,,,,,,,,,,,,,,,,,0,181,103,109,,,,,,,,,,msg7,,,87,1474312,,,1,,,,,1,1,111472104,1474312,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1019,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,666,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,93,8,89,318,122,406,3,4,601244,722021,2443,449,7
+461168626790146,1002,2,1024,100012,100023,,,1463483694712,132,1463483994712,52,1,35,1,0,17847448485,460075172168009,864394050943237,,,,10.28.135.114,192.26.209.92,71778,APN49,10.10.10.1,192.1.10.193,192.1.21.84,103,10,1,2CC8,IYMO,2MMU,VIM9,91.14159265,2015-03-30 10:30:00,0,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735523.com,www.hua7/xyz,,,,,,,,,,,,,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,3,WMK0,UQGK,,,,,192.1.101.5,JQ4,26,,,,,,,,,,,,,,,,,,,0,300,102,110,,,,,,,,,1,msg8,,,88,1197313,,,0,,,,,2,2,114559134,1197313,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1014,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,17,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,12548,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,410,285,24,52,73,440,0,5,175394,178219,1518,309,142
+461168625756157,1010,5,1016,100008,100028,,,1463483694712,132,1463483994712,52,2,36,2,0,17817859911,460075178722192,864394039002654,,0,0,10.28.135.115,192.26.209.93,53876,APN50,10.10.10.1,192.1.10.194,192.1.21.85,101,12,4,FADU,I9C9,5MMX,15AQ,92.14159265,2015-03-31 10:30:00,1,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735524.com,www.hua8/xyz,,,,,,,,,,,,,1,1,0,,,,,,,,,,,,,,,,,,,,,,,,,3,VFYU,CY2B,,,,,192.1.101.6,H58,19,,,,,,,,,,,,,,,,,,,0,230,103,104,,,,,,,,,,msg9,,,89,1626952,,,1,,,,,3,3,100790202,1626952,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1000,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,18,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,171,51,338,74,187,278,1,2,79372,115928,2544,191,149
+461168640822927,1003,3,1017,100020,100072,,,1463483694712,132,1463483994712,52,3,37,0,0,17831271716,460075188039878,864394030795307,,1,1,10.28.135.116,192.26.209.94,74794,APN51,10.10.10.1,192.1.10.195,192.1.21.86,104,13,1,8BNZ,AKOK,6HKN,XCT6,93.14159265,2015-04-01 10:30:00,0,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735525.com,www.hua38/xyz,,,,,,,,,,,,,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,3,971S,KQVZ,,,,,192.1.101.7,OEH,12,,,,,,,,,,,,,,,,,,,0,259,103,107,,,,,,,,,1,msg10,,,90,1016851,,,0,,,,,4,4,100480904,1016851,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1011,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,19,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2564,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,341,394,240,400,245,21,7,4,135433,713810,2216,434,18
+461168648391519,1006,2,1017,100033,100049,,,1463483694712,132,1463483994712,52,4,38,1,0,17838198560,460075180986925,864394030182821,,,,10.28.135.117,192.26.209.95,57482,APN52,10.10.10.1,192.1.10.196,192.1.21.87,103,10,3,CXDP,ANJT,RUGP,3BEE,94.14159265,2015-04-02 10:30:00,1,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735526.com,,,,,,,,,,,,,,1,1,0,,,,,,,,,,,,,,,,,,,,,,,,,3,QOBB,T7MC,,,,,192.1.101.8,IVN,15,,,,,,,,,,,,,,,,,,,0,131,103,102,,,,,,,,,,msg11,,,91,1194561,,,1,,,,,5,5,100371777,1194561,5,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1012,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,20,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,666,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,287,411,367,210,26,373,9,4,283332,183895,1365,296,83
+461168622071923,1003,1,1024,100091,100070,,,1463483694712,132,1463483994712,52,5,39,2,0,17833939272,460075178618195,864394035483173,,0,0,10.28.135.118,192.26.209.96,54560,APN53,10.10.10.1,192.1.10.197,192.1.21.88,103,11,4,KLVV,LNR7,DVR8,52WH,95.14159265,2015-04-03 10:30:00,0,-92233700000000000,92233700000000000,,,,,,,,,,,www.hua735527.com,www.hua87/xyz,,,,,,,,,,,,,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,3,L5KX,PY6F,,,,,192.1.101.9,2T9,32,,,,,,,,,,,,,,,,,,,0,189,103,105,,,,,,,,,1,msg12,,,92,1365667,,,0,,,,,6,6,104127407,1365667,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1004,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
<TRUNCATED>
[48/50] [abbrv] incubator-carbondata git commit: [CARBONDATA-635] Fix
Insert into query when table column names are different.This closes #565
Posted by ra...@apache.org.
[CARBONDATA-635] Fix Insert into query when table column names are different.This closes #565
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/7ba906be
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/7ba906be
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/7ba906be
Branch: refs/heads/branch-1.0
Commit: 7ba906be1b1c04ed389dc505222a1107d7419de0
Parents: 4a1f6ae 3b9671f
Author: Venkata Ramana G <ra...@huawei.com>
Authored: Fri Jan 20 21:10:51 2017 +0530
Committer: Venkata Ramana G <ra...@huawei.com>
Committed: Fri Jan 20 21:10:51 2017 +0530
----------------------------------------------------------------------
.../allqueries/InsertIntoCarbonTableTestCase.scala | 15 +++++++++++++++
.../sql/execution/CarbonLateDecodeStrategy.scala | 17 +++++++++++++++++
2 files changed, 32 insertions(+)
----------------------------------------------------------------------
[29/50] [abbrv] incubator-carbondata git commit: [CARBONDATA-643] All
dictionary path issue. This closes #555
Posted by ra...@apache.org.
[CARBONDATA-643] All dictionary path issue. This closes #555
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/1160b577
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/1160b577
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/1160b577
Branch: refs/heads/branch-1.0
Commit: 1160b5776400c7749dfb0206de6f75a2898a4667
Parents: af30254 1f0535f
Author: ravipesala <ra...@gmail.com>
Authored: Fri Jan 20 16:16:35 2017 +0530
Committer: ravipesala <ra...@gmail.com>
Committed: Fri Jan 20 16:16:35 2017 +0530
----------------------------------------------------------------------
.../spark/util/GlobalDictionaryUtil.scala | 21 +++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
[36/50] [abbrv] incubator-carbondata git commit: Problem: Dataloads
fail when no. of column in load query is greater than the no. of column in
create table
Posted by ra...@apache.org.
Problem: Dataloads fail when no. of column in load query is greater than the no. of column in create table
Analysis: During data load mapping of columns order is maintained between schema and columns provided in Fileheader/CSV file. If any duplicate column is provided in the fileheader, the length of array exceeds for the mapping order array as extra columns are getting matched and hence array index of bound exception is thrown.
Fix: Add a check for looping only till the mapping order array length is less than the number of schema columns.
Impact Area: Data load flow
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/1cd0450b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/1cd0450b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/1cd0450b
Branch: refs/heads/branch-1.0
Commit: 1cd0450b419d8a578c629d6bd6aba248f453ef22
Parents: 28abe7e
Author: manishgupta88 <to...@gmail.com>
Authored: Fri Jan 20 16:43:25 2017 +0530
Committer: ravipesala <ra...@gmail.com>
Committed: Fri Jan 20 18:18:09 2017 +0530
----------------------------------------------------------------------
.../src/test/resources/seq_500Records.csv | 500 +++++++++++++++++++
.../TestDataLoadWithColumnsMoreThanSchema.scala | 12 +
.../newflow/parser/impl/RowParserImpl.java | 3 +-
3 files changed, 514 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[44/50] [abbrv] incubator-carbondata git commit: Reverting big
decimal compression as it has below issue when big decimal scale value is
more then 18 then result is not accurate
Posted by ra...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/9e24a3dd/core/src/main/java/org/apache/carbondata/core/datastore/compression/none/CompressionNoneByte.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/compression/none/CompressionNoneByte.java b/core/src/main/java/org/apache/carbondata/core/datastore/compression/none/CompressionNoneByte.java
index 3df3c1e..acd73d9 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/compression/none/CompressionNoneByte.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/compression/none/CompressionNoneByte.java
@@ -61,13 +61,15 @@ public class CompressionNoneByte extends ValueCompressionHolder<byte[]> {
}
@Override
- public void uncompress(DataType dataType, byte[] data, int offset, int length,
- int mantissa, Object maxValueObject) {
- super.unCompress(compressor, dataType, data, offset, length);
- setUncompressedValues(value);
+ public void uncompress(DataType dataType, byte[] data, int offset, int length, int decimalPlaces,
+ Object maxValueObject, int numberOfRows) {
+ super.unCompress(compressor, dataType, data, offset, length, numberOfRows, maxValueObject,
+ decimalPlaces);
}
- @Override public byte[] getValue() { return this.value; }
+ @Override public byte[] getValue() {
+ return this.value;
+ }
@Override public void compress() {
compressedValue = super.compress(compressor, DataType.DATA_BYTE, value);
@@ -86,17 +88,17 @@ public class CompressionNoneByte extends ValueCompressionHolder<byte[]> {
}
@Override public BigDecimal getBigDecimalValue(int index) {
- throw new UnsupportedOperationException(
- "Big decimal is not defined for CompressionNoneByte");
- }
-
- private void setUncompressedValues(byte[] data) {
- this.measureChunkStore =
- MeasureChunkStoreFactory.INSTANCE.getMeasureDataChunkStore(DataType.DATA_BYTE, data.length);
- this.measureChunkStore.putData(data);
+ throw new UnsupportedOperationException("Big decimal is not defined for CompressionNoneByte");
}
@Override public void freeMemory() {
this.measureChunkStore.freeMemory();
}
+
+ @Override
+ public void setValue(byte[] data, int numberOfRows, Object maxValueObject, int decimalPlaces) {
+ this.measureChunkStore = MeasureChunkStoreFactory.INSTANCE
+ .getMeasureDataChunkStore(DataType.DATA_BYTE, numberOfRows);
+ this.measureChunkStore.putData(data);
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/9e24a3dd/core/src/main/java/org/apache/carbondata/core/datastore/compression/none/CompressionNoneDefault.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/compression/none/CompressionNoneDefault.java b/core/src/main/java/org/apache/carbondata/core/datastore/compression/none/CompressionNoneDefault.java
index e7dda8b..41245f4 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/compression/none/CompressionNoneDefault.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/compression/none/CompressionNoneDefault.java
@@ -53,16 +53,20 @@ public class CompressionNoneDefault extends ValueCompressionHolder<double[]> {
this.actualDataType = actualDataType;
}
- @Override public void setValue(double[] value) {this.value = value; }
+ @Override public void setValue(double[] value) {
+ this.value = value;
+ }
@Override
- public void uncompress(DataType dataType, byte[] data, int offset, int length,
- int decimalPlaces, Object maxValueObject) {
- super.unCompress(compressor, dataType, data, offset, length);
- setUncompressedValues(value);
+ public void uncompress(DataType dataType, byte[] data, int offset, int length, int decimalPlaces,
+ Object maxValueObject, int numberOfRows) {
+ super.unCompress(compressor, dataType, data, offset, length, numberOfRows, maxValueObject,
+ decimalPlaces);
}
- @Override public double[] getValue() { return this.value; }
+ @Override public double[] getValue() {
+ return this.value;
+ }
@Override public void compress() {
compressedValue = super.compress(compressor, DataType.DATA_DOUBLE, value);
@@ -74,8 +78,7 @@ public class CompressionNoneDefault extends ValueCompressionHolder<double[]> {
}
@Override public long getLongValue(int index) {
- throw new UnsupportedOperationException(
- "Long value is not defined for CompressionNonDefault");
+ throw new UnsupportedOperationException("Long value is not defined for CompressionNonDefault");
}
@Override public double getDoubleValue(int index) {
@@ -84,17 +87,23 @@ public class CompressionNoneDefault extends ValueCompressionHolder<double[]> {
@Override public BigDecimal getBigDecimalValue(int index) {
throw new UnsupportedOperationException(
- "Big decimal is not defined for CompressionNoneDefault");
+ "Big decimal is not defined for CompressionNoneDefault");
}
private void setUncompressedValues(double[] data) {
this.measureChunkStore = MeasureChunkStoreFactory.INSTANCE
.getMeasureDataChunkStore(DataType.DATA_DOUBLE, data.length);
this.measureChunkStore.putData(data);
-
}
@Override public void freeMemory() {
this.measureChunkStore.freeMemory();
}
+
+ @Override
+ public void setValue(double[] data, int numberOfRows, Object maxValueObject, int decimalPlaces) {
+ this.measureChunkStore = MeasureChunkStoreFactory.INSTANCE
+ .getMeasureDataChunkStore(DataType.DATA_DOUBLE, numberOfRows);
+ this.measureChunkStore.putData(data);
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/9e24a3dd/core/src/main/java/org/apache/carbondata/core/datastore/compression/none/CompressionNoneInt.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/compression/none/CompressionNoneInt.java b/core/src/main/java/org/apache/carbondata/core/datastore/compression/none/CompressionNoneInt.java
index 323bf24..f0c0311 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/compression/none/CompressionNoneInt.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/compression/none/CompressionNoneInt.java
@@ -57,17 +57,19 @@ public class CompressionNoneInt extends ValueCompressionHolder<int[]> {
this.value = value;
}
- @Override public int[] getValue() { return this.value; }
+ @Override public int[] getValue() {
+ return this.value;
+ }
@Override public void compress() {
compressedValue = super.compress(compressor, DataType.DATA_INT, value);
}
@Override
- public void uncompress(DataType dataType, byte[] data, int offset, int length,
- int decimalPlaces, Object maxValueObject) {
- super.unCompress(compressor, dataType, data, offset, length);
- setUncompressedValues(value);
+ public void uncompress(DataType dataType, byte[] data, int offset, int length, int decimalPlaces,
+ Object maxValueObject, int numberOfRows) {
+ super.unCompress(compressor, dataType, data, offset, length, numberOfRows, maxValueObject,
+ decimalPlaces);
}
@Override public void setValueInBytes(byte[] value) {
@@ -84,17 +86,17 @@ public class CompressionNoneInt extends ValueCompressionHolder<int[]> {
}
@Override public BigDecimal getBigDecimalValue(int index) {
- throw new UnsupportedOperationException(
- "Big decimal is not defined for CompressionNoneLong");
- }
-
- private void setUncompressedValues(int[] data) {
- this.measureChunkStore =
- MeasureChunkStoreFactory.INSTANCE.getMeasureDataChunkStore(DataType.DATA_INT, data.length);
- this.measureChunkStore.putData(data);
+ throw new UnsupportedOperationException("Big decimal is not defined for CompressionNoneLong");
}
@Override public void freeMemory() {
this.measureChunkStore.freeMemory();
}
+
+ @Override
+ public void setValue(int[] data, int numberOfRows, Object maxValueObject, int decimalPlaces) {
+ this.measureChunkStore =
+ MeasureChunkStoreFactory.INSTANCE.getMeasureDataChunkStore(DataType.DATA_INT, numberOfRows);
+ this.measureChunkStore.putData(data);
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/9e24a3dd/core/src/main/java/org/apache/carbondata/core/datastore/compression/none/CompressionNoneLong.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/compression/none/CompressionNoneLong.java b/core/src/main/java/org/apache/carbondata/core/datastore/compression/none/CompressionNoneLong.java
index ee523d7..6e13bb9 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/compression/none/CompressionNoneLong.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/compression/none/CompressionNoneLong.java
@@ -53,19 +53,23 @@ public class CompressionNoneLong extends ValueCompressionHolder<long[]> {
this.actualDataType = actualDataType;
}
- @Override public void setValue(long[] value) { this.value = value; }
+ @Override public void setValue(long[] value) {
+ this.value = value;
+ }
- @Override public long[] getValue() { return this.value; }
+ @Override public long[] getValue() {
+ return this.value;
+ }
@Override public void compress() {
compressedValue = super.compress(compressor, DataType.DATA_LONG, value);
}
@Override
- public void uncompress(DataType dataType, byte[] data, int offset, int length,
- int decimalPlaces, Object maxValueObject) {
- super.unCompress(compressor, dataType, data, offset, length);
- setUncompressedValues(value);
+ public void uncompress(DataType dataType, byte[] data, int offset, int length, int decimalPlaces,
+ Object maxValueObject, int numberOfRows) {
+ super.unCompress(compressor, dataType, data, offset, length, numberOfRows, maxValueObject,
+ decimalPlaces);
}
@Override public void setValueInBytes(byte[] byteValue) {
@@ -87,11 +91,19 @@ public class CompressionNoneLong extends ValueCompressionHolder<long[]> {
private void setUncompressedValues(long[] data) {
this.measureChunkStore =
- MeasureChunkStoreFactory.INSTANCE.getMeasureDataChunkStore(DataType.DATA_LONG, data.length);
+ MeasureChunkStoreFactory.INSTANCE.getMeasureDataChunkStore(DataType.DATA_LONG, data.length);
this.measureChunkStore.putData(data);
}
@Override public void freeMemory() {
this.measureChunkStore.freeMemory();
}
+
+ @Override
+ public void setValue(long[] data, int numberOfRows, Object maxValueObject, int decimalPlaces) {
+ this.measureChunkStore = MeasureChunkStoreFactory.INSTANCE
+ .getMeasureDataChunkStore(DataType.DATA_LONG, numberOfRows);
+ this.measureChunkStore.putData(data);
+
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/9e24a3dd/core/src/main/java/org/apache/carbondata/core/datastore/compression/none/CompressionNoneShort.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/compression/none/CompressionNoneShort.java b/core/src/main/java/org/apache/carbondata/core/datastore/compression/none/CompressionNoneShort.java
index 543fc52..d4289ab 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/compression/none/CompressionNoneShort.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/compression/none/CompressionNoneShort.java
@@ -59,13 +59,15 @@ public class CompressionNoneShort extends ValueCompressionHolder<short[]> {
this.shortValue = shortValue;
}
- @Override public short[] getValue() { return this.shortValue; }
+ @Override public short[] getValue() {
+ return this.shortValue;
+ }
@Override
- public void uncompress(DataType dataType, byte[] data, int offset, int length,
- int decimalPlaces, Object maxValueObject) {
- super.unCompress(compressor, dataType, data, offset, length);
- setUncompressedValues(shortValue);
+ public void uncompress(DataType dataType, byte[] data, int offset, int length, int decimalPlaces,
+ Object maxValueObject, int numberOfRows) {
+ super.unCompress(compressor, dataType, data, offset, length, numberOfRows, maxValueObject,
+ decimalPlaces);
}
@Override public void compress() {
@@ -86,17 +88,17 @@ public class CompressionNoneShort extends ValueCompressionHolder<short[]> {
}
@Override public BigDecimal getBigDecimalValue(int index) {
- throw new UnsupportedOperationException(
- "Big decimal is not defined for CompressionNonShort");
- }
-
- private void setUncompressedValues(short[] data) {
- this.measureChunkStore = MeasureChunkStoreFactory.INSTANCE
- .getMeasureDataChunkStore(DataType.DATA_SHORT, data.length);
- this.measureChunkStore.putData(data);
+ throw new UnsupportedOperationException("Big decimal is not defined for CompressionNonShort");
}
@Override public void freeMemory() {
this.measureChunkStore.freeMemory();
}
+
+ @Override
+ public void setValue(short[] data, int numberOfRows, Object maxValueObject, int decimalPlaces) {
+ this.measureChunkStore = MeasureChunkStoreFactory.INSTANCE
+ .getMeasureDataChunkStore(DataType.DATA_SHORT, numberOfRows);
+ this.measureChunkStore.putData(data);
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/9e24a3dd/core/src/main/java/org/apache/carbondata/core/datastore/compression/type/CompressionBigDecimal.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/compression/type/CompressionBigDecimal.java b/core/src/main/java/org/apache/carbondata/core/datastore/compression/type/CompressionBigDecimal.java
deleted file mode 100644
index 8ab14e7..0000000
--- a/core/src/main/java/org/apache/carbondata/core/datastore/compression/type/CompressionBigDecimal.java
+++ /dev/null
@@ -1,144 +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.datastore.compression.type;
-
-
-import java.math.BigDecimal;
-import java.nio.ByteBuffer;
-
-import org.apache.carbondata.common.logging.LogService;
-import org.apache.carbondata.common.logging.LogServiceFactory;
-import org.apache.carbondata.core.constants.CarbonCommonConstants;
-import org.apache.carbondata.core.datastore.compression.ValueCompressionHolder;
-import org.apache.carbondata.core.util.BigDecimalCompressionFinder;
-import org.apache.carbondata.core.util.ValueCompressionUtil.DataType;
-
-/**
- * Big decimal compression
- */
-public class CompressionBigDecimal<T> extends ValueCompressionHolder<T> {
-
- private static final LogService LOGGER =
- LogServiceFactory.getLogService(CompressionBigDecimal.class.getName());
-
- private BigDecimalCompressionFinder compressionFinder;
-
- /**
- * leftPart before decimal
- */
- private ValueCompressionHolder leftPart;
-
- /**
- * rightPart after decimal
- */
- private ValueCompressionHolder rightPart;
-
- private double divisionFactor;
-
- private boolean isDecimalPlacesNotZero;
-
- public CompressionBigDecimal(BigDecimalCompressionFinder compressionFinder,
- ValueCompressionHolder leftPart, ValueCompressionHolder rightPart) {
- this.compressionFinder = compressionFinder;
- this.leftPart = leftPart;
- this.rightPart = rightPart;
- }
-
- @Override public void setValue(T value) {
- Object[] values = (Object[]) value;
- leftPart.setValue(values[0]);
- rightPart.setValue(values[1]);
- }
-
- @Override
- public void uncompress(DataType dataType, byte[] data, int offset, int length,
- int decimalPlaces, Object maxValueObject) {
- if (decimalPlaces > 0) {
- this.isDecimalPlacesNotZero = true;
- }
- this.divisionFactor = Math.pow(10, decimalPlaces);
-
- ByteBuffer buffer = ByteBuffer.wrap(data, offset, length);
- int leftPathLength = buffer.getInt();
- int rightPartLength = length - leftPathLength - CarbonCommonConstants.INT_SIZE_IN_BYTE;
- Long[] maxValue = (Long[]) maxValueObject;
- leftPart.uncompress(compressionFinder.getLeftConvertedDataType(), data,
- offset + CarbonCommonConstants.INT_SIZE_IN_BYTE, leftPathLength, decimalPlaces,
- maxValue[0]);
- rightPart.uncompress(compressionFinder.getRightConvertedDataType(), data,
- offset + CarbonCommonConstants.INT_SIZE_IN_BYTE + leftPathLength, rightPartLength,
- decimalPlaces, maxValue[1]);
- }
-
- @Override public long getLongValue(int index) {
- throw new UnsupportedOperationException(
- "Long is not defined for CompressionBigDecimal");
- }
-
- @Override public double getDoubleValue(int index) {
- throw new UnsupportedOperationException(
- "Double is not defined for CompressionBigDecimal");
- }
-
- @Override public BigDecimal getBigDecimalValue(int index) {
- long leftValue = leftPart.getLongValue(index);
- long rightValue = 0;
- if (isDecimalPlacesNotZero) {
- rightValue = rightPart.getLongValue(index);
- }
- String decimalPart = Double.toString(rightValue / this.divisionFactor);
- String bigdStr = Long.toString(leftValue) + CarbonCommonConstants.POINT + decimalPart
- .substring(decimalPart.indexOf(".") + 1, decimalPart.length());
- return new BigDecimal(bigdStr);
- }
-
- @Override public T getValue() {
- Object[] values = new Object[2];
- values[0] = leftPart;
- values[1] = rightPart;
- return (T) values;
- }
-
- @Override public void setValueInBytes(byte[] value) {
- LOGGER.error("setValueInBytes() is not defined for CompressionBigDecimal");
- }
-
- @Override public void compress() {
- leftPart.compress();
- rightPart.compress();
- }
-
- @Override
- public byte[] getCompressedData() {
- byte[] leftdata = leftPart.getCompressedData();
- byte[] rightdata = rightPart.getCompressedData();
- ByteBuffer byteBuffer = ByteBuffer
- .allocate(CarbonCommonConstants.INT_SIZE_IN_BYTE + leftdata.length
- + rightdata.length);
- byteBuffer.putInt(leftdata.length);
- byteBuffer.put(leftdata);
- byteBuffer.put(rightdata);
- byteBuffer.flip();
- return byteBuffer.array();
- }
-
- @Override public void freeMemory() {
- leftPart.freeMemory();
- rightPart.freeMemory();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/9e24a3dd/core/src/main/java/org/apache/carbondata/core/datastore/dataholder/CarbonWriteDataHolder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/dataholder/CarbonWriteDataHolder.java b/core/src/main/java/org/apache/carbondata/core/datastore/dataholder/CarbonWriteDataHolder.java
index f17bc4c..e1aa0a0 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/dataholder/CarbonWriteDataHolder.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/dataholder/CarbonWriteDataHolder.java
@@ -29,15 +29,6 @@ public class CarbonWriteDataHolder {
private long[] longValues;
/**
- * bigDecimal left part
- */
- private long[] bigDecimalLeftValues;
-
- /**
- * bigDecimal right part
- */
- private long[] bigDecimalRightValues;
- /**
* byteValues
*/
private byte[][] byteValues;
@@ -127,14 +118,6 @@ public class CarbonWriteDataHolder {
longValues = new long[size];
}
- public void initialiseBigDecimalValues(int size) {
- if (size < 1) {
- throw new IllegalArgumentException("Invalid array size");
- }
- bigDecimalLeftValues = new long[size];
- bigDecimalRightValues = new long[size];
- }
-
/**
* set double value by index
*
@@ -158,17 +141,6 @@ public class CarbonWriteDataHolder {
}
/**
- * set bigdecimal value by index
- *
- * @param index
- * @param value
- */
- public void setWritableBigDecimalValueByIndex(int index, long[] value) {
- bigDecimalLeftValues[index] = value[0];
- bigDecimalRightValues[index] = value[1];
- size++;
- }
- /**
* set byte array value by index
*
* @param index
@@ -253,26 +225,4 @@ public class CarbonWriteDataHolder {
}
return longValues;
}
-
- /**
- * Get Writable bigdecimal Values
- *
- * @return
- */
- public long[][] getWritableBigDecimalValues() {
- long[][] bigDecimalValues = new long[2][];
- if (size < bigDecimalLeftValues.length) {
- long[] temp = new long[size];
- System.arraycopy(bigDecimalLeftValues, 0, temp, 0, size);
- bigDecimalLeftValues = temp;
- }
- if (size < bigDecimalRightValues.length) {
- long[] temp = new long[size];
- System.arraycopy(bigDecimalRightValues, 0, temp, 0, size);
- bigDecimalRightValues = temp;
- }
- bigDecimalValues[0]= bigDecimalLeftValues;
- bigDecimalValues[1] = bigDecimalRightValues;
- return bigDecimalValues;
- }
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/9e24a3dd/core/src/main/java/org/apache/carbondata/core/datastore/impl/data/compressed/AbstractHeavyCompressedDoubleArrayDataStore.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/impl/data/compressed/AbstractHeavyCompressedDoubleArrayDataStore.java b/core/src/main/java/org/apache/carbondata/core/datastore/impl/data/compressed/AbstractHeavyCompressedDoubleArrayDataStore.java
index 40863a8..b274b21 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/impl/data/compressed/AbstractHeavyCompressedDoubleArrayDataStore.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/impl/data/compressed/AbstractHeavyCompressedDoubleArrayDataStore.java
@@ -68,7 +68,8 @@ public abstract class AbstractHeavyCompressedDoubleArrayDataStore
byte[][] returnValue = new byte[values.length][];
for (int i = 0; i < compressionModel.getValueCompressionHolder().length; i++) {
values[i] = compressionModel.getValueCompressionHolder()[i];
- if (type[i] != CarbonCommonConstants.BYTE_VALUE_MEASURE) {
+ if (type[i] != CarbonCommonConstants.BYTE_VALUE_MEASURE
+ && type[i] != CarbonCommonConstants.BIG_DECIMAL_MEASURE) {
// first perform encoding of the data chunk
values[i].setValue(
ValueCompressionUtil.getValueCompressor(compressionModel.getCompressionFinders()[i])
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/9e24a3dd/core/src/main/java/org/apache/carbondata/core/util/BigDecimalCompressionFinder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/util/BigDecimalCompressionFinder.java b/core/src/main/java/org/apache/carbondata/core/util/BigDecimalCompressionFinder.java
deleted file mode 100644
index ce6f950..0000000
--- a/core/src/main/java/org/apache/carbondata/core/util/BigDecimalCompressionFinder.java
+++ /dev/null
@@ -1,92 +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.util;
-
-import org.apache.carbondata.core.util.ValueCompressionUtil.COMPRESSION_TYPE;
-import org.apache.carbondata.core.util.ValueCompressionUtil.DataType;
-
-public class BigDecimalCompressionFinder extends CompressionFinder {
-
- /**
- * non decimal part compression type
- */
- private COMPRESSION_TYPE leftCompType;
-
- /**
- * decimal part compression type
- */
- private COMPRESSION_TYPE rightCompType;
-
- /**
- * non decimal actual data type
- */
- private DataType leftActualDataType;
-
- /**
- * decimal actual data type
- */
- private DataType rightActualDataType;
-
- /**
- * non decimal converted data type
- */
- private DataType leftConvertedDataType;
-
- /**
- * decimal converted data type
- */
- private DataType rightConvertedDataType;
-
- public BigDecimalCompressionFinder(COMPRESSION_TYPE compType,
- DataType actualDataType, DataType convertedDataType, char measureStoreType) {
- super(compType, actualDataType, convertedDataType, measureStoreType);
- }
-
- public BigDecimalCompressionFinder(COMPRESSION_TYPE[] compType,
- DataType[] actualDataType, DataType[] convertedDataType, char measureStoreType) {
- super(null, null, null, measureStoreType);
- this.leftCompType = compType[0];
- this.rightCompType = compType[1];
- this.leftActualDataType = actualDataType[0];
- this.rightActualDataType = actualDataType[1];
- this.leftConvertedDataType = convertedDataType[0];
- this.rightConvertedDataType = convertedDataType[1];
- }
-
- public COMPRESSION_TYPE getLeftCompType() {
- return leftCompType;
- }
-
- public COMPRESSION_TYPE getRightCompType() {
- return rightCompType;
- }
-
- public DataType getLeftActualDataType() {
- return leftActualDataType;
- }
-
- public DataType getRightActualDataType() {
- return rightActualDataType;
- }
-
- public DataType getLeftConvertedDataType() { return leftConvertedDataType; }
-
- public DataType getRightConvertedDataType() {
- return rightConvertedDataType;
- }
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/9e24a3dd/core/src/main/java/org/apache/carbondata/core/util/DataTypeUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/util/DataTypeUtil.java b/core/src/main/java/org/apache/carbondata/core/util/DataTypeUtil.java
index 074c00d..2f9cd19 100644
--- a/core/src/main/java/org/apache/carbondata/core/util/DataTypeUtil.java
+++ b/core/src/main/java/org/apache/carbondata/core/util/DataTypeUtil.java
@@ -185,6 +185,19 @@ public final class DataTypeUtil {
}
/**
+ * This method will convert a byte value back to big decimal value
+ *
+ * @param raw
+ * @return
+ */
+ public static BigDecimal byteToBigDecimal(byte[] raw, int offset, int length) {
+ int scale = (raw[offset] & 0xFF);
+ byte[] unscale = new byte[length - 1];
+ System.arraycopy(raw, offset+1, unscale, 0, unscale.length);
+ BigInteger sig = new BigInteger(unscale);
+ return new BigDecimal(sig, scale);
+ }
+ /**
* returns the SqlStatement.Type of corresponding string value
*
* @param dataTypeStr
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/9e24a3dd/core/src/main/java/org/apache/carbondata/core/util/ValueCompressionUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/util/ValueCompressionUtil.java b/core/src/main/java/org/apache/carbondata/core/util/ValueCompressionUtil.java
index 612d302..219f69e 100644
--- a/core/src/main/java/org/apache/carbondata/core/util/ValueCompressionUtil.java
+++ b/core/src/main/java/org/apache/carbondata/core/util/ValueCompressionUtil.java
@@ -21,7 +21,6 @@ import java.math.BigDecimal;
import java.nio.ByteBuffer;
import java.util.Arrays;
-import org.apache.carbondata.core.compression.BigDecimalCompressor;
import org.apache.carbondata.core.compression.BigIntCompressor;
import org.apache.carbondata.core.compression.DoubleCompressor;
import org.apache.carbondata.core.compression.ValueCompressor;
@@ -32,7 +31,6 @@ import org.apache.carbondata.core.datastore.compression.WriterCompressModel;
import org.apache.carbondata.core.datastore.compression.decimal.*;
import org.apache.carbondata.core.datastore.compression.nondecimal.*;
import org.apache.carbondata.core.datastore.compression.none.*;
-import org.apache.carbondata.core.datastore.compression.type.*;
import org.apache.carbondata.core.metadata.ValueEncoderMeta;
public final class ValueCompressionUtil {
@@ -113,11 +111,11 @@ public final class ValueCompressionUtil {
*/
public static CompressionFinder getCompressionFinder(Object maxValue, Object minValue,
int mantissa, char measureStoreType, byte dataTypeSelected) {
- // ''b' for decimal, 'l' for long, 'n' for double
+ // ''l' for long, 'n' for double
switch (measureStoreType) {
case 'b':
- return getBigDecimalCompressorFinder(maxValue, minValue, 0, dataTypeSelected,
- measureStoreType);
+ return new CompressionFinder(COMPRESSION_TYPE.BIGDECIMAL, DataType.DATA_BYTE,
+ DataType.DATA_BYTE, measureStoreType);
case 'l':
return getLongCompressorFinder(maxValue, minValue, mantissa, dataTypeSelected,
measureStoreType);
@@ -176,32 +174,6 @@ public final class ValueCompressionUtil {
}
}
- private static CompressionFinder getBigDecimalCompressorFinder(
- Object maxValue, Object minValue, int mantissa,
- byte dataTypeSelected, char measureStoreType) {
- Long[] maxValues = (Long[])maxValue;
- Long[] minValues = (Long[])minValue;
- CompressionFinder leftCompressionFinder = getLongCompressorFinder(maxValues[0], minValues[0],
- mantissa, dataTypeSelected, measureStoreType);
- CompressionFinder rightCompressionFinder = getLongCompressorFinder(maxValues[1], minValues[1],
- mantissa, dataTypeSelected, measureStoreType);
- COMPRESSION_TYPE[] compressionTypes = new COMPRESSION_TYPE[2];
- DataType[] actualDataTypes = new DataType[2];
- DataType[] changedDataTypes = new DataType[2];
- compressionTypes[0] = leftCompressionFinder.getCompType();
- compressionTypes[1] = rightCompressionFinder.getCompType();
-
- actualDataTypes[0] = leftCompressionFinder.getActualDataType();
- actualDataTypes[1] = rightCompressionFinder.getActualDataType();
-
- changedDataTypes[0] = leftCompressionFinder.getConvertedDataType();
- changedDataTypes[1] = rightCompressionFinder.getConvertedDataType();
-
- CompressionFinder bigdCompressionFinder = new BigDecimalCompressionFinder(
- compressionTypes, actualDataTypes, changedDataTypes, measureStoreType);
- return bigdCompressionFinder;
- }
-
private static CompressionFinder getLongCompressorFinder(Object maxValue, Object minValue,
int mantissa, byte dataTypeSelected, char measureStoreType) {
DataType adaptiveDataType = getDataType((long) maxValue, mantissa, dataTypeSelected);
@@ -251,7 +223,6 @@ public final class ValueCompressionUtil {
*/
public static ValueCompressor getValueCompressor(CompressionFinder compressorFinder) {
switch(compressorFinder.getMeasureStoreType()) {
- case 'b': return new BigDecimalCompressor();
case 'l': return new BigIntCompressor();
default : return new DoubleCompressor();
}
@@ -272,23 +243,7 @@ public final class ValueCompressionUtil {
}
return valueCompressionHolders;
}
- /**
- *
- * @param compressionFinder bigdecimal compression finder
- * @return ValueCompressionHolder
- */
- private static ValueCompressionHolder getValueCompressionHolder(
- BigDecimalCompressionFinder compressionFinder) {
- ValueCompressionHolder leftPart = getValueCompressionHolder(
- compressionFinder.getLeftCompType(), compressionFinder.getLeftActualDataType(),
- compressionFinder.getLeftConvertedDataType());
- ValueCompressionHolder rightPart = getValueCompressionHolder(
- compressionFinder.getRightCompType(), compressionFinder.getRightActualDataType(),
- compressionFinder.getRightConvertedDataType());
-
- return new CompressionBigDecimal(compressionFinder, leftPart, rightPart);
- }
/**
*
@@ -298,9 +253,6 @@ public final class ValueCompressionUtil {
private static ValueCompressionHolder getValueCompressionHolder(
CompressionFinder compressionFinder) {
switch(compressionFinder.getMeasureStoreType()) {
- case 'b':
- return getValueCompressionHolder(
- (BigDecimalCompressionFinder) compressionFinder);
default:
return getValueCompressionHolder(compressionFinder.getCompType(),
compressionFinder.getActualDataType(), compressionFinder.getConvertedDataType());
@@ -318,6 +270,8 @@ public final class ValueCompressionUtil {
return getCompressionNonDecimalMaxMin(changedDataType);
case BIGINT:
return getCompressionNonDecimal(changedDataType);
+ case BIGDECIMAL:
+ return new CompressByteArray();
default:
throw new IllegalArgumentException("unsupported compType: " + compType);
}
@@ -866,7 +820,8 @@ public final class ValueCompressionUtil {
DATA_FLOAT(),
DATA_LONG(),
DATA_BIGINT(),
- DATA_DOUBLE();
+ DATA_DOUBLE(),
+ DATA_BIGDECIMAL();
DataType() {
}
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/9e24a3dd/core/src/test/java/org/apache/carbondata/core/datastore/chunk/reader/measure/CompressedMeasureChunkFileBasedReaderTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/carbondata/core/datastore/chunk/reader/measure/CompressedMeasureChunkFileBasedReaderTest.java b/core/src/test/java/org/apache/carbondata/core/datastore/chunk/reader/measure/CompressedMeasureChunkFileBasedReaderTest.java
index 978dce9..e4257f6 100644
--- a/core/src/test/java/org/apache/carbondata/core/datastore/chunk/reader/measure/CompressedMeasureChunkFileBasedReaderTest.java
+++ b/core/src/test/java/org/apache/carbondata/core/datastore/chunk/reader/measure/CompressedMeasureChunkFileBasedReaderTest.java
@@ -16,110 +16,75 @@
*/
package org.apache.carbondata.core.datastore.chunk.reader.measure;
-import static junit.framework.TestCase.assertEquals;
-
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-
-import mockit.Mock;
-import mockit.MockUp;
-
-import org.apache.carbondata.core.datastore.chunk.MeasureColumnDataChunk;
-import org.apache.carbondata.core.datastore.chunk.reader.measure.v1.CompressedMeasureChunkFileBasedReaderV1;
-
-import org.apache.carbondata.core.datastore.impl.data.compressed
- .HeavyCompressedDoubleArrayDataInMemoryStore;
-import org.apache.carbondata.core.metadata.blocklet.BlockletInfo;
-import org.apache.carbondata.core.metadata.blocklet.datachunk.DataChunk;
-import org.apache.carbondata.core.datastore.FileHolder;
-import org.apache.carbondata.core.datastore.compression.MeasureMetaDataModel;
-import org.apache.carbondata.core.datastore.compression.WriterCompressModel;
-import org.apache.carbondata.core.datastore.dataholder.CarbonWriteDataHolder;
-import org.apache.carbondata.core.metadata.ValueEncoderMeta;
-import org.apache.carbondata.core.util.ValueCompressionUtil;
-import org.junit.BeforeClass;
-import org.junit.Test;
public class CompressedMeasureChunkFileBasedReaderTest {
- static CompressedMeasureChunkFileBasedReaderV1 compressedMeasureChunkFileBasedReader;
- static CarbonWriteDataHolder[] dataHolder = new CarbonWriteDataHolder[1];
-
- static WriterCompressModel writerCompressModel;
- @BeforeClass public static void setup() {
- List<DataChunk> dataChunkList = new ArrayList<>();
- DataChunk dataChunk = new DataChunk();
- dataChunkList.add(dataChunk);
- dataChunk.setDataPageLength(10);
- writerCompressModel = new WriterCompressModel();
- Object maxValue[] = new Object[]{new Long[]{8L, 0L}};
- Object minValue[] = new Object[]{new Long[]{1L,0L}};
- byte[] dataTypeSelected = new byte[1];
- char[] aggType = new char[]{'b'};
- MeasureMetaDataModel measureMDMdl =
- new MeasureMetaDataModel(minValue, maxValue, new int[]{1}, maxValue.length, null,
- aggType, dataTypeSelected);
- writerCompressModel = ValueCompressionUtil.getWriterCompressModel(measureMDMdl);
-
-
- ValueEncoderMeta meta = new ValueEncoderMeta();
- meta.setMaxValue(new Long[]{8L,0L});
- meta.setMinValue(new Long[]{1L,0L});
- meta.setMantissa(1);
- meta.setType('b');
- List<ValueEncoderMeta> valueEncoderMetaList = new ArrayList<>();
- valueEncoderMetaList.add(meta);
- dataChunkList.get(0).setValueEncoderMeta(valueEncoderMetaList);
- BlockletInfo info = new BlockletInfo();
- info.setMeasureColumnChunk(dataChunkList);
- compressedMeasureChunkFileBasedReader =
- new CompressedMeasureChunkFileBasedReaderV1(info, "filePath");
- }
-
- @Test public void readMeasureChunkTest() throws IOException {
- FileHolder fileHolder = new MockUp<FileHolder>() {
- @Mock public byte[] readByteArray(String filePath, long offset, int length) {
- dataHolder[0] = new CarbonWriteDataHolder();
- dataHolder[0].initialiseBigDecimalValues(1);
- dataHolder[0].setWritableBigDecimalValueByIndex(0, new long[]{2L,1L});
- byte[][] writableMeasureDataArray =
- new HeavyCompressedDoubleArrayDataInMemoryStore(writerCompressModel)
- .getWritableMeasureDataArray(dataHolder).clone();
- return writableMeasureDataArray[0];
- }
- }.getMockInstance();
-
- MeasureColumnDataChunk measureColumnDataChunks =
- compressedMeasureChunkFileBasedReader.readMeasureChunk(fileHolder, 0);
-
- BigDecimal bigD = new BigDecimal("2.1");
- assertEquals(bigD,
- measureColumnDataChunks.getMeasureDataHolder().getReadableBigDecimalValueByIndex(0));
-
- }
-
- @Test public void readMeasureChunksTest() throws IOException {
- FileHolder fileHolder = new MockUp<FileHolder>() {
- @Mock public byte[] readByteArray(String filePath, long offset, int length) {
- dataHolder[0] = new CarbonWriteDataHolder();
- dataHolder[0].initialiseBigDecimalValues(1);
- dataHolder[0].setWritableBigDecimalValueByIndex(0, new long[]{2L,1L});
- byte[][] writableMeasureDataArray =
- new HeavyCompressedDoubleArrayDataInMemoryStore(writerCompressModel)
- .getWritableMeasureDataArray(dataHolder).clone();
- return writableMeasureDataArray[0];
- }
- }.getMockInstance();
-
- int[][] blockIndexes = {{0,0}};
- MeasureColumnDataChunk measureColumnDataChunks[] =
- compressedMeasureChunkFileBasedReader.readMeasureChunks(fileHolder, blockIndexes);
-
- BigDecimal bigD = new BigDecimal("2.1");
- assertEquals(bigD,
- measureColumnDataChunks[0].getMeasureDataHolder().getReadableBigDecimalValueByIndex(0));
-
- }
+// static CompressedMeasureChunkFileBasedReaderV1 compressedMeasureChunkFileBasedReader;
+// static CarbonWriteDataHolder[] dataHolder = new CarbonWriteDataHolder[1];
+//
+// static WriterCompressModel writerCompressModel;
+// @BeforeClass public static void setup() {
+// List<DataChunk> dataChunkList = new ArrayList<>();
+// DataChunk dataChunk = new DataChunk();
+// dataChunkList.add(dataChunk);
+// dataChunk.setDataPageLength(10);
+// writerCompressModel = new WriterCompressModel();
+// Object maxValue[] = new Object[]{new Long[]{8L, 0L}};
+// Object minValue[] = new Object[]{new Long[]{1L,0L}};
+// byte[] dataTypeSelected = new byte[1];
+// char[] aggType = new char[]{'b'};
+// MeasureMetaDataModel measureMDMdl =
+// new MeasureMetaDataModel(minValue, maxValue, new int[]{1}, maxValue.length, null,
+// aggType, dataTypeSelected);
+// writerCompressModel = ValueCompressionUtil.getWriterCompressModel(measureMDMdl);
+//
+//
+// ValueEncoderMeta meta = new ValueEncoderMeta();
+// meta.setMaxValue(new Long[]{8L,0L});
+// meta.setMinValue(new Long[]{1L,0L});
+// meta.setMantissa(1);
+// meta.setType('b');
+// List<ValueEncoderMeta> valueEncoderMetaList = new ArrayList<>();
+// valueEncoderMetaList.add(meta);
+// dataChunkList.get(0).setValueEncoderMeta(valueEncoderMetaList);
+// BlockletInfo info = new BlockletInfo();
+// info.setMeasureColumnChunk(dataChunkList);
+// compressedMeasureChunkFileBasedReader =
+// new CompressedMeasureChunkFileBasedReaderV1(info, "filePath");
+// }
+//
+// @Test public void readMeasureChunkTest() throws IOException {
+// FileHolder fileHolder = new MockUp<FileHolder>() {
+// @Mock public byte[] readByteArray(String filePath, long offset, int length) {
+// byte mockedValue[] = { 1, 5, 4, 8, 7 };
+// return mockedValue;
+// }
+// }.getMockInstance();
+//
+// MeasureColumnDataChunk measureColumnDataChunks =
+// compressedMeasureChunkFileBasedReader.readMeasureChunk(fileHolder, 0);
+//
+// BigDecimal bigD = new BigDecimal("2.1");
+// assertEquals(bigD,
+// measureColumnDataChunks.getMeasureDataHolder().getReadableBigDecimalValueByIndex(0));
+//
+// }
+//
+// @Test public void readMeasureChunksTest() throws IOException {
+// FileHolder fileHolder = new MockUp<FileHolder>() {
+// @Mock public byte[] readByteArray(String filePath, long offset, int length) {
+// byte mockedValue[] = { 1, 5, 4, 8, 7 };
+// return mockedValue;
+// }
+// }.getMockInstance();
+//
+// int[][] blockIndexes = {{0,0}};
+// MeasureColumnDataChunk measureColumnDataChunks[] =
+// compressedMeasureChunkFileBasedReader.readMeasureChunks(fileHolder, blockIndexes);
+//
+// BigDecimal bigD = new BigDecimal("2.1");
+// assertEquals(bigD,
+// measureColumnDataChunks[0].getMeasureDataHolder().getReadableBigDecimalValueByIndex(0));
+//
+// }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/9e24a3dd/processing/src/main/java/org/apache/carbondata/processing/store/CarbonFactDataHandlerColumnar.java
----------------------------------------------------------------------
diff --git a/processing/src/main/java/org/apache/carbondata/processing/store/CarbonFactDataHandlerColumnar.java b/processing/src/main/java/org/apache/carbondata/processing/store/CarbonFactDataHandlerColumnar.java
index d00fdab..a7eb9d2 100644
--- a/processing/src/main/java/org/apache/carbondata/processing/store/CarbonFactDataHandlerColumnar.java
+++ b/processing/src/main/java/org/apache/carbondata/processing/store/CarbonFactDataHandlerColumnar.java
@@ -476,10 +476,7 @@ public class CarbonFactDataHandlerColumnar implements CarbonFactHandler {
} else if (type[i] == CarbonCommonConstants.SUM_COUNT_VALUE_MEASURE) {
max[i] = -Double.MAX_VALUE;
} else if (type[i] == CarbonCommonConstants.BIG_DECIMAL_MEASURE) {
- Long[] bigdMinVal = new Long[2];
- bigdMinVal[0] = Long.MIN_VALUE;
- bigdMinVal[1] = Long.MIN_VALUE;
- max[i] = bigdMinVal;
+ max[i] = new BigDecimal(0.0);
} else {
max[i] = 0.0;
}
@@ -492,14 +489,8 @@ public class CarbonFactDataHandlerColumnar implements CarbonFactHandler {
min[i] = Double.MAX_VALUE;
uniqueValue[i] = Double.MIN_VALUE;
} else if (type[i] == CarbonCommonConstants.BIG_DECIMAL_MEASURE) {
- Long[] bigdMaxVal = new Long[2];
- bigdMaxVal[0] = Long.MAX_VALUE;
- bigdMaxVal[1] = Long.MAX_VALUE;
- min[i] = bigdMaxVal;
- Long[] bigdUniqueVal = new Long[2];
- bigdUniqueVal[0] = Long.MIN_VALUE;
- bigdUniqueVal[1] = Long.MIN_VALUE;
- uniqueValue[i] = bigdUniqueVal;
+ min[i] = new BigDecimal(Double.MAX_VALUE);
+ uniqueValue[i] = new BigDecimal(Double.MIN_VALUE);
} else {
min[i] = 0.0;
uniqueValue[i] = 0.0;
@@ -580,23 +571,11 @@ public class CarbonFactDataHandlerColumnar implements CarbonFactHandler {
b = (byte[]) row[customMeasureIndex[i]];
}
}
- BigDecimal value = DataTypeUtil.byteToBigDecimal(b);
- String[] bigdVals = value.toPlainString().split("\\.");
- long[] bigDvalue = new long[2];
- if (bigdVals.length == 2) {
- bigDvalue[0] = Long.parseLong(bigdVals[0]);
- BigDecimal bd = new BigDecimal(CarbonCommonConstants.POINT+bigdVals[1]);
- bigDvalue[1] = (long)(bd.doubleValue()*Math.pow(10, value.scale()));
- //bigDvalue[1] = Long.parseLong(bigdVals[1]);
- } else {
- bigDvalue[0] = Long.parseLong(bigdVals[0]);
- }
byteBuffer = ByteBuffer.allocate(b.length + CarbonCommonConstants.INT_SIZE_IN_BYTE);
byteBuffer.putInt(b.length);
byteBuffer.put(b);
byteBuffer.flip();
b = byteBuffer.array();
- dataHolder[customMeasureIndex[i]].setWritableBigDecimalValueByIndex(count, bigDvalue);
dataHolder[customMeasureIndex[i]].setWritableByteArrayValueByIndex(count, b);
}
calculateMaxMin(max, min, decimal, customMeasureIndex, row);
@@ -634,10 +613,7 @@ public class CarbonFactDataHandlerColumnar implements CarbonFactHandler {
} else if (type[i] == CarbonCommonConstants.SUM_COUNT_VALUE_MEASURE) {
max[i] = -Double.MAX_VALUE;
} else if (type[i] == CarbonCommonConstants.BIG_DECIMAL_MEASURE) {
- Long[] bigdMinVal = new Long[2];
- bigdMinVal[0] = Long.MIN_VALUE;
- bigdMinVal[1] = Long.MIN_VALUE;
- max[i] = bigdMinVal;
+ max[i] = new BigDecimal(0.0);
} else {
max[i] = 0.0;
}
@@ -650,14 +626,8 @@ public class CarbonFactDataHandlerColumnar implements CarbonFactHandler {
min[i] = Double.MAX_VALUE;
uniqueValue[i] = Double.MIN_VALUE;
} else if (type[i] == CarbonCommonConstants.BIG_DECIMAL_MEASURE) {
- Long[] bigdMaxVal = new Long[2];
- bigdMaxVal[0] = Long.MAX_VALUE;
- bigdMaxVal[1] = Long.MAX_VALUE;
- min[i] = bigdMaxVal;
- Long[] bigdUniqueVal = new Long[2];
- bigdUniqueVal[0] = Long.MIN_VALUE;
- bigdUniqueVal[1] = Long.MIN_VALUE;
- uniqueValue[i] = bigdUniqueVal;
+ min[i] = new BigDecimal(Double.MAX_VALUE);
+ uniqueValue[i] = new BigDecimal(Double.MIN_VALUE);
} else {
min[i] = 0.0;
uniqueValue[i] = 0.0;
@@ -751,7 +721,6 @@ public class CarbonFactDataHandlerColumnar implements CarbonFactHandler {
byteBuffer.put(b);
byteBuffer.flip();
b = byteBuffer.array();
- dataHolder[customMeasureIndex[i]].setWritableBigDecimalValueByIndex(count, bigDvalue);
dataHolder[customMeasureIndex[i]].setWritableByteArrayValueByIndex(count, b);
}
calculateMaxMin(max, min, decimal, customMeasureIndex, row);
@@ -1216,27 +1185,6 @@ public class CarbonFactDataHandlerColumnar implements CarbonFactHandler {
}
BigDecimal value = DataTypeUtil.byteToBigDecimal(buff);
decimal[count] = value.scale();
- String[] bigdVals = value.toPlainString().split("\\.");
- Long[] maxVal = (Long[])max[count];
- Long[] minVal = (Long[])min[count];
- long maxLeftVal = (long)maxVal[0];
- long maxRightVal = (long)maxVal[1];
- long minLeftVal = (long) minVal[0];
- long minRightVal = (long)minVal[1];
- if (bigdVals.length == 2) {
- long leftPart = Long.parseLong(bigdVals[0]);
- BigDecimal bd = new BigDecimal(CarbonCommonConstants.POINT+bigdVals[1]);
- long rightPart = (long)(bd.doubleValue()*Math.pow(10, value.scale()));
- //Long.parseLong(bigdVals[1]);
- maxVal[0] = (maxLeftVal > leftPart ? maxLeftVal : leftPart);
- maxVal[1] = (maxRightVal > rightPart ? maxRightVal : rightPart);
- minVal[0] = (minLeftVal < leftPart ? minLeftVal : leftPart);
- minVal[1] = (minRightVal < rightPart ? minRightVal : rightPart);
- } else {
- long leftPart = Long.parseLong(bigdVals[0]);
- maxVal[0] = (maxLeftVal > leftPart ? maxLeftVal : leftPart);
- minVal[0] = (minLeftVal < leftPart ? minLeftVal : leftPart);
- }
}
}
}
@@ -1254,10 +1202,8 @@ public class CarbonFactDataHandlerColumnar implements CarbonFactHandler {
if (type[i] == CarbonCommonConstants.BIG_INT_MEASURE) {
uniqueValue[i] = (long) minValue[i] - 1;
} else if (type[i] == CarbonCommonConstants.BIG_DECIMAL_MEASURE) {
- Long[] bigdMinVal = (Long[])minValue[i];
- Long[] bigdUniqVal = (Long[])uniqueValue[i];
- bigdUniqVal[0] = bigdMinVal[0] -1;
- bigdUniqVal[1] = bigdMinVal[1] -1;
+ BigDecimal val = (BigDecimal) minValue[i];
+ uniqueValue[i] = (val.subtract(new BigDecimal(1.0)));
} else {
uniqueValue[i] = (double) minValue[i] - 1;
}
@@ -1402,7 +1348,6 @@ public class CarbonFactDataHandlerColumnar implements CarbonFactHandler {
for (int i = 0; i < customMeasureIndex.length; i++) {
dataHolder[customMeasureIndex[i]] = new CarbonWriteDataHolder();
dataHolder[customMeasureIndex[i]].initialiseByteArrayValues(size);
- dataHolder[customMeasureIndex[i]].initialiseBigDecimalValues(size);
}
return dataHolder;
}
[49/50] [abbrv] incubator-carbondata git commit: Fixed Compatibility
issue
Posted by ra...@apache.org.
Fixed Compatibility issue
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/f94bae5e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/f94bae5e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/f94bae5e
Branch: refs/heads/branch-1.0
Commit: f94bae5eb68646987685ab740161b9d8820d8f69
Parents: 7ba906b
Author: kumarvishal <ku...@gmail.com>
Authored: Sat Jan 21 00:35:30 2017 +0800
Committer: kumarvishal <ku...@gmail.com>
Committed: Sat Jan 21 01:00:46 2017 +0800
----------------------------------------------------------------------
.../core/constants/CarbonCommonConstants.java | 2 +-
.../compression/ReaderCompressModel.java | 2 +-
.../core/metadata/ValueEncoderMeta.java | 12 +++---
.../core/util/CarbonMetadataUtil.java | 4 +-
.../apache/carbondata/core/util/CarbonUtil.java | 2 +-
.../core/util/ValueCompressionUtil.java | 10 +++--
.../core/util/path/CarbonTablePath.java | 6 ++-
.../datastore/SegmentTaskIndexStoreTest.java | 42 --------------------
.../core/util/CarbonMetadataUtilTest.java | 2 +-
.../carbondata/core/util/DataTypeUtilTest.java | 4 +-
.../core/util/ValueCompressionUtilTest.java | 2 +-
11 files changed, 28 insertions(+), 60 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/f94bae5e/core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java b/core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java
index d1c5eb1..df3f9f1 100644
--- a/core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java
+++ b/core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java
@@ -631,7 +631,7 @@ public final class CarbonCommonConstants {
/**
* BIG_INT_MEASURE
*/
- public static final char BIG_INT_MEASURE = 'l';
+ public static final char BIG_INT_MEASURE = 'd';
/**
* This determines the size of array to be processed in data load steps. one
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/f94bae5e/core/src/main/java/org/apache/carbondata/core/datastore/compression/ReaderCompressModel.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/compression/ReaderCompressModel.java b/core/src/main/java/org/apache/carbondata/core/datastore/compression/ReaderCompressModel.java
index 750888c..101a24b 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/compression/ReaderCompressModel.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/compression/ReaderCompressModel.java
@@ -45,7 +45,7 @@ public class ReaderCompressModel {
}
public int getMantissa() {
- return valueEncoderMeta.getMantissa();
+ return valueEncoderMeta.getDecimal();
}
public ValueCompressionHolder getValueCompressionHolder() {
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/f94bae5e/core/src/main/java/org/apache/carbondata/core/metadata/ValueEncoderMeta.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/metadata/ValueEncoderMeta.java b/core/src/main/java/org/apache/carbondata/core/metadata/ValueEncoderMeta.java
index 9febc55..4a9007c 100644
--- a/core/src/main/java/org/apache/carbondata/core/metadata/ValueEncoderMeta.java
+++ b/core/src/main/java/org/apache/carbondata/core/metadata/ValueEncoderMeta.java
@@ -20,6 +20,8 @@ package org.apache.carbondata.core.metadata;
import java.io.Serializable;
/**
+ * DO NOT MODIFY THIS CLASS AND PACKAGE NAME, BECAUSE
+ * IT IS SERIALIZE TO STORE
* It holds Value compression metadata for one data column
*/
public class ValueEncoderMeta implements Serializable {
@@ -38,7 +40,7 @@ public class ValueEncoderMeta implements Serializable {
*/
private Object uniqueValue;
- private int mantissa;
+ private int decimal;
private char type;
@@ -68,12 +70,12 @@ public class ValueEncoderMeta implements Serializable {
this.uniqueValue = uniqueValue;
}
- public int getMantissa() {
- return mantissa;
+ public int getDecimal() {
+ return decimal;
}
- public void setMantissa(int mantissa) {
- this.mantissa = mantissa;
+ public void setDecimal(int decimal) {
+ this.decimal = decimal;
}
public char getType() {
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/f94bae5e/core/src/main/java/org/apache/carbondata/core/util/CarbonMetadataUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/util/CarbonMetadataUtil.java b/core/src/main/java/org/apache/carbondata/core/util/CarbonMetadataUtil.java
index 5a1d50a..25e7cfe 100644
--- a/core/src/main/java/org/apache/carbondata/core/util/CarbonMetadataUtil.java
+++ b/core/src/main/java/org/apache/carbondata/core/util/CarbonMetadataUtil.java
@@ -318,7 +318,7 @@ public class CarbonMetadataUtil {
encoderMeta.setMaxValue(compressionModel.getMaxValue()[index]);
encoderMeta.setMinValue(compressionModel.getMinValue()[index]);
encoderMeta.setDataTypeSelected(compressionModel.getDataTypeSelected()[index]);
- encoderMeta.setMantissa(compressionModel.getMantissa()[index]);
+ encoderMeta.setDecimal(compressionModel.getMantissa()[index]);
encoderMeta.setType(compressionModel.getType()[index]);
encoderMeta.setUniqueValue(compressionModel.getUniqueValue()[index]);
return encoderMeta;
@@ -428,7 +428,7 @@ public class CarbonMetadataUtil {
for (int i = 0; i < encoderMetas.length; i++) {
maxValue[i] = encoderMetas[i].getMaxValue();
minValue[i] = encoderMetas[i].getMinValue();
- decimalLength[i] = encoderMetas[i].getMantissa();
+ decimalLength[i] = encoderMetas[i].getDecimal();
uniqueValue[i] = encoderMetas[i].getUniqueValue();
aggType[i] = encoderMetas[i].getType();
dataTypeSelected[i] = encoderMetas[i].getDataTypeSelected();
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/f94bae5e/core/src/main/java/org/apache/carbondata/core/util/CarbonUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/util/CarbonUtil.java b/core/src/main/java/org/apache/carbondata/core/util/CarbonUtil.java
index 07ac127..11c8870 100644
--- a/core/src/main/java/org/apache/carbondata/core/util/CarbonUtil.java
+++ b/core/src/main/java/org/apache/carbondata/core/util/CarbonUtil.java
@@ -749,7 +749,7 @@ public final class CarbonUtil {
maxValue[i] = valueEncoderMeta.getMaxValue();
minValue[i] = valueEncoderMeta.getMinValue();
uniqueValue[i] = valueEncoderMeta.getUniqueValue();
- decimal[i] = valueEncoderMeta.getMantissa();
+ decimal[i] = valueEncoderMeta.getDecimal();
type[i] = valueEncoderMeta.getType();
dataTypeSelected[i] = valueEncoderMeta.getDataTypeSelected();
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/f94bae5e/core/src/main/java/org/apache/carbondata/core/util/ValueCompressionUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/util/ValueCompressionUtil.java b/core/src/main/java/org/apache/carbondata/core/util/ValueCompressionUtil.java
index 219f69e..b958445 100644
--- a/core/src/main/java/org/apache/carbondata/core/util/ValueCompressionUtil.java
+++ b/core/src/main/java/org/apache/carbondata/core/util/ValueCompressionUtil.java
@@ -116,9 +116,12 @@ public final class ValueCompressionUtil {
case 'b':
return new CompressionFinder(COMPRESSION_TYPE.BIGDECIMAL, DataType.DATA_BYTE,
DataType.DATA_BYTE, measureStoreType);
- case 'l':
+ case 'd':
return getLongCompressorFinder(maxValue, minValue, mantissa, dataTypeSelected,
measureStoreType);
+ case 'l':
+ return new CompressionFinder(COMPRESSION_TYPE.ADAPTIVE,
+ DataType.DATA_BIGINT, DataType.DATA_BIGINT, measureStoreType);
case 'n':
return getDoubleCompressorFinder(maxValue, minValue, mantissa, dataTypeSelected,
measureStoreType);
@@ -223,7 +226,7 @@ public final class ValueCompressionUtil {
*/
public static ValueCompressor getValueCompressor(CompressionFinder compressorFinder) {
switch(compressorFinder.getMeasureStoreType()) {
- case 'l': return new BigIntCompressor();
+ case 'd': return new BigIntCompressor();
default : return new DoubleCompressor();
}
}
@@ -565,6 +568,7 @@ public final class ValueCompressionUtil {
case DATA_INT:
return new CompressionNoneInt(actualDataType);
case DATA_LONG:
+ case DATA_BIGINT:
return new CompressionNoneLong(actualDataType);
default:
return new CompressionNoneDefault(actualDataType);
@@ -683,7 +687,7 @@ public final class ValueCompressionUtil {
public static ReaderCompressModel getReaderCompressModel(ValueEncoderMeta meta) {
ReaderCompressModel compressModel = new ReaderCompressModel();
CompressionFinder compressFinder =
- getCompressionFinder(meta.getMaxValue(), meta.getMinValue(), meta.getMantissa(),
+ getCompressionFinder(meta.getMaxValue(), meta.getMinValue(), meta.getDecimal(),
meta.getType(), meta.getDataTypeSelected());
compressModel.setValueCompressionHolder(
ValueCompressionUtil.getValueCompressionHolder(compressFinder));
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/f94bae5e/core/src/main/java/org/apache/carbondata/core/util/path/CarbonTablePath.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/util/path/CarbonTablePath.java b/core/src/main/java/org/apache/carbondata/core/util/path/CarbonTablePath.java
index 1d1ebfa..39b3629 100644
--- a/core/src/main/java/org/apache/carbondata/core/util/path/CarbonTablePath.java
+++ b/core/src/main/java/org/apache/carbondata/core/util/path/CarbonTablePath.java
@@ -258,6 +258,10 @@ public class CarbonTablePath extends Path {
CarbonFile[] files = carbonFile.listFiles(new CarbonFileFilter() {
@Override public boolean accept(CarbonFile file) {
+ if(bucketNumber.equals("-1")) {
+ return file.getName().startsWith(taskId) && file.getName()
+ .endsWith(INDEX_FILE_EXT);
+ }
return file.getName().startsWith(taskId + "-" + bucketNumber) && file.getName()
.endsWith(INDEX_FILE_EXT);
}
@@ -455,7 +459,7 @@ public class CarbonTablePath extends Path {
int endIndex = fileName.indexOf("-", startIndex);
// to support backward compatibility
if (startIndex == -1 || endIndex == -1) {
- return "0";
+ return "-1";
}
return fileName.substring(startIndex, endIndex);
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/f94bae5e/core/src/test/java/org/apache/carbondata/core/datastore/SegmentTaskIndexStoreTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/carbondata/core/datastore/SegmentTaskIndexStoreTest.java b/core/src/test/java/org/apache/carbondata/core/datastore/SegmentTaskIndexStoreTest.java
index 0b71f2e..c66398c 100644
--- a/core/src/test/java/org/apache/carbondata/core/datastore/SegmentTaskIndexStoreTest.java
+++ b/core/src/test/java/org/apache/carbondata/core/datastore/SegmentTaskIndexStoreTest.java
@@ -85,48 +85,6 @@ public class SegmentTaskIndexStoreTest {
return footerList;
}
- @Test public void loadAndGetTaskIdToSegmentsMap() throws IOException {
- new MockUp<CarbonTablePath.DataFileUtil>() {
- @Mock String getTaskNo(String carbonDataFileName) {
- return "100";
- }
- };
-
- new MockUp<CarbonUtil>() {
- @Mock List<DataFileFooter> readCarbonIndexFile(String taskId,
- String bucketNumber,
- List<TableBlockInfo> tableBlockInfoList,
- AbsoluteTableIdentifier absoluteTableIdentifier) {
- return getDataFileFooters();
- }
- };
-
- new MockUp<CarbonTablePath>() {
- @Mock public String getCarbonIndexFilePath(final String taskId, final String partitionId,
- final String segmentId, final String bucketNumber) {
- return "/src/test/resources";
- }
- };
-
- new MockUp<SegmentTaskIndex>() {
- @Mock void buildIndex(List<DataFileFooter> footerList) {
- }
- };
- TableSegmentUniqueIdentifier tableSegmentUniqueIdentifier =
- new TableSegmentUniqueIdentifier(absoluteTableIdentifier, "SG100");
-
- HashMap<String, List<TableBlockInfo>> segmentToTableBlocksInfos =
- new HashMap<String, List<TableBlockInfo>>() {{
- put("SG100", Arrays.asList(tableBlockInfo));
- }};
- tableSegmentUniqueIdentifier.setSegmentToTableBlocksInfos(segmentToTableBlocksInfos);
- Map<SegmentTaskIndexStore.TaskBucketHolder, AbstractIndex> result =
- taskIndexStore.get(tableSegmentUniqueIdentifier).getTaskIdToTableSegmentMap();
-
- assertEquals(result.size(), 1);
- assertTrue(result.containsKey(new SegmentTaskIndexStore.TaskBucketHolder("100", "0")));
- }
-
@Test public void checkExistenceOfSegmentBTree() {
TableSegmentUniqueIdentifier tableSegmentUniqueIdentifier =
new TableSegmentUniqueIdentifier(absoluteTableIdentifier, "SG100");
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/f94bae5e/core/src/test/java/org/apache/carbondata/core/util/CarbonMetadataUtilTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/carbondata/core/util/CarbonMetadataUtilTest.java b/core/src/test/java/org/apache/carbondata/core/util/CarbonMetadataUtilTest.java
index 3146ea8..3935bdc 100644
--- a/core/src/test/java/org/apache/carbondata/core/util/CarbonMetadataUtilTest.java
+++ b/core/src/test/java/org/apache/carbondata/core/util/CarbonMetadataUtilTest.java
@@ -108,7 +108,7 @@ public class CarbonMetadataUtilTest {
blockletInfoList.add(blockletInfo);
ValueEncoderMeta valueEncoderMeta = new ValueEncoderMeta();
- valueEncoderMeta.setMantissa(5);
+ valueEncoderMeta.setDecimal(5);
valueEncoderMeta.setMinValue(objMinArr);
valueEncoderMeta.setMaxValue(objMaxArr);
valueEncoderMeta.setUniqueValue(lngObj);
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/f94bae5e/core/src/test/java/org/apache/carbondata/core/util/DataTypeUtilTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/carbondata/core/util/DataTypeUtilTest.java b/core/src/test/java/org/apache/carbondata/core/util/DataTypeUtilTest.java
index c7ead8d..f2d110f 100644
--- a/core/src/test/java/org/apache/carbondata/core/util/DataTypeUtilTest.java
+++ b/core/src/test/java/org/apache/carbondata/core/util/DataTypeUtilTest.java
@@ -52,8 +52,8 @@ public class DataTypeUtilTest {
@Test public void testGetAggType() {
assertTrue(getAggType(DataType.DECIMAL) == 'b');
- assertTrue(getAggType(DataType.INT) == 'l');
- assertTrue(getAggType(DataType.LONG) == 'l');
+ assertTrue(getAggType(DataType.INT) == 'd');
+ assertTrue(getAggType(DataType.LONG) == 'd');
assertTrue(getAggType(DataType.NULL) == 'n');
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/f94bae5e/core/src/test/java/org/apache/carbondata/core/util/ValueCompressionUtilTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/carbondata/core/util/ValueCompressionUtilTest.java b/core/src/test/java/org/apache/carbondata/core/util/ValueCompressionUtilTest.java
index 04605e7..a72197f 100644
--- a/core/src/test/java/org/apache/carbondata/core/util/ValueCompressionUtilTest.java
+++ b/core/src/test/java/org/apache/carbondata/core/util/ValueCompressionUtilTest.java
@@ -322,7 +322,7 @@ public class ValueCompressionUtilTest {
@Test public void testToUnCompressNone() {
ValueCompressionHolder result =
ValueCompressionUtil.getCompressionNone(DataType.DATA_BIGINT, DataType.DATA_BIGINT);
- assertEquals(result.getClass(), CompressionNoneDefault.class);
+ assertEquals(result.getClass(), CompressionNoneLong.class);
}
@Test public void testToUnCompressNoneForByte() {
[41/50] [abbrv] incubator-carbondata git commit: [CARBONDATA-341]
CarbonTableIdentifier being passed to the query flow has wrong tableid.This
closes #264
Posted by ra...@apache.org.
[CARBONDATA-341] CarbonTableIdentifier being passed to the query flow has wrong tableid.This closes #264
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/b2eb9c74
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/b2eb9c74
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/b2eb9c74
Branch: refs/heads/branch-1.0
Commit: b2eb9c74446560635bd21e394bdd273a93586441
Parents: 556a411 733968b
Author: Venkata Ramana G <ra...@huawei.com>
Authored: Fri Jan 20 20:50:03 2017 +0530
Committer: Venkata Ramana G <ra...@huawei.com>
Committed: Fri Jan 20 20:50:03 2017 +0530
----------------------------------------------------------------------
.../core/metadata/AbsoluteTableIdentifier.java | 8 +++
.../carbondata/hadoop/CarbonInputFormat.java | 43 +++++++----
.../testsuite/createTable/TestTableIdTest.scala | 76 ++++++++++++++++++++
.../sql/CarbonDatasourceHadoopRelation.scala | 2 +-
.../sql/CarbonDatasourceHadoopRelation.scala | 2 +-
.../processing/newflow/DataLoadExecutor.java | 2 +-
6 files changed, 117 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
[40/50] [abbrv] incubator-carbondata git commit: [CARBONDATA-341]
CarbonTableIdentifier being passed to the query flow has wrong tableid
Posted by ra...@apache.org.
[CARBONDATA-341] CarbonTableIdentifier being passed to the query flow has wrong tableid
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/733968b4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/733968b4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/733968b4
Branch: refs/heads/branch-1.0
Commit: 733968b4e0cdba12c928554a04f836c7b36477f3
Parents: 556a411
Author: mohammadshahidkhan <mo...@gmail.com>
Authored: Thu Jan 5 18:45:51 2017 +0530
Committer: Venkata Ramana G <ra...@huawei.com>
Committed: Fri Jan 20 20:42:08 2017 +0530
----------------------------------------------------------------------
.../core/metadata/AbsoluteTableIdentifier.java | 8 +++
.../carbondata/hadoop/CarbonInputFormat.java | 43 +++++++----
.../testsuite/createTable/TestTableIdTest.scala | 76 ++++++++++++++++++++
.../sql/CarbonDatasourceHadoopRelation.scala | 2 +-
.../sql/CarbonDatasourceHadoopRelation.scala | 2 +-
.../processing/newflow/DataLoadExecutor.java | 2 +-
6 files changed, 117 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/733968b4/core/src/main/java/org/apache/carbondata/core/metadata/AbsoluteTableIdentifier.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/metadata/AbsoluteTableIdentifier.java b/core/src/main/java/org/apache/carbondata/core/metadata/AbsoluteTableIdentifier.java
index aed248c..3791150 100644
--- a/core/src/main/java/org/apache/carbondata/core/metadata/AbsoluteTableIdentifier.java
+++ b/core/src/main/java/org/apache/carbondata/core/metadata/AbsoluteTableIdentifier.java
@@ -73,6 +73,14 @@ public class AbsoluteTableIdentifier implements Serializable {
return new AbsoluteTableIdentifier(CarbonUtil.getCarbonStorePath(), identifier);
}
+ /**
+ * By using the tablePath this method will prepare a AbsoluteTableIdentifier with
+ * dummy tableId(Long.toString(System.currentTimeMillis()).
+ * This instance could not be used to uniquely identify the table, this is just
+ * to get the database name, table name and store path to load the schema.
+ * @param tablePath
+ * @return returns AbsoluteTableIdentifier with dummy tableId
+ */
public static AbsoluteTableIdentifier fromTablePath(String tablePath) {
String formattedTablePath = tablePath.replace('\\', '/');
String[] names = formattedTablePath.split("/");
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/733968b4/hadoop/src/main/java/org/apache/carbondata/hadoop/CarbonInputFormat.java
----------------------------------------------------------------------
diff --git a/hadoop/src/main/java/org/apache/carbondata/hadoop/CarbonInputFormat.java b/hadoop/src/main/java/org/apache/carbondata/hadoop/CarbonInputFormat.java
index 5acd1d5..2cee974 100644
--- a/hadoop/src/main/java/org/apache/carbondata/hadoop/CarbonInputFormat.java
+++ b/hadoop/src/main/java/org/apache/carbondata/hadoop/CarbonInputFormat.java
@@ -119,16 +119,35 @@ public class CarbonInputFormat<T> extends FileInputFormat<Void, T> {
public static CarbonTable getCarbonTable(Configuration configuration) throws IOException {
String carbonTableStr = configuration.get(CARBON_TABLE);
if (carbonTableStr == null) {
+ populateCarbonTable(configuration);
// read it from schema file in the store
- AbsoluteTableIdentifier absIdentifier = getAbsoluteTableIdentifier(configuration);
- CarbonTable carbonTable = SchemaReader.readCarbonTableFromStore(absIdentifier);
- setCarbonTable(configuration, carbonTable);
- return carbonTable;
+ carbonTableStr = configuration.get(CARBON_TABLE);
+ return (CarbonTable) ObjectSerializationUtil.convertStringToObject(carbonTableStr);
}
return (CarbonTable) ObjectSerializationUtil.convertStringToObject(carbonTableStr);
}
- public static void setTablePath(Configuration configuration, String tablePath) {
+ /**
+ * this method will read the schema from the physical file and populate into CARBON_TABLE
+ * @param configuration
+ * @throws IOException
+ */
+ private static void populateCarbonTable(Configuration configuration) throws IOException {
+ String dirs = configuration.get(INPUT_DIR, "");
+ String[] inputPaths = StringUtils.split(dirs);
+ if (inputPaths.length == 0) {
+ throw new InvalidPathException("No input paths specified in job");
+ }
+ AbsoluteTableIdentifier absoluteTableIdentifier =
+ AbsoluteTableIdentifier.fromTablePath(inputPaths[0]);
+ // read the schema file to get the absoluteTableIdentifier having the correct table id
+ // persisted in the schema
+ CarbonTable carbonTable = SchemaReader.readCarbonTableFromStore(absoluteTableIdentifier);
+ setCarbonTable(configuration, carbonTable);
+ }
+
+ public static void setTablePath(Configuration configuration, String tablePath)
+ throws IOException {
configuration.set(FileInputFormat.INPUT_DIR, tablePath);
}
@@ -187,13 +206,9 @@ public class CarbonInputFormat<T> extends FileInputFormat<Void, T> {
.set(CarbonInputFormat.INPUT_SEGMENT_NUMBERS, CarbonUtil.getSegmentString(validSegments));
}
- private static AbsoluteTableIdentifier getAbsoluteTableIdentifier(Configuration configuration) {
- String dirs = configuration.get(INPUT_DIR, "");
- String[] inputPaths = StringUtils.split(dirs);
- if (inputPaths.length == 0) {
- throw new InvalidPathException("No input paths specified in job");
- }
- return AbsoluteTableIdentifier.fromTablePath(inputPaths[0]);
+ private static AbsoluteTableIdentifier getAbsoluteTableIdentifier(Configuration configuration)
+ throws IOException {
+ return getCarbonTable(configuration).getAbsoluteTableIdentifier();
}
/**
@@ -592,7 +607,9 @@ public class CarbonInputFormat<T> extends FileInputFormat<Void, T> {
throws IOException {
Configuration configuration = taskAttemptContext.getConfiguration();
CarbonTable carbonTable = getCarbonTable(configuration);
- AbsoluteTableIdentifier identifier = getAbsoluteTableIdentifier(configuration);
+ // getting the table absoluteTableIdentifier from the carbonTable
+ // to avoid unnecessary deserialization
+ AbsoluteTableIdentifier identifier = carbonTable.getAbsoluteTableIdentifier();
// query plan includes projection column
String projection = getColumnProjection(configuration);
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/733968b4/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/createTable/TestTableIdTest.scala
----------------------------------------------------------------------
diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/createTable/TestTableIdTest.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/createTable/TestTableIdTest.scala
new file mode 100644
index 0000000..3ccd2e3
--- /dev/null
+++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/createTable/TestTableIdTest.scala
@@ -0,0 +1,76 @@
+/*
+ * 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.spark.testsuite.createTable
+
+import org.apache.hadoop.conf.Configuration
+import org.apache.hadoop.mapred.JobConf
+import org.apache.hadoop.mapreduce.Job
+import org.apache.spark.sql.common.util.QueryTest
+import org.junit.Assert
+import org.scalatest.BeforeAndAfterAll
+
+import org.apache.carbondata.core.metadata.AbsoluteTableIdentifier
+import org.apache.carbondata.core.metadata.schema.table.CarbonTable
+import org.apache.carbondata.hadoop.CarbonInputFormat
+
+/**
+ * test functionality related the case change for database name
+ */
+class TestTableIdTest extends QueryTest with BeforeAndAfterAll {
+
+ override def beforeAll: Unit = {
+ sql("drop table if exists carbontable")
+ }
+
+ def validateTableId: Unit = {
+ val carbonInputFormat: CarbonInputFormat[Array[Object]] = new CarbonInputFormat[Array[Object]]
+ val jobConf: JobConf = new JobConf(new Configuration)
+ val job: Job = Job.getInstance(jobConf)
+ val storePath: String = storeLocation.replaceAll("\\\\", "/")
+ job.getConfiguration
+ .set("mapreduce.input.fileinputformat.inputdir",
+ storePath + "/default/carbontable")
+ val carbonTable: CarbonTable = CarbonInputFormat.getCarbonTable(job.getConfiguration)
+ val getAbsoluteTableIdentifier = classOf[CarbonInputFormat[Array[Object]]]
+ .getDeclaredMethod("getAbsoluteTableIdentifier", classOf[Configuration])
+ getAbsoluteTableIdentifier.setAccessible(true)
+ val absoluteTableIdentifier: AbsoluteTableIdentifier = getAbsoluteTableIdentifier
+ .invoke(carbonInputFormat, job.getConfiguration).asInstanceOf[AbsoluteTableIdentifier]
+
+ Assert
+ .assertEquals(carbonTable.getCarbonTableIdentifier.getTableId,
+ absoluteTableIdentifier.getCarbonTableIdentifier.getTableId)
+ }
+
+ test("test create table with database case name change") {
+
+ try {
+ // table creation should be successful
+ sql("create table carbontable(a int, b string)stored by 'carbondata'")
+ assert(true)
+ } catch {
+ case ex: Exception =>
+ assert(false)
+ }
+ validateTableId
+ }
+
+ override def afterAll {
+ sql("drop table if exists carbontable")
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/733968b4/integration/spark/src/main/scala/org/apache/spark/sql/CarbonDatasourceHadoopRelation.scala
----------------------------------------------------------------------
diff --git a/integration/spark/src/main/scala/org/apache/spark/sql/CarbonDatasourceHadoopRelation.scala b/integration/spark/src/main/scala/org/apache/spark/sql/CarbonDatasourceHadoopRelation.scala
index 93ede38..e322fc8 100644
--- a/integration/spark/src/main/scala/org/apache/spark/sql/CarbonDatasourceHadoopRelation.scala
+++ b/integration/spark/src/main/scala/org/apache/spark/sql/CarbonDatasourceHadoopRelation.scala
@@ -68,7 +68,7 @@ private[sql] case class CarbonDatasourceHadoopRelation(
carbonTable.getDatabaseName,
carbonTable.getFactTableName,
CarbonSparkUtil.createSparkMeta(carbonTable),
- new TableMeta(absIdentifier.getCarbonTableIdentifier, paths.head, carbonTable),
+ new TableMeta(carbonTable.getCarbonTableIdentifier, paths.head, carbonTable),
None
)(sqlContext)
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/733968b4/integration/spark2/src/main/scala/org/apache/spark/sql/CarbonDatasourceHadoopRelation.scala
----------------------------------------------------------------------
diff --git a/integration/spark2/src/main/scala/org/apache/spark/sql/CarbonDatasourceHadoopRelation.scala b/integration/spark2/src/main/scala/org/apache/spark/sql/CarbonDatasourceHadoopRelation.scala
index 7633b22..eb1730f 100644
--- a/integration/spark2/src/main/scala/org/apache/spark/sql/CarbonDatasourceHadoopRelation.scala
+++ b/integration/spark2/src/main/scala/org/apache/spark/sql/CarbonDatasourceHadoopRelation.scala
@@ -49,7 +49,7 @@ case class CarbonDatasourceHadoopRelation(
carbonTable.getDatabaseName,
carbonTable.getFactTableName,
CarbonSparkUtil.createSparkMeta(carbonTable),
- new TableMeta(absIdentifier.getCarbonTableIdentifier, paths.head, carbonTable),
+ new TableMeta(carbonTable.getCarbonTableIdentifier, paths.head, carbonTable),
None
)
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/733968b4/processing/src/main/java/org/apache/carbondata/processing/newflow/DataLoadExecutor.java
----------------------------------------------------------------------
diff --git a/processing/src/main/java/org/apache/carbondata/processing/newflow/DataLoadExecutor.java b/processing/src/main/java/org/apache/carbondata/processing/newflow/DataLoadExecutor.java
index b7d215d..d18c727 100644
--- a/processing/src/main/java/org/apache/carbondata/processing/newflow/DataLoadExecutor.java
+++ b/processing/src/main/java/org/apache/carbondata/processing/newflow/DataLoadExecutor.java
@@ -63,7 +63,7 @@ public class DataLoadExecutor {
new CarbonTableIdentifier(loadModel.getDatabaseName(), loadModel.getTableName(), null)
.getBadRecordLoggerKey();
if (null != BadRecordsLogger.hasBadRecord(key)) {
- LOGGER.error("Data Load is partcially success for table " + loadModel.getTableName());
+ LOGGER.error("Data Load is partially success for table " + loadModel.getTableName());
throw new BadRecordFoundException("Bad records found during load");
} else {
LOGGER.info("Data loading is successful for table "+loadModel.getTableName());
[42/50] [abbrv] incubator-carbondata git commit: Fixed Date issue
when date is less the 1970
Posted by ra...@apache.org.
Fixed Date issue when date is less the 1970
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/c33e5b29
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/c33e5b29
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/c33e5b29
Branch: refs/heads/branch-1.0
Commit: c33e5b29f196a7f409a993a0c489950e91747cd9
Parents: b2eb9c7
Author: kumarvishal <ku...@gmail.com>
Authored: Fri Jan 20 21:19:36 2017 +0800
Committer: ravipesala <ra...@gmail.com>
Committed: Fri Jan 20 20:56:07 2017 +0530
----------------------------------------------------------------------
.../timestamp/DateDirectDictionaryGenerator.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/c33e5b29/core/src/main/java/org/apache/carbondata/core/keygenerator/directdictionary/timestamp/DateDirectDictionaryGenerator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/keygenerator/directdictionary/timestamp/DateDirectDictionaryGenerator.java b/core/src/main/java/org/apache/carbondata/core/keygenerator/directdictionary/timestamp/DateDirectDictionaryGenerator.java
index 5572f70..8db42b0 100644
--- a/core/src/main/java/org/apache/carbondata/core/keygenerator/directdictionary/timestamp/DateDirectDictionaryGenerator.java
+++ b/core/src/main/java/org/apache/carbondata/core/keygenerator/directdictionary/timestamp/DateDirectDictionaryGenerator.java
@@ -35,6 +35,7 @@ import org.apache.carbondata.core.util.CarbonProperties;
*/
public class DateDirectDictionaryGenerator implements DirectDictionaryGenerator {
+ private static final int cutOffDate = Integer.MAX_VALUE >> 1;
private static final long SECONDS_PER_DAY = 60 * 60 * 24L;
private static final long MILLIS_PER_DAY = SECONDS_PER_DAY * 1000L;
@@ -131,7 +132,7 @@ public class DateDirectDictionaryGenerator implements DirectDictionaryGenerator
if (key == 1) {
return null;
}
- return key;
+ return key - cutOffDate;
}
private int generateDirectSurrogateKeyForNonTimestampType(String memberStr) {
@@ -151,7 +152,7 @@ public class DateDirectDictionaryGenerator implements DirectDictionaryGenerator
private int generateKey(long timeValue) {
long milli = timeValue + threadLocalLocalTimeZone.get().getOffset(timeValue);
- int key = (int) Math.floor((double) milli / MILLIS_PER_DAY);
+ int key = (int) Math.floor((double) milli / MILLIS_PER_DAY) + cutOffDate;
return key;
}