minor, fix NumberDictionaryForestTest
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/9d2d7aef Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/9d2d7aef Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/9d2d7aef Branch: refs/heads/yang22-hbase1.x Commit: 9d2d7aef8aa62743452bb537757a92ec50743066 Parents: 740c220 Author: Li Yang <liy...@apache.org> Authored: Sun Dec 11 20:03:22 2016 +0800 Committer: Li Yang <liy...@apache.org> Committed: Sun Dec 11 20:05:47 2016 +0800 ---------------------------------------------------------------------- .../mr/steps/NumberDictionaryForestTest.java | 35 +++++++------------- .../mr/steps/SelfDefineSortableKeyTest.java | 8 ++--- 2 files changed, 16 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/9d2d7aef/engine-mr/src/test/java/org/apache/kylin/engine/mr/steps/NumberDictionaryForestTest.java ---------------------------------------------------------------------- diff --git a/engine-mr/src/test/java/org/apache/kylin/engine/mr/steps/NumberDictionaryForestTest.java b/engine-mr/src/test/java/org/apache/kylin/engine/mr/steps/NumberDictionaryForestTest.java index 12105c9..bb10b4a 100644 --- a/engine-mr/src/test/java/org/apache/kylin/engine/mr/steps/NumberDictionaryForestTest.java +++ b/engine-mr/src/test/java/org/apache/kylin/engine/mr/steps/NumberDictionaryForestTest.java @@ -14,7 +14,6 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; import java.util.Random; -import java.util.UUID; import org.apache.hadoop.io.Text; import org.apache.kylin.common.util.Bytes; @@ -35,14 +34,13 @@ import org.junit.Test; public class NumberDictionaryForestTest { @Test public void testNumberDictionaryForestLong() { - List<String> list = randomLongData(10); + List<String> list = randomLongData(100); testData(list, TypeFlag.INTEGER_FAMILY_TYPE); } @Test public void testNumberDictionaryForestDouble() { - List<String> list = randomDoubleData(10); - + List<String> list = randomDoubleData(100); testData(list, TypeFlag.DOUBLE_FAMILY_TYPE); } @@ -199,23 +197,15 @@ public class NumberDictionaryForestTest { Random rand = new Random(System.currentTimeMillis()); ArrayList<String> list = new ArrayList<>(); for (int i = 0; i < count; i++) { - list.add(rand.nextDouble() + ""); + String str = rand.nextDouble() + ""; + if (str.contains("E")) + continue; + list.add(str); } list.add("-1"); return list; } - private List<String> randomStringData(int count) { - Random rand = new Random(System.currentTimeMillis()); - ArrayList<String> list = new ArrayList<>(); - for (int i = 0; i < count; i++) { - list.add(UUID.randomUUID().toString()); - } - list.add("123"); - list.add("123"); - return list; - } - private ArrayList<SelfDefineSortableKey> createKeyList(List<String> strNumList, byte typeFlag) { int partationId = 0; ArrayList<SelfDefineSortableKey> keyList = new ArrayList<>(); @@ -237,16 +227,15 @@ public class NumberDictionaryForestTest { } private String printKey(SelfDefineSortableKey key) { - byte[] data = key.getText().getBytes(); - byte[] fieldValue = Bytes.copy(data, 1, data.length - 1); - System.out.println("type flag:" + key.getTypeId() + " fieldValue:" + new String(fieldValue)); - return new String(fieldValue); + Text data = key.getText(); + String fieldValue = Bytes.toString(data.getBytes(), 1, data.getLength() - 1); + System.out.println("type flag:" + key.getTypeId() + " fieldValue:" + fieldValue); + return fieldValue; } private String getFieldValue(SelfDefineSortableKey key) { - byte[] data = key.getText().getBytes(); - byte[] fieldValue = Bytes.copy(data, 1, data.length - 1); - return new String(fieldValue); + Text data = key.getText(); + return Bytes.toString(data.getBytes(), 1, data.getLength() - 1); } private <T> boolean isIncreasedOrder(List<T> list, Comparator<T> comp) { http://git-wip-us.apache.org/repos/asf/kylin/blob/9d2d7aef/engine-mr/src/test/java/org/apache/kylin/engine/mr/steps/SelfDefineSortableKeyTest.java ---------------------------------------------------------------------- diff --git a/engine-mr/src/test/java/org/apache/kylin/engine/mr/steps/SelfDefineSortableKeyTest.java b/engine-mr/src/test/java/org/apache/kylin/engine/mr/steps/SelfDefineSortableKeyTest.java index 283a0f5..d71e366 100644 --- a/engine-mr/src/test/java/org/apache/kylin/engine/mr/steps/SelfDefineSortableKeyTest.java +++ b/engine-mr/src/test/java/org/apache/kylin/engine/mr/steps/SelfDefineSortableKeyTest.java @@ -182,10 +182,10 @@ public class SelfDefineSortableKeyTest { } private String printKey(SelfDefineSortableKey key) { - byte[] data = key.getText().getBytes(); - byte[] fieldValue = Bytes.copy(data, 1, data.length - 1); - System.out.println("type flag:" + key.getTypeId() + " fieldValue:" + new String(fieldValue)); - return new String(fieldValue); + Text data = key.getText(); + String fieldValue = Bytes.toString(data.getBytes(), 1, data.getLength() - 1); + System.out.println("type flag:" + key.getTypeId() + " fieldValue:" + fieldValue); + return fieldValue; } private <T> boolean isIncreasedOrder(List<T> list, Comparator<T> comp) {
