apache · morningman · Jul 9, 2019 · Jul 12, 2019 · Jul 12, 2019 · Jul 16, 2019
diff --git a/be/src/agent/agent_server.cpp b/be/src/agent/agent_server.cpp
@@ -329,8 +329,8 @@ void AgentServer::submit_tasks(
             break;
         case TTaskType::ROLLUP:
         case TTaskType::SCHEMA_CHANGE:
-        case TTaskType::ALTER_TASK:
-            if (task.__isset.alter_tablet_req) {
+        case TTaskType::ALTER:
+            if (task.__isset.alter_tablet_req || task.__isset.alter_tablet_req_v2) {
                 _alter_tablet_workers->submit_task(task);
             } else {
                 status_code = TStatusCode::ANALYSIS_ERROR;

diff --git a/be/src/agent/task_worker_pool.cpp b/be/src/agent/task_worker_pool.cpp
@@ -550,7 +550,7 @@ void* TaskWorkerPool::_alter_tablet_worker_thread_callback(void* arg_this) {
             switch (task_type) {
             case TTaskType::SCHEMA_CHANGE:
             case TTaskType::ROLLUP:
-            case TTaskType::ALTER_TASK:
+            case TTaskType::ALTER:
                 worker_pool_this->_alter_tablet(worker_pool_this,
                                             agent_task_req,
                                             signatrue,
@@ -588,8 +588,8 @@ void TaskWorkerPool::_alter_tablet(
     case TTaskType::SCHEMA_CHANGE:
         process_name = "schema change";
         break;
-    case TTaskType::ALTER_TASK:
-        process_name = "alter table";
+    case TTaskType::ALTER:
+        process_name = "alter";
         break;
     default:
         std::string task_name;
@@ -607,7 +607,7 @@ void TaskWorkerPool::_alter_tablet(
     TSchemaHash new_schema_hash = 0;
     if (status == DORIS_SUCCESS) {
         OLAPStatus sc_status = OLAP_SUCCESS;
-        if (task_type == TTaskType::ALTER_TASK) {
+        if (task_type == TTaskType::ALTER) {
             new_tablet_id = agent_task_req.alter_tablet_req_v2.new_tablet_id;
             new_schema_hash = agent_task_req.alter_tablet_req_v2.new_schema_hash;
             EngineAlterTabletTask engine_task(agent_task_req.alter_tablet_req_v2, signature, task_type, &error_msgs, process_name);

diff --git a/be/src/olap/delta_writer.cpp b/be/src/olap/delta_writer.cpp
@@ -142,19 +142,9 @@ OLAPStatus DeltaWriter::init() {
         return OLAP_ERR_ROWSET_WRITER_INIT;
     }
 
-    const std::vector<SlotDescriptor*>& slots = _req.tuple_desc->slots();
-    const TabletSchema& schema = _tablet->tablet_schema();
-    for (size_t col_id = 0; col_id < schema.num_columns(); ++col_id) {
-        const TabletColumn& column = schema.column(col_id);
-        for (size_t i = 0; i < slots.size(); ++i) {
-            if (slots[i]->col_name() == column.name()) {
-                _col_ids.push_back(i);
-            }
-        }
-    }
     _tablet_schema = &(_tablet->tablet_schema());
     _schema = new Schema(*_tablet_schema);
-    _mem_table = new MemTable(_schema, _tablet_schema, &_col_ids,
+    _mem_table = new MemTable(_schema, _tablet_schema, _req.slots,
                               _req.tuple_desc, _tablet->keys_type());
     _is_init = true;
     return OLAP_SUCCESS;
@@ -173,7 +163,7 @@ OLAPStatus DeltaWriter::write(Tuple* tuple) {
         RETURN_NOT_OK(_mem_table->flush(_rowset_writer));
 
         SAFE_DELETE(_mem_table);
-        _mem_table = new MemTable(_schema, _tablet_schema, &_col_ids,
+        _mem_table = new MemTable(_schema, _tablet_schema, _req.slots,
                                   _req.tuple_desc, _tablet->keys_type());
     }
     return OLAP_SUCCESS;

diff --git a/be/src/olap/delta_writer.h b/be/src/olap/delta_writer.h
@@ -47,6 +47,8 @@ struct WriteRequest {
     PUniqueId load_id;
     bool need_gen_rollup;
     TupleDescriptor* tuple_desc;
+    // slots are in order of tablet's schema
+    std::vector<SlotDescriptor*>* slots;
 };
 
 class DeltaWriter {
@@ -76,7 +78,6 @@ class DeltaWriter {
     MemTable* _mem_table;
     Schema* _schema;
     const TabletSchema* _tablet_schema;
-    std::vector<uint32_t> _col_ids;
     bool _delta_written_success;
 };
 

diff --git a/be/src/olap/memtable.cpp b/be/src/olap/memtable.cpp
@@ -27,12 +27,12 @@
 namespace doris {
 
 MemTable::MemTable(Schema* schema, const TabletSchema* tablet_schema,
-                   std::vector<uint32_t>* col_ids, TupleDescriptor* tuple_desc,
+                   std::vector<SlotDescriptor*>* slot_descs, TupleDescriptor* tuple_desc,
                    KeysType keys_type)
     : _schema(schema),
       _tablet_schema(tablet_schema),
       _tuple_desc(tuple_desc),
-      _col_ids(col_ids),
+      _slot_descs(slot_descs),
       _keys_type(keys_type),
       _row_comparator(_schema) {
     _schema_size = _schema->schema_size();
@@ -58,11 +58,10 @@ size_t MemTable::memory_usage() {
 }
 
 void MemTable::insert(Tuple* tuple) {
-    const std::vector<SlotDescriptor*>& slots = _tuple_desc->slots();
     ContiguousRow row(_schema, _tuple_buf);
-    for (size_t i = 0; i < _col_ids->size(); ++i) {
+    for (size_t i = 0; i < _slot_descs->size(); ++i) {
         auto cell = row.cell(i);
-        const SlotDescriptor* slot = slots[(*_col_ids)[i]];
+        const SlotDescriptor* slot = (*_slot_descs)[i];
 
         if (tuple->is_null(slot->null_indicator_offset())) {
             cell.set_null();

diff --git a/be/src/olap/memtable.h b/be/src/olap/memtable.h
@@ -32,7 +32,7 @@ class RowCursor;
 class MemTable {
 public:
     MemTable(Schema* schema, const TabletSchema* tablet_schema,
-             std::vector<uint32_t>* col_ids, TupleDescriptor* tuple_desc,
+             std::vector<SlotDescriptor*>* slot_descs, TupleDescriptor* tuple_desc,
              KeysType keys_type);
     ~MemTable();
     size_t memory_usage();
@@ -43,7 +43,8 @@ class MemTable {
     Schema* _schema;
     const TabletSchema* _tablet_schema;
     TupleDescriptor* _tuple_desc;
-    std::vector<uint32_t>* _col_ids;
+    // the slot in _slot_descs are in order of tablet's schema
+    std::vector<SlotDescriptor*>* _slot_descs;
     KeysType _keys_type;
 
     struct RowCursorComparator {

diff --git a/be/src/olap/schema_change.cpp b/be/src/olap/schema_change.cpp
@@ -1329,9 +1329,12 @@ OLAPStatus SchemaChangeHandler::_do_process_alter_tablet_v2(const TAlterTabletRe
         if (res != OLAP_SUCCESS) {
             break;
         }
-        res = _validate_alter_result(new_tablet, request);
     } while(0);
 
+    // _validate_alter_result should be outside the above while loop.
+    // to avoid requiring the header lock twice.
+    res = _validate_alter_result(new_tablet, request);
+
     // if failed convert history data, then just remove the new tablet
     if (res != OLAP_SUCCESS) {
         LOG(WARNING) << "failed to alter tablet. base_tablet=" << base_tablet->full_name()
@@ -2143,7 +2146,7 @@ OLAPStatus SchemaChangeHandler::_validate_alter_result(TabletSharedPtr new_table
     Version max_continuous_version = {-1, 0};
     VersionHash max_continuous_version_hash = 0;
     new_tablet->max_continuous_version_from_begining(&max_continuous_version, &max_continuous_version_hash);
-    LOG(INFO) << "find max continuous version "
+    LOG(INFO) << "find max continuous version of tablet=" << new_tablet->full_name()
               << ", start_version=" << max_continuous_version.first
               << ", end_version=" << max_continuous_version.second
               << ", version_hash=" << max_continuous_version_hash;

diff --git a/be/src/olap/task/engine_alter_tablet_task.cpp b/be/src/olap/task/engine_alter_tablet_task.cpp
@@ -33,11 +33,6 @@ EngineAlterTabletTask::EngineAlterTabletTask(const TAlterTabletReqV2& request,
         _process_name(process_name) { }
 
 OLAPStatus EngineAlterTabletTask::execute() {
-    LOG(INFO) << "begin to create new alter tablet. base_tablet_id=" << _alter_tablet_req.base_tablet_id
-              << ", base_schema_hash=" << _alter_tablet_req.base_schema_hash
-              << ", new_tablet_id=" << _alter_tablet_req.new_tablet_id
-              << ", new_schema_hash=" << _alter_tablet_req.new_schema_hash;
-
     DorisMetrics::create_rollup_requests_total.increment(1);
 
     SchemaChangeHandler handler;

diff --git a/be/src/runtime/tablet_writer_mgr.cpp b/be/src/runtime/tablet_writer_mgr.cpp
@@ -205,16 +205,16 @@ Status TabletsChannel::close(int sender_id, bool* finished,
 }
 
 Status TabletsChannel::_open_all_writers(const PTabletWriterOpenRequest& params) {
-    std::vector<SlotDescriptor*>* columns = nullptr;
+    std::vector<SlotDescriptor*>* index_slots = nullptr;
     int32_t schema_hash = 0;
     for (auto& index : _schema->indexes()) {
         if (index->index_id == _index_id) {
-            columns = &index->slots;
+            index_slots = &index->slots;
             schema_hash = index->schema_hash;
             break;
         }
     }
-    if (columns == nullptr) {
+    if (index_slots == nullptr) {
         std::stringstream ss;
         ss << "unknown index id, key=" << _key;
         return Status::InternalError(ss.str());
@@ -229,6 +229,7 @@ Status TabletsChannel::_open_all_writers(const PTabletWriterOpenRequest& params)
         request.load_id = params.id();
         request.need_gen_rollup = params.need_gen_rollup();
         request.tuple_desc = _tuple_desc;
+        request.slots = index_slots;
 
         DeltaWriter* writer = nullptr;
         auto st = DeltaWriter::open(&request, &writer);

diff --git a/docs/documentation/cn/administrator-guide/operation/tablet-meta-tool.md b/docs/documentation/cn/administrator-guide/operation/tablet-meta-tool.md
@@ -72,7 +72,7 @@ api：
 命令:
 
 ```
-./lib/meta_tool --operation=delete_header --root_path=/path/to/root_path --tablet_id=xxx --schema_hash=xxx`
+./lib/meta_tool --operation=delete_header --root_path=/path/to/root_path --tablet_id=xxx --schema_hash=xxx
 ```
 
 ### 展示 pb 格式的 TabletMeta

diff --git a/fe/src/main/cup/sql_parser.cup b/fe/src/main/cup/sql_parser.cup
@@ -1853,11 +1853,15 @@ show_param ::=
     :}
     | KW_TABLET INTEGER_LITERAL:tabletId
     {:
-        RESULT = new ShowTabletStmt(null, tabletId);
+        RESULT = new ShowTabletStmt(null, tabletId, null);
     :}
     | KW_TABLET KW_FROM table_name:dbTblName
     {:
-        RESULT = new ShowTabletStmt(dbTblName, -1L);
+        RESULT = new ShowTabletStmt(dbTblName, -1L, null);
+    :}
+    | KW_TABLET KW_FROM table_name:dbTblName KW_ROLLUP ident:rollup
+    {:
+        RESULT = new ShowTabletStmt(dbTblName, -1L, rollup);
     :}
     | KW_PROPERTY opt_user:user opt_wild_where
     {:

diff --git a/fe/src/main/java/org/apache/doris/alter/Alter.java b/fe/src/main/java/org/apache/doris/alter/Alter.java
@@ -45,6 +45,7 @@
 import org.apache.doris.common.DdlException;
 import org.apache.doris.common.ErrorCode;
 import org.apache.doris.common.ErrorReport;
+import org.apache.doris.common.UserException;
 
 import com.google.common.base.Preconditions;
 
@@ -73,7 +74,7 @@ public void start() {
         clusterHandler.start();
     }
 
-    public void processAlterTable(AlterTableStmt stmt) throws DdlException {
+    public void processAlterTable(AlterTableStmt stmt) throws UserException {
         TableName dbTableName = stmt.getTbl();
         String dbName = dbTableName.getDb();
         final String clusterName = stmt.getClusterName();
@@ -171,13 +172,8 @@ public void processAlterTable(AlterTableStmt stmt) throws DdlException {
                 throw new DdlException("table with empty parition cannot do schema change. [" + tableName + "]");
             }
 
-            if (olapTable.getState() == OlapTableState.SCHEMA_CHANGE
-                    || olapTable.getState() == OlapTableState.RESTORE) {
-                throw new DdlException("Table[" + table.getName() + "]'s state[" + olapTable.getState()
-                        + "] does not allow doing ALTER ops");
-                // here we pass NORMAL and ROLLUP
-                // NORMAL: ok to do any alter ops
-                // ROLLUP: we allow user DROP a rollup index when it's under ROLLUP
+            if (olapTable.getState() != OlapTableState.NORMAL) {
+                throw new DdlException("Table[" + table.getName() + "]'s state is not NORMAL. Do not allow doing ALTER ops");
             }
 
             if (hasSchemaChange || hasModifyProp || hasRollup) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -72,7 +72,7 @@ api： @@
     命令:
     ```
-    ./lib/meta_tool --operation=delete_header --root_path=/path/to/root_path --tablet_id=xxx --schema_hash=xxx`
+    ./lib/meta_tool --operation=delete_header --root_path=/path/to/root_path --tablet_id=xxx --schema_hash=xxx
     ```
     ### 展示 pb 格式的 TabletMeta
@@ Expand Down @@