Merge 498ce1f into ebe78dc

apache · Jul 13, 2019 · 82e8c7a · 82e8c7a
2 parents ebe78dc + 498ce1f
commit 82e8c7a
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 2 deletions.
diff --git a/core/src/main/java/org/apache/carbondata/core/util/CarbonThreadFactory.java b/core/src/main/java/org/apache/carbondata/core/util/CarbonThreadFactory.java
@@ -49,7 +49,7 @@ public CarbonThreadFactory(String name, boolean withTime) {
   @Override public Thread newThread(Runnable r) {
     final Thread thread = defaultFactory.newThread(r);
     if (withTime) {
-      thread.setName(name + "_" + System.currentTimeMillis());
+      thread.setName(name + "_" + System.nanoTime());
     } else {
       thread.setName(name);
     }

diff --git a/...n/scala/org/apache/spark/sql/carbondata/execution/datasources/SparkCarbonFileFormat.scala b/...n/scala/org/apache/spark/sql/carbondata/execution/datasources/SparkCarbonFileFormat.scala
@@ -18,6 +18,8 @@
 package org.apache.spark.sql.carbondata.execution.datasources
 
 import java.net.URI
+import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.atomic.AtomicLong
 
 import scala.collection.JavaConverters._
 import scala.collection.mutable.ArrayBuffer
@@ -143,6 +145,13 @@ class SparkCarbonFileFormat extends FileFormat
     conf.set(CarbonSQLHadoopMapReduceCommitProtocol.COMMIT_PROTOCOL, "true")
 
     new OutputWriterFactory {
+
+      /**
+       * counter used for generating unique task numbers.
+       */
+      val counter = new AtomicLong()
+      val taskIdMap = new ConcurrentHashMap[String, java.lang.Long]()
+
       override def newInstance(
           path: String,
           dataSchema: StructType,
@@ -153,10 +162,28 @@ class SparkCarbonFileFormat extends FileFormat
           path
         }
         context.getConfiguration.set("carbon.outputformat.writepath", updatedPath)
-        context.getConfiguration.set("carbon.outputformat.taskno", System.nanoTime() + "")
+        context.getConfiguration
+          .set("carbon.outputformat.taskno", generateTaskNumber(updatedPath, context))
         new CarbonOutputWriter(path, context, dataSchema.fields)
       }
 
+      /**
+       * Generate taskId using the taskID of taskcontext and the path. It should be unique in case
+       * for each spark task.
+       */
+      private def generateTaskNumber(path: String,
+          context: TaskAttemptContext): String = {
+        var count: java.lang.Long = taskIdMap.get(path)
+        if (count == null) {
+          count = counter.incrementAndGet()
+          // Generate task_id using the combination of task_id and counter to make it unique.
+          taskIdMap.put(path, count)
+        }
+        // generate unique value combining spark task id and global counter value
+        String.valueOf(Math.pow(10, 6).toInt + context.getTaskAttemptID.getTaskID.getId) +
+        String.valueOf(count + Math.pow(10, 6).toInt)
+      }
+
       override def getFileExtension(context: TaskAttemptContext): String = {
         CarbonTablePath.CARBON_DATA_EXT
       }