function name to camel

apache · Aug 21, 2019 · 58093b8 · 58093b8
1 parent a4427f7
commit 58093b8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/fe/src/main/java/org/apache/doris/analysis/DateLiteral.java b/fe/src/main/java/org/apache/doris/analysis/DateLiteral.java
@@ -250,7 +250,7 @@ protected Expr uncheckedCastTo(Type targetType) throws AnalysisException {
     }
 
 
-    private long make_packed_datetime () {
+    private long makePackedDatetime() {
         long ymd = ((year * 13 + month) << 5) | day;
         long hms = (hour << 12) | (minute << 6) | second;
         long packed_datetime = ((ymd << 17) | hms) << 24 + microsecond;
@@ -260,10 +260,10 @@ private long make_packed_datetime () {
     @Override
     public void write(DataOutput out) throws IOException {
         super.write(out);
-        out.writeLong(make_packed_datetime());
+        out.writeLong(makePackedDatetime());
     }
 
-    private void from_packed_datetime (long packed_time) {
+    private void fromPackedDatetime(long packed_time) {
         microsecond = (packed_time % (1L << 24));
         long ymdhms = (packed_time >> 24);
         long ymd = ymdhms >> 17;
@@ -283,8 +283,8 @@ private void from_packed_datetime (long packed_time) {
     @Override
     public void readFields(DataInput in) throws IOException {
         super.readFields(in);
-        if (Catalog.getCurrentCatalogJournalVersion() >= FeMetaVersion.VERSION_59) {
-            from_packed_datetime(in.readLong());
+        if (Catalog.getCurrentCatalogJournalVersion() >= FeMetaVersion.VERSION_60) {
+            fromPackedDatetime(in.readLong());
         } else {
             Date date = new Date(in.readLong());
             String date_str = TimeUtils.format(date, Type.DATETIME);

diff --git a/fe/src/main/java/org/apache/doris/common/FeConstants.java b/fe/src/main/java/org/apache/doris/common/FeConstants.java
@@ -35,5 +35,5 @@ public class FeConstants {
 
     // general model
     // Current meta data version. Use this version to write journals and image
-    public static int meta_version = FeMetaVersion.VERSION_59;
+    public static int meta_version = FeMetaVersion.VERSION_60;
 }