You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by ma...@apache.org on 2015/05/27 12:12:04 UTC

incubator-kylin git commit: fix ci: deal with GTDiskStore fail create dir case

Repository: incubator-kylin
Updated Branches:
  refs/heads/0.8.0 92c069679 -> a499adff8


fix ci: deal with GTDiskStore fail create dir case


Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/a499adff
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/a499adff
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/a499adff

Branch: refs/heads/0.8.0
Commit: a499adff8389d26fdf6712a680bdc46d1d01be96
Parents: 92c0696
Author: honma <ho...@ebay.com>
Authored: Wed May 27 18:11:29 2015 +0800
Committer: honma <ho...@ebay.com>
Committed: Wed May 27 18:11:47 2015 +0800

----------------------------------------------------------------------
 .../gridtable/diskstore/GTDiskStore.java        | 29 ++++++++------------
 1 file changed, 12 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/a499adff/storage/src/main/java/org/apache/kylin/storage/gridtable/diskstore/GTDiskStore.java
----------------------------------------------------------------------
diff --git a/storage/src/main/java/org/apache/kylin/storage/gridtable/diskstore/GTDiskStore.java b/storage/src/main/java/org/apache/kylin/storage/gridtable/diskstore/GTDiskStore.java
index b6f7d95..e8926c2 100644
--- a/storage/src/main/java/org/apache/kylin/storage/gridtable/diskstore/GTDiskStore.java
+++ b/storage/src/main/java/org/apache/kylin/storage/gridtable/diskstore/GTDiskStore.java
@@ -1,24 +1,14 @@
 package org.apache.kylin.storage.gridtable.diskstore;
 
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.EOFException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.nio.ByteBuffer;
-import java.util.BitSet;
-import java.util.UUID;
-
-import org.apache.kylin.storage.gridtable.GTInfo;
-import org.apache.kylin.storage.gridtable.GTRecord;
-import org.apache.kylin.storage.gridtable.GTRowBlock;
-import org.apache.kylin.storage.gridtable.GTScanRequest;
-import org.apache.kylin.storage.gridtable.IGTStore;
+import com.google.common.base.Preconditions;
+import org.apache.kylin.storage.gridtable.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.base.Preconditions;
+import java.io.*;
+import java.nio.ByteBuffer;
+import java.util.BitSet;
+import java.util.UUID;
 
 /**
  */
@@ -46,17 +36,22 @@ public class GTDiskStore implements IGTStore {
     }
 
     private String generateIdentifier(FileSystem fs) {
+        int tryCount = 0;
         while (true) {
+            //uuid may conflict
             String identifier = UUID.randomUUID().toString();
             final String path = getRootDirectory(identifier);
             if (fs.createDirectory(path)) {
                 return identifier;
             }
+            if (++tryCount > 5) {
+                throw new RuntimeException("failed to generateIdentifier");
+            }
         }
     }
 
     private String getRootDirectory(String identifier) {
-        return "/tmp/kylin/gtdiskstore/" + identifier;
+        return "/tmp/kylin_gtdiskstore/" + identifier;
     }
 
     private String getRowBlockFile(String identifier) {