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/07/25 17:37:52 UTC
[15/15] carbondata git commit: Merge metadata branch onto master
Merge metadata branch onto master
resolve conflict files: core/src/test/java/org/apache/carbondata/core/CarbonPropertiesValidationTest.java
hadoop/src/main/java/org/apache/carbondata/hadoop/CarbonInputFormat.java
integration/hive/src/main/java/org/apache/carbondata/hive/MapredCarbonInputFormat.java
integration/spark-common/src/main/scala/org/apache/spark/sql/test/util/QueryTest.scala
Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/06ddd82f
Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/06ddd82f
Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/06ddd82f
Branch: refs/heads/master
Commit: 06ddd82f6307d684c65efb450c00fff511f6b415
Parents: 2b66476
Author: Raghunandan S <ca...@gmail.com>
Authored: Tue Jul 25 18:09:19 2017 +0800
Committer: Jacky Li <ja...@qq.com>
Committed: Wed Jul 26 01:37:12 2017 +0800
----------------------------------------------------------------------
.../core/CarbonPropertiesValidationTest.java | 16 ----------------
.../apache/carbondata/hadoop/CarbonInputFormat.java | 5 +++--
.../carbondata/hive/MapredCarbonInputFormat.java | 2 +-
.../org/apache/spark/sql/test/util/QueryTest.scala | 1 -
4 files changed, 4 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/carbondata/blob/06ddd82f/core/src/test/java/org/apache/carbondata/core/CarbonPropertiesValidationTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/carbondata/core/CarbonPropertiesValidationTest.java b/core/src/test/java/org/apache/carbondata/core/CarbonPropertiesValidationTest.java
index e0262dc..10b93ed 100644
--- a/core/src/test/java/org/apache/carbondata/core/CarbonPropertiesValidationTest.java
+++ b/core/src/test/java/org/apache/carbondata/core/CarbonPropertiesValidationTest.java
@@ -145,20 +145,4 @@ public class CarbonPropertiesValidationTest extends TestCase {
assertTrue(
CarbonCommonConstants.CSV_READ_BUFFER_SIZE_DEFAULT.equalsIgnoreCase(valueAfterValidation));
}
-
- @Test public void testValidateHighCardinalityIdentify()
- throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
- Method validateMethodType =
- carbonProperties.getClass().getDeclaredMethod("validateHighCardinalityIdentify");
- validateMethodType.setAccessible(true);
- carbonProperties.addProperty(CarbonCommonConstants.HIGH_CARDINALITY_IDENTIFY_ENABLE, "xyz");
- String valueBeforeValidation =
- carbonProperties.getProperty(CarbonCommonConstants.HIGH_CARDINALITY_IDENTIFY_ENABLE);
- validateMethodType.invoke(carbonProperties);
- String valueAfterValidation =
- carbonProperties.getProperty(CarbonCommonConstants.HIGH_CARDINALITY_IDENTIFY_ENABLE);
- assertTrue(!valueBeforeValidation.equals(valueAfterValidation));
- assertTrue(CarbonCommonConstants.HIGH_CARDINALITY_IDENTIFY_ENABLE_DEFAULT
- .equalsIgnoreCase(valueAfterValidation));
- }
}
http://git-wip-us.apache.org/repos/asf/carbondata/blob/06ddd82f/hadoop/src/main/java/org/apache/carbondata/hadoop/CarbonInputFormat.java
----------------------------------------------------------------------
diff --git a/hadoop/src/main/java/org/apache/carbondata/hadoop/CarbonInputFormat.java b/hadoop/src/main/java/org/apache/carbondata/hadoop/CarbonInputFormat.java
index b81fdf4..dd91446 100644
--- a/hadoop/src/main/java/org/apache/carbondata/hadoop/CarbonInputFormat.java
+++ b/hadoop/src/main/java/org/apache/carbondata/hadoop/CarbonInputFormat.java
@@ -368,8 +368,9 @@ public class CarbonInputFormat<T> extends FileInputFormat<Void, T> {
Boolean isIUDTable = false;
AbsoluteTableIdentifier absoluteTableIdentifier =
- getCarbonTable(job.getConfiguration()).getAbsoluteTableIdentifier();
- SegmentUpdateStatusManager updateStatusManager = new SegmentUpdateStatusManager(identifier);
+ getOrCreateCarbonTable(job.getConfiguration()).getAbsoluteTableIdentifier();
+ SegmentUpdateStatusManager updateStatusManager =
+ new SegmentUpdateStatusManager(absoluteTableIdentifier);
isIUDTable = (updateStatusManager.getUpdateStatusDetails().length != 0);
http://git-wip-us.apache.org/repos/asf/carbondata/blob/06ddd82f/integration/hive/src/main/java/org/apache/carbondata/hive/MapredCarbonInputFormat.java
----------------------------------------------------------------------
diff --git a/integration/hive/src/main/java/org/apache/carbondata/hive/MapredCarbonInputFormat.java b/integration/hive/src/main/java/org/apache/carbondata/hive/MapredCarbonInputFormat.java
index 58f25c9..5ffc058 100644
--- a/integration/hive/src/main/java/org/apache/carbondata/hive/MapredCarbonInputFormat.java
+++ b/integration/hive/src/main/java/org/apache/carbondata/hive/MapredCarbonInputFormat.java
@@ -105,7 +105,7 @@ public class MapredCarbonInputFormat extends CarbonInputFormat<ArrayWritable>
// read the schema file to get the absoluteTableIdentifier having the correct table id
// persisted in the schema
CarbonTable carbonTable = SchemaReader.readCarbonTableFromStore(absoluteTableIdentifier);
- setCarbonTable(configuration, carbonTable);
+ setTableInfo(configuration, carbonTable.getTableInfo());
}
private static CarbonTable getCarbonTable(Configuration configuration, String path)
http://git-wip-us.apache.org/repos/asf/carbondata/blob/06ddd82f/integration/spark-common/src/main/scala/org/apache/spark/sql/test/util/QueryTest.scala
----------------------------------------------------------------------
diff --git a/integration/spark-common/src/main/scala/org/apache/spark/sql/test/util/QueryTest.scala b/integration/spark-common/src/main/scala/org/apache/spark/sql/test/util/QueryTest.scala
index 146df1b..d96ef47 100644
--- a/integration/spark-common/src/main/scala/org/apache/spark/sql/test/util/QueryTest.scala
+++ b/integration/spark-common/src/main/scala/org/apache/spark/sql/test/util/QueryTest.scala
@@ -27,7 +27,6 @@ import org.apache.spark.sql.catalyst.util._
import org.apache.spark.sql.test.TestQueryExecutor
import org.apache.carbondata.common.logging.LogServiceFactory
-
import org.apache.carbondata.core.constants.CarbonCommonConstants
import org.apache.carbondata.core.util.CarbonProperties