Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
FinClip
ligase
提交
fef290c4
ligase
项目概览
FinClip
/
ligase
通知
36
Star
8
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
ligase
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
fef290c4
编写于
9月 21, 2017
作者:
M
Mark Haines
提交者:
GitHub
9月 21, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add context to the server key database (#248)
上级
7596c19f
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
16 addition
and
7 deletion
+16
-7
src/github.com/matrix-org/dendrite/common/keydb/keydb.go
src/github.com/matrix-org/dendrite/common/keydb/keydb.go
+2
-2
src/github.com/matrix-org/dendrite/common/keydb/server_key_table.go
....com/matrix-org/dendrite/common/keydb/server_key_table.go
+14
-5
未找到文件。
src/github.com/matrix-org/dendrite/common/keydb/keydb.go
浏览文件 @
fef290c4
...
@@ -49,7 +49,7 @@ func (d *Database) FetchKeys(
...
@@ -49,7 +49,7 @@ func (d *Database) FetchKeys(
ctx
context
.
Context
,
ctx
context
.
Context
,
requests
map
[
gomatrixserverlib
.
PublicKeyRequest
]
gomatrixserverlib
.
Timestamp
,
requests
map
[
gomatrixserverlib
.
PublicKeyRequest
]
gomatrixserverlib
.
Timestamp
,
)
(
map
[
gomatrixserverlib
.
PublicKeyRequest
]
gomatrixserverlib
.
ServerKeys
,
error
)
{
)
(
map
[
gomatrixserverlib
.
PublicKeyRequest
]
gomatrixserverlib
.
ServerKeys
,
error
)
{
return
d
.
statements
.
bulkSelectServerKeys
(
requests
)
return
d
.
statements
.
bulkSelectServerKeys
(
ctx
,
requests
)
}
}
// StoreKeys implements gomatrixserverlib.KeyDatabase
// StoreKeys implements gomatrixserverlib.KeyDatabase
...
@@ -62,7 +62,7 @@ func (d *Database) StoreKeys(
...
@@ -62,7 +62,7 @@ func (d *Database) StoreKeys(
// high for a single insert statement.
// high for a single insert statement.
var
lastErr
error
var
lastErr
error
for
request
,
keys
:=
range
keyMap
{
for
request
,
keys
:=
range
keyMap
{
if
err
:=
d
.
statements
.
upsertServerKeys
(
request
,
keys
);
err
!=
nil
{
if
err
:=
d
.
statements
.
upsertServerKeys
(
ctx
,
request
,
keys
);
err
!=
nil
{
// Rather than returning immediately on error we try to insert the
// Rather than returning immediately on error we try to insert the
// remaining keys.
// remaining keys.
// Since we are inserting the keys outside of a transaction it is
// Since we are inserting the keys outside of a transaction it is
...
...
src/github.com/matrix-org/dendrite/common/keydb/server_key_table.go
浏览文件 @
fef290c4
...
@@ -15,6 +15,7 @@
...
@@ -15,6 +15,7 @@
package
keydb
package
keydb
import
(
import
(
"context"
"database/sql"
"database/sql"
"encoding/json"
"encoding/json"
...
@@ -73,13 +74,15 @@ func (s *serverKeyStatements) prepare(db *sql.DB) (err error) {
...
@@ -73,13 +74,15 @@ func (s *serverKeyStatements) prepare(db *sql.DB) (err error) {
}
}
func
(
s
*
serverKeyStatements
)
bulkSelectServerKeys
(
func
(
s
*
serverKeyStatements
)
bulkSelectServerKeys
(
ctx
context
.
Context
,
requests
map
[
gomatrixserverlib
.
PublicKeyRequest
]
gomatrixserverlib
.
Timestamp
,
requests
map
[
gomatrixserverlib
.
PublicKeyRequest
]
gomatrixserverlib
.
Timestamp
,
)
(
map
[
gomatrixserverlib
.
PublicKeyRequest
]
gomatrixserverlib
.
ServerKeys
,
error
)
{
)
(
map
[
gomatrixserverlib
.
PublicKeyRequest
]
gomatrixserverlib
.
ServerKeys
,
error
)
{
var
nameAndKeyIDs
[]
string
var
nameAndKeyIDs
[]
string
for
request
:=
range
requests
{
for
request
:=
range
requests
{
nameAndKeyIDs
=
append
(
nameAndKeyIDs
,
nameAndKeyID
(
request
))
nameAndKeyIDs
=
append
(
nameAndKeyIDs
,
nameAndKeyID
(
request
))
}
}
rows
,
err
:=
s
.
bulkSelectServerKeysStmt
.
Query
(
pq
.
StringArray
(
nameAndKeyIDs
))
stmt
:=
s
.
bulkSelectServerKeysStmt
rows
,
err
:=
stmt
.
QueryContext
(
ctx
,
pq
.
StringArray
(
nameAndKeyIDs
))
if
err
!=
nil
{
if
err
!=
nil
{
return
nil
,
err
return
nil
,
err
}
}
...
@@ -106,15 +109,21 @@ func (s *serverKeyStatements) bulkSelectServerKeys(
...
@@ -106,15 +109,21 @@ func (s *serverKeyStatements) bulkSelectServerKeys(
}
}
func
(
s
*
serverKeyStatements
)
upsertServerKeys
(
func
(
s
*
serverKeyStatements
)
upsertServerKeys
(
request
gomatrixserverlib
.
PublicKeyRequest
,
keys
gomatrixserverlib
.
ServerKeys
,
ctx
context
.
Context
,
request
gomatrixserverlib
.
PublicKeyRequest
,
keys
gomatrixserverlib
.
ServerKeys
,
)
error
{
)
error
{
keyJSON
,
err
:=
json
.
Marshal
(
keys
)
keyJSON
,
err
:=
json
.
Marshal
(
keys
)
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
}
}
_
,
err
=
s
.
upsertServerKeysStmt
.
Exec
(
_
,
err
=
s
.
upsertServerKeysStmt
.
ExecContext
(
string
(
request
.
ServerName
),
string
(
request
.
KeyID
),
nameAndKeyID
(
request
),
ctx
,
int64
(
keys
.
ValidUntilTS
),
keyJSON
,
string
(
request
.
ServerName
),
string
(
request
.
KeyID
),
nameAndKeyID
(
request
),
int64
(
keys
.
ValidUntilTS
),
keyJSON
,
)
)
return
err
return
err
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录