You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by ku...@apache.org on 2018/06/29 14:59:22 UTC
carbondata git commit: [HOTFIX] Fixed compilation issues and bloom
clear issue
Repository: carbondata
Updated Branches:
refs/heads/master b0d24eac5 -> 589fe1883
[HOTFIX] Fixed compilation issues and bloom clear issue
Fixed test
This closes #2428
Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/589fe188
Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/589fe188
Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/589fe188
Branch: refs/heads/master
Commit: 589fe18834b75c797aeda590debad6f619be7a1d
Parents: b0d24ea
Author: ravipesala <ra...@gmail.com>
Authored: Fri Jun 29 14:58:20 2018 +0530
Committer: kumarvishal09 <ku...@gmail.com>
Committed: Fri Jun 29 20:28:40 2018 +0530
----------------------------------------------------------------------
.../localdictionary/TestLocalDictionaryGenerator.java | 14 ++++++++++----
.../core/localdictionary/TestPageLevelDictionary.java | 6 +++---
.../datamap/bloom/BloomCoarseGrainDataMapFactory.java | 12 +++---------
3 files changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/carbondata/blob/589fe188/core/src/test/java/org/apache/carbondata/core/localdictionary/TestLocalDictionaryGenerator.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/carbondata/core/localdictionary/TestLocalDictionaryGenerator.java b/core/src/test/java/org/apache/carbondata/core/localdictionary/TestLocalDictionaryGenerator.java
index d860fb5..d5b3d55 100644
--- a/core/src/test/java/org/apache/carbondata/core/localdictionary/TestLocalDictionaryGenerator.java
+++ b/core/src/test/java/org/apache/carbondata/core/localdictionary/TestLocalDictionaryGenerator.java
@@ -16,6 +16,7 @@
*/
package org.apache.carbondata.core.localdictionary;
+import java.nio.ByteBuffer;
import java.util.Arrays;
import org.apache.carbondata.core.constants.CarbonCommonConstants;
@@ -30,7 +31,7 @@ public class TestLocalDictionaryGenerator {
@Test
public void testColumnLocalDictionaryGeneratorWithValidDataWithinThreshold() {
- LocalDictionaryGenerator generator = new ColumnLocalDictionaryGenerator(1000);
+ LocalDictionaryGenerator generator = new ColumnLocalDictionaryGenerator(1000, 2);
try {
for (int i = 1; i <= 1000; i++) {
generator.generateDictionary(("" + i).getBytes());
@@ -51,7 +52,7 @@ public class TestLocalDictionaryGenerator {
@Test
public void testColumnLocalDictionaryGeneratorWhenThresholdReached_ExceptionShouldBeThrown() {
- LocalDictionaryGenerator generator = new ColumnLocalDictionaryGenerator(1000);
+ LocalDictionaryGenerator generator = new ColumnLocalDictionaryGenerator(1000, 2);
try {
for (int i = 1; i <= 10000; i++) {
generator.generateDictionary(("" + i).getBytes());
@@ -65,8 +66,13 @@ public class TestLocalDictionaryGenerator {
@Test
public void testColumnLocalDictionaryGeneratorForNullValueIsPresentWithoutAddingAnyData() {
- LocalDictionaryGenerator generator = new ColumnLocalDictionaryGenerator(1000);
+ LocalDictionaryGenerator generator = new ColumnLocalDictionaryGenerator(1000, 2);
+ ByteBuffer byteBuffer = ByteBuffer.allocate(
+ 2 + CarbonCommonConstants.MEMBER_DEFAULT_VAL_ARRAY.length);
+ byteBuffer.putShort((short)CarbonCommonConstants.MEMBER_DEFAULT_VAL_ARRAY.length);
+ byteBuffer.put(CarbonCommonConstants.MEMBER_DEFAULT_VAL_ARRAY);
+
Assert.assertTrue(Arrays.equals(generator.getDictionaryKeyBasedOnValue(1),
- CarbonCommonConstants.MEMBER_DEFAULT_VAL_ARRAY));
+ byteBuffer.array()));
}
}
http://git-wip-us.apache.org/repos/asf/carbondata/blob/589fe188/core/src/test/java/org/apache/carbondata/core/localdictionary/TestPageLevelDictionary.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/carbondata/core/localdictionary/TestPageLevelDictionary.java b/core/src/test/java/org/apache/carbondata/core/localdictionary/TestPageLevelDictionary.java
index b9f7548..da62133 100644
--- a/core/src/test/java/org/apache/carbondata/core/localdictionary/TestPageLevelDictionary.java
+++ b/core/src/test/java/org/apache/carbondata/core/localdictionary/TestPageLevelDictionary.java
@@ -26,7 +26,7 @@ import org.junit.Test;
public class TestPageLevelDictionary {
@Test public void testPageLevelDictionaryGenerateDataIsGenertingProperDictionaryValues() {
- LocalDictionaryGenerator generator = new ColumnLocalDictionaryGenerator(1000);
+ LocalDictionaryGenerator generator = new ColumnLocalDictionaryGenerator(1000, 2);
String columnName = "column1";
PageLevelDictionary pageLevelDictionary = new PageLevelDictionary(generator, columnName,
DataTypes.STRING);
@@ -41,7 +41,7 @@ public class TestPageLevelDictionary {
}
@Test public void testPageLevelDictionaryContainsOnlyUsedDictionaryValues() {
- LocalDictionaryGenerator generator = new ColumnLocalDictionaryGenerator(1000);
+ LocalDictionaryGenerator generator = new ColumnLocalDictionaryGenerator(1000, 2);
String columnName = "column1";
PageLevelDictionary pageLevelDictionary1 = new PageLevelDictionary(generator, columnName, DataTypes.STRING);
byte[][] validateData = new byte[500][];
@@ -93,7 +93,7 @@ public class TestPageLevelDictionary {
@Test
public void testPageLevelDictionaryContainsOnlyUsedDictionaryValuesWhenMultiplePagesUseSameDictionary() {
- LocalDictionaryGenerator generator = new ColumnLocalDictionaryGenerator(1000);
+ LocalDictionaryGenerator generator = new ColumnLocalDictionaryGenerator(1000, 2);
String columnName = "column1";
PageLevelDictionary pageLevelDictionary1 = new PageLevelDictionary(generator, columnName, DataTypes.STRING);
byte[][] validateData = new byte[10][];
http://git-wip-us.apache.org/repos/asf/carbondata/blob/589fe188/datamap/bloom/src/main/java/org/apache/carbondata/datamap/bloom/BloomCoarseGrainDataMapFactory.java
----------------------------------------------------------------------
diff --git a/datamap/bloom/src/main/java/org/apache/carbondata/datamap/bloom/BloomCoarseGrainDataMapFactory.java b/datamap/bloom/src/main/java/org/apache/carbondata/datamap/bloom/BloomCoarseGrainDataMapFactory.java
index b174b2a..e5f27a9 100644
--- a/datamap/bloom/src/main/java/org/apache/carbondata/datamap/bloom/BloomCoarseGrainDataMapFactory.java
+++ b/datamap/bloom/src/main/java/org/apache/carbondata/datamap/bloom/BloomCoarseGrainDataMapFactory.java
@@ -17,14 +17,7 @@
package org.apache.carbondata.datamap.bloom;
import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
import org.apache.carbondata.common.annotations.InterfaceAudience;
import org.apache.carbondata.common.exceptions.sql.MalformedDataMapCommandException;
@@ -340,7 +333,8 @@ public class BloomCoarseGrainDataMapFactory extends DataMapFactory<CoarseGrainDa
@Override
public void clear() {
- for (String segmentId : segmentMap.keySet().toArray(new String[segmentMap.size()])) {
+ List<String> segments = new ArrayList<>(segmentMap.keySet());
+ for (String segmentId : segments) {
clear(new Segment(segmentId, null, null));
}
}