You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by mo...@apache.org on 2022/05/29 04:25:48 UTC
[incubator-doris] branch master updated: [fix](ut) fix BE ut (#9831)
This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git
The following commit(s) were added to refs/heads/master by this push:
new 9fe3827239 [fix](ut) fix BE ut (#9831)
9fe3827239 is described below
commit 9fe3827239faf89c128df89330ecc5f910cfc9f4
Author: Mingyu Chen <mo...@gmail.com>
AuthorDate: Sun May 29 12:25:41 2022 +0800
[fix](ut) fix BE ut (#9831)
introduced from #8923, the github checks has some problem that failed to check BE ut in #8923
---
be/test/olap/cumulative_compaction_policy_test.cpp | 12 ++++++------
be/test/olap/tablet_meta_test.cpp | 3 ++-
be/test/olap/tablet_test.cpp | 6 +++---
be/test/olap/test_data/header_without_inc_rs.txt | 3 ++-
gensrc/proto/olap_file.proto | 2 +-
5 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/be/test/olap/cumulative_compaction_policy_test.cpp b/be/test/olap/cumulative_compaction_policy_test.cpp
index 21c3d15f9c..e30df7e343 100644
--- a/be/test/olap/cumulative_compaction_policy_test.cpp
+++ b/be/test/olap/cumulative_compaction_policy_test.cpp
@@ -31,9 +31,9 @@ class TestNumBasedCumulativeCompactionPolicy : public testing::Test {
public:
TestNumBasedCumulativeCompactionPolicy() {}
void SetUp() {
- _tablet_meta = static_cast<TabletMetaSharedPtr>(
- new TabletMeta(1, 2, 15673, 4, 5, TTabletSchema(), 6, {{7, 8}}, UniqueId(9, 10),
- TTabletType::TABLET_TYPE_DISK, TStorageMedium::HDD, ""));
+ _tablet_meta = static_cast<TabletMetaSharedPtr>(new TabletMeta(
+ 1, 2, 15673, 4, 5, TTabletSchema(), 6, {{7, 8}}, UniqueId(9, 10),
+ TTabletType::TABLET_TYPE_DISK, TStorageMedium::HDD, "", TCompressionType::LZ4F));
_json_rowset_meta = R"({
"rowset_id": 540081,
@@ -335,9 +335,9 @@ public:
config::cumulative_size_based_promotion_min_size_mbytes = 64;
config::cumulative_size_based_compaction_lower_size_mbytes = 64;
- _tablet_meta = static_cast<TabletMetaSharedPtr>(
- new TabletMeta(1, 2, 15673, 4, 5, TTabletSchema(), 6, {{7, 8}}, UniqueId(9, 10),
- TTabletType::TABLET_TYPE_DISK, TStorageMedium::HDD, ""));
+ _tablet_meta = static_cast<TabletMetaSharedPtr>(new TabletMeta(
+ 1, 2, 15673, 4, 5, TTabletSchema(), 6, {{7, 8}}, UniqueId(9, 10),
+ TTabletType::TABLET_TYPE_DISK, TStorageMedium::HDD, "", TCompressionType::LZ4F));
_json_rowset_meta = R"({
"rowset_id": 540081,
diff --git a/be/test/olap/tablet_meta_test.cpp b/be/test/olap/tablet_meta_test.cpp
index afff946bd8..f728616922 100644
--- a/be/test/olap/tablet_meta_test.cpp
+++ b/be/test/olap/tablet_meta_test.cpp
@@ -27,7 +27,8 @@ TEST(TabletMetaTest, SaveAndParse) {
std::string meta_path = "./be/test/olap/test_data/tablet_meta_test.hdr";
TabletMeta old_tablet_meta(1, 2, 3, 4, 5, TTabletSchema(), 6, {{7, 8}}, UniqueId(9, 10),
- TTabletType::TABLET_TYPE_DISK, TStorageMedium::HDD, "");
+ TTabletType::TABLET_TYPE_DISK, TStorageMedium::HDD, "",
+ TCompressionType::LZ4F);
EXPECT_EQ(Status::OK(), old_tablet_meta.save(meta_path));
{
diff --git a/be/test/olap/tablet_test.cpp b/be/test/olap/tablet_test.cpp
index ba39e1d0fd..d5883ad708 100644
--- a/be/test/olap/tablet_test.cpp
+++ b/be/test/olap/tablet_test.cpp
@@ -35,9 +35,9 @@ public:
virtual ~TestTablet() {}
virtual void SetUp() {
- _tablet_meta = static_cast<TabletMetaSharedPtr>(
- new TabletMeta(1, 2, 15673, 4, 5, TTabletSchema(), 6, {{7, 8}}, UniqueId(9, 10),
- TTabletType::TABLET_TYPE_DISK, TStorageMedium::HDD, ""));
+ _tablet_meta = static_cast<TabletMetaSharedPtr>(new TabletMeta(
+ 1, 2, 15673, 4, 5, TTabletSchema(), 6, {{7, 8}}, UniqueId(9, 10),
+ TTabletType::TABLET_TYPE_DISK, TStorageMedium::HDD, "", TCompressionType::LZ4F));
_json_rowset_meta = R"({
"rowset_id": 540081,
"tablet_id": 15673,
diff --git a/be/test/olap/test_data/header_without_inc_rs.txt b/be/test/olap/test_data/header_without_inc_rs.txt
index a55f1f8afa..03cef06a3d 100644
--- a/be/test/olap/test_data/header_without_inc_rs.txt
+++ b/be/test/olap/test_data/header_without_inc_rs.txt
@@ -53,7 +53,8 @@
"delete_sign_idx": -1,
"sequence_col_idx": -1,
"sort_type": "LEXICAL",
- "sort_col_num": 0
+ "sort_col_num": 0,
+ "compression_type": "LZ4F"
},
"rs_metas": [
{
diff --git a/gensrc/proto/olap_file.proto b/gensrc/proto/olap_file.proto
index ac7c08580b..3d5ee5e83a 100644
--- a/gensrc/proto/olap_file.proto
+++ b/gensrc/proto/olap_file.proto
@@ -196,7 +196,7 @@ message TabletSchemaPB {
optional int32 sequence_col_idx = 10 [default= -1];
optional SortType sort_type = 11;
optional int32 sort_col_num = 12;
- optional segment_v2.CompressionTypePB compression_type = 13;
+ optional segment_v2.CompressionTypePB compression_type = 13 [default=LZ4F];
}
enum TabletStatePB {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org