Repository: incubator-carbondata Updated Branches: refs/heads/master 8f6ae29c8 -> 32354b37b
Fixed carbondata file version issue Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/51425d49 Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/51425d49 Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/51425d49 Branch: refs/heads/master Commit: 51425d49b2ba210b505ecc6fd69cf69e763409cd Parents: 8f6ae29 Author: kumarvishal <kumarvishal.1...@gmail.com> Authored: Mon Jan 9 01:47:19 2017 +0800 Committer: kumarvishal <kumarvishal.1...@gmail.com> Committed: Fri Jan 13 17:06:41 2017 +0800 ---------------------------------------------------------------------- .../java/org/apache/carbondata/core/util/CarbonProperties.java | 3 ++- .../apache/carbondata/carbon/datastore/BlockIndexStoreTest.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/51425d49/core/src/main/java/org/apache/carbondata/core/util/CarbonProperties.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/util/CarbonProperties.java b/core/src/main/java/org/apache/carbondata/core/util/CarbonProperties.java index 8a5a1c6..0763f1b 100644 --- a/core/src/main/java/org/apache/carbondata/core/util/CarbonProperties.java +++ b/core/src/main/java/org/apache/carbondata/core/util/CarbonProperties.java @@ -375,7 +375,8 @@ public final class CarbonProperties { return getDefaultFormatVersion(); } else { try { - return ColumnarFormatVersion.valueOf(versionStr); + short version = Short.parseShort(versionStr); + return ColumnarFormatVersion.valueOf(version); } catch (IllegalArgumentException e) { return getDefaultFormatVersion(); } http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/51425d49/processing/src/test/java/org/apache/carbondata/carbon/datastore/BlockIndexStoreTest.java ---------------------------------------------------------------------- diff --git a/processing/src/test/java/org/apache/carbondata/carbon/datastore/BlockIndexStoreTest.java b/processing/src/test/java/org/apache/carbondata/carbon/datastore/BlockIndexStoreTest.java index a468c81..b43b690 100644 --- a/processing/src/test/java/org/apache/carbondata/carbon/datastore/BlockIndexStoreTest.java +++ b/processing/src/test/java/org/apache/carbondata/carbon/datastore/BlockIndexStoreTest.java @@ -62,7 +62,7 @@ public class BlockIndexStoreTest extends TestCase { @BeforeClass public void setUp() { property = CarbonProperties.getInstance().getProperty(CarbonCommonConstants.CARBON_DATA_FILE_VERSION); - CarbonProperties.getInstance().addProperty(CarbonCommonConstants.CARBON_DATA_FILE_VERSION, "V1"); + CarbonProperties.getInstance().addProperty(CarbonCommonConstants.CARBON_DATA_FILE_VERSION, "1"); StoreCreator.createCarbonStore(); CarbonProperties.getInstance(). addProperty(CarbonCommonConstants.CARBON_MAX_DRIVER_LRU_CACHE_SIZE, "10");
