rebase stable

Lchangliang · Jun 9, 2022 · 9927468 · 9927468
1 parent 4c7ce00
commit 9927468
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 27 deletions.
diff --git a/be/src/olap/delta_writer.cpp b/be/src/olap/delta_writer.cpp
@@ -117,8 +117,7 @@ Status DeltaWriter::init() {
     _build_current_tablet_schema(_req.ptable_schema_param, _tablet->tablet_schema());
 
     RETURN_NOT_OK(_tablet->create_rowset_writer(_req.txn_id, _req.load_id, PREPARED, OVERLAPPING,
-                                                &_tablet->tablet_schema(), &_rowset_writer));
-    _tablet_schema = &(_tablet->tablet_schema());
+                                                _tablet_schema.get(), &_rowset_writer));
     _schema.reset(new Schema(*_tablet_schema));
     _reset_mem_table();
 

diff --git a/be/src/olap/tablet.h b/be/src/olap/tablet.h
@@ -261,19 +261,6 @@ class Tablet : public BaseTablet {
         return _tablet_meta->all_beta();
     }
 
-    void find_alpha_rowsets(std::vector<RowsetSharedPtr>* rowsets) const;
-
-    Status create_rowset_writer(const Version& version, const RowsetStatePB& rowset_state,
-                                const SegmentsOverlapPB& overlap,
-                                const doris::TabletSchema* tablet_schema,
-                                std::unique_ptr<RowsetWriter>* rowset_writer);
-
-    Status create_rowset_writer(const int64_t& txn_id, const PUniqueId& load_id,
-                                const RowsetStatePB& rowset_state, const SegmentsOverlapPB& overlap,
-                                const doris::TabletSchema* tablet_schema,
-                                std::unique_ptr<RowsetWriter>* rowset_writer);
-
-    Status create_rowset(RowsetMetaSharedPtr rowset_meta, RowsetSharedPtr* rowset);
     const TabletSchema& tablet_schema() const override;
 
 private:

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
@@ -812,16 +812,6 @@ public static void loadJournal(Catalog catalog, JournalEntity journal) {
                     catalog.getAlterInstance().replayProcessModifyEngine(log);
                     break;
                 }
-                case OperationType.OP_CREATE_POLICY: {
-                    RowPolicy log = (RowPolicy) journal.getData();
-                    catalog.getPolicyMgr().replayCreate(log);
-                    break;
-                }
-                case OperationType.OP_DROP_POLICY: {
-                    DropPolicyLog log = (DropPolicyLog) journal.getData();
-                    catalog.getPolicyMgr().replayDrop(log);
-                    break;
-                }
                 case OperationType.OP_MODIFY_TABLE_ADD_OR_DROP_COLUMNS: {
                     final TableAddOrDropColumnsInfo info = (TableAddOrDropColumnsInfo) journal.getData();
                     catalog.replayModifyTableAddOrDropColumns(info);

diff --git a/regression-test/suites/schema_change/test_delete_schema_change.sql b/regression-test/suites/schema_change/test_delete_schema_change.sql
@@ -27,11 +27,11 @@ INSERT INTO schema_change_delete_regression_test VALUES
 INSERT INTO schema_change_delete_regression_test VALUES
              (2, '2017-10-01', 'Beijing', 10, 1, '2020-01-03', '2020-01-03', '2020-01-03', 1, 32, 20);
 
-SELECT * FROM schema_change_delete_regression_test;
+SELECT * FROM schema_change_delete_regression_test order by user_id ASC, last_visit_date;
 
 ALTER table schema_change_delete_regression_test ADD COLUMN new_column INT default "1";
 
-SELECT * FROM schema_change_delete_regression_test;
+SELECT * FROM schema_change_delete_regression_test order by user_id DESC, last_visit_date;
 
 DELETE FROM schema_change_delete_regression_test where new_column = 1;