From a315c1cd2b6ed8fe45f6025318896f3f7f140132 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=AF=E5=AE=87?= <hzfengyu@corp.netease.com>
Date: Fri, 30 Oct 2015 17:51:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=B1=E4=BA=8E=E8=A1=8C?=
 =?UTF-8?q?=E4=B8=AD=E5=AD=97=E6=AE=B5=E8=BF=87=E9=95=BF=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/org/apache/kylin/common/util/BytesSplitter.java | 8 +++++++-
 .../java/org/apache/kylin/job/hadoop/cube/BaseCuboidMapper.java   | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/common/src/main/java/org/apache/kylin/common/util/BytesSplitter.java b/common/src/main/java/org/apache/kylin/common/util/BytesSplitter.java
index 26c02d7..65857cc 100644
--- a/common/src/main/java/org/apache/kylin/common/util/BytesSplitter.java
+++ b/common/src/main/java/org/apache/kylin/common/util/BytesSplitter.java
@@ -64,8 +64,11 @@ public class BytesSplitter {
         for (int i = 0; i < byteLen; i++) {
             if (bytes[i] == delimiter) {
                 SplittedBytes split = this.splitBuffers[this.bufferSize++];
-                split.length = length;
+                if(length > split.value.length) {
+                    length = split.value.length;
+                }
                 System.arraycopy(bytes, offset, split.value, 0, length);
+                split.length = length;
                 offset = i + 1;
                 length = 0;
             } else {
@@ -73,6 +76,9 @@ public class BytesSplitter {
             }
         }
         SplittedBytes split = this.splitBuffers[this.bufferSize++];
+        if(length > split.value.length) {
+            length = split.value.length;
+        }
         System.arraycopy(bytes, offset, split.value, 0, length);
         split.length = length;
 
diff --git a/job/src/main/java/org/apache/kylin/job/hadoop/cube/BaseCuboidMapper.java b/job/src/main/java/org/apache/kylin/job/hadoop/cube/BaseCuboidMapper.java
index 5286fbc..08a87d6 100644
--- a/job/src/main/java/org/apache/kylin/job/hadoop/cube/BaseCuboidMapper.java
+++ b/job/src/main/java/org/apache/kylin/job/hadoop/cube/BaseCuboidMapper.java
@@ -226,8 +226,8 @@ public class BaseCuboidMapper<KEYIN> extends KylinMapper<KEYIN, Text, Text, Text
 
     private void handleErrorRecord(BytesSplitter bytesSplitter, Exception ex) throws IOException {
 
-        System.err.println("Insane record: " + bytesSplitter);
         ex.printStackTrace(System.err);
+        System.err.println("Insane record: " + bytesSplitter);
 
         errorRecordCounter++;
         if (errorRecordCounter > BatchConstants.ERROR_RECORD_THRESHOLD) {
-- 
1.9.4.msysgit.2