Skip to content

Commit 65ebd86

Browse files
hello-stephenhello-stephen
authored
Merge branch 'master' into 0107-p1
2 parents b70b0c5 + 0428172 commit 65ebd86

File tree

628 files changed

+33665
-10870
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

628 files changed

+33665
-10870
lines changed

‎.asf.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ github:
5050
- Clang Formatter
5151
- CheckStyle
5252
- P0 Regression (Doris Regression)
53-
- NonConcurrent Regression (Doris Regression)
53+
- NonConcurrent Regression (nonConcurrent)
5454
- External Regression (Doris External Regression)
5555
- cloud_p0 (Doris Cloud Regression)
5656
- vault_p0 (Doris Cloud Regression)
@@ -83,7 +83,7 @@ github:
8383
- Cloud UT (Doris Cloud UT)
8484
- COMPILE (DORIS_COMPILE)
8585
- P0 Regression (Doris Regression)
86-
- NonConcurrent Regression (Doris Regression)
86+
- NonConcurrent Regression (nonConcurrent)
8787
- External Regression (Doris External Regression)
8888
- cloud_p0 (Doris Cloud Regression)
8989
- vault_p0 (Doris Cloud Regression)
@@ -105,7 +105,7 @@ github:
105105
- Cloud UT (Doris Cloud UT)
106106
- COMPILE (DORIS_COMPILE)
107107
- P0 Regression (Doris Regression)
108-
- NonConcurrent Regression (Doris Regression)
108+
- NonConcurrent Regression (nonConcurrent)
109109
- External Regression (Doris External Regression)
110110
- cloud_p0 (Doris Cloud Regression)
111111
- vault_p0 (Doris Cloud Regression)
@@ -127,7 +127,7 @@ github:
127127
- Cloud UT (Doris Cloud UT)
128128
- COMPILE (DORIS_COMPILE)
129129
- P0 Regression (Doris Regression)
130-
- NonConcurrent Regression (Doris Regression)
130+
- NonConcurrent Regression (nonConcurrent)
131131
- External Regression (Doris External Regression)
132132
- cloud_p0 (Doris Cloud Regression)
133133
- vault_p0 (Doris Cloud Regression)

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,9 @@ lru_cache_test
137137
docker/thirdparties/docker-compose/*/data
138138
docker/thirdparties/docker-compose/*/logs
139139
docker/thirdparties/docker-compose/*/*.yaml
140+
docker/thirdparties/docker-compose/*/*.env
141+
docker/thirdparties/docker-compose/*/cache/
142+
docker/thirdparties/docker-compose/*/scripts/SUCCESS
140143
docker/runtime/be/resource/apache-doris/
141144

142145
# other

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ For the first time in Doris community, you can:
3333

