Fix comment

apache · Aug 28, 2018 · d402633 · d402633
1 parent febd215
commit d402633
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
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
@@ -79,7 +79,14 @@ class SparkCarbonFileFormat extends FileFormat
       options: Map[String, String],
       files: Seq[FileStatus]): Option[StructType] = {
     val tablePath = options.get("path") match {
-      case Some(path) => path
+      case Some(path) =>
+        val defaultFsUrl =
+          sparkSession.sparkContext.hadoopConfiguration.get(CarbonCommonConstants.FS_DEFAULT_FS)
+        if (defaultFsUrl == null) {
+          path
+        } else {
+          defaultFsUrl + CarbonCommonConstants.FILE_SEPARATOR + path
+        }
       case _ => FileFactory.getUpdatedFilePath(files.head.getPath.getParent.toUri.toString)
     }
 

diff --git a/...org/apache/carbondata/processing/loading/steps/InputProcessorStepWithNoConverterImpl.java b/...org/apache/carbondata/processing/loading/steps/InputProcessorStepWithNoConverterImpl.java
@@ -214,6 +214,8 @@ private static class InputProcessorIterator extends CarbonIterator<CarbonRowBatc
 
     private DirectDictionaryGenerator timestampDictionaryGenerator;
 
+    private BadRecordLogHolder logHolder = new BadRecordLogHolder();
+
     public InputProcessorIterator(List<CarbonIterator<Object[]>> inputIterators, int batchSize,
         boolean preFetch, AtomicLong rowCounter, int[] orderOfData, boolean[] noDictionaryMapping,
         DataType[] dataTypes, CarbonDataLoadConfiguration configuration,
@@ -281,7 +283,6 @@ private CarbonRowBatch getBatch() {
 
     private Object[] convertToNoDictionaryToBytes(Object[] data, DataField[] dataFields) {
       Object[] newData = new Object[data.length];
-      BadRecordLogHolder logHolder = new BadRecordLogHolder();
       for (int i = 0; i < data.length; i++) {
         if (i < noDictionaryMapping.length && noDictionaryMapping[i]) {
           newData[i] = DataTypeUtil