[incubator-doris] branch dev-1.0.1 updated: [chore] fix compile error when use clang as compiler and a be ut problem (#8554)

[mo...@apache.org]

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

morningman pushed a commit to branch dev-1.0.1
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git


The following commit(s) were added to refs/heads/dev-1.0.1 by this push:
     new 584e5d0  [chore] fix compile error when use clang as compiler and a be ut problem (#8554)
584e5d0 is described below

commit 584e5d0966b07228d250fea5cd71be05f1e4643e
Author: Zhengguo Yang <ya...@gmail.com>
AuthorDate: Mon Mar 21 15:38:59 2022 +0800

    [chore] fix compile error when use clang as compiler and a be ut problem (#8554)
---
 be/src/vec/columns/column_dictionary.h | 11 ++++++-----
 be/test/olap/tablet_mgr_test.cpp       | 10 ++--------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/be/src/vec/columns/column_dictionary.h b/be/src/vec/columns/column_dictionary.h
index eb33f55..cca6c85 100644
--- a/be/src/vec/columns/column_dictionary.h
+++ b/be/src/vec/columns/column_dictionary.h
@@ -17,9 +17,10 @@
 
 #pragma once
 
-#include <algorithm>
 #include <parallel_hashmap/phmap.h>
 
+#include <algorithm>
+
 #include "gutil/hash/string_hash.h"
 #include "olap/decimal12.h"
 #include "olap/uint24.h"
@@ -141,20 +142,20 @@ public:
 
     // it's impossable to use ComplexType as key , so we don't have to implemnt them
     [[noreturn]] StringRef serialize_value_into_arena(size_t n, Arena& arena,
-                                                      char const*& begin) const {
+                                                      char const*& begin) const override {
         LOG(FATAL) << "serialize_value_into_arena not supported in ColumnDictionary";
     }
 
-    [[noreturn]] const char* deserialize_and_insert_from_arena(const char* pos) {
+    [[noreturn]] const char* deserialize_and_insert_from_arena(const char* pos) override {
         LOG(FATAL) << "deserialize_and_insert_from_arena not supported in ColumnDictionary";
     }
 
     [[noreturn]] int compare_at(size_t n, size_t m, const IColumn& rhs,
-                                int nan_direction_hint) const {
+                                int nan_direction_hint) const override {
         LOG(FATAL) << "compare_at not supported in ColumnDictionary";
     }
 
-    void get_extremes(Field& min, Field& max) const {
+    void get_extremes(Field& min, Field& max) const override {
         LOG(FATAL) << "get_extremes not supported in ColumnDictionary";
     }
 
diff --git a/be/test/olap/tablet_mgr_test.cpp b/be/test/olap/tablet_mgr_test.cpp
index 246e82e..c104a87 100644
--- a/be/test/olap/tablet_mgr_test.cpp
+++ b/be/test/olap/tablet_mgr_test.cpp
@@ -15,8 +15,8 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include <fstream>
 #include <filesystem>
+#include <fstream>
 #include <sstream>
 #include <string>
 
@@ -118,12 +118,6 @@ TEST_F(TabletMgrTest, CreateTablet) {
     create_st = _tablet_mgr->create_tablet(create_tablet_req, data_dirs);
     ASSERT_TRUE(create_st == OLAP_SUCCESS);
 
-    // create tablet with different schema hash should be error
-    tablet_schema.__set_schema_hash(4444);
-    create_tablet_req.__set_tablet_schema(tablet_schema);
-    create_st = _tablet_mgr->create_tablet(create_tablet_req, data_dirs);
-    ASSERT_TRUE(create_st == OLAP_ERR_CE_TABLET_ID_EXIST);
-
     OLAPStatus drop_st = _tablet_mgr->drop_tablet(111, 3333, false);
     ASSERT_TRUE(drop_st == OLAP_SUCCESS);
     tablet.reset();
@@ -213,7 +207,7 @@ TEST_F(TabletMgrTest, DropTablet) {
     ASSERT_TRUE(tablet != nullptr);
 
     // drop unexist tablet will be success
-    OLAPStatus drop_st = _tablet_mgr->drop_tablet(111, 4444, false);
+    OLAPStatus drop_st = _tablet_mgr->drop_tablet(1121, 4444, false);
     ASSERT_TRUE(drop_st == OLAP_SUCCESS);
     tablet = _tablet_mgr->get_tablet(111, 3333);
     ASSERT_TRUE(tablet != nullptr);

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