Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
2340e55d
C
ClickHouse
项目概览
2dot5
/
ClickHouse
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
ClickHouse
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
2340e55d
编写于
12月 18, 2017
作者:
A
Alexey Zatelepin
提交者:
alexey-milovidov
12月 20, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
revert to old behaviour of getPartIfExists() [#CLICKHOUSE-3508]
上级
3124ffea
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
14 addition
and
10 deletion
+14
-10
dbms/src/Storages/MergeTree/DataPartsExchange.cpp
dbms/src/Storages/MergeTree/DataPartsExchange.cpp
+4
-3
dbms/src/Storages/MergeTree/MergeTreeData.cpp
dbms/src/Storages/MergeTree/MergeTreeData.cpp
+1
-1
dbms/src/Storages/MergeTree/MergeTreeData.h
dbms/src/Storages/MergeTree/MergeTreeData.h
+2
-2
dbms/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
dbms/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
+2
-1
dbms/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.cpp
...torages/MergeTree/ReplicatedMergeTreeRestartingThread.cpp
+2
-1
dbms/src/Storages/StorageReplicatedMergeTree.cpp
dbms/src/Storages/StorageReplicatedMergeTree.cpp
+3
-2
未找到文件。
dbms/src/Storages/MergeTree/DataPartsExchange.cpp
浏览文件 @
2340e55d
...
...
@@ -141,9 +141,10 @@ void Service::processQuery(const Poco::Net::HTMLForm & params, ReadBuffer & /*bo
MergeTreeData
::
DataPartPtr
Service
::
findPart
(
const
String
&
name
)
{
/// It is important to include PreCommitted parts here
/// Because part could be actually committed into ZooKeeper, but response from ZooKeeper to the server could be delayed
auto
part
=
data
.
getPartIfExists
(
name
,
{
MergeTreeDataPart
::
State
::
PreCommitted
,
MergeTreeDataPart
::
State
::
Committed
});
/// It is important to include PreCommitted and Outdated parts here because remote replicas cannot reliably
/// determine the local state of the part, so queries for the parts in these states are completely normal.
auto
part
=
data
.
getPartIfExists
(
name
,
{
MergeTreeDataPartState
::
PreCommitted
,
MergeTreeDataPartState
::
Committed
,
MergeTreeDataPartState
::
Outdated
});
if
(
part
)
return
part
;
...
...
dbms/src/Storages/MergeTree/MergeTreeData.cpp
浏览文件 @
2340e55d
...
...
@@ -1718,7 +1718,7 @@ MergeTreeData::DataPartPtr MergeTreeData::getPartIfExists(const String & part_na
for
(
auto
state
:
valid_states
)
{
if
((
*
it
)
->
state
==
state
)
return
*
it
;
return
*
it
;
}
return
nullptr
;
...
...
dbms/src/Storages/MergeTree/MergeTreeData.h
浏览文件 @
2340e55d
...
...
@@ -352,8 +352,8 @@ public:
/// Returns an comitted part with the given name or a part containing it. If there is no such part, returns nullptr.
DataPartPtr
getActiveContainingPart
(
const
String
&
part_name
);
/// Returns the part with the given name
(and state)
or nullptr if no such part.
DataPartPtr
getPartIfExists
(
const
String
&
part_name
,
const
DataPartStates
&
valid_states
=
{
DataPartState
::
Committed
}
);
/// Returns the part with the given name
and state
or nullptr if no such part.
DataPartPtr
getPartIfExists
(
const
String
&
part_name
,
const
DataPartStates
&
valid_states
);
/// Total size of active parts in bytes.
size_t
getTotalActiveSizeInBytes
()
const
;
...
...
dbms/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
浏览文件 @
2340e55d
#include <Storages/MergeTree/ReplicatedMergeTreeQueue.h>
#include <IO/ReadHelpers.h>
#include <IO/WriteHelpers.h>
#include <Storages/MergeTree/MergeTreeDataPart.h>
#include <Storages/MergeTree/MergeTreeDataMerger.h>
#include <Common/StringUtils.h>
...
...
@@ -635,7 +636,7 @@ bool ReplicatedMergeTreeQueue::shouldExecuteLogEntry(
return
false
;
}
auto
part
=
data
.
getPartIfExists
(
name
);
auto
part
=
data
.
getPartIfExists
(
name
,
{
MergeTreeDataPartState
::
Committed
,
MergeTreeDataPartState
::
Outdated
}
);
if
(
part
)
sum_parts_size_in_bytes
+=
part
->
size_in_bytes
;
}
...
...
dbms/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.cpp
浏览文件 @
2340e55d
...
...
@@ -253,7 +253,8 @@ void ReplicatedMergeTreeRestartingThread::removeFailedQuorumParts()
for
(
auto
part_name
:
failed_parts
)
{
auto
part
=
storage
.
data
.
getPartIfExists
(
part_name
);
auto
part
=
storage
.
data
.
getPartIfExists
(
part_name
,
{
MergeTreeDataPartState
::
PreCommitted
,
MergeTreeDataPartState
::
Committed
,
MergeTreeDataPartState
::
Outdated
});
if
(
part
)
{
LOG_DEBUG
(
log
,
"Found part "
<<
part_name
<<
" with failed quorum. Moving to detached. This shouldn't happen often."
);
...
...
dbms/src/Storages/StorageReplicatedMergeTree.cpp
浏览文件 @
2340e55d
...
...
@@ -5,6 +5,7 @@
#include <Storages/ColumnsDescription.h>
#include <Storages/StorageReplicatedMergeTree.h>
#include <Storages/MergeTree/MergeTreeDataPart.h>
#include <Storages/MergeTree/ReplicatedMergeTreeBlockOutputStream.h>
#include <Storages/MergeTree/ReplicatedMergeTreeQuorumEntry.h>
#include <Storages/MergeTree/MergeList.h>
...
...
@@ -2125,7 +2126,7 @@ bool StorageReplicatedMergeTree::fetchPart(const String & part_name, const Strin
if
(
auto
part
=
data
.
getPartIfExists
(
part_name
,
{
MergeTreeDataPart
::
State
::
Outdated
,
MergeTreeDataPart
::
State
::
Deleting
}))
{
LOG_DEBUG
(
log
,
"Part "
<<
part
->
getNameWithState
()
<<
" should be deleted after previous attempt before fetch"
);
/// Force
premature parts cleanup
/// Force
immediate parts cleanup to delete the part that was left from the previous fetch attempt.
cleanup_thread
->
schedule
();
return
false
;
}
...
...
@@ -2322,7 +2323,7 @@ BlockInputStreams StorageReplicatedMergeTree::read(
String
last_part
;
zookeeper
->
tryGet
(
zookeeper_path
+
"/quorum/last_part"
,
last_part
);
if
(
!
last_part
.
empty
()
&&
!
data
.
get
PartIfExists
(
last_part
))
/// TODO Disable replica for distributed queries.
if
(
!
last_part
.
empty
()
&&
!
data
.
get
ActiveContainingPart
(
last_part
))
/// TODO Disable replica for distributed queries.
throw
Exception
(
"Replica doesn't have part "
+
last_part
+
" which was successfully written to quorum of other replicas."
" Send query to another replica or disable 'select_sequential_consistency' setting."
,
ErrorCodes
::
REPLICA_IS_NOT_IN_QUORUM
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录