From eeb71085aead3dbfbabda4358625febac83ec3f0 Mon Sep 17 00:00:00 2001 From: Jarek Jarcec Cecho Date: Sat, 28 Feb 2015 06:53:10 -0800 Subject: [PATCH] SQOOP-2149: Update Kite dependency to 1.0.0 (Qian Xu via Jarek Jarcec Cecho) --- ivy/libraries.properties | 2 +- src/java/org/apache/sqoop/util/AppendUtils.java | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/ivy/libraries.properties b/ivy/libraries.properties index fe309a0c..2e3d884a 100644 --- a/ivy/libraries.properties +++ b/ivy/libraries.properties @@ -20,7 +20,7 @@ avro.version=1.7.5 -kite-data.version=0.17.0 +kite-data.version=1.0.0 checkstyle.version=5.0 diff --git a/src/java/org/apache/sqoop/util/AppendUtils.java b/src/java/org/apache/sqoop/util/AppendUtils.java index b6bbc184..c53a6e24 100644 --- a/src/java/org/apache/sqoop/util/AppendUtils.java +++ b/src/java/org/apache/sqoop/util/AppendUtils.java @@ -19,10 +19,8 @@ package org.apache.sqoop.util; import java.io.IOException; -import java.lang.management.ManagementFactory; import java.text.NumberFormat; -import java.text.SimpleDateFormat; -import java.util.Date; +import java.util.UUID; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -41,8 +39,6 @@ public class AppendUtils { public static final Log LOG = LogFactory.getLog(AppendUtils.class.getName()); - private static final SimpleDateFormat DATE_FORM = new SimpleDateFormat( - "ddHHmmssSSSSSSSSS"); private static final String TEMP_IMPORT_ROOT = System.getProperty("sqoop.test.import.rootDir", "_sqoop"); @@ -278,9 +274,8 @@ private String getFileExtension(String filename) { * @return a path pointing to the temporary directory */ public static Path getTempAppendDir(String salt) { - String timeId = DATE_FORM.format(new Date(System.currentTimeMillis())); - String jvmName = ManagementFactory.getRuntimeMXBean().getName().replaceAll("@", "_"); - String tempDir = TEMP_IMPORT_ROOT + Path.SEPARATOR + timeId + "_" + jvmName + "_" + salt; + String uuid = UUID.randomUUID().toString().replace("-", ""); + String tempDir = TEMP_IMPORT_ROOT + Path.SEPARATOR + uuid + "_" + salt; return new Path(tempDir); }