3434
* Follow [Doris GitHub](https://github.com/apache/doris)
3535
* Subscribe to our [mailing list](./docs/en/community/subscribe-mail-list.md);
36-
* Join Doris [Slack](https://join.slack.com/t/apachedoriscommunity/shared_invite/zt-11jb8gesh-7IukzSrdea6mqoG0HB4gZg)
36+
* Join Doris [Slack](https://doris.apache.org/slack)
3737

3838
Learn the development trends of Doris project in time and give your opinions on the topics you are concerned about.
3939

‎CONTRIBUTING_CN.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ under the License.
3333

3434
* 关注 Doris [GitHub 代码库](https://github.com/apache/doris)
3535
* 订阅我们的 [邮件列表](./docs/zh-CN/community/subscribe-mail-list.md)；
36-
* 加入 Doris 的 [Slack](https://join.slack.com/t/apachedoriscommunity/shared_invite/zt-11jb8gesh-7IukzSrdea6mqoG0HB4gZg)
36+
* 加入 Doris 的 [Slack](https://doris.apache.org/slack)
3737

3838
通过以上方式及时了解 Doris 项目的开发动态并为您关注的话题发表意见。
3939

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ under the License.
4646
 
4747
<a href="https://github.com/apache/doris/discussions"><img src="https://img.shields.io/badge/- Discussion -red?style=social&logo=discourse" height=25></a>
4848
&nbsp;
49-
<a href="https://join.slack.com/t/apachedoriscommunity/shared_invite/zt-35mzao67o-BrpU70FNKPyB6UlgpXf8_w" height=25></a>
49+
<a href="https://doris.apache.org/slack" height=25></a>
5050
&nbsp;
5151
<a href="https://medium.com/@ApacheDoris"><img src="https://img.shields.io/badge/-Medium-red?style=social&logo=medium" height=25></a>
5252

@@ -295,7 +295,7 @@ Contact us through the following mailing list.
295295

296296
* Apache Doris Official Website - [Site](https://doris.apache.org)
297297
* Developer Mailing list - <dev@doris.apache.org>. Mail to <dev-subscribe@doris.apache.org>, follow the reply to subscribe the mail list.
298-
* Slack channel - [Join the Slack](https://join.slack.com/t/apachedoriscommunity/shared_invite/zt-35mzao67o-BrpU70FNKPyB6UlgpXf8_w)
298+
* Slack channel - [Join the Slack](https://doris.apache.org/slack)
299299
* Twitter - [Follow @doris_apache](https://twitter.com/doris_apache)
300300

301301

‎be/src/cloud/cloud_rowset_writer.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ Status CloudRowsetWriter::init(const RowsetWriterContext& rowset_writer_context)
6161
_rowset_meta->set_newest_write_timestamp(_context.newest_write_timestamp);
6262
}
6363
_rowset_meta->set_tablet_schema(_context.tablet_schema);
64+
_rowset_meta->set_job_id(_context.job_id);
6465
_context.segment_collector = std::make_shared<SegmentCollectorT<BaseBetaRowsetWriter>>(this);
6566
_context.file_writer_creator = std::make_shared<FileWriterCreatorT<BaseBetaRowsetWriter>>(this);
6667
if (_context.mow_context != nullptr) {

‎be/src/cloud/cloud_schema_change_job.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,7 @@ Status CloudSchemaChangeJob::_convert_historical_rowsets(const SchemaChangeParam
326326
context.tablet_schema = _new_tablet->tablet_schema();
327327
context.newest_write_timestamp = rs_reader->newest_write_timestamp();
328328
context.storage_resource = _cloud_storage_engine.get_storage_resource(sc_params.vault_id);
329+
context.job_id = _job_id;
329330
context.write_file_cache = sc_params.output_to_file_cache;
330331
context.tablet = _new_tablet;
331332
if (!context.storage_resource) {

‎be/src/cloud/cloud_stream_load_executor.cpp‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,11 @@ Status CloudStreamLoadExecutor::operate_txn_2pc(StreamLoadContext* ctx) {
104104

105105
Status CloudStreamLoadExecutor::commit_txn(StreamLoadContext* ctx) {
106106
DBUG_EXECUTE_IF("StreamLoadExecutor.commit_txn.block", DBUG_BLOCK);
107+
DBUG_EXECUTE_IF("StreamLoadExecutor.commit_txn.crash", {
108+
LOG(INFO) << "debug point " << DP_NAME << " trigger crash";
109+
volatile int* p = nullptr;
110+
*p = 1;
111+
});
107112
// forward to fe to excute commit transaction for MoW table
108113
if (ctx->is_mow_table() || !config::enable_stream_load_commit_txn_on_be ||
109114
ctx->load_type == TLoadType::ROUTINE_LOAD) {

‎be/src/cloud/cloud_tablet_mgr.cpp‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
#include "common/status.h"
3030
#include "olap/lru_cache.h"
3131
#include "runtime/memory/cache_policy.h"
32+
#include "util/debug_points.h"
3233
#include "util/stack_util.h"
3334

3435
namespace doris {
@@ -148,7 +149,9 @@ CloudTabletMgr::CloudTabletMgr(CloudStorageEngine& engine)
148149
_tablet_map(std::make_unique<TabletMap>()),
149150
_cache(std::make_unique<LRUCachePolicy>(
150151
CachePolicy::CacheType::CLOUD_TABLET_CACHE, config::tablet_cache_capacity,
151-
LRUCacheType::NUMBER, 0, config::tablet_cache_shards, false /*enable_prune*/)) {}
152+
LRUCacheType::NUMBER, /*sweep time*/ 0, config::tablet_cache_shards,
153+
/*element_count_capacity*/ 0, /*enable_prune*/ false,
154+
/*is_lru_k*/ false)) {}
152155

153156
CloudTabletMgr::~CloudTabletMgr() = default;
154157

@@ -163,6 +166,7 @@ Result<std::shared_ptr<CloudTablet>> CloudTabletMgr::get_tablet(int64_t tablet_i
163166
SyncRowsetStats* sync_stats,
164167
bool force_use_only_cached,
165168
bool cache_on_miss) {
169+
DBUG_EXECUTE_IF("CloudTabletMgr::get_tablet.block", DBUG_BLOCK);
166170
// LRU value type. `Value`'s lifetime MUST NOT be longer than `CloudTabletMgr`
167171
class Value : public LRUCacheValueBase {
168172
public:

‎be/src/cloud/cloud_txn_delete_bitmap_cache.cpp‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@ namespace doris {
3434

3535
CloudTxnDeleteBitmapCache::CloudTxnDeleteBitmapCache(size_t size_in_bytes)
3636
: LRUCachePolicy(CachePolicy::CacheType::CLOUD_TXN_DELETE_BITMAP_CACHE, size_in_bytes,
37-
LRUCacheType::SIZE, 86400, 4),
37+
LRUCacheType::SIZE, /*stale_sweep_time_s*/ 86400, /*num_shards*/ 4,
38+
/*element_count_capacity*/ 0, /*enable_prune*/ true,
39+
/*is_lru_k*/ false),
3840
_stop_latch(1) {}
3941

4042
CloudTxnDeleteBitmapCache::~CloudTxnDeleteBitmapCache() {

0 commit comments

Comments
 (0)