carbondata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ravipes...@apache.org
Subject carbondata git commit: [HOTFIX] Fixed sdv tests
Date Sun, 04 Mar 2018 11:51:48 GMT
Repository: carbondata
Updated Branches:
  refs/heads/branch-1.3 1be56f781 -> 362513a68


[HOTFIX] Fixed sdv tests

fixed sdv tests

This closes #2028


Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/362513a6
Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/362513a6
Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/362513a6

Branch: refs/heads/branch-1.3
Commit: 362513a689c1de901d725f7126c314c0c83b5ece
Parents: 1be56f7
Author: ravipesala <ravi.pesala@gmail.com>
Authored: Sun Mar 4 10:54:47 2018 +0530
Committer: ravipesala <ravi.pesala@gmail.com>
Committed: Sun Mar 4 17:21:27 2018 +0530

----------------------------------------------------------------------
 .../cluster/sdv/generated/MergeIndexTestCase.scala      | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/carbondata/blob/362513a6/integration/spark-common-cluster-test/src/test/scala/org/apache/carbondata/cluster/sdv/generated/MergeIndexTestCase.scala
----------------------------------------------------------------------
diff --git a/integration/spark-common-cluster-test/src/test/scala/org/apache/carbondata/cluster/sdv/generated/MergeIndexTestCase.scala
b/integration/spark-common-cluster-test/src/test/scala/org/apache/carbondata/cluster/sdv/generated/MergeIndexTestCase.scala
index 8e71257..2d5b64b 100644
--- a/integration/spark-common-cluster-test/src/test/scala/org/apache/carbondata/cluster/sdv/generated/MergeIndexTestCase.scala
+++ b/integration/spark-common-cluster-test/src/test/scala/org/apache/carbondata/cluster/sdv/generated/MergeIndexTestCase.scala
@@ -57,8 +57,7 @@ class MergeIndexTestCase extends QueryTest with BeforeAndAfterAll {
 
     val table = CarbonMetadata.getInstance().getCarbonTable("default","carbon_automation_merge")
     val carbonTablePath = new CarbonTablePath(table.getCarbonTableIdentifier, table.getTablePath)
-    new CarbonIndexFileMergeWriter()
-      .mergeCarbonIndexFilesOfSegment(carbonTablePath.getSegmentDir("0","0"), false)
+    new CarbonIndexFileMergeWriter().mergeCarbonIndexFilesOfSegment("0", table.getTablePath,
false)
     assert(getIndexFileCount("default", "carbon_automation_merge", "0") == 0)
     checkAnswer(sql("""Select count(*) from carbon_automation_nonmerge"""),
       sql("""Select count(*) from carbon_automation_merge"""))
@@ -76,10 +75,8 @@ class MergeIndexTestCase extends QueryTest with BeforeAndAfterAll {
     assert(getIndexFileCount("default", "carbon_automation_nonmerge", "1") == 2)
     val table = CarbonMetadata.getInstance().getCarbonTable("default","carbon_automation_nonmerge")
     val carbonTablePath = new CarbonTablePath(table.getCarbonTableIdentifier, table.getTablePath)
-    new CarbonIndexFileMergeWriter()
-      .mergeCarbonIndexFilesOfSegment(carbonTablePath.getSegmentDir("0","0"), false)
-    new CarbonIndexFileMergeWriter()
-      .mergeCarbonIndexFilesOfSegment(carbonTablePath.getSegmentDir("0","1"), false)
+    new CarbonIndexFileMergeWriter().mergeCarbonIndexFilesOfSegment("0", table.getTablePath,
false)
+    new CarbonIndexFileMergeWriter().mergeCarbonIndexFilesOfSegment("1", table.getTablePath,
false)
     assert(getIndexFileCount("default", "carbon_automation_nonmerge", "0") == 0)
     assert(getIndexFileCount("default", "carbon_automation_nonmerge", "1") == 0)
     checkAnswer(sql("""Select count(*) from carbon_automation_nonmerge"""), rows)
@@ -100,8 +97,7 @@ class MergeIndexTestCase extends QueryTest with BeforeAndAfterAll {
     sql("ALTER TABLE carbon_automation_nonmerge COMPACT 'minor'").collect()
     val table = CarbonMetadata.getInstance().getCarbonTable("default","carbon_automation_nonmerge")
     val carbonTablePath = new CarbonTablePath(table.getCarbonTableIdentifier, table.getTablePath)
-    new CarbonIndexFileMergeWriter()
-      .mergeCarbonIndexFilesOfSegment(carbonTablePath.getSegmentDir("0","0.1"), false)
+    new CarbonIndexFileMergeWriter().mergeCarbonIndexFilesOfSegment("0.1", table.getTablePath,
false)
     assert(getIndexFileCount("default", "carbon_automation_nonmerge", "0.1") == 0)
     checkAnswer(sql("""Select count(*) from carbon_automation_nonmerge"""), rows)
   }


Mime
View raw message