(doris) branch branch-2.0 updated: [fix](partition) Comment out some exceptions with partition equal to 0 and return (#28614)

[dataroaring]

This is an automated email from the ASF dual-hosted git repository.

dataroaring pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git


The following commit(s) were added to refs/heads/branch-2.0 by this push:
     new 265fb9e2614 [fix](partition) Comment out some exceptions with 
partition equal to 0 and return (#28614)
265fb9e2614 is described below

commit 265fb9e2614cad17a571b4027d8bcf328daddea4
Author: deardeng <565620...@qq.com>
AuthorDate: Thu Dec 21 10:22:39 2023 +0800

    [fix](partition) Comment out some exceptions with partition equal to 0 and 
return (#28614)
---
 be/src/olap/rowset/rowset_meta_manager.cpp | 5 +++--
 be/src/olap/tablet.cpp                     | 3 ++-
 be/src/olap/tablet_meta_manager.cpp        | 5 +++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/be/src/olap/rowset/rowset_meta_manager.cpp 
b/be/src/olap/rowset/rowset_meta_manager.cpp
index 16bda887c35..23682338ff9 100644
--- a/be/src/olap/rowset/rowset_meta_manager.cpp
+++ b/be/src/olap/rowset/rowset_meta_manager.cpp
@@ -94,8 +94,9 @@ Status RowsetMetaManager::save(OlapMeta* meta, TabletUid 
tablet_uid, const Rowse
     if (rowset_meta_pb.partition_id() <= 0) {
         LOG(WARNING) << "invalid partition id " << 
rowset_meta_pb.partition_id() << " tablet "
                      << rowset_meta_pb.tablet_id();
-        return Status::InternalError("invaid partition id {} tablet {}",
-                                     rowset_meta_pb.partition_id(), 
rowset_meta_pb.tablet_id());
+        // TODO(dx): after fix partition id eq 0 bug, fix it
+        // return Status::InternalError("invaid partition id {} tablet {}",
+        //  rowset_meta_pb.partition_id(), rowset_meta_pb.tablet_id());
     }
     if (enable_binlog) {
         return _save_with_binlog(meta, tablet_uid, rowset_id, rowset_meta_pb);
diff --git a/be/src/olap/tablet.cpp b/be/src/olap/tablet.cpp
index 0d9f21da326..4c1ebd721de 100644
--- a/be/src/olap/tablet.cpp
+++ b/be/src/olap/tablet.cpp
@@ -245,7 +245,8 @@ TabletSharedPtr 
Tablet::create_tablet_from_meta(TabletMetaSharedPtr tablet_meta,
     if (tablet_meta->partition_id() <= 0) {
         LOG(WARNING) << "invalid partition id " << tablet_meta->partition_id() 
<< ", tablet "
                      << tablet_meta->tablet_id();
-        return nullptr;
+        // TODO(dx): after fix partition id eq 0 bug, fix it
+        // return nullptr;
     }
     return std::make_shared<Tablet>(tablet_meta, data_dir);
 }
diff --git a/be/src/olap/tablet_meta_manager.cpp 
b/be/src/olap/tablet_meta_manager.cpp
index 20f3872a03e..bf161b6524d 100644
--- a/be/src/olap/tablet_meta_manager.cpp
+++ b/be/src/olap/tablet_meta_manager.cpp
@@ -95,8 +95,9 @@ Status TabletMetaManager::save(DataDir* store, TTabletId 
tablet_id, TSchemaHash
     if (tablet_meta->partition_id() <= 0) {
         LOG(WARNING) << "invalid partition id " << tablet_meta->partition_id() 
<< " tablet "
                      << tablet_meta->tablet_id();
-        return Status::InternalError("invaid partition id {} tablet {}",
-                                     tablet_meta->partition_id(), 
tablet_meta->tablet_id());
+        // TODO(dx): after fix partition id eq 0 bug, fix it
+        // return Status::InternalError("invaid partition id {} tablet {}",
+        //  tablet_meta->partition_id(), tablet_meta->tablet_id());
     }
     OlapMeta* meta = store->get_meta();
     VLOG_NOTICE << "save tablet meta"


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org