[HOTFIX] Fixed random test failure Fixed random test failure
This closes #2553 Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/f5d3c17b Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/f5d3c17b Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/f5d3c17b Branch: refs/heads/external-format Commit: f5d3c17b7f969244b4a161ce7ec4ac8451943eb8 Parents: 4d95dfc Author: mohammadshahidkhan <mohdshahidkhan1...@gmail.com> Authored: Wed Jul 25 12:14:38 2018 +0530 Committer: kunal642 <kunalkapoor...@gmail.com> Committed: Sun Jul 29 18:44:46 2018 +0530 ---------------------------------------------------------------------- .../lucene/LuceneFineGrainDataMapSuite.scala | 43 ++++++++++---------- 1 file changed, 22 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/carbondata/blob/f5d3c17b/integration/spark-common-test/src/test/scala/org/apache/carbondata/datamap/lucene/LuceneFineGrainDataMapSuite.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/datamap/lucene/LuceneFineGrainDataMapSuite.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/datamap/lucene/LuceneFineGrainDataMapSuite.scala index 08e44f7..a380f04 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/datamap/lucene/LuceneFineGrainDataMapSuite.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/datamap/lucene/LuceneFineGrainDataMapSuite.scala @@ -587,24 +587,28 @@ class LuceneFineGrainDataMapSuite extends QueryTest with BeforeAndAfterAll { sql("EXPLAIN SELECT * FROM main WHERE TEXT_MATCH('name:bob')").show(false) val rows = sql("EXPLAIN SELECT * FROM main WHERE TEXT_MATCH('name:bob')").collect() - - assertResult( - """== CarbonData Profiler == - |Table Scan on main - | - total blocklets: 1 - | - filter: TEXT_MATCH('name:bob') - | - pruned by Main DataMap - | - skipped blocklets: 0 - | - pruned by FG DataMap - | - name: dm - | - provider: lucene - | - skipped blocklets: 1 - |""".stripMargin)(rows(0).getString(0)) - - LuceneFineGrainDataMapSuite.deleteFile(file1) - sql("drop datamap dm on table main") - CarbonProperties.getInstance().addProperty( - CarbonCommonConstants.BLOCKLET_SIZE, CarbonCommonConstants.BLOCKLET_SIZE_DEFAULT_VAL) + // sometimes the plan comparison is failing even in case of both the plan being same. + // once the failure happens the dropped datamap is not getting executed + // and due to this other test cases also failing. + try { + assertResult( + """== CarbonData Profiler == + |Table Scan on main + | - total blocklets: 1 + | - filter: TEXT_MATCH('name:bob') + | - pruned by Main DataMap + | - skipped blocklets: 0 + | - pruned by FG DataMap + | - name: dm + | - provider: lucene + | - skipped blocklets: 1 + |""".stripMargin)(rows(0).getString(0)) + } finally { + LuceneFineGrainDataMapSuite.deleteFile(file1) + sql("drop datamap dm on table main") + CarbonProperties.getInstance().addProperty( + CarbonCommonConstants.BLOCKLET_SIZE, CarbonCommonConstants.BLOCKLET_SIZE_DEFAULT_VAL) + } } test("test lucene datamap creation for blocked features") { @@ -910,9 +914,6 @@ class LuceneFineGrainDataMapSuite extends QueryTest with BeforeAndAfterAll { sql("use default") sql("drop database if exists lucene cascade") CarbonProperties.getInstance() - .addProperty(CarbonCommonConstants.CARBON_SYSTEM_FOLDER_LOCATION, - CarbonProperties.getStorePath) - CarbonProperties.getInstance() .addProperty(CarbonCommonConstants.CARBON_LUCENE_INDEX_STOP_WORDS, CarbonCommonConstants.CARBON_LUCENE_INDEX_STOP_WORDS_DEFAULT) CarbonProperties.getInstance()
