You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by ja...@apache.org on 2017/09/14 09:20:20 UTC

[27/54] [abbrv] carbondata git commit: [CARBONDATA-1399]Enable findbugs

[CARBONDATA-1399]Enable findbugs

This closes #1272


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

Branch: refs/heads/streaming_ingest
Commit: 1852e135ae07a343b1f2a270e20d21069bd23c27
Parents: 0ebdc94
Author: Raghunandan S <ca...@gmail.com>
Authored: Sat Aug 19 21:34:39 2017 +0530
Committer: Ravindra Pesala <ra...@gmail.com>
Committed: Sat Sep 9 18:29:11 2017 +0530

----------------------------------------------------------------------
 .../generator/key/DictionaryMessage.java        |  6 ++-
 pom.xml                                         | 50 ++++++++------------
 2 files changed, 25 insertions(+), 31 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/carbondata/blob/1852e135/core/src/main/java/org/apache/carbondata/core/dictionary/generator/key/DictionaryMessage.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/dictionary/generator/key/DictionaryMessage.java b/core/src/main/java/org/apache/carbondata/core/dictionary/generator/key/DictionaryMessage.java
index 749c3f4..d59e9f8 100644
--- a/core/src/main/java/org/apache/carbondata/core/dictionary/generator/key/DictionaryMessage.java
+++ b/core/src/main/java/org/apache/carbondata/core/dictionary/generator/key/DictionaryMessage.java
@@ -55,7 +55,8 @@ public class DictionaryMessage {
   public void readData(ByteBuf byteBuf) {
     byte[] tableIdBytes = new byte[byteBuf.readInt()];
     byteBuf.readBytes(tableIdBytes);
-    tableUniqueId = new String(tableIdBytes);
+    tableUniqueId =
+        new String(tableIdBytes, Charset.forName(CarbonCommonConstants.DEFAULT_CHARSET));
 
     byte[] colBytes = new byte[byteBuf.readInt()];
     byteBuf.readBytes(colBytes);
@@ -79,7 +80,8 @@ public class DictionaryMessage {
     // Just reserve the bytes to add length of header at last.
     byteBuf.writeShort(Short.MAX_VALUE);
 
-    byte[] tableIdBytes = tableUniqueId.getBytes();
+    byte[] tableIdBytes =
+        tableUniqueId.getBytes(Charset.forName(CarbonCommonConstants.DEFAULT_CHARSET));
     byteBuf.writeInt(tableIdBytes.length);
     byteBuf.writeBytes(tableIdBytes);
 

http://git-wip-us.apache.org/repos/asf/carbondata/blob/1852e135/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3540221..a1301f6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -101,7 +101,6 @@
     <module>hadoop</module>
     <module>integration/spark-common</module>
     <module>integration/spark-common-test</module>
-    <module>integration/hive</module>
     <module>assembly</module>
   </modules>
 
@@ -329,6 +328,27 @@
         </configuration>
       </plugin>
       <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>findbugs-maven-plugin</artifactId>
+        <version>3.0.4</version>
+        <configuration>
+          <excludeFilterFile>${dev.path}/findbugs-exclude.xml</excludeFilterFile>
+          <failOnError>true</failOnError>
+          <findbugsXmlOutput>true</findbugsXmlOutput>
+          <xmlOutput>true</xmlOutput>
+          <effort>Max</effort>
+        </configuration>
+        <executions>
+          <execution>
+            <id>analyze-compile</id>
+            <phase>compile</phase>
+            <goals>
+              <goal>check</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
         <groupId>org.jacoco</groupId>
         <artifactId>jacoco-maven-plugin</artifactId>
         <version>0.7.9</version>
@@ -556,34 +576,6 @@
       </build>
     </profile>
     <profile>
-      <id>findbugs</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>findbugs-maven-plugin</artifactId>
-            <version>3.0.4</version>
-            <configuration>
-              <excludeFilterFile>${dev.path}/findbugs-exclude.xml</excludeFilterFile>
-              <failOnError>true</failOnError>
-              <findbugsXmlOutput>true</findbugsXmlOutput>
-              <xmlOutput>true</xmlOutput>
-              <effort>Max</effort>
-            </configuration>
-            <executions>
-              <execution>
-                <id>analyze-compile</id>
-                <phase>compile</phase>
-                <goals>
-                  <goal>check</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <profile>
       <id>include-all</id>
     </profile>
     <profile>