[GitHub] carbondata pull request #2195: [CARBONDATA-2366] fixed concurrent datamap cr...

2018-05-03 Thread xubo245
Github user xubo245 commented on a diff in the pull request:

https://github.com/apache/carbondata/pull/2195#discussion_r185715423
  
--- Diff: 
integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/detailquery/SearchModeTestCase.scala
 ---
@@ -19,15 +19,17 @@ package 
org.apache.carbondata.spark.testsuite.detailquery
 
 import org.apache.spark.sql.test.util.QueryTest
 import org.apache.spark.sql.{CarbonSession, Row, SaveMode}
-import org.scalatest.BeforeAndAfterAll
-
+import org.scalatest.{BeforeAndAfterAll, Ignore}
 import org.apache.carbondata.core.constants.CarbonCommonConstants
 import org.apache.carbondata.core.util.CarbonProperties
 import org.apache.carbondata.spark.util.DataGenerator
 
 /**
  * Test Suite for search mode
  */
+
+// TODO: Need to Fix
+@Ignore
--- End diff --

Why ignore this test case? Are there any one to fix it now?


---


[GitHub] carbondata pull request #2195: [CARBONDATA-2366] fixed concurrent datamap cr...

2018-05-02 Thread asfgit
Github user asfgit closed the pull request at:

https://github.com/apache/carbondata/pull/2195


---


[GitHub] carbondata pull request #2195: [CARBONDATA-2366] fixed concurrent datamap cr...

2018-04-20 Thread kumarvishal09
Github user kumarvishal09 commented on a diff in the pull request:

https://github.com/apache/carbondata/pull/2195#discussion_r183065125
  
--- Diff: 
integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/datamap/CarbonDropDataMapCommand.scala
 ---
@@ -77,7 +78,24 @@ case class CarbonDropDataMapCommand(
 null
 }
   }
-  if (forceDrop && mainTable != null && dataMapSchema != null) {
+  if (forceDrop) {
--- End diff --

Please add detail comments when this scenario will come


---


[GitHub] carbondata pull request #2195: [CARBONDATA-2366] fixed concurrent datamap cr...

2018-04-20 Thread kumarvishal09
Github user kumarvishal09 commented on a diff in the pull request:

https://github.com/apache/carbondata/pull/2195#discussion_r183057775
  
--- Diff: 
integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/preaaggregate/PreAggregateUtil.scala
 ---
@@ -438,7 +439,17 @@ object PreAggregateUtil {
   wrapperTableInfo.getDataMapSchemaList.add(childSchema)
   val thriftTable = schemaConverter.fromWrapperToExternalTableInfo(
 wrapperTableInfo, dbName, tableName)
-  updateSchemaInfo(carbonTable, thriftTable)(sparkSession)
+  try {
+updateSchemaInfo(carbonTable, thriftTable)(sparkSession)
+  } catch {
+case ex: Exception =>
+  val dropTableCommand = 
CarbonDropDataMapCommand(childSchema.getDataMapName,
+ifExistsSet = true,
+Some(TableIdentifier
+  .apply(carbonTable.getTableName, 
Some(carbonTable.getDatabaseName))),
+forceDrop = true)
+  dropTableCommand.processMetadata(sparkSession)
+  }
--- End diff --

need to throw exception from catch block after dropping agg data map


---


[GitHub] carbondata pull request #2195: [CARBONDATA-2366] fixed concurrent datamap cr...

2018-04-20 Thread kumarvishal09
Github user kumarvishal09 commented on a diff in the pull request:

https://github.com/apache/carbondata/pull/2195#discussion_r183057594
  
--- Diff: 
integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/preaaggregate/PreAggregateUtil.scala
 ---
@@ -438,7 +439,17 @@ object PreAggregateUtil {
   wrapperTableInfo.getDataMapSchemaList.add(childSchema)
   val thriftTable = schemaConverter.fromWrapperToExternalTableInfo(
 wrapperTableInfo, dbName, tableName)
-  updateSchemaInfo(carbonTable, thriftTable)(sparkSession)
+  try {
+updateSchemaInfo(carbonTable, thriftTable)(sparkSession)
+  } catch {
+case ex: Exception =>
+  val dropTableCommand = 
CarbonDropDataMapCommand(childSchema.getDataMapName,
--- End diff --

Please add some comments


---


[GitHub] carbondata pull request #2195: [CARBONDATA-2366] fixed concurrent datamap cr...

2018-04-20 Thread kumarvishal09
Github user kumarvishal09 commented on a diff in the pull request:

https://github.com/apache/carbondata/pull/2195#discussion_r183056905
  
--- Diff: 
integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/preaggregate/TestPreAggCreateCommand.scala
 ---
@@ -454,8 +454,8 @@ class TestPreAggCreateCommand extends QueryTest with 
BeforeAndAfterAll {
 .stripMargin))
   i = i + 1
 }
-executorService.invokeAll(tasks)
-
+val futures = executorService.invokeAll(tasks).asScala
+futures.foreach(_.get())
 checkExistence(sql("show tables"), true, "agg_concu1", "tbl_concurr")
 executorService.shutdown()
--- End diff --

use executorService.awaitTermination(2, TimeUnit.Hour);


---


[GitHub] carbondata pull request #2195: [CARBONDATA-2366] fixed concurrent datamap cr...

2018-04-20 Thread kunal642
GitHub user kunal642 opened a pull request:

https://github.com/apache/carbondata/pull/2195

[CARBONDATA-2366] fixed concurrent datamap creation issue

Problem1: CarbonTable is not getting refreshed while creation due to which 
all datamaps are getting wrong carbonTable object. Due to this only the last 
datamap is getting registered. 

Problem2: If datamap creation fails then DropTableCommand is called instead 
of DropDataMapCommand with forceDrop as true.

Be sure to do all of the following checklist to help us incorporate 
your contribution quickly and easily:

 - [ ] Any interfaces changed?
 
 - [ ] Any backward compatibility impacted?
 
 - [ ] Document update required?

 - [ ] Testing done
Please provide details on 
- Whether new unit test cases have been added or why no new tests 
are required?
- How it is tested? Please attach test report.
- Is it a performance related change? Please attach the performance 
test report.
- Any additional information to help reviewers in testing this 
change.
   
 - [ ] For large changes, please consider breaking it into sub-tasks under 
an umbrella JIRA. 



You can merge this pull request into a Git repository by running:

$ git pull https://github.com/kunal642/carbondata concurrent_load_fix

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/carbondata/pull/2195.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #2195


commit b462a630a56b9a77435613410ec4302276323d6f
Author: kunal642 
Date:   2018-04-20T07:10:20Z

fixed concurrent datamap creation issue




---