You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by ja...@apache.org on 2017/03/27 14:57:41 UTC
[3/6] incubator-carbondata git commit: Add add license header and
rename filePath to carbonDataFileName in fillBlockIndexInfoDetails.
Add add license header and rename filePath to carbonDataFileName in fillBlockIndexInfoDetails.
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/84477cc2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/84477cc2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/84477cc2
Branch: refs/heads/master
Commit: 84477cc2590cf86ca597bd40bf4c328295e449c9
Parents: da4d39e
Author: Yadong Qi <qi...@gmail.com>
Authored: Mon Mar 27 10:20:35 2017 +0800
Committer: Yadong Qi <qi...@gmail.com>
Committed: Mon Mar 27 10:20:35 2017 +0800
----------------------------------------------------------------------
.../dataload/TestDataLoadWithFileName.scala | 17 +++++++++++++++++
.../store/writer/AbstractFactDataWriter.java | 8 ++++----
.../writer/v3/CarbonFactDataWriterImplV3.java | 6 +++---
3 files changed, 24 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84477cc2/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestDataLoadWithFileName.scala
----------------------------------------------------------------------
diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestDataLoadWithFileName.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestDataLoadWithFileName.scala
index be81b2d..20f2cd8 100644
--- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestDataLoadWithFileName.scala
+++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestDataLoadWithFileName.scala
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.carbondata.spark.testsuite.dataload
import java.io.{File, FilenameFilter}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84477cc2/processing/src/main/java/org/apache/carbondata/processing/store/writer/AbstractFactDataWriter.java
----------------------------------------------------------------------
diff --git a/processing/src/main/java/org/apache/carbondata/processing/store/writer/AbstractFactDataWriter.java b/processing/src/main/java/org/apache/carbondata/processing/store/writer/AbstractFactDataWriter.java
index f820999..a7dc534 100644
--- a/processing/src/main/java/org/apache/carbondata/processing/store/writer/AbstractFactDataWriter.java
+++ b/processing/src/main/java/org/apache/carbondata/processing/store/writer/AbstractFactDataWriter.java
@@ -347,11 +347,11 @@ public abstract class AbstractFactDataWriter<T> implements CarbonFactDataWriter<
* Below method will be used to fill the vlock info details
*
* @param numberOfRows number of rows in file
- * @param filePath file path
+ * @param carbonDataFileName The name of carbonData file
* @param currentPosition current offset
*/
- protected void fillBlockIndexInfoDetails(long numberOfRows,
- String filePath, long currentPosition) {
+ protected void fillBlockIndexInfoDetails(long numberOfRows, String carbonDataFileName,
+ long currentPosition) {
// as min-max will change for each blocklet and second blocklet min-max can be lesser than
// the first blocklet so we need to calculate the complete block level min-max by taking
@@ -382,7 +382,7 @@ public abstract class AbstractFactDataWriter<T> implements CarbonFactDataWriter<
minmax.setMaxValues(currentMaxValue);
BlockletIndex blockletIndex = new BlockletIndex(btree, minmax);
BlockIndexInfo blockIndexInfo =
- new BlockIndexInfo(numberOfRows, filePath, currentPosition, blockletIndex);
+ new BlockIndexInfo(numberOfRows, carbonDataFileName, currentPosition, blockletIndex);
blockIndexInfoList.add(blockIndexInfo);
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84477cc2/processing/src/main/java/org/apache/carbondata/processing/store/writer/v3/CarbonFactDataWriterImplV3.java
----------------------------------------------------------------------
diff --git a/processing/src/main/java/org/apache/carbondata/processing/store/writer/v3/CarbonFactDataWriterImplV3.java b/processing/src/main/java/org/apache/carbondata/processing/store/writer/v3/CarbonFactDataWriterImplV3.java
index 2b138b2..668d0d8 100644
--- a/processing/src/main/java/org/apache/carbondata/processing/store/writer/v3/CarbonFactDataWriterImplV3.java
+++ b/processing/src/main/java/org/apache/carbondata/processing/store/writer/v3/CarbonFactDataWriterImplV3.java
@@ -476,10 +476,10 @@ public class CarbonFactDataWriterImplV3 extends AbstractFactDataWriter<short[]>
* Below method will be used to fill the block info details
*
* @param numberOfRows number of rows in file
- * @param filePath file path
+ * @param carbonDataFileName The name of carbonData file
* @param currentPosition current offset
*/
- protected void fillBlockIndexInfoDetails(long numberOfRows, String filePath,
+ protected void fillBlockIndexInfoDetails(long numberOfRows, String carbonDataFileName,
long currentPosition) {
byte[][] currentMinValue = new byte[blockletIndex.get(0).min_max_index.max_values.size()][];
byte[][] currentMaxValue = new byte[blockletIndex.get(0).min_max_index.max_values.size()][];
@@ -528,7 +528,7 @@ public class CarbonFactDataWriterImplV3 extends AbstractFactDataWriter<short[]>
org.apache.carbondata.core.metadata.blocklet.index.BlockletIndex blockletIndex =
new org.apache.carbondata.core.metadata.blocklet.index.BlockletIndex(btree, minmax);
BlockIndexInfo blockIndexInfo =
- new BlockIndexInfo(numberOfRows, filePath, currentPosition, blockletIndex);
+ new BlockIndexInfo(numberOfRows, carbonDataFileName, currentPosition, blockletIndex);
blockIndexInfoList.add(blockIndexInfo);
}