carbondata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ravipes...@apache.org
Subject carbondata git commit: [HOTFIX]Add new modules to coverage report and make package name consistent with directory structure
Date Wed, 09 May 2018 12:43:51 GMT
Repository: carbondata
Updated Branches:
  refs/heads/master cf3e91965 -> e70b6b446


[HOTFIX]Add new modules to coverage report and make package name consistent with directory
structure

This closes #2285


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

Branch: refs/heads/master
Commit: e70b6b446c829abea3954fd852944957ba13522e
Parents: cf3e919
Author: sraghunandan <carbondatacontributions@gmail.com>
Authored: Wed May 9 12:36:31 2018 +0530
Committer: ravipesala <ravi.pesala@gmail.com>
Committed: Wed May 9 18:12:50 2018 +0530

----------------------------------------------------------------------
 integration/spark-common-test/pom.xml           | 50 +++++++++++++++++++-
 .../datasources/SparkCarbonFileFormat.scala     |  3 +-
 ....apache.spark.sql.sources.DataSourceRegister |  2 +-
 pom.xml                                         | 10 ++++
 4 files changed, 62 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/carbondata/blob/e70b6b44/integration/spark-common-test/pom.xml
----------------------------------------------------------------------
diff --git a/integration/spark-common-test/pom.xml b/integration/spark-common-test/pom.xml
index 9f184e6..ae78523 100644
--- a/integration/spark-common-test/pom.xml
+++ b/integration/spark-common-test/pom.xml
@@ -42,6 +42,11 @@
     <build.directory.projectSparkCommonTest>../../integration/spark-common-test/target</build.directory.projectSparkCommonTest>
     <build.directory.projectHive>../../integration/hive/target</build.directory.projectHive>
     <build.directory.projectPresto>../../integration/presto/target</build.directory.projectPresto>
+    <build.directory.projectStoreSdk>../../store/sdk/target</build.directory.projectStoreSdk>
+    <build.directory.projectStoreSearch>../../store/search/target</build.directory.projectStoreSearch>
+    <build.directory.projectStreaming>../../streaming/target</build.directory.projectStreaming>
+    <build.directory.projectBloom>../../datamap/bloom/target</build.directory.projectBloom>
+    <build.directory.projectLucene>../../datamap/lucene/target</build.directory.projectLucene>
 
     <classes.directory.projectCommon>../../common/target/classes</classes.directory.projectCommon>
     <classes.directory.projectCore>../../core/target/classes</classes.directory.projectCore>
@@ -54,6 +59,11 @@
     <classes.directory.projectSparkCommonTest>../../integration/spark-common-test/target/classes</classes.directory.projectSparkCommonTest>
     <classes.directory.projectHive>../../integration/hive/target/classes</classes.directory.projectHive>
     <classes.directory.projectPresto>../../integration/presto/target/classes</classes.directory.projectPresto>
+    <classes.directory.projectStoreSdk>../../store/sdk/target/classes</classes.directory.projectStoreSdk>
+    <classes.directory.projectStoreSearch>../../store/search/target/classes</classes.directory.projectStoreSearch>
+    <classes.directory.projectStreaming>../../streaming/target/classes</classes.directory.projectStreaming>
+    <classes.directory.projectBloom>../../datamap/bloom/target/classes</classes.directory.projectBloom>
+    <classes.directory.projectLucene>../../datamap/lucene/target/classes</classes.directory.projectLucene>
 
     <sources.directory.projectCommon>../../common/src/main/java</sources.directory.projectCommon>
     <sources.directory.projectCore>../../core/src/main/java</sources.directory.projectCore>
@@ -70,6 +80,13 @@
     <sources.directory.projectHive>../../integration/hive/src/main/scala</sources.directory.projectHive>
     <sources.directory.projectPresto>../../integration/presto/src/main/java</sources.directory.projectPresto>
     <sources.directory.projectPresto>../../integration/presto/src/main/scala</sources.directory.projectPresto>
+    <sources.directory.projectStoreSdk>../../store/sdk/src/main/java</sources.directory.projectStoreSdk>
+    <sources.directory.projectStoreSearch>../../store/search/src/main/java</sources.directory.projectStoreSearch>
+    <sources.directory.projectStoreSearch>../../store/search/src/main/scala</sources.directory.projectStoreSearch>
+    <sources.directory.projectStreaming>../../streaming/src/main/java</sources.directory.projectStreaming>
+    <sources.directory.projectStreaming>../../streaming/src/main/scala</sources.directory.projectStreaming>
+    <sources.directory.projectBloom>../../datamap/bloom/src/main/java</sources.directory.projectBloom>
+    <sources.directory.projectLucene>../../datamap/lucene/src/main/java</sources.directory.projectLucene>
 
     <generated-sources.directory.projectCommon>../../common/target/generated-sources/annotations</generated-sources.directory.projectCommon>
     <generated-sources.directory.projectCore>../../core/target/generated-sources/annotations</generated-sources.directory.projectCore>
@@ -82,6 +99,12 @@
     <generated-sources.directory.projectSparkCommonTest>../../integration/spark-common-test/target/generated-sources/annotations</generated-sources.directory.projectSparkCommonTest>
     <generated-sources.directory.projectHive>../../integration/hive/target/generated-sources/annotations</generated-sources.directory.projectHive>
     <generated-sources.directory.projectPresto>../../integration/presto/target/generated-sources/annotations</generated-sources.directory.projectPresto>
+    <generated-sources.directory.projectStoreSdk>../../store/sdk/target/generated-sources/annotations</generated-sources.directory.projectStoreSdk>
+    <generated-sources.directory.projectStoreSearch>../../store/search/target/generated-sources/annotations</generated-sources.directory.projectStoreSearch>
+    <generated-sources.directory.projectStreaming>../../streaming/target/generated-sources/annotations</generated-sources.directory.projectStreaming>
+    <generated-sources.directory.projectBloom>../../datamap/bloom/target/generated-sources/annotations</generated-sources.directory.projectBloom>
+    <generated-sources.directory.projectLucene>../../datamap/lucene/target/generated-sources/annotations</generated-sources.directory.projectLucene>
+
   </properties>
 
 
@@ -313,6 +336,21 @@
                     <fileset dir="${build.directory.projectPresto}" erroronmissingdir="false">
                       <include name="jacoco.exec" />
                     </fileset>
+                    <fileset dir="${build.directory.projectStoreSdk}" erroronmissingdir="false">
+                      <include name="jacoco.exec" />
+                    </fileset>
+                    <fileset dir="${build.directory.projectStoreSearch}" erroronmissingdir="false">
+                      <include name="jacoco.exec" />
+                    </fileset>
+                    <fileset dir="${build.directory.projectStreaming}" erroronmissingdir="false">
+                      <include name="jacoco.exec" />
+                    </fileset>
+                    <fileset dir="${build.directory.projectBloom}" erroronmissingdir="false">
+                      <include name="jacoco.exec" />
+                    </fileset>
+                    <fileset dir="${build.directory.projectLucene}" erroronmissingdir="false">
+                      <include name="jacoco.exec" />
+                    </fileset>
 
                   </executiondata>
                   <structure name="jacoco-CarbonData Coverage Project">
@@ -329,7 +367,11 @@
                         <fileset dir="${classes.directory.projectSparkCommonTest}" />
                         <fileset dir="${classes.directory.projectHive}" erroronmissingdir="false"
/>
                         <fileset dir="${classes.directory.projectPresto}" erroronmissingdir="false"
/>
-
+                        <fileset dir="${classes.directory.projectStoreSdk}" erroronmissingdir="false"
/>
+                        <fileset dir="${classes.directory.projectStoreSearch}" erroronmissingdir="false"
/>
+                        <fileset dir="${classes.directory.projectStreaming}" erroronmissingdir="false"
/>
+                        <fileset dir="${classes.directory.projectBloom}" erroronmissingdir="false"
/>
+                        <fileset dir="${classes.directory.projectLucene}" erroronmissingdir="false"
/>
                       </classfiles>
                       <sourcefiles encoding="UTF-8">
                         <fileset dir="${sources.directory.projectCommon}" />
@@ -342,6 +384,12 @@
                         <fileset dir="${sources.directory.projectSparkCommon}" />
                         <fileset dir="${sources.directory.projectHive}" erroronmissingdir="false"
/>
                         <fileset dir="${sources.directory.projectPresto}" erroronmissingdir="false"
/>
+                        <fileset dir="${sources.directory.projectStoreSdk}" erroronmissingdir="false"
/>
+                        <fileset dir="${sources.directory.projectStoreSearch}" erroronmissingdir="false"
/>
+                        <fileset dir="${sources.directory.projectStreaming}" erroronmissingdir="false"
/>
+                        <fileset dir="${sources.directory.projectBloom}" erroronmissingdir="false"
/>
+                        <fileset dir="${sources.directory.projectLucene}" erroronmissingdir="false"
/>
+
                       </sourcefiles>
                     </group>
                   </structure>

http://git-wip-us.apache.org/repos/asf/carbondata/blob/e70b6b44/integration/spark2/src/main/scala/org/apache/spark/sql/execution/datasources/SparkCarbonFileFormat.scala
----------------------------------------------------------------------
diff --git a/integration/spark2/src/main/scala/org/apache/spark/sql/execution/datasources/SparkCarbonFileFormat.scala
b/integration/spark2/src/main/scala/org/apache/spark/sql/execution/datasources/SparkCarbonFileFormat.scala
index 4f60297..35db1f5 100644
--- a/integration/spark2/src/main/scala/org/apache/spark/sql/execution/datasources/SparkCarbonFileFormat.scala
+++ b/integration/spark2/src/main/scala/org/apache/spark/sql/execution/datasources/SparkCarbonFileFormat.scala
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.spark.sql
+package org.apache.spark.sql.execution.datasources
 
 import java.net.URI
 
@@ -34,6 +34,7 @@ import org.apache.spark.sql.catalyst.InternalRow
 import org.apache.spark.sql.execution.datasources._
 import org.apache.spark.sql.execution.datasources.text.TextOutputWriter
 import org.apache.spark.sql.optimizer.CarbonFilters
+import org.apache.spark.sql.SparkSession
 import org.apache.spark.sql.sources.{DataSourceRegister, Filter}
 import org.apache.spark.sql.types.{AtomicType, StructField, StructType}
 

http://git-wip-us.apache.org/repos/asf/carbondata/blob/e70b6b44/integration/spark2/src/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister
----------------------------------------------------------------------
diff --git a/integration/spark2/src/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister
b/integration/spark2/src/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister
index 5831f3e..4958a75 100644
--- a/integration/spark2/src/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister
+++ b/integration/spark2/src/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister
@@ -15,4 +15,4 @@
 ## limitations under the License.
 ## ------------------------------------------------------------------------
 org.apache.spark.sql.CarbonSource
-org.apache.spark.sql.SparkCarbonFileFormat
\ No newline at end of file
+org.apache.spark.sql.execution.datasources.SparkCarbonFileFormat
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/carbondata/blob/e70b6b44/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9e629f3..7c460e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -516,6 +516,11 @@
                 <sourceDirectory>${basedir}/integration/presto/src/main/java</sourceDirectory>
                 <sourceDirectory>${basedir}/streaming/src/main/java</sourceDirectory>
                 <sourceDirectory>${basedir}/streaming/src/main/scala</sourceDirectory>
+                <sourceDirectory>${basedir}/store/sdk/src/main/java</sourceDirectory>
+                <sourceDirectory>${basedir}/store/search/src/main/scala</sourceDirectory>
+                <sourceDirectory>${basedir}/store/search/src/main/java</sourceDirectory>
+                <sourceDirectory>${basedir}/datamap/bloom/src/main/java</sourceDirectory>
+                <sourceDirectory>${basedir}/datamap/lucene/src/main/java</sourceDirectory>
               </sourceDirectories>
             </configuration>
           </plugin>
@@ -572,6 +577,11 @@
                 <sourceDirectory>${basedir}/integration/presto/src/main/java</sourceDirectory>
                 <sourceDirectory>${basedir}/streaming/src/main/java</sourceDirectory>
                 <sourceDirectory>${basedir}/streaming/src/main/scala</sourceDirectory>
+                <sourceDirectory>${basedir}/store/sdk/src/main/java</sourceDirectory>
+                <sourceDirectory>${basedir}/store/search/src/main/scala</sourceDirectory>
+                <sourceDirectory>${basedir}/store/search/src/main/java</sourceDirectory>
+                <sourceDirectory>${basedir}/datamap/bloom/src/main/java</sourceDirectory>
+                <sourceDirectory>${basedir}/datamap/lucene/src/main/java</sourceDirectory>
               </sourceDirectories>
             </configuration>
           </plugin>


Mime
View raw message