You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by ch...@apache.org on 2016/11/25 09:43:22 UTC

[5/5] incubator-carbondata git commit: [CARBONDATA-448] Solve compilation error for spark2 integration This closes #352

[CARBONDATA-448] Solve compilation error for spark2 integration This closes #352


Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/5c697e94
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/5c697e94
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/5c697e94

Branch: refs/heads/master
Commit: 5c697e942fdcc320c6060225b354986a00ad910e
Parents: 75e02ca f88737d
Author: chenliang613 <ch...@apache.org>
Authored: Fri Nov 25 17:43:04 2016 +0800
Committer: chenliang613 <ch...@apache.org>
Committed: Fri Nov 25 17:43:04 2016 +0800

----------------------------------------------------------------------
 assembly/pom.xml                                |   39 +-
 .../scan/complextypes/StructQueryType.java      |    4 +-
 examples/CARBON_EXAMPLESLogResource.properties  |   18 -
 examples/pom.xml                                |  134 ---
 .../spark/CARBON_EXAMPLESLogResource.properties |   18 +
 examples/spark/pom.xml                          |   85 ++
 .../spark/src/main/resources/complexdata.csv    |  101 ++
 examples/spark/src/main/resources/data.csv      | 1001 ++++++++++++++++++
 examples/spark/src/main/resources/dimSample.csv |   21 +
 .../spark/src/main/resources/factSample.csv     |   51 +
 .../examples/AllDictionaryExample.scala         |   62 ++
 .../carbondata/examples/AlluxioExample.scala    |   65 ++
 .../carbondata/examples/CarbonExample.scala     |   78 ++
 .../examples/CaseClassDataFrameAPIExample.scala |   49 +
 .../examples/ComplexTypeExample.scala           |   78 ++
 .../examples/DataFrameAPIExample.scala          |   49 +
 .../examples/DataManagementExample.scala        |   78 ++
 .../carbondata/examples/DatasourceExample.scala |   41 +
 .../carbondata/examples/DirectSQLExample.scala  |   44 +
 .../examples/GenerateDictionaryExample.scala    |   95 ++
 .../carbondata/examples/HadoopFileExample.scala |   40 +
 .../apache/carbondata/examples/PerfTest.scala   |  330 ++++++
 .../examples/util/AllDictionaryUtil.scala       |  109 ++
 .../carbondata/examples/util/ExampleUtils.scala |   93 ++
 examples/spark2/pom.xml                         |   85 ++
 examples/src/main/resources/complexdata.csv     |  101 --
 examples/src/main/resources/data.csv            | 1001 ------------------
 examples/src/main/resources/dimSample.csv       |   21 -
 examples/src/main/resources/factSample.csv      |   51 -
 .../examples/AllDictionaryExample.scala         |   62 --
 .../carbondata/examples/AlluxioExample.scala    |   65 --
 .../carbondata/examples/CarbonExample.scala     |   78 --
 .../examples/CaseClassDataFrameAPIExample.scala |   49 -
 .../examples/ComplexTypeExample.scala           |   78 --
 .../examples/DataFrameAPIExample.scala          |   49 -
 .../examples/DataManagementExample.scala        |   78 --
 .../carbondata/examples/DatasourceExample.scala |   41 -
 .../carbondata/examples/DirectSQLExample.scala  |   44 -
 .../examples/GenerateDictionaryExample.scala    |   95 --
 .../carbondata/examples/HadoopFileExample.scala |   40 -
 .../apache/carbondata/examples/PerfTest.scala   |  330 ------
 .../examples/util/AllDictionaryUtil.scala       |  109 --
 .../carbondata/examples/util/ExampleUtils.scala |   93 --
 .../spark/src/test/resources/dimSample.csv      |   21 +
 .../spark/src/test/resources/example-data.csv   | 1001 ++++++++++++++++++
 .../dataload/TestLoadTblNameIsKeyword.scala     |    6 +-
 .../TestNoInvertedIndexLoadAndQuery.scala       |   12 +-
 .../dataload/TestTableLevelBlockSize.scala      |   18 +-
 pom.xml                                         |   17 +-
 49 files changed, 3661 insertions(+), 2567 deletions(-)
----------------------------------------------------------------------