format be core

apache · Jun 30, 2022 · 923cd3b · 923cd3b
1 parent 3085c74
commit 923cd3b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/be/src/exec/olap_scanner.cpp b/be/src/exec/olap_scanner.cpp
@@ -23,8 +23,8 @@
 #include "exprs/expr_context.h"
 #include "gen_cpp/PaloInternalService_types.h"
 #include "olap/decimal12.h"
-#include "olap/storage_engine.h"
 #include "olap/field.h"
+#include "olap/storage_engine.h"
 #include "olap/tablet_schema.h"
 #include "olap/uint24.h"
 #include "olap_scan_node.h"

diff --git a/be/src/olap/snapshot_manager.cpp b/be/src/olap/snapshot_manager.cpp
@@ -159,7 +159,7 @@ Status SnapshotManager::convert_rowset_ids(const FilePathDesc& clone_dir_desc, i
     std::unordered_map<Version, RowsetMetaPB*, HashOfVersion> rs_version_map;
     for (auto& visible_rowset : *cloned_tablet_meta_pb.mutable_rs_metas()) {
         RowsetMetaPB* rowset_meta = new_tablet_meta_pb.add_rs_metas();
-        
+
         RowsetId rowset_id = StorageEngine::instance()->next_rowset_id();
         RETURN_NOT_OK(_rename_rowset_id(visible_rowset, clone_dir_desc, tablet_schema, rowset_id,
                                         rowset_meta));

diff --git a/fe/fe-core/src/main/java/org/apache/doris/persist/EditLog.java b/fe/fe-core/src/main/java/org/apache/doris/persist/EditLog.java
@@ -1461,14 +1461,12 @@ public void logCreatePolicy(Policy policy) {
     public void logDropPolicy(DropPolicyLog log) {
         logEdit(OperationType.OP_DROP_POLICY, log);
     }
-<<<<<<<HEAD
 
     public void logDatasourceLog(short id, CatalogLog log) {
         logEdit(id, log);
-=======
+    }
 
-        public void logModifyTableAddOrDropColumns (TableAddOrDropColumnsInfo info){
-            logEdit(OperationType.OP_MODIFY_TABLE_ADD_OR_DROP_COLUMNS, info);
->>>>>>>bdea689a0([Schema Change]support fast add / drop column(#49))
-        }
+    public void logModifyTableAddOrDropColumns (TableAddOrDropColumnsInfo info){
+        logEdit(OperationType.OP_MODIFY_TABLE_ADD_OR_DROP_COLUMNS, info);
     }
+}