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 2018/02/08 13:43:05 UTC
carbondata git commit: [HotFix][CheckStyle] Fix import related
checkstyle
Repository: carbondata
Updated Branches:
refs/heads/carbonstore e972fd3d5 -> cd7eed66b
[HotFix][CheckStyle] Fix import related checkstyle
This closes #1952
Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/cd7eed66
Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/cd7eed66
Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/cd7eed66
Branch: refs/heads/carbonstore
Commit: cd7eed66bdd7b0044953cb5bf037f6cce38c9e12
Parents: e972fd3
Author: xuchuanyin <xu...@hust.edu.cn>
Authored: Thu Feb 8 15:39:45 2018 +0800
Committer: Jacky Li <ja...@qq.com>
Committed: Thu Feb 8 21:42:53 2018 +0800
----------------------------------------------------------------------
.../core/indexstore/blockletindex/BlockletDataRefNode.java | 2 +-
.../org/apache/carbondata/core/memory/HeapMemoryAllocator.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/carbondata/blob/cd7eed66/core/src/main/java/org/apache/carbondata/core/indexstore/blockletindex/BlockletDataRefNode.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/indexstore/blockletindex/BlockletDataRefNode.java b/core/src/main/java/org/apache/carbondata/core/indexstore/blockletindex/BlockletDataRefNode.java
index ad4a7cc..95c04f3 100644
--- a/core/src/main/java/org/apache/carbondata/core/indexstore/blockletindex/BlockletDataRefNode.java
+++ b/core/src/main/java/org/apache/carbondata/core/indexstore/blockletindex/BlockletDataRefNode.java
@@ -32,8 +32,8 @@ import org.apache.carbondata.core.datastore.chunk.reader.MeasureColumnChunkReade
import org.apache.carbondata.core.indexstore.BlockletDetailInfo;
import org.apache.carbondata.core.indexstore.FineGrainBlocklet;
import org.apache.carbondata.core.metadata.ColumnarFormatVersion;
-import org.apache.carbondata.core.util.BitSetGroup;
import org.apache.carbondata.core.metadata.blocklet.index.BlockletIndex;
+import org.apache.carbondata.core.util.BitSetGroup;
/**
* wrapper for blocklet data map data
http://git-wip-us.apache.org/repos/asf/carbondata/blob/cd7eed66/core/src/main/java/org/apache/carbondata/core/memory/HeapMemoryAllocator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/memory/HeapMemoryAllocator.java b/core/src/main/java/org/apache/carbondata/core/memory/HeapMemoryAllocator.java
index 2203b3b..5862933 100644
--- a/core/src/main/java/org/apache/carbondata/core/memory/HeapMemoryAllocator.java
+++ b/core/src/main/java/org/apache/carbondata/core/memory/HeapMemoryAllocator.java
@@ -17,11 +17,11 @@
package org.apache.carbondata.core.memory;
-import javax.annotation.concurrent.GuardedBy;
import java.lang.ref.WeakReference;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.Map;
+import javax.annotation.concurrent.GuardedBy;
/**
* Code ported from Apache Spark {org.apache.spark.unsafe.memory} package