You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by ra...@apache.org on 2017/09/14 08:36:14 UTC
carbondata git commit: [CARBONDATA-1412] - Fixed bug related to
incorrect behavior of delete functionality while using segment.starttime
before ''
Repository: carbondata
Updated Branches:
refs/heads/master c15a11d08 -> df95547d1
[CARBONDATA-1412] - Fixed bug related to incorrect behavior of delete functionality while using segment.starttime before '<any_date_value>'
This closes #1316
Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/df95547d
Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/df95547d
Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/df95547d
Branch: refs/heads/master
Commit: df95547d1b7e79c04407966a4f07ba6dbd6442da
Parents: c15a11d
Author: SangeetaGulia <sa...@knoldus.in>
Authored: Mon Sep 4 12:34:54 2017 +0530
Committer: Ravindra Pesala <ra...@gmail.com>
Committed: Thu Sep 14 14:05:49 2017 +0530
----------------------------------------------------------------------
.../carbondata/core/statusmanager/LoadMetadataDetails.java | 2 +-
.../org/apache/carbondata/hadoop/test/util/StoreCreator.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/carbondata/blob/df95547d/core/src/main/java/org/apache/carbondata/core/statusmanager/LoadMetadataDetails.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/statusmanager/LoadMetadataDetails.java b/core/src/main/java/org/apache/carbondata/core/statusmanager/LoadMetadataDetails.java
index c2acedb..3f83c72 100644
--- a/core/src/main/java/org/apache/carbondata/core/statusmanager/LoadMetadataDetails.java
+++ b/core/src/main/java/org/apache/carbondata/core/statusmanager/LoadMetadataDetails.java
@@ -52,7 +52,7 @@ public class LoadMetadataDetails implements Serializable {
// dont remove static as the write will fail.
private static final SimpleDateFormat parser =
- new SimpleDateFormat(CarbonCommonConstants.CARBON_TIMESTAMP);
+ new SimpleDateFormat(CarbonCommonConstants.CARBON_TIMESTAMP_MILLIS);
/**
* Segment modification or deletion time stamp
*/
http://git-wip-us.apache.org/repos/asf/carbondata/blob/df95547d/hadoop/src/test/java/org/apache/carbondata/hadoop/test/util/StoreCreator.java
----------------------------------------------------------------------
diff --git a/hadoop/src/test/java/org/apache/carbondata/hadoop/test/util/StoreCreator.java b/hadoop/src/test/java/org/apache/carbondata/hadoop/test/util/StoreCreator.java
index beca50d..9be3ed5 100644
--- a/hadoop/src/test/java/org/apache/carbondata/hadoop/test/util/StoreCreator.java
+++ b/hadoop/src/test/java/org/apache/carbondata/hadoop/test/util/StoreCreator.java
@@ -144,7 +144,7 @@ public class StoreCreator {
loadModel.setDateFormat(null);
loadModel.setDefaultTimestampFormat(CarbonProperties.getInstance().getProperty(
CarbonCommonConstants.CARBON_TIMESTAMP_FORMAT,
- CarbonCommonConstants.CARBON_TIMESTAMP_DEFAULT_FORMAT));
+ CarbonCommonConstants.CARBON_TIMESTAMP_MILLIS));
loadModel.setDefaultDateFormat(CarbonProperties.getInstance().getProperty(
CarbonCommonConstants.CARBON_DATE_FORMAT,
CarbonCommonConstants.CARBON_DATE_DEFAULT_FORMAT));
@@ -495,7 +495,7 @@ public class StoreCreator {
}
public static String readCurrentTime() {
- SimpleDateFormat sdf = new SimpleDateFormat(CarbonCommonConstants.CARBON_TIMESTAMP);
+ SimpleDateFormat sdf = new SimpleDateFormat(CarbonCommonConstants.CARBON_TIMESTAMP_MILLIS);
String date = null;
date = sdf.format(new Date());