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 2016/07/05 22:11:49 UTC

[1/2] incubator-carbondata git commit: fix test case failure for windows user

Repository: incubator-carbondata
Updated Branches:
  refs/heads/master 5e7fb7c1e -> dc12d1040


fix test case failure for windows user


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

Branch: refs/heads/master
Commit: aefea8e0988c06f17853275e6b048f4ef809ac5e
Parents: 5e7fb7c
Author: Jay357089 <li...@huawei.com>
Authored: Tue Jul 5 17:09:21 2016 +0800
Committer: chenliang613 <ch...@apache.org>
Committed: Wed Jul 6 03:40:21 2016 +0530

----------------------------------------------------------------------
 .../core/path/CarbonFormatDirectoryStructureTest.java | 14 +++++++-------
 .../core/path/CarbonFormatSharedDictionaryTest.java   |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/aefea8e0/core/src/test/java/org/carbondata/core/path/CarbonFormatDirectoryStructureTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/carbondata/core/path/CarbonFormatDirectoryStructureTest.java b/core/src/test/java/org/carbondata/core/path/CarbonFormatDirectoryStructureTest.java
index 540daa1..b5f5385 100644
--- a/core/src/test/java/org/carbondata/core/path/CarbonFormatDirectoryStructureTest.java
+++ b/core/src/test/java/org/carbondata/core/path/CarbonFormatDirectoryStructureTest.java
@@ -43,17 +43,17 @@ public class CarbonFormatDirectoryStructureTest {
     CarbonTableIdentifier tableIdentifier = new CarbonTableIdentifier("d1", "t1", UUID.randomUUID().toString());
     CarbonStorePath carbonStorePath = new CarbonStorePath(CARBON_STORE);
     CarbonTablePath carbonTablePath = carbonStorePath.getCarbonTablePath(tableIdentifier);
-    assertTrue(carbonTablePath.getPath().equals(CARBON_STORE + "/d1/t1"));
-    assertTrue(carbonTablePath.getSchemaFilePath().equals(CARBON_STORE + "/d1/t1/Metadata/schema"));
-    assertTrue(carbonTablePath.getTableStatusFilePath()
+    assertTrue(carbonTablePath.getPath().replace("\\", "/").equals(CARBON_STORE + "/d1/t1"));
+    assertTrue(carbonTablePath.getSchemaFilePath().replace("\\", "/").equals(CARBON_STORE + "/d1/t1/Metadata/schema"));
+    assertTrue(carbonTablePath.getTableStatusFilePath().replace("\\", "/")
         .equals(CARBON_STORE + "/d1/t1/Metadata/tablestatus"));
-    assertTrue(carbonTablePath.getDictionaryFilePath("t1_c1")
+    assertTrue(carbonTablePath.getDictionaryFilePath("t1_c1").replace("\\", "/")
         .equals(CARBON_STORE + "/d1/t1/Metadata/t1_c1.dict"));
-    assertTrue(carbonTablePath.getDictionaryMetaFilePath("t1_c1")
+    assertTrue(carbonTablePath.getDictionaryMetaFilePath("t1_c1").replace("\\", "/")
         .equals(CARBON_STORE + "/d1/t1/Metadata/t1_c1.dictmeta"));
-    assertTrue(carbonTablePath.getSortIndexFilePath("t1_c1")
+    assertTrue(carbonTablePath.getSortIndexFilePath("t1_c1").replace("\\", "/")
         .equals(CARBON_STORE + "/d1/t1/Metadata/t1_c1.sortindex"));
-    assertTrue(carbonTablePath.getCarbonDataFilePath("1", "2", 3, 4, "999")
+    assertTrue(carbonTablePath.getCarbonDataFilePath("1", "2", 3, 4, "999").replace("\\", "/")
         .equals(CARBON_STORE + "/d1/t1/Fact/Part1/Segment_2/part-3-4-999.carbondata"));
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/aefea8e0/core/src/test/java/org/carbondata/core/path/CarbonFormatSharedDictionaryTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/carbondata/core/path/CarbonFormatSharedDictionaryTest.java b/core/src/test/java/org/carbondata/core/path/CarbonFormatSharedDictionaryTest.java
index dc79b85..d1d0421 100644
--- a/core/src/test/java/org/carbondata/core/path/CarbonFormatSharedDictionaryTest.java
+++ b/core/src/test/java/org/carbondata/core/path/CarbonFormatSharedDictionaryTest.java
@@ -38,11 +38,11 @@ public class CarbonFormatSharedDictionaryTest {
    * test shared dictionary location
    */
   @Test public void testSharedDimentionLocation() throws IOException {
-    assertTrue(CarbonSharedDictionaryPath.getDictionaryFilePath(CARBON_STORE, "d1", "shared_c1")
+    assertTrue(CarbonSharedDictionaryPath.getDictionaryFilePath(CARBON_STORE, "d1", "shared_c1").replace("\\", "/")
         .equals(CARBON_STORE + "/d1/SharedDictionary/shared_c1.dict"));
-    assertTrue(CarbonSharedDictionaryPath.getDictionaryMetaFilePath(CARBON_STORE, "d1", "shared_c1")
+    assertTrue(CarbonSharedDictionaryPath.getDictionaryMetaFilePath(CARBON_STORE, "d1", "shared_c1").replace("\\", "/")
         .equals(CARBON_STORE + "/d1/SharedDictionary/shared_c1.dictmeta"));
-    assertTrue(CarbonSharedDictionaryPath.getSortIndexFilePath(CARBON_STORE, "d1", "shared_c1")
+    assertTrue(CarbonSharedDictionaryPath.getSortIndexFilePath(CARBON_STORE, "d1", "shared_c1").replace("\\", "/")
         .equals(CARBON_STORE + "/d1/SharedDictionary/shared_c1.sortindex"));
   }
 }


[2/2] incubator-carbondata git commit: [BUG]Fix test case failure for windows user This closes #22

Posted by ch...@apache.org.
[BUG]Fix test case failure for windows user This closes #22


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

Branch: refs/heads/master
Commit: dc12d10407929572a2ff58a0478777641eba4ebd
Parents: 5e7fb7c aefea8e
Author: chenliang613 <ch...@apache.org>
Authored: Wed Jul 6 03:41:30 2016 +0530
Committer: chenliang613 <ch...@apache.org>
Committed: Wed Jul 6 03:41:30 2016 +0530

----------------------------------------------------------------------
 .../core/path/CarbonFormatDirectoryStructureTest.java | 14 +++++++-------
 .../core/path/CarbonFormatSharedDictionaryTest.java   |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------