You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by ra...@apache.org on 2017/05/11 05:26:59 UTC
[1/2] carbondata git commit: Problem: When bad records action is set
to fail and any IUD operation is executed and it fails due to bad records
error message is not displayed correctly because of which user is not clear
with the cause of update operation
Repository: carbondata
Updated Branches:
refs/heads/master 36ecb3741 -> 35b23c9dd
Problem: When bad records action is set to fail and any IUD operation is executed and it fails due to bad records error message is not displayed correctly because of which user is not clear with the cause of update operation failure. Whereas in the same case in other operations like data load and insert into, if there is any failure due to bad record proper error message is displayed to the user for failure due to bad record.
Fix: Instead of forming own message get the executor failure message and send it to update operation as exception message.
Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/822363f5
Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/822363f5
Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/822363f5
Branch: refs/heads/master
Commit: 822363f56cf9e79a6f7673b86b5afb3147a98bbc
Parents: 36ecb37
Author: manishgupta88 <to...@gmail.com>
Authored: Wed May 10 19:16:31 2017 +0530
Committer: manishgupta88 <to...@gmail.com>
Committed: Thu May 11 09:38:47 2017 +0530
----------------------------------------------------------------------
.../src/test/resources/IUD/bad_record.csv | 2 ++
.../spark/rdd/CarbonDataRDDFactory.scala | 6 +++++-
.../testsuite/iud/UpdateCarbonTableTestCase.scala | 18 ++++++++++++++++++
3 files changed, 25 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/carbondata/blob/822363f5/integration/spark-common-test/src/test/resources/IUD/bad_record.csv
----------------------------------------------------------------------
diff --git a/integration/spark-common-test/src/test/resources/IUD/bad_record.csv b/integration/spark-common-test/src/test/resources/IUD/bad_record.csv
new file mode 100644
index 0000000..358cbf6
--- /dev/null
+++ b/integration/spark-common-test/src/test/resources/IUD/bad_record.csv
@@ -0,0 +1,2 @@
+item,name
+2,Apple
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/carbondata/blob/822363f5/integration/spark/src/main/scala/org/apache/carbondata/spark/rdd/CarbonDataRDDFactory.scala
----------------------------------------------------------------------
diff --git a/integration/spark/src/main/scala/org/apache/carbondata/spark/rdd/CarbonDataRDDFactory.scala b/integration/spark/src/main/scala/org/apache/carbondata/spark/rdd/CarbonDataRDDFactory.scala
index 4cca0a3..51a56e9 100644
--- a/integration/spark/src/main/scala/org/apache/carbondata/spark/rdd/CarbonDataRDDFactory.scala
+++ b/integration/spark/src/main/scala/org/apache/carbondata/spark/rdd/CarbonDataRDDFactory.scala
@@ -826,7 +826,11 @@ object CarbonDataRDDFactory {
// updateModel.get.executorErrors.errorMsg = errorMessage
if (updateModel.get.executorErrors.failureCauses == FailureCauses.NONE) {
updateModel.get.executorErrors.failureCauses = FailureCauses.EXECUTOR_FAILURE
- updateModel.get.executorErrors.errorMsg = "Update failed as the data load has failed."
+ if (null != executorMessage && !executorMessage.isEmpty) {
+ updateModel.get.executorErrors.errorMsg = executorMessage
+ } else {
+ updateModel.get.executorErrors.errorMsg = "Update failed as the data load has failed."
+ }
}
return
}
http://git-wip-us.apache.org/repos/asf/carbondata/blob/822363f5/integration/spark/src/test/scala/org/apache/carbondata/spark/testsuite/iud/UpdateCarbonTableTestCase.scala
----------------------------------------------------------------------
diff --git a/integration/spark/src/test/scala/org/apache/carbondata/spark/testsuite/iud/UpdateCarbonTableTestCase.scala b/integration/spark/src/test/scala/org/apache/carbondata/spark/testsuite/iud/UpdateCarbonTableTestCase.scala
index 8e9efe5..2fc51b5 100644
--- a/integration/spark/src/test/scala/org/apache/carbondata/spark/testsuite/iud/UpdateCarbonTableTestCase.scala
+++ b/integration/spark/src/test/scala/org/apache/carbondata/spark/testsuite/iud/UpdateCarbonTableTestCase.scala
@@ -365,6 +365,24 @@ class UpdateCarbonTableTestCase extends QueryTest with BeforeAndAfterAll {
}
}
+ test("Failure of update operation due to bad record with proper error message") {
+ try {
+ CarbonProperties.getInstance()
+ .addProperty(CarbonCommonConstants.CARBON_BAD_RECORDS_ACTION, "FAIL")
+ val errorMessage = intercept[Exception] {
+ sql("drop table if exists update_with_bad_record")
+ sql("create table update_with_bad_record(item int, name String) stored by 'carbondata'")
+ sql(s"LOAD DATA LOCAL INPATH '$resourcesPath/IUD/bad_record.csv' into table " +
+ s"update_with_bad_record")
+ sql("update update_with_bad_record set (item)=(3.45)").show()
+ sql("drop table if exists update_with_bad_record")
+ }
+ assert(errorMessage.getMessage.contains("Data load failed due to bad record"))
+ } finally {
+ CarbonProperties.getInstance()
+ .addProperty(CarbonCommonConstants.CARBON_BAD_RECORDS_ACTION, "FORCE")
+ }
+ }
override def afterAll {
sql("use default")
[2/2] carbondata git commit: [CARBONDATA-1045] Mismatch in message
display with insert and load operation on failure due to bad records in
update operation. This closes #904
Posted by ra...@apache.org.
[CARBONDATA-1045] Mismatch in message display with insert and load operation on failure due to bad records in update operation. This closes #904
Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/35b23c9d
Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/35b23c9d
Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/35b23c9d
Branch: refs/heads/master
Commit: 35b23c9dd038dc9917ef3af9a4b3e176bd3ed2f1
Parents: 36ecb37 822363f
Author: ravipesala <ra...@gmail.com>
Authored: Thu May 11 10:56:37 2017 +0530
Committer: ravipesala <ra...@gmail.com>
Committed: Thu May 11 10:56:37 2017 +0530
----------------------------------------------------------------------
.../src/test/resources/IUD/bad_record.csv | 2 ++
.../spark/rdd/CarbonDataRDDFactory.scala | 6 +++++-
.../testsuite/iud/UpdateCarbonTableTestCase.scala | 18 ++++++++++++++++++
3 files changed, 25 insertions(+), 1 deletion(-)
----------------------------------------------------------------------