You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by ch...@apache.org on 2018/03/04 11:27:38 UTC
carbondata git commit: [HOTFIX] Fixed sdv tests
Repository: carbondata
Updated Branches:
refs/heads/master f5df308d0 -> 9f2884a04
[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/9f2884a0
Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/9f2884a0
Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/9f2884a0
Branch: refs/heads/master
Commit: 9f2884a048963244ab7386386efe60c5c0431cae
Parents: f5df308
Author: ravipesala <ra...@gmail.com>
Authored: Sun Mar 4 10:54:47 2018 +0530
Committer: chenliang613 <ch...@huawei.com>
Committed: Sun Mar 4 19:27:24 2018 +0800
----------------------------------------------------------------------
.../cluster/sdv/generated/MergeIndexTestCase.scala | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/carbondata/blob/9f2884a0/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)
}