Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
doodoocoder
prometheus
提交
a6600f56
P
prometheus
项目概览
doodoocoder
/
prometheus
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
prometheus
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
a6600f56
编写于
6月 09, 2020
作者:
B
Bartlomiej Plotka
提交者:
GitHub
6月 09, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #7368 from prometheus/bugfix-cut-2.18.2-2
Cut 2.18.2 release with query bug fix
上级
1a4c97ec
0f345350
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
22 addition
and
13 deletion
+22
-13
CHANGELOG.md
CHANGELOG.md
+4
-0
VERSION
VERSION
+1
-1
storage/fanout_test.go
storage/fanout_test.go
+11
-4
storage/generic.go
storage/generic.go
+6
-8
未找到文件。
CHANGELOG.md
浏览文件 @
a6600f56
## 2.18.2 / 2020-06-09
*
[BUGFIX] TSDB: Fix incorrect query results when using Prometheus with remote reads configured #7361
## 2.18.1 / 2020-05-07
*
[BUGFIX] TSDB: Fixed snapshot API. #7217
...
...
VERSION
浏览文件 @
a6600f56
2.18.
1
2.18.
2
storage/fanout_test.go
浏览文件 @
a6600f56
...
...
@@ -195,10 +195,18 @@ func TestMergeQuerierWithChainMerger(t *testing.T) {
}
qs
=
append
(
qs
,
tc
.
extraQueriers
...
)
merged
,
_
,
_
:=
NewMergeQuerier
(
qs
[
0
],
qs
,
ChainedSeriesMerge
)
.
Select
(
false
,
nil
)
for
merged
.
Next
()
{
mergedQuerier
,
_
,
_
:=
NewMergeQuerier
(
qs
[
0
],
qs
,
ChainedSeriesMerge
)
.
Select
(
false
,
nil
)
// Get all merged series upfront to make sure there are no incorrectly retained shared
// buffers causing bugs.
var
mergedSeries
[]
Series
for
mergedQuerier
.
Next
()
{
mergedSeries
=
append
(
mergedSeries
,
mergedQuerier
.
At
())
}
testutil
.
Ok
(
t
,
mergedQuerier
.
Err
())
for
_
,
actualSeries
:=
range
mergedSeries
{
testutil
.
Assert
(
t
,
tc
.
expected
.
Next
(),
"Expected Next() to be true"
)
actualSeries
:=
merged
.
At
()
expectedSeries
:=
tc
.
expected
.
At
()
testutil
.
Equals
(
t
,
expectedSeries
.
Labels
(),
actualSeries
.
Labels
())
...
...
@@ -207,7 +215,6 @@ func TestMergeQuerierWithChainMerger(t *testing.T) {
testutil
.
Equals
(
t
,
expErr
,
actErr
)
testutil
.
Equals
(
t
,
expSmpl
,
actSmpl
)
}
testutil
.
Ok
(
t
,
merged
.
Err
())
testutil
.
Assert
(
t
,
!
tc
.
expected
.
Next
(),
"Expected Next() to be false"
)
})
}
...
...
storage/generic.go
浏览文件 @
a6600f56
...
...
@@ -108,26 +108,24 @@ func (q *chunkQuerierAdapter) Select(sortSeries bool, hints *SelectHints, matche
type
seriesMergerAdapter
struct
{
VerticalSeriesMergeFunc
buf
[]
Series
}
func
(
a
*
seriesMergerAdapter
)
Merge
(
s
...
Labels
)
Labels
{
a
.
buf
=
a
.
buf
[
:
0
]
buf
:=
make
([]
Series
,
0
,
len
(
s
))
for
_
,
ser
:=
range
s
{
a
.
buf
=
append
(
a
.
buf
,
ser
.
(
Series
))
buf
=
append
(
buf
,
ser
.
(
Series
))
}
return
a
.
VerticalSeriesMergeFunc
(
a
.
buf
...
)
return
a
.
VerticalSeriesMergeFunc
(
buf
...
)
}
type
chunkSeriesMergerAdapter
struct
{
VerticalChunkSeriesMergerFunc
buf
[]
ChunkSeries
}
func
(
a
*
chunkSeriesMergerAdapter
)
Merge
(
s
...
Labels
)
Labels
{
a
.
buf
=
a
.
buf
[
:
0
]
buf
:=
make
([]
ChunkSeries
,
0
,
len
(
s
))
for
_
,
ser
:=
range
s
{
a
.
buf
=
append
(
a
.
buf
,
ser
.
(
ChunkSeries
))
buf
=
append
(
buf
,
ser
.
(
ChunkSeries
))
}
return
a
.
VerticalChunkSeriesMergerFunc
(
a
.
buf
...
)
return
a
.
VerticalChunkSeriesMergerFunc
(
buf
...
)
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录