diff --git a/docs/locales/zh_CN/LC_MESSAGES/index.po b/docs/locales/zh_CN/LC_MESSAGES/index.po index 0221aa53..6b749fc5 100644 --- a/docs/locales/zh_CN/LC_MESSAGES/index.po +++ b/docs/locales/zh_CN/LC_MESSAGES/index.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: SCQL\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-16 10:08+0800\n" +"POT-Creation-Date: 2023-12-04 16:14+0800\n" "PO-Revision-Date: 2023-10-11 20:47+0800\n" "Last-Translator: \n" "Language: zh_CN\n" @@ -39,9 +39,9 @@ msgstr "开始" #: ../../index.rst:15 msgid "" -"Follow the :doc:`tutorial ` and try out SCQL on your " -"machine!" -msgstr "按照 :doc:`快速教程 ` 在本地尝试 SCQL！" +"Follow the :doc:`tutorial ` and try out SCQL on your" +" machine!" +msgstr "按照 :doc:`快速教程 ` 在本地尝试 SCQL！" #: ../../index.rst:19 msgid "SCQL Systems" @@ -53,8 +53,8 @@ msgid "" "` | :doc:`Common usage ` | " ":doc:`P2P `" msgstr "" -"**概述**：:doc:`系统简介及架构设计 ` | :doc:`使用流程 ` | " -":doc:`P2P `" +"**概述**：:doc:`系统简介及架构设计 ` | :doc:`使用流程 " +"` | :doc:`P2P `" #: ../../index.rst:26 msgid "**Security**: :doc:`Security overview `" @@ -120,7 +120,10 @@ msgid "" "mode` | :doc:`How " "to deploy an SCQL cluster in P2P mode`" -msgstr "**指南**：:doc:`如何部署 SCQL 集群 ` | :doc:`如何在 P2P 模式下部署 SCQL 集群 ` " +msgstr "" +"**指南**：:doc:`如何部署 SCQL 集群 ` | :doc:`如何在 P2P 模式下部署 SCQL 集群 ` " #: ../../index.rst:69 msgid "**Reference**: :doc:`SCQL system config `" diff --git a/docs/locales/zh_CN/LC_MESSAGES/intro/p2p-tutorial.po b/docs/locales/zh_CN/LC_MESSAGES/intro/p2p-tutorial.po index d4014a96..a752c2c9 100644 --- a/docs/locales/zh_CN/LC_MESSAGES/intro/p2p-tutorial.po +++ b/docs/locales/zh_CN/LC_MESSAGES/intro/p2p-tutorial.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: SCQL \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-16 10:08+0800\n" +"POT-Creation-Date: 2023-12-04 16:14+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,117 +18,149 @@ msgstr "" "Generated-By: Babel 2.12.1\n" #: ../../intro/p2p-tutorial.rst:2 -msgid "P2P Quickstart Tutorial" -msgstr "P2P 快速开始" +msgid "Quickstart Tutorial" +msgstr "快速开始" -#: ../../intro/p2p-tutorial.rst:5 -msgid "TL;DR" -msgstr "摘要" +#: ../../intro/p2p-tutorial.rst:4 +msgid "" +"In this tutorial, you will deploy the SCQL system on a single machine, " +"then simulate the project settings for joint data analysis between two " +"parties, and finally initiate a joint analysis query." +msgstr "在本教程中，您将在单机上部署 SCQL 系统，然后模拟两方联合数据分析场景，对项目设置并发起联合分析查询。" + +#: ../../intro/p2p-tutorial.rst:8 +msgid "Deployment Architecture Description" +msgstr "部署架构说明" + +#: ../../intro/p2p-tutorial.rst:10 +msgid "SCQL supports two deployment architectures: centralized and P2P." +msgstr "SCQL 支持两种部署架构：中心化和 P2P 。" + +#: ../../intro/p2p-tutorial.rst:12 +msgid "" +"Centralized: The centralized deployment architecture relies on a trusted " +"third party to deploy the coordination service SCDB. Each data " +"participant only needs to deploy a computing engine named SCQLEngine." +msgstr "中心化：中心化部署架构依靠可信第三方部署协调服务 SCDB，每个数据参与方只需要部署一个 SCQLEngine 计算引擎。" -#: ../../intro/p2p-tutorial.rst:7 +#: ../../intro/p2p-tutorial.rst:13 msgid "" -"Use ``docker-compose`` to deploy a standalone SCQL in P2P model, then use" -" brokerctl to query" -msgstr "使用 ``docker-compose`` 来部署一个独立的 P2P 模式 SCQL，然后使用 brokerctl 来配置及查询" +"P2P: The P2P deployment architecture does not require a trusted third " +"party. Each data participant needs to deploy an SCQLEngine and an " +"SCQLBroker service." +msgstr "P2P ： P2P 部署架构不需要可信第三方。每个数据参与方都需要部署一个 SCQLEngine 和 SCQLBroker 。" -#: ../../intro/p2p-tutorial.rst:11 +#: ../../intro/p2p-tutorial.rst:15 +msgid "" +"This tutorial uses the P2P deployment architecture. If you would like to " +"experience the centralized deployment architecture, you can go :doc:`here" +" `." +msgstr "本教程采用 P2P 部署架构。 如果您想体验中心化部署架构，可以参考 :doc: `这里 `" + +#: ../../intro/p2p-tutorial.rst:19 msgid "Prerequisites" msgstr "先决条件" -#: ../../intro/p2p-tutorial.rst:15 +#: ../../intro/p2p-tutorial.rst:23 msgid "Build brokerctl" msgstr "构建 brokerctl" -#: ../../intro/p2p-tutorial.rst:17 +#: ../../intro/p2p-tutorial.rst:25 msgid "" "``brokerctl`` is a command-line tool for SCQLBroker, we would use it to " "configure project and submit queries to the SCQLBrokers." msgstr "``brokerctl`` 是面向 SCQLBroker 的命令行工具，我们将使用它来配置项目并向 SCQLBroker 提交查询。" -#: ../../intro/p2p-tutorial.rst:31 +#: ../../intro/p2p-tutorial.rst:39 msgid "Generate PrivateKey and Exchange PublicKey" msgstr "生成私钥并交换公钥" -#: ../../intro/p2p-tutorial.rst:38 +#: ../../intro/p2p-tutorial.rst:46 msgid "" "The setup.sh script will generate private key for each party, and " "exchange public key with peers." msgstr "setup.sh 脚本将为各参与方生成私钥，并与其它参与方互相交换公钥。" -#: ../../intro/p2p-tutorial.rst:41 +#: ../../intro/p2p-tutorial.rst:49 msgid "Start SCQL Service" msgstr "启动" -#: ../../intro/p2p-tutorial.rst:43 +#: ../../intro/p2p-tutorial.rst:51 msgid "" "You could start SCQL service via `docker-compose " "`_, " "it would deploy and start services as shown in the following figure, it " "contains two SCQLBrokers and SCQLEngines for party ``alice``, ``bob``." -msgstr "你可以通过 `docker-compose " +msgstr "" +"你可以通过 `docker-compose " "`_ " -"来启动 SCQL 服务 ，它将部署和启动服务，如下图所示，它包含两个参与方 ``alice`` 和 " -"``bob`` 的 SCQLBroker 和 SCQLEngine 。" +"来启动 SCQL 服务 ，它将部署和启动服务，如下图所示，它包含两个参与方 ``alice`` 和 ``bob`` 的 SCQLBroker 和 " +"SCQLEngine 。" #: ../../intro/p2p-tutorial.rst:-1 msgid "docker-compose deployment for quickstart example" msgstr "快速开始对应的 docker-compose 部署示例" -#: ../../intro/p2p-tutorial.rst:50 +#: ../../intro/p2p-tutorial.rst:58 msgid "To demonstrate SCQL, we conducted the following simplified operations:" msgstr "为了演示 SCQL，我们进行了以下简化操作：" -#: ../../intro/p2p-tutorial.rst:52 +#: ../../intro/p2p-tutorial.rst:60 msgid "" "The SCQLBrokers and SCQLEngines use the same database server but are " "separated by distinct database names." msgstr "SCQLBrokers 和 SCQLEngines 使用同一个数据库服务器，但是使用不同的数据库名称进行区分。" -#: ../../intro/p2p-tutorial.rst:53 +#: ../../intro/p2p-tutorial.rst:61 msgid "" "The SCQLBrokers are served through the HTTP protocol. However, for " "production environments, it is recommended to use HTTPS instead. Please " -"check :ref:`TLS Configuration ` for details." +"check :ref:`TLS Configuration ` for details." msgstr "" "SCQLBrokers 是通过 HTTP 协议提供服务的。然而，对于生产环境，建议使用 HTTPS 协议来代替。请查看 :ref:`TLS 配置 " -"` 以了解详情。" +"` 以了解详情。" -#: ../../intro/p2p-tutorial.rst:54 +#: ../../intro/p2p-tutorial.rst:62 msgid "" "The brokerctl can send requests to both SCQLBrokers, but in production " "environments, the SCQLBroker should use the local port and only listen to" " local requests for security." -msgstr "演示环境中 brokerctl 可以向两个 SCQLBrokers 发送请求，但在生产环境中，SCQLBroker 应使用本地端口，并且仅监听本地请求以确保安全。" +msgstr "" +"演示环境中 brokerctl 可以向两个 SCQLBrokers 发送请求，但在生产环境中，SCQLBroker " +"应使用本地端口，并且仅监听本地请求以确保安全。" -#: ../../intro/p2p-tutorial.rst:63 +#: ../../intro/p2p-tutorial.rst:71 msgid "" "SCQLBroker for alice is listening on ``http://localhost:8081`` while bob " "is on ``http://localhost:8082`` you could send requests to them via " "brokerctl." -msgstr "alice 的 SCQLBroker 监听 ``http://localhost:8081``，而 bob 则监听 ``http://localhost:8082``，您可以通过 brokerctl 向他们发送请求。" +msgstr "" +"alice 的 SCQLBroker 监听 ``http://localhost:8081``，而 bob 则监听 " +"``http://localhost:8082``，您可以通过 brokerctl 向他们发送请求。" -#: ../../intro/p2p-tutorial.rst:66 +#: ../../intro/p2p-tutorial.rst:74 msgid "" "Please checkout `examples/p2p-tutorial/README.md " "`_ troubleshooting section for help if you encounter " "any problems." -msgstr "如果你遇到任何问题，请查看 `examples/p2p-tutorial/README.md " -"`_ 故障排除部分以获得帮助。" +msgstr "" +"如果你遇到任何问题，请查看 `examples/p2p-tutorial/README.md " +"`_ 故障排除部分以获得帮助。" -#: ../../intro/p2p-tutorial.rst:71 +#: ../../intro/p2p-tutorial.rst:79 msgid "Create project, invite party to join" msgstr "创建项目，并邀请参与方加入" -#: ../../intro/p2p-tutorial.rst:120 +#: ../../intro/p2p-tutorial.rst:128 msgid "Create tables" msgstr "创建数据表" -#: ../../intro/p2p-tutorial.rst:157 +#: ../../intro/p2p-tutorial.rst:165 msgid "Grant CCL" msgstr "授权 CCL" -#: ../../intro/p2p-tutorial.rst:212 +#: ../../intro/p2p-tutorial.rst:220 msgid "Do query" msgstr "查询" - diff --git a/docs/locales/zh_CN/LC_MESSAGES/intro/tutorial.po b/docs/locales/zh_CN/LC_MESSAGES/intro/tutorial.po index 9e5e7026..ba1c27c3 100644 --- a/docs/locales/zh_CN/LC_MESSAGES/intro/tutorial.po +++ b/docs/locales/zh_CN/LC_MESSAGES/intro/tutorial.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: SCQL \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-16 10:08+0800\n" +"POT-Creation-Date: 2023-12-04 16:14+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language: zh_CN\n" @@ -19,34 +19,31 @@ msgstr "" "Generated-By: Babel 2.12.1\n" #: ../../intro/tutorial.rst:2 -msgid "Quickstart tutorial" -msgstr "快速开始" +msgid "Centralized Deployment Quickstart Tutorial" +msgstr "以中心化模式快速开始" -#: ../../intro/tutorial.rst:5 -msgid "TL;DR" -msgstr "摘要" - -#: ../../intro/tutorial.rst:7 +#: ../../intro/tutorial.rst:4 msgid "" -"Use ``docker-compose`` to deploy a standalone SCQL, then use scdbclient " -"to query" -msgstr "使用 ``docker-compose`` 来部署一个独立的 SCQL，然后使用 scdbclient 来查询" +"In this tutorial, you will deploy the SCQL system on a single machine, " +"then simulate the project settings for joint data analysis between two " +"parties, and finally initiate a joint analysis query." +msgstr "在本教程中，您将在单机上部署 SCQL 系统，然后模拟两方联合数据分析场景，对项目设置并发起联合分析查询。" -#: ../../intro/tutorial.rst:11 +#: ../../intro/tutorial.rst:8 msgid "Prerequisites" msgstr "先决条件" -#: ../../intro/tutorial.rst:15 +#: ../../intro/tutorial.rst:12 msgid "Build scdbclient & scqltool" msgstr "构建 scdbclient & scqltool" -#: ../../intro/tutorial.rst:17 +#: ../../intro/tutorial.rst:14 msgid "" "``scdbclient`` is a command-line client for SCDBServer, we would use it " "to submit queries to SCDBServer and fetch the query results back." msgstr "``scdbclient`` 是 SCDBServer 的一个命令行客户端，我们将用它来向 SCDBServer 提交查询，并取回查询结果。" -#: ../../intro/tutorial.rst:30 +#: ../../intro/tutorial.rst:27 msgid "" "``scqltool`` is a command-line tool to help you generate create-user-" "statement query. Since create-user-statement query should contain message" @@ -56,22 +53,22 @@ msgstr "" "``scqltool`` 是一个命令行工具，可以帮助您生成创建用户的 query 语句。由于创建用户的 query " "语句应包含消息及其由当事人私钥加签的签名，因此很难手动编写。" -#: ../../intro/tutorial.rst:43 +#: ../../intro/tutorial.rst:40 msgid "Generate PrivateKey and Exchange PublicKey" msgstr "生成私钥并交换公钥" -#: ../../intro/tutorial.rst:50 +#: ../../intro/tutorial.rst:47 msgid "" "The setup.sh script will generate private key for each party, and " "exchange public key with peers, add peers public key to " "authorized_profile.json configuration." msgstr "setup.sh 脚本将为各方生成私钥，并交换各参与方的公钥，将公钥添加到 authorized_profile.json 配置中。" -#: ../../intro/tutorial.rst:53 +#: ../../intro/tutorial.rst:50 msgid "Start SCQL Service" msgstr "启动 SCQL 服务" -#: ../../intro/tutorial.rst:55 +#: ../../intro/tutorial.rst:52 msgid "" "You could start SCQL service via `docker-compose " "`_, " @@ -87,17 +84,17 @@ msgstr "" msgid "docker-compose deployment for quickstart example" msgstr "快速入门示例的 docker-compose 部署" -#: ../../intro/tutorial.rst:62 +#: ../../intro/tutorial.rst:59 msgid "To demonstrate SCQL, we conducted the following simplified operations:" msgstr "为了演示 SCQL，我们进行了以下简化操作：" -#: ../../intro/tutorial.rst:64 +#: ../../intro/tutorial.rst:61 msgid "" "The SCDBServer and two other SCQLEngines use the same database server but" " are separated by distinct database names." msgstr "SCDBServer 和另外两个 SCQLEngines 使用同一个数据库服务器，但是使用不同的数据库名称进行区分。" -#: ../../intro/tutorial.rst:65 +#: ../../intro/tutorial.rst:62 msgid "" "The SCDBServer is served through the HTTP protocol. However, for " "production environments, it is recommended to use HTTPS instead. Please " @@ -106,13 +103,13 @@ msgstr "" "SCDBServer 是通过 HTTP 协议提供服务的。然而，对于生产环境，建议使用 HTTPS 协议来代替。请查看 :ref:`TLS 配置 " "` 以了解详情。" -#: ../../intro/tutorial.rst:74 +#: ../../intro/tutorial.rst:71 msgid "" "SCDBServer is listening on ``http://localhost:8080``, you could send " "queries to it via scdbclient." msgstr "SCDBServer 监听 ``http://localhost:8080`` ，你可以通过 scdbclient 向它发送查询。" -#: ../../intro/tutorial.rst:77 +#: ../../intro/tutorial.rst:74 msgid "" "Please checkout `examples/scdb-tutorial/README.md " "`_ 故障排除部分以获得帮助。" +"`_ 故障排除部分以获得帮助。" -#: ../../intro/tutorial.rst:82 +#: ../../intro/tutorial.rst:79 msgid "Create database, user and tables" msgstr "创建数据库、用户和数据表" -#: ../../intro/tutorial.rst:168 +#: ../../intro/tutorial.rst:165 msgid "Register SCQLEngine Endpoints" msgstr "注册 SCQLEngine Endpoints" -#: ../../intro/tutorial.rst:178 +#: ../../intro/tutorial.rst:175 msgid "Grant CCL" msgstr "授权 CCL" -#: ../../intro/tutorial.rst:229 +#: ../../intro/tutorial.rst:226 msgid "Do query" -msgstr "查询" - +msgstr "查询" \ No newline at end of file diff --git a/docs/locales/zh_CN/LC_MESSAGES/reference/engine-config.po b/docs/locales/zh_CN/LC_MESSAGES/reference/engine-config.po index 931faa1c..78814a23 100644 --- a/docs/locales/zh_CN/LC_MESSAGES/reference/engine-config.po +++ b/docs/locales/zh_CN/LC_MESSAGES/reference/engine-config.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: SCQL \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-16 18:46+0800\n" +"POT-Creation-Date: 2023-12-04 16:14+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language: zh_CN\n" @@ -45,449 +45,449 @@ msgstr "在 SCDB 中配置参数以 yaml 文件形式提供。" msgid "Example for SCDB" msgstr "SCDB 配置示例" -#: ../../reference/engine-config.rst:57 +#: ../../reference/engine-config.rst:56 msgid "Config in SCDB" msgstr "SCDB 配置项" -#: ../../reference/engine-config.rst:60 ../../reference/engine-config.rst:284 -#: ../../reference/engine-config.rst:378 +#: ../../reference/engine-config.rst:59 ../../reference/engine-config.rst:291 +#: ../../reference/engine-config.rst:416 msgid "Name" msgstr "名称" -#: ../../reference/engine-config.rst:60 ../../reference/engine-config.rst:284 -#: ../../reference/engine-config.rst:378 +#: ../../reference/engine-config.rst:59 ../../reference/engine-config.rst:291 +#: ../../reference/engine-config.rst:416 msgid "Default" msgstr "默认值" -#: ../../reference/engine-config.rst:60 ../../reference/engine-config.rst:284 -#: ../../reference/engine-config.rst:378 +#: ../../reference/engine-config.rst:59 ../../reference/engine-config.rst:291 +#: ../../reference/engine-config.rst:416 msgid "Description" msgstr "描述" -#: ../../reference/engine-config.rst:62 +#: ../../reference/engine-config.rst:61 msgid "scdb_host" msgstr "scdb_host" -#: ../../reference/engine-config.rst:62 ../../reference/engine-config.rst:64 -#: ../../reference/engine-config.rst:94 ../../reference/engine-config.rst:96 -#: ../../reference/engine-config.rst:98 ../../reference/engine-config.rst:100 -#: ../../reference/engine-config.rst:110 ../../reference/engine-config.rst:114 -#: ../../reference/engine-config.rst:116 ../../reference/engine-config.rst:118 -#: ../../reference/engine-config.rst:120 ../../reference/engine-config.rst:288 -#: ../../reference/engine-config.rst:292 ../../reference/engine-config.rst:294 -#: ../../reference/engine-config.rst:296 ../../reference/engine-config.rst:298 -#: ../../reference/engine-config.rst:302 ../../reference/engine-config.rst:304 -#: ../../reference/engine-config.rst:310 ../../reference/engine-config.rst:312 -#: ../../reference/engine-config.rst:314 ../../reference/engine-config.rst:316 -#: ../../reference/engine-config.rst:318 ../../reference/engine-config.rst:320 -#: ../../reference/engine-config.rst:324 ../../reference/engine-config.rst:328 -#: ../../reference/engine-config.rst:330 ../../reference/engine-config.rst:404 -#: ../../reference/engine-config.rst:420 ../../reference/engine-config.rst:432 -#: ../../reference/engine-config.rst:434 ../../reference/engine-config.rst:438 -#: ../../reference/engine-config.rst:442 ../../reference/engine-config.rst:448 -#: ../../reference/engine-config.rst:450 ../../reference/engine-config.rst:456 -#: ../../reference/engine-config.rst:460 +#: ../../reference/engine-config.rst:61 ../../reference/engine-config.rst:63 +#: ../../reference/engine-config.rst:93 ../../reference/engine-config.rst:95 +#: ../../reference/engine-config.rst:97 ../../reference/engine-config.rst:99 +#: ../../reference/engine-config.rst:109 ../../reference/engine-config.rst:113 +#: ../../reference/engine-config.rst:115 ../../reference/engine-config.rst:117 +#: ../../reference/engine-config.rst:119 ../../reference/engine-config.rst:295 +#: ../../reference/engine-config.rst:299 ../../reference/engine-config.rst:301 +#: ../../reference/engine-config.rst:303 ../../reference/engine-config.rst:305 +#: ../../reference/engine-config.rst:309 ../../reference/engine-config.rst:311 +#: ../../reference/engine-config.rst:317 ../../reference/engine-config.rst:319 +#: ../../reference/engine-config.rst:321 ../../reference/engine-config.rst:323 +#: ../../reference/engine-config.rst:325 ../../reference/engine-config.rst:329 +#: ../../reference/engine-config.rst:331 ../../reference/engine-config.rst:336 +#: ../../reference/engine-config.rst:338 ../../reference/engine-config.rst:442 +#: ../../reference/engine-config.rst:458 ../../reference/engine-config.rst:470 +#: ../../reference/engine-config.rst:472 ../../reference/engine-config.rst:476 +#: ../../reference/engine-config.rst:480 ../../reference/engine-config.rst:486 +#: ../../reference/engine-config.rst:488 ../../reference/engine-config.rst:494 +#: ../../reference/engine-config.rst:498 msgid "none" msgstr "无" -#: ../../reference/engine-config.rst:62 +#: ../../reference/engine-config.rst:61 msgid "The callback URL for the SCQLEngine to notify SCDB" msgstr "SCQLEngine 通知 SCDB 的回调 URL" -#: ../../reference/engine-config.rst:64 +#: ../../reference/engine-config.rst:63 msgid "port" msgstr "端口" -#: ../../reference/engine-config.rst:64 +#: ../../reference/engine-config.rst:63 msgid "The listening port of the SCDB server" msgstr "SCDB服务器监听端口" -#: ../../reference/engine-config.rst:66 +#: ../../reference/engine-config.rst:65 msgid "protocol" msgstr "协议" -#: ../../reference/engine-config.rst:66 ../../reference/engine-config.rst:112 +#: ../../reference/engine-config.rst:65 ../../reference/engine-config.rst:111 msgid "https" msgstr "https" -#: ../../reference/engine-config.rst:66 +#: ../../reference/engine-config.rst:65 msgid "The transfer protocol of SCDB server, supports HTTP/HTTPS" msgstr "SCDB服务器传输协议支持HTTP/HTTPS" -#: ../../reference/engine-config.rst:68 +#: ../../reference/engine-config.rst:67 msgid "query_result_callback_timeout" msgstr "query_result_callback_timeout" -#: ../../reference/engine-config.rst:68 +#: ../../reference/engine-config.rst:67 msgid "200ms" msgstr "200ms" -#: ../../reference/engine-config.rst:68 +#: ../../reference/engine-config.rst:67 msgid "Timeout for SCDB to notify the query result" msgstr "SCDB 返回查询结果的超时时间" -#: ../../reference/engine-config.rst:70 +#: ../../reference/engine-config.rst:69 ../../reference/engine-config.rst:348 msgid "session_expire_time" msgstr "session_expire_time" -#: ../../reference/engine-config.rst:70 +#: ../../reference/engine-config.rst:69 msgid "48h" msgstr "48h" -#: ../../reference/engine-config.rst:70 +#: ../../reference/engine-config.rst:69 msgid "The expiration duration of a session" msgstr "会话超时时间" -#: ../../reference/engine-config.rst:72 +#: ../../reference/engine-config.rst:71 ../../reference/engine-config.rst:350 msgid "session_expire_check_time" msgstr "session_expire_check_time" -#: ../../reference/engine-config.rst:72 +#: ../../reference/engine-config.rst:71 msgid "1h" msgstr "1h" -#: ../../reference/engine-config.rst:72 +#: ../../reference/engine-config.rst:71 msgid "The cleanup interval of expired session" msgstr "超时会话的清理间隔" -#: ../../reference/engine-config.rst:74 +#: ../../reference/engine-config.rst:73 msgid "password_check" msgstr "password_check" -#: ../../reference/engine-config.rst:74 ../../reference/engine-config.rst:78 -#: ../../reference/engine-config.rst:124 ../../reference/engine-config.rst:380 -#: ../../reference/engine-config.rst:384 ../../reference/engine-config.rst:400 -#: ../../reference/engine-config.rst:416 ../../reference/engine-config.rst:430 -#: ../../reference/engine-config.rst:454 ../../reference/engine-config.rst:458 +#: ../../reference/engine-config.rst:73 ../../reference/engine-config.rst:77 +#: ../../reference/engine-config.rst:123 ../../reference/engine-config.rst:418 +#: ../../reference/engine-config.rst:422 ../../reference/engine-config.rst:438 +#: ../../reference/engine-config.rst:454 ../../reference/engine-config.rst:468 +#: ../../reference/engine-config.rst:492 ../../reference/engine-config.rst:496 msgid "true" msgstr "true" -#: ../../reference/engine-config.rst:74 +#: ../../reference/engine-config.rst:73 msgid "Whether to validate password strength when create a user" msgstr "创建用户时是否验证密码强度" -#: ../../reference/engine-config.rst:76 ../../reference/engine-config.rst:308 +#: ../../reference/engine-config.rst:75 ../../reference/engine-config.rst:315 msgid "log_level" msgstr "log_level" -#: ../../reference/engine-config.rst:76 ../../reference/engine-config.rst:308 +#: ../../reference/engine-config.rst:75 ../../reference/engine-config.rst:315 msgid "info" msgstr "info" -#: ../../reference/engine-config.rst:76 ../../reference/engine-config.rst:308 +#: ../../reference/engine-config.rst:75 ../../reference/engine-config.rst:315 msgid "The type and severity of a logged event" msgstr "日志等级" -#: ../../reference/engine-config.rst:78 ../../reference/engine-config.rst:384 +#: ../../reference/engine-config.rst:77 ../../reference/engine-config.rst:422 msgid "enable_audit_logger" msgstr "enable_audit_logger" -#: ../../reference/engine-config.rst:78 +#: ../../reference/engine-config.rst:77 msgid "Whether to enable audit logger" msgstr "是否记录审计日志" -#: ../../reference/engine-config.rst:80 +#: ../../reference/engine-config.rst:79 msgid "audit.audit_log_file" msgstr "audit.audit_log_file" -#: ../../reference/engine-config.rst:80 ../../reference/engine-config.rst:386 +#: ../../reference/engine-config.rst:79 ../../reference/engine-config.rst:424 msgid "audit/audit.log" msgstr "audit/audit.log" -#: ../../reference/engine-config.rst:80 ../../reference/engine-config.rst:386 +#: ../../reference/engine-config.rst:79 ../../reference/engine-config.rst:424 msgid "The file to save basic information about a query" msgstr "存储基础审计信息的日志文件" -#: ../../reference/engine-config.rst:82 +#: ../../reference/engine-config.rst:81 msgid "audit.audit_detail_file" msgstr "audit.audit_detail_file" -#: ../../reference/engine-config.rst:82 ../../reference/engine-config.rst:388 +#: ../../reference/engine-config.rst:81 ../../reference/engine-config.rst:426 msgid "audit/detail.log" msgstr "audit/detail.log" -#: ../../reference/engine-config.rst:82 ../../reference/engine-config.rst:388 +#: ../../reference/engine-config.rst:81 ../../reference/engine-config.rst:426 msgid "The file to save more detailed information about a query" msgstr "存储补充审计信息的日志文件" -#: ../../reference/engine-config.rst:84 +#: ../../reference/engine-config.rst:83 msgid "audit.audit_max_size" msgstr "audit.audit_max_size" -#: ../../reference/engine-config.rst:84 +#: ../../reference/engine-config.rst:83 msgid "500" msgstr "5000" -#: ../../reference/engine-config.rst:84 +#: ../../reference/engine-config.rst:83 msgid "The maximum size of the audit log file before it gets rotated, unit: MB" msgstr "单个审计日志文件的最大容量，单位为MB" -#: ../../reference/engine-config.rst:86 +#: ../../reference/engine-config.rst:85 msgid "audit.audit_max_backups" msgstr "audit.audit_max_backups" -#: ../../reference/engine-config.rst:86 +#: ../../reference/engine-config.rst:85 msgid "0" msgstr "0" -#: ../../reference/engine-config.rst:86 +#: ../../reference/engine-config.rst:85 msgid "" "The maximum number of old audit log files to retain, default 0 to retain " "all old log files" msgstr "系统中保留的审计日志文件的最大数量，0 表示保留所有的日志文件" -#: ../../reference/engine-config.rst:88 +#: ../../reference/engine-config.rst:87 msgid "audit.audit_max_age_days" msgstr "audit.audit_max_age_days" -#: ../../reference/engine-config.rst:88 ../../reference/engine-config.rst:390 +#: ../../reference/engine-config.rst:87 ../../reference/engine-config.rst:428 msgid "180" msgstr "180" -#: ../../reference/engine-config.rst:88 +#: ../../reference/engine-config.rst:87 msgid "The maximum number of days to retain old log files" msgstr "单个审计日志文件所能保存的最长时间，单位：天" -#: ../../reference/engine-config.rst:90 +#: ../../reference/engine-config.rst:89 msgid "audit.audit_max_compress" msgstr "audit.audit_max_compress" -#: ../../reference/engine-config.rst:90 ../../reference/engine-config.rst:92 -#: ../../reference/engine-config.rst:326 ../../reference/engine-config.rst:402 -#: ../../reference/engine-config.rst:418 ../../reference/engine-config.rst:424 -#: ../../reference/engine-config.rst:436 ../../reference/engine-config.rst:440 -#: ../../reference/engine-config.rst:452 +#: ../../reference/engine-config.rst:89 ../../reference/engine-config.rst:91 +#: ../../reference/engine-config.rst:334 ../../reference/engine-config.rst:440 +#: ../../reference/engine-config.rst:456 ../../reference/engine-config.rst:462 +#: ../../reference/engine-config.rst:474 ../../reference/engine-config.rst:478 +#: ../../reference/engine-config.rst:490 msgid "false" msgstr "false" -#: ../../reference/engine-config.rst:90 +#: ../../reference/engine-config.rst:89 msgid "Whether the rotated log files should be compressed" msgstr "是否对审计日志进行压缩" -#: ../../reference/engine-config.rst:92 ../../reference/engine-config.rst:326 +#: ../../reference/engine-config.rst:91 ../../reference/engine-config.rst:334 msgid "security_compromise.reveal_group_mark" msgstr "security_compromise.reveal_group_mark" -#: ../../reference/engine-config.rst:92 ../../reference/engine-config.rst:326 +#: ../../reference/engine-config.rst:91 ../../reference/engine-config.rst:334 msgid "Whether to reveal group_mark directly for group by" msgstr "是否在计算 group by 的时候泄露分组标记信息" -#: ../../reference/engine-config.rst:94 +#: ../../reference/engine-config.rst:93 msgid "tls.cert_file" msgstr "tls.cert_file" -#: ../../reference/engine-config.rst:94 +#: ../../reference/engine-config.rst:93 msgid "Certificate file path to enable TSL, supports crt/pem type" msgstr "启用支持 crt/pem 类型的TSL证书文件路径" -#: ../../reference/engine-config.rst:96 +#: ../../reference/engine-config.rst:95 msgid "tls.key_file" msgstr "tls.key_file" -#: ../../reference/engine-config.rst:96 +#: ../../reference/engine-config.rst:95 msgid "Private key file path to enable TSL, supports key/pem type" msgstr "启用支持 key/pem 类型的 TLS 私钥文件路径" -#: ../../reference/engine-config.rst:98 ../../reference/engine-config.rst:328 +#: ../../reference/engine-config.rst:97 ../../reference/engine-config.rst:336 msgid "storage.type" msgstr "storage.type" -#: ../../reference/engine-config.rst:98 +#: ../../reference/engine-config.rst:97 msgid "" "Database kind in SCDB, supports MYSQL/SQLite3, MYSQL is recommended, " "SQLite3 may have problems with concurrency" msgstr "SCDB 使用的数据库类型， 支持 MYSQL/SQLite3，推荐使用 MYSQL，SQLite3在并发下可能出问题" -#: ../../reference/engine-config.rst:100 ../../reference/engine-config.rst:330 +#: ../../reference/engine-config.rst:99 ../../reference/engine-config.rst:338 msgid "storage.conn_str" msgstr "storage.conn_str" -#: ../../reference/engine-config.rst:100 ../../reference/engine-config.rst:330 +#: ../../reference/engine-config.rst:99 ../../reference/engine-config.rst:338 msgid "Used to connect to a database" msgstr "数据库连接串" -#: ../../reference/engine-config.rst:102 ../../reference/engine-config.rst:332 +#: ../../reference/engine-config.rst:101 ../../reference/engine-config.rst:340 msgid "storage.max_idle_conns" msgstr "storage.max_idle_conns" -#: ../../reference/engine-config.rst:102 ../../reference/engine-config.rst:104 -#: ../../reference/engine-config.rst:332 ../../reference/engine-config.rst:334 +#: ../../reference/engine-config.rst:101 ../../reference/engine-config.rst:103 +#: ../../reference/engine-config.rst:340 ../../reference/engine-config.rst:342 msgid "1" msgstr "1" -#: ../../reference/engine-config.rst:102 ../../reference/engine-config.rst:332 +#: ../../reference/engine-config.rst:101 ../../reference/engine-config.rst:340 msgid "Maximum number of connections in idle connection pool" msgstr "空闲连接池最大连接数" -#: ../../reference/engine-config.rst:104 ../../reference/engine-config.rst:334 +#: ../../reference/engine-config.rst:103 ../../reference/engine-config.rst:342 msgid "storage.max_open_conns" msgstr "storage.max_open_conns" -#: ../../reference/engine-config.rst:104 ../../reference/engine-config.rst:334 +#: ../../reference/engine-config.rst:103 ../../reference/engine-config.rst:342 msgid "Maximum number of open connections to the database" msgstr "数据库最大连接数" -#: ../../reference/engine-config.rst:106 ../../reference/engine-config.rst:336 +#: ../../reference/engine-config.rst:105 ../../reference/engine-config.rst:344 msgid "storage.conn_max_idle_time" msgstr "storage.conn_max_idle_time" -#: ../../reference/engine-config.rst:106 ../../reference/engine-config.rst:108 -#: ../../reference/engine-config.rst:336 ../../reference/engine-config.rst:338 +#: ../../reference/engine-config.rst:105 ../../reference/engine-config.rst:107 +#: ../../reference/engine-config.rst:344 ../../reference/engine-config.rst:346 msgid "-1s" msgstr "-1s" -#: ../../reference/engine-config.rst:106 ../../reference/engine-config.rst:336 +#: ../../reference/engine-config.rst:105 ../../reference/engine-config.rst:344 msgid "Maximum amount of time a connection may be idle" msgstr "连接处于空闲状态的最长时间" -#: ../../reference/engine-config.rst:108 ../../reference/engine-config.rst:338 +#: ../../reference/engine-config.rst:107 ../../reference/engine-config.rst:346 msgid "storage.conn_max_lifetime" msgstr "storage.conn_max_lifetime" -#: ../../reference/engine-config.rst:108 ../../reference/engine-config.rst:338 +#: ../../reference/engine-config.rst:107 ../../reference/engine-config.rst:346 msgid "Maximum amount of time a connection may be reused" msgstr "可重复连接使用的最长时间" -#: ../../reference/engine-config.rst:110 ../../reference/engine-config.rst:320 +#: ../../reference/engine-config.rst:109 ../../reference/engine-config.rst:325 msgid "engine.timeout" msgstr "engine.timeout" -#: ../../reference/engine-config.rst:110 +#: ../../reference/engine-config.rst:109 msgid "Timeout for SCDB to send message to engine" msgstr "SCDB 向 SCQLEngine 发送消息的响应超时时间" -#: ../../reference/engine-config.rst:112 ../../reference/engine-config.rst:322 +#: ../../reference/engine-config.rst:111 ../../reference/engine-config.rst:327 msgid "engine.protocol" msgstr "engine.protocol" -#: ../../reference/engine-config.rst:112 +#: ../../reference/engine-config.rst:111 msgid "The transfer protocol of Engine, support http/https" msgstr "SCQLEngine 传输协议，支持 http/https" -#: ../../reference/engine-config.rst:114 ../../reference/engine-config.rst:324 +#: ../../reference/engine-config.rst:113 ../../reference/engine-config.rst:329 msgid "engine.content_type" msgstr "engine.content_type" -#: ../../reference/engine-config.rst:114 +#: ../../reference/engine-config.rst:113 msgid "The original media type in post body from SCDB to engine" msgstr "从 SCDB 向 SCQLEngine 实际发送的数据类型" -#: ../../reference/engine-config.rst:116 +#: ../../reference/engine-config.rst:115 msgid "engine.spu.protocol" msgstr "engine.spu.protocol" -#: ../../reference/engine-config.rst:116 +#: ../../reference/engine-config.rst:115 msgid "The mpc protocol for engine to work with" msgstr "SCQLEngine 使用的 mpc 协议" -#: ../../reference/engine-config.rst:118 +#: ../../reference/engine-config.rst:117 msgid "engine.spu.field" msgstr "engine.spu.field" -#: ../../reference/engine-config.rst:118 +#: ../../reference/engine-config.rst:117 msgid "A security parameter type for engine to work with" msgstr "SCQLEngine 所使用的安全参数类型" -#: ../../reference/engine-config.rst:120 +#: ../../reference/engine-config.rst:119 msgid "engine.spu.sigmoid_mode" msgstr "engine.spu.sigmoid_mode" -#: ../../reference/engine-config.rst:120 +#: ../../reference/engine-config.rst:119 msgid "The sigmoid approximation method for engine to work with" msgstr "SCQLEngine 中 MPC 协议中的 Sigmoid 方法" -#: ../../reference/engine-config.rst:122 +#: ../../reference/engine-config.rst:121 msgid "party_auth.method" msgstr "party_auth.method" -#: ../../reference/engine-config.rst:122 +#: ../../reference/engine-config.rst:121 msgid "pubkey" msgstr "pubkey" -#: ../../reference/engine-config.rst:122 +#: ../../reference/engine-config.rst:121 msgid "" "Method to authenticate the participant when registering a user, supports " "pubkey/token" msgstr "注册用户时验证参与者的方法，支持 pubkey/token 认证" -#: ../../reference/engine-config.rst:124 +#: ../../reference/engine-config.rst:123 msgid "party_auth.enable_timestamp_check" msgstr "party_auth.enable_timestamp_check" -#: ../../reference/engine-config.rst:124 +#: ../../reference/engine-config.rst:123 msgid "" "When using pubkey authentication, whether to check the signed timestamp " "to avoid `replay attacks`_" msgstr "使用 pubkey 认证时，是否检查签名时间戳以避免 `replay attacks`_" -#: ../../reference/engine-config.rst:126 +#: ../../reference/engine-config.rst:125 msgid "party_auth.validity_period" msgstr "party_auth.validity_period" -#: ../../reference/engine-config.rst:126 +#: ../../reference/engine-config.rst:125 msgid "30s" msgstr "30s" -#: ../../reference/engine-config.rst:126 +#: ../../reference/engine-config.rst:125 msgid "" "When enable timestamp check, SCDB will check whether signed timestamp is" " within (now() - validity_period, now())" msgstr "当启用时间戳检查时，SCDB 将检查签名时间戳是否在 (now() - valid_period, now()) 内" -#: ../../reference/engine-config.rst:133 +#: ../../reference/engine-config.rst:132 msgid "Config for SecurityCompromise" msgstr "安全退让配置" -#: ../../reference/engine-config.rst:135 +#: ../../reference/engine-config.rst:134 msgid "" -"SCDB provides some security compromise options, which can be selectively " +"SCQL provides some security compromise options, which can be selectively " "enabled when the security risk is acceptable to speed up the overall " "operation." -msgstr "SCDB 提供了一些安全妥协选项，当安全风险可以接受时可以选择性地启用这些选项，以加快整体运行速度" +msgstr "SCQL 提供了一些安全妥协选项，当安全风险可以接受时可以选择性地启用这些选项，以加快整体运行速度" -#: ../../reference/engine-config.rst:137 +#: ../../reference/engine-config.rst:136 msgid "" -"1. reveal_group_mark: default disable, if enabled, SCDB will expose " +"1. reveal_group_mark: default disable, if enabled, SCQL will expose " "grouping information(size of each group) when calculating group-by-" "aggregation, thereby avoiding the overhead caused by pre-shuffle. " "``risk``: group size will be leaked, which is equivalent to the result of" " count(*)" msgstr "" -"1. reveal_group_mark: 默认禁用，如果启用，SCDB 在计算分组聚合时会公开分组信息（每个组的大小），从而避免前置 " +"1. reveal_group_mark: 默认禁用，如果启用，SCQL 在计算分组聚合时会公开分组信息（每个组的大小），从而避免前置 " "shuffle 带来的开销。``风险``：分组大小会泄露，等价于泄露 count(*) 的结果" -#: ../../reference/engine-config.rst:140 +#: ../../reference/engine-config.rst:139 msgid "A typical config of security_compromise can be like:" msgstr "典型的配置如下：" -#: ../../reference/engine-config.rst:151 +#: ../../reference/engine-config.rst:150 msgid "Config for storage" msgstr "存储配置" -#: ../../reference/engine-config.rst:152 +#: ../../reference/engine-config.rst:151 msgid "" -"Database in SCDB is used to store the SCQL system data, such as CCL and " -"user information, currently SCDB support MySQL/SQLite3. You can connect " -"to a database by setting ``conn_str`` and ``type`` in the storage config." +"Database is used to store the SCQL system data, such as CCL and user " +"information, currently support MySQL/SQLite3. You can connect to a " +"database by setting ``conn_str`` and ``type`` in the storage config." msgstr "" -"SCDB 中的数据库用于存储 SCQL 系统数据，如 CCL 和用户信息，目前 SCDB 支持 MySQL/SQLite3 。您可以通过配置项 " +"数据库用于存储 SCQL 系统数据，如 CCL 和用户信息，目前 SCDB 支持 MySQL/SQLite3 。您可以通过配置项 " "``conn_str`` 和 ``type`` 来连接不同的数据库。" -#: ../../reference/engine-config.rst:155 +#: ../../reference/engine-config.rst:154 msgid "type" msgstr "type" -#: ../../reference/engine-config.rst:155 +#: ../../reference/engine-config.rst:154 msgid "" "The database type, which can be set as mysql/sqlite. And MySQL is " "recommended, which has been fully tested." msgstr "数据库类型可以设置为 mysql/sqlite，我们更加推荐使用 MySQL 来作为 SCDB 的数据库，其相关测试更加充分。" -#: ../../reference/engine-config.rst:173 +#: ../../reference/engine-config.rst:172 msgid "conn_str" msgstr "conn_str" -#: ../../reference/engine-config.rst:158 +#: ../../reference/engine-config.rst:157 msgid "" "MySQL string format, see `dsn-data-source-name `_ for more information." @@ -495,39 +495,39 @@ msgstr "" "MySQL语句格式, 更多信息请参考: `dsn-data-source-name `_ " -#: ../../reference/engine-config.rst:160 +#: ../../reference/engine-config.rst:159 msgid "[username[:password]@][protocol[(address)]]/dbname[?param1=value1&...¶mN=valueN]" msgstr "[username[:password]@][protocol[(address)]]/dbname[?param1=value1&...¶mN=valueN]" -#: ../../reference/engine-config.rst:163 +#: ../../reference/engine-config.rst:162 msgid "MySQL string example:" msgstr "MySQL 连接串示例：" -#: ../../reference/engine-config.rst:165 +#: ../../reference/engine-config.rst:164 msgid "``user:pass@tcp(127.0.0.1:3306)/dbname?charset=utf8mb4&parseTime=True&loc=Local&interpolateParams=true``" msgstr "``user:pass@tcp(127.0.0.1:3306)/dbname?charset=utf8mb4&parseTime=True&loc=Local&interpolateParams=true``" -#: ../../reference/engine-config.rst:167 +#: ../../reference/engine-config.rst:166 msgid "SQLite3 string format:" msgstr "SQLite3 连接串示例：" -#: ../../reference/engine-config.rst:169 +#: ../../reference/engine-config.rst:168 msgid "more infos: https://github.com/mattn/go-sqlite3#connection-string." msgstr "参考: https://github.com/mattn/go-sqlite3#connection-string. " -#: ../../reference/engine-config.rst:171 +#: ../../reference/engine-config.rst:170 msgid "SQLite3 string example:" msgstr "SQLite3 连接串示例：" -#: ../../reference/engine-config.rst:173 +#: ../../reference/engine-config.rst:172 msgid "``scdb.db``" msgstr "``scdb.db``" -#: ../../reference/engine-config.rst:175 +#: ../../reference/engine-config.rst:174 msgid "A typical config of storage can be like:" msgstr "典型的存储配置如下：" -#: ../../reference/engine-config.rst:188 +#: ../../reference/engine-config.rst:187 msgid "" "To handle time.Time correctly, you need to include parseTime as a " "parameter. To fully support UTF-8 encoding, you need to change " @@ -536,17 +536,17 @@ msgstr "" "正确处理 time.Time 需要包含 parseTime 参数。为了完全支持 UTF-8 编码，需要将 ``charset=utf8`` 更改为" " ``charset=utf8mb4`` " -#: ../../reference/engine-config.rst:192 ../../reference/engine-config.rst:584 +#: ../../reference/engine-config.rst:191 ../../reference/engine-config.rst:624 msgid "Config for audit" msgstr "审计日志配置" -#: ../../reference/engine-config.rst:194 +#: ../../reference/engine-config.rst:193 msgid "" "Audit log are used to record the SCDB activities during query execution. " "It has two types: basic audit log and detail audit log." msgstr "SCDB 的审计日志是用来记录 SCDB 在执行 query 过程中所产生的一系列事件，它有两种类型：基础审计日志和补充审计日志。" -#: ../../reference/engine-config.rst:196 +#: ../../reference/engine-config.rst:195 msgid "" "The basic audit log are used to record the basic information of a query, " "such as the result and user information, while the detail audit log " @@ -560,7 +560,7 @@ msgstr "" " `scdb_audit " "`_ 。" -#: ../../reference/engine-config.rst:198 +#: ../../reference/engine-config.rst:197 msgid "" "When the audit log has reaches the maximum size ( set by " "``audit_max_size``), SCDB will save the audit log as ``name-" @@ -575,7 +575,7 @@ msgstr "" "``audit_log_file`` 中设置的不带后缀的文件名，`timestamp` 是当前时间（格式为 " "`2006-01-02T15-04-05.000`），`ext` 是在 ``audit_log_file`` 中设置的后缀名。" -#: ../../reference/engine-config.rst:201 +#: ../../reference/engine-config.rst:200 msgid "" "For example, if ``audit_log_file`` set as `audit/audit.log`, a backup " "created at 6:30pm on Nov 11 2016 would be saved to " @@ -585,11 +585,11 @@ msgstr "" "在2016年11月4日18:30归档的审计日志会被保存至 `./audit/audit-2016-11-04T18-30-00.000.log` " "。" -#: ../../reference/engine-config.rst:205 +#: ../../reference/engine-config.rst:204 msgid "Password check" msgstr "密码校验" -#: ../../reference/engine-config.rst:206 +#: ../../reference/engine-config.rst:205 msgid "" "``password_check`` serves to validate password strength. For ALTER USER, " "CREATE USER statements, if it's true, the password should be at least 16 " @@ -599,17 +599,24 @@ msgstr "" "`password_check` 用于验证密码强度校验。如果该参数设置为true， 对于 ALTER USER、CREATE USER " "语句，其所涉及的密码长度至少为 16 个字符，其中包括数字、小写字母、大写字母和特殊字符。" -#: ../../reference/engine-config.rst:212 +#: ../../reference/engine-config.rst:211 msgid "Config for TLS" msgstr "TLS 配置" -#: ../../reference/engine-config.rst:213 +#: ../../reference/engine-config.rst:212 msgid "" "If you need to enable TLS in SCDB, please refer to the following " "configuration." msgstr "如果需要在 SCDB 中启用 TLS ，请参考以下配置。" -#: ../../reference/engine-config.rst:225 +#: ../../reference/engine-config.rst:226 ../../reference/engine-config.rst:375 +msgid "" +"Self-signed CA files may not be trusted by default, please refer to " +"`Trouble shooting `_ for help." +msgstr "默认情况下，自签的 CA 文件可能不受信任，请参阅 `故障排除 `_ 获取帮助。" + +#: ../../reference/engine-config.rst:228 msgid "" "Additionally, it is necessary to configure the SCQLEngine to work with " "SSL, please refer :ref:`Config for SSL in SCQLEngine `." @@ -617,11 +624,11 @@ msgstr "" "除此之外，用户还需要设置 :ref:`SCQLEngine 的 SSL 配置 `，以保证 SCDB 和 " "SCQLEngine 能正常工作。" -#: ../../reference/engine-config.rst:229 +#: ../../reference/engine-config.rst:232 msgid "Config for SPU" msgstr "SPU 配置" -#: ../../reference/engine-config.rst:230 +#: ../../reference/engine-config.rst:233 msgid "" "SCQL supports different mpc protocol powered by SPU, you can choose " "different mpc protocol by setting SPU runtime config. Protocol **SEMI2K**" @@ -634,208 +641,227 @@ msgstr "" "`_" " 。" -#: ../../reference/engine-config.rst:244 +#: ../../reference/engine-config.rst:247 msgid "SCQLBroker configuration options" msgstr "SCQLBroker 配置说明" -#: ../../reference/engine-config.rst:246 +#: ../../reference/engine-config.rst:249 msgid "" "SCQLBroker, like SCDB, uses yaml files to configure parameters, The " "majority of their configuration items are the same." msgstr "SCQLBroker 和 SCDB一样，使用 yaml 文件配置参数，两者的配置项也大体相同" -#: ../../reference/engine-config.rst:249 +#: ../../reference/engine-config.rst:252 msgid "Example for SCQLBroker" msgstr "SCQLBroker 配置示例" -#: ../../reference/engine-config.rst:281 +#: ../../reference/engine-config.rst:288 msgid "Config in SCQLBroker" msgstr "SCQLBroker 配置" -#: ../../reference/engine-config.rst:286 +#: ../../reference/engine-config.rst:293 msgid "intra_server.host" msgstr "intra_server.host" -#: ../../reference/engine-config.rst:286 +#: ../../reference/engine-config.rst:293 msgid "127.0.0.1" msgstr "127.0.0.1" -#: ../../reference/engine-config.rst:286 +#: ../../reference/engine-config.rst:293 msgid "" "The host where SCQLBroker listens for IntraServer requests, default " "localhost for safety" msgstr "SCQLBroker 监听 IntraServer 请求的 host，为了安全起见，默认 localhost" -#: ../../reference/engine-config.rst:288 +#: ../../reference/engine-config.rst:295 msgid "intra_server.port" msgstr "intra_server.port" -#: ../../reference/engine-config.rst:288 +#: ../../reference/engine-config.rst:295 msgid "The port on which SCQLBroker listens for IntraServer requests" msgstr "SCQLBroker 监听 IntraServer 请求的端口" -#: ../../reference/engine-config.rst:290 +#: ../../reference/engine-config.rst:297 msgid "intra_server.protocol" msgstr "intra_server.protocol" -#: ../../reference/engine-config.rst:290 ../../reference/engine-config.rst:300 -#: ../../reference/engine-config.rst:322 +#: ../../reference/engine-config.rst:297 ../../reference/engine-config.rst:307 +#: ../../reference/engine-config.rst:327 msgid "http" msgstr "http" -#: ../../reference/engine-config.rst:290 +#: ../../reference/engine-config.rst:297 msgid "The transfer protocol of IntraServer, supports HTTP/HTTPS" msgstr "IntraServer 传输协议，支持 HTTP/HTTPS" -#: ../../reference/engine-config.rst:292 +#: ../../reference/engine-config.rst:299 msgid "intra_server.cert_file" msgstr "intra_server.cert_file" -#: ../../reference/engine-config.rst:292 +#: ../../reference/engine-config.rst:299 msgid "" "Certificate file path for IntraServer to enable HTTPS, supports crt/pem " "type" msgstr "启用 IntraServer HTTPS 的证书文件路径，支持 crt/pem 类型" -#: ../../reference/engine-config.rst:294 +#: ../../reference/engine-config.rst:301 msgid "intra_server.key_file" msgstr "intra_server.key_file" -#: ../../reference/engine-config.rst:294 +#: ../../reference/engine-config.rst:301 msgid "" "Private key file path for IntraServer to enable HTTPS, supports key/pem " "type" msgstr "启用 IntraServer HTTPS 的私钥文件路径，支持 key/pem 类型" -#: ../../reference/engine-config.rst:296 +#: ../../reference/engine-config.rst:303 msgid "inter_server.host" msgstr "" -#: ../../reference/engine-config.rst:296 +#: ../../reference/engine-config.rst:303 msgid "The host where SCQLBroker listens for InterServer requests" msgstr "SCQLBroker 监听 InterServer 请求的 host" -#: ../../reference/engine-config.rst:298 +#: ../../reference/engine-config.rst:305 msgid "inter_server.port" msgstr "" -#: ../../reference/engine-config.rst:298 +#: ../../reference/engine-config.rst:305 msgid "The port on which SCQLBroker listens for InterServer requests" msgstr "SCQLBroker 监听 InterServer 请求的端口" -#: ../../reference/engine-config.rst:300 +#: ../../reference/engine-config.rst:307 msgid "inter_server.protocol" msgstr "" -#: ../../reference/engine-config.rst:300 +#: ../../reference/engine-config.rst:307 msgid "The transfer protocol of InterServer, supports HTTP/HTTPS" msgstr "InterServer 的传输协议，支持 HTTP/HTTPS" -#: ../../reference/engine-config.rst:302 +#: ../../reference/engine-config.rst:309 msgid "inter_server.cert_file" msgstr "" -#: ../../reference/engine-config.rst:302 +#: ../../reference/engine-config.rst:309 msgid "" "Certificate file path for InterServer to enable HTTPS, supports crt/pem " "type" msgstr "启用 InterServer HTTPS 的证书文件路径，支持 crt/pem 类型" -#: ../../reference/engine-config.rst:304 +#: ../../reference/engine-config.rst:311 msgid "inter_server.key_file" msgstr "" -#: ../../reference/engine-config.rst:304 +#: ../../reference/engine-config.rst:311 msgid "" "Private key file path for InterServer to enable HTTPS, supports key/pem " "type" msgstr "启用 InterServer HTTPS 的私钥文件路径，支持 key/pem 类型" -#: ../../reference/engine-config.rst:306 +#: ../../reference/engine-config.rst:313 msgid "inter_timeout" msgstr "" -#: ../../reference/engine-config.rst:306 +#: ../../reference/engine-config.rst:313 msgid "5s" msgstr "" -#: ../../reference/engine-config.rst:306 +#: ../../reference/engine-config.rst:313 msgid "Timeout for requesting InterServe" msgstr "InterServer 的请求超时时间" -#: ../../reference/engine-config.rst:310 +#: ../../reference/engine-config.rst:317 msgid "party_code" msgstr "" -#: ../../reference/engine-config.rst:310 +#: ../../reference/engine-config.rst:317 msgid "Unique identifier used to identify the party" msgstr "用于识别参与方的唯一标识" -#: ../../reference/engine-config.rst:312 +#: ../../reference/engine-config.rst:319 msgid "party_info_file" msgstr "" -#: ../../reference/engine-config.rst:312 +#: ../../reference/engine-config.rst:319 msgid "" "File path that stores information of each party, including party code, " "public key and InterServer's URL" msgstr "存储参与方信息的文件路径，包括各参与方的 party code 、公钥和 InterServer 的 URL" -#: ../../reference/engine-config.rst:314 +#: ../../reference/engine-config.rst:321 msgid "private_pem_path" msgstr "" -#: ../../reference/engine-config.rst:314 +#: ../../reference/engine-config.rst:321 msgid "" "Private key file path for party_code, which will be used to sign requests" " to other SCQLBrokers" msgstr "party_code 的私钥文件路径，将用于签署对其他 SCQLBrokers 的请求" -#: ../../reference/engine-config.rst:316 +#: ../../reference/engine-config.rst:323 msgid "intra_host" msgstr "intra_host" -#: ../../reference/engine-config.rst:316 +#: ../../reference/engine-config.rst:323 msgid "The callback URL for the local SCQLEngine to notify SCQLBroker" msgstr "SCQLEngine 通知 SCQLBroker 的回调 URL" -#: ../../reference/engine-config.rst:318 -msgid "engines" -msgstr "engines" - -#: ../../reference/engine-config.rst:318 -msgid "The URLs for local available SCQLEngines" -msgstr "本地可用 SCQLEngine 的 URL" - -#: ../../reference/engine-config.rst:320 +#: ../../reference/engine-config.rst:325 msgid "Timeout for SCQLBroker to send message to SCQLEngine" msgstr "SCQLBroker 向 SCQLEngine 发送消息的响应超时时间" -#: ../../reference/engine-config.rst:322 +#: ../../reference/engine-config.rst:327 msgid "The transfer protocol of SCQLEngine, support http/https" msgstr "SCQLEngine 传输协议，支持 http/https" -#: ../../reference/engine-config.rst:324 +#: ../../reference/engine-config.rst:329 msgid "The original media type in post body from SCQLBroker to SCQLEngine" msgstr "从 SCQLBroker 向 SCQLEngine 实际发送的数据类型" -#: ../../reference/engine-config.rst:328 +#: ../../reference/engine-config.rst:331 +msgid "engine.uris" +msgstr "engine.uris" + +#: ../../reference/engine-config.rst:331 +msgid "" +"The URIs for local SCQLEngines, which using **for_peer** to serve peer " +"engines and **for_self** to serve the SCQLBroker, if **for_self** is " +"empty, **for_peer** is used instead" +msgstr "本地 SCQLEngines 的 URI，其中 **for_peer** 为其它参与方的 SCQLEngines 提供服务， **for_self** 则为 SCQLBroker 提供服务，如果 **for_self** 为空，则默认使用 **for_peer** 来代替" + +#: ../../reference/engine-config.rst:336 msgid "" "Database kind in SCQLBroker, supports MYSQL/SQLite3, MYSQL is " "recommended, SQLite3 may have problems with concurrency" msgstr "SCQLBroker 使用的数据库类型， 支持 MYSQL/SQLite3，推荐使用 MYSQL，SQLite3在并发下可能出问题" -#: ../../reference/engine-config.rst:342 +#: ../../reference/engine-config.rst:348 +msgid "24h" +msgstr "24h" + +#: ../../reference/engine-config.rst:348 +msgid "Maximum lifespan of a job" +msgstr "任务的超时时间" + +#: ../../reference/engine-config.rst:350 +msgid "1m" +msgstr "1m" + +#: ../../reference/engine-config.rst:350 +msgid "The interval checking whether session is timeout" +msgstr "检查会话是否超时的间隔" + +#: ../../reference/engine-config.rst:355 msgid "Config for ServerConfig" msgstr "ServerConfig 配置" -#: ../../reference/engine-config.rst:343 +#: ../../reference/engine-config.rst:356 msgid "" "SCQLBroker accept intra-domain requests through IntraServer, while accept" " requests between different SCQLBrokers through InterServer." msgstr "SCQLBroker 通过IntraServer 接收域内请求，而通过 InterServer 接收不同 SCQLBroker 之间的请求。" -#: ../../reference/engine-config.rst:345 +#: ../../reference/engine-config.rst:358 msgid "" "IntraServer is recommended to use localhost host or LAN address to avoid " "external attacks, while InterServer is recommended to enable HTTPS to " @@ -844,11 +870,36 @@ msgstr "" "IntraServer 建议使用 localhost 或 LAN 地址以避免外部攻击，而 InterServer 建议启用 HTTPS " "以提高安全性。" -#: ../../reference/engine-config.rst:349 +#: ../../reference/engine-config.rst:362 +msgid "" +"Please refer to the following configuration to enable HTTPS for " +"InterServer: (similar to IntraServer)" +msgstr "请参考以下配置为 InterServer 启用 HTTPS ：（IntraServer 类似）" + +#: ../../reference/engine-config.rst:377 +msgid "Please change the endpoints in **party_info.json** from http to https." +msgstr "请将 **party_info.json** 中的 endpoints 从 http 更改为 https" + +#: ../../reference/engine-config.rst:379 +msgid "" +"We have enabled HTTPS in the `p2p examples " +"`_, and the initialization process of related " +"configurations may provide some help." +msgstr "我们在 `p2p examples `_ 中启用了 HTTPS，相关配置的初始化过程也许能提供一些帮助" + +#: ../../reference/engine-config.rst:381 +msgid "" +"For SCQLEngine to work with SSL, please refer :ref:`Config for SSL in " +"SCQLEngine `." +msgstr "" +"除此之外，用户还需要设置 :ref:`SCQLEngine 的 SSL 配置 `，以保证 SCQLEngine 能正常工作。" + +#: ../../reference/engine-config.rst:385 msgid "Reused Config" msgstr "复用的配置" -#: ../../reference/engine-config.rst:351 +#: ../../reference/engine-config.rst:387 msgid "" "For more about SecurityCompromise, see :ref:`Config for " "SecurityCompromise `" @@ -856,411 +907,418 @@ msgstr "" "有关 SecurityCompromise 的更多信息，请参阅 :ref:`安全退让配置 " "`" -#: ../../reference/engine-config.rst:353 +#: ../../reference/engine-config.rst:389 msgid "" "For more about Storage, see :ref:`Config for storage " "`" msgstr "有关存储的更多信息，请参阅 :ref:`存储配置 `" -#: ../../reference/engine-config.rst:359 +#: ../../reference/engine-config.rst:395 msgid "SCQLEngine configuration options" msgstr "SCQLEngine 配置说明" -#: ../../reference/engine-config.rst:360 +#: ../../reference/engine-config.rst:396 msgid "SCQLEngine uses Gflags to manage configurations when SCQLEngine set up." msgstr "SCQLEngine 使用 Gflags 来管理配置项。" -#: ../../reference/engine-config.rst:363 +#: ../../reference/engine-config.rst:399 msgid "Example for SCQLEngine" msgstr "SCQLEngine 配置示例" -#: ../../reference/engine-config.rst:375 +#: ../../reference/engine-config.rst:411 msgid "Config in SCQLEngine" msgstr "SCQLEngine 配置项" -#: ../../reference/engine-config.rst:380 +#: ../../reference/engine-config.rst:413 +msgid "" +"SCQLEngine can cooperate with upper-layer modules such as SCDB and " +"SCQLBroker according to the deployment mode. ``Driver`` is used in the " +"configuration items to represent these upper-layer modules." +msgstr "SCQLEngine 根据部署方式可以与 SCDB 、 SCQLBroker 等上层模块协作。配置项中使用 ``Driver`` 来表示这些上层模块。" + +#: ../../reference/engine-config.rst:418 msgid "log_enable_console_logger" msgstr "log_enable_console_logger" -#: ../../reference/engine-config.rst:380 +#: ../../reference/engine-config.rst:418 msgid "Whether logging to stdout while logging to file" msgstr "是否记录日志文件到控制台" -#: ../../reference/engine-config.rst:382 +#: ../../reference/engine-config.rst:420 msgid "log_dir" msgstr "log_dir" -#: ../../reference/engine-config.rst:382 +#: ../../reference/engine-config.rst:420 msgid "logs" msgstr "logs" -#: ../../reference/engine-config.rst:382 +#: ../../reference/engine-config.rst:420 msgid "The directory to save log file" msgstr "保存log文件的目录" -#: ../../reference/engine-config.rst:384 +#: ../../reference/engine-config.rst:422 msgid "Whether to enable audit log" msgstr "是否记录审计日志" -#: ../../reference/engine-config.rst:386 +#: ../../reference/engine-config.rst:424 msgid "audit_log_file" msgstr "audit_log_file" -#: ../../reference/engine-config.rst:388 +#: ../../reference/engine-config.rst:426 msgid "audit_detail_file" msgstr "audit_detail_file" -#: ../../reference/engine-config.rst:390 +#: ../../reference/engine-config.rst:428 msgid "audit_max_files" msgstr "audit_max_files" -#: ../../reference/engine-config.rst:390 +#: ../../reference/engine-config.rst:428 msgid "The maximum number of old audit log files to retain" msgstr "系统中保留的审计日志文件的最大数量，0 表示保留所有的日志文件" -#: ../../reference/engine-config.rst:392 +#: ../../reference/engine-config.rst:430 msgid "peer_engine_protocol" msgstr "peer_engine_protocol" -#: ../../reference/engine-config.rst:392 ../../reference/engine-config.rst:408 +#: ../../reference/engine-config.rst:430 ../../reference/engine-config.rst:446 msgid "`http:proto`" msgstr "`http:proto`" -#: ../../reference/engine-config.rst:392 +#: ../../reference/engine-config.rst:430 msgid "The rpc protocol between engine and engine" msgstr "SCQLEngine 与 SCQLEngine 之间的rpc协议" -#: ../../reference/engine-config.rst:394 +#: ../../reference/engine-config.rst:432 msgid "peer_engine_connection_type" msgstr "peer_engine_connection_type" -#: ../../reference/engine-config.rst:394 ../../reference/engine-config.rst:410 +#: ../../reference/engine-config.rst:432 ../../reference/engine-config.rst:448 msgid "pooled" msgstr "pooled" -#: ../../reference/engine-config.rst:394 +#: ../../reference/engine-config.rst:432 msgid "The rpc connection type between engine and engine" msgstr "SCQLEngine 与SCQLEngine 之间的 rpc 连接类型" -#: ../../reference/engine-config.rst:396 +#: ../../reference/engine-config.rst:434 msgid "peer_engine_timeout_ms" msgstr "peer_engine_timeout_ms" -#: ../../reference/engine-config.rst:396 +#: ../../reference/engine-config.rst:434 msgid "300000" msgstr "300000" -#: ../../reference/engine-config.rst:396 +#: ../../reference/engine-config.rst:434 msgid "The rpc timeout between engine and engine, unit: ms" msgstr "SCQLEngine 与 SCQLEngine之间的 rpc 超时时间，单位：ms" -#: ../../reference/engine-config.rst:398 +#: ../../reference/engine-config.rst:436 msgid "peer_engine_max_retry" msgstr "peer_engine_max_retry" -#: ../../reference/engine-config.rst:398 ../../reference/engine-config.rst:414 +#: ../../reference/engine-config.rst:436 ../../reference/engine-config.rst:452 msgid "3" msgstr "3" -#: ../../reference/engine-config.rst:398 +#: ../../reference/engine-config.rst:436 msgid "Rpc max retries(not including the first rpc) between engine and engine" msgstr "SCQLEngine 与 SCQLEngine 之间的rpc最大重试次数（不包括第一个rpc）" -#: ../../reference/engine-config.rst:400 +#: ../../reference/engine-config.rst:438 msgid "peer_engine_enable_ssl_as_client" msgstr "peer_engine_enable_ssl_as_client" -#: ../../reference/engine-config.rst:400 +#: ../../reference/engine-config.rst:438 msgid "Whether enable ssl encryption when send message to another engine" msgstr "SCQLEngine 与 SCQLEngine 之间发送消息是否启用ssl加密" -#: ../../reference/engine-config.rst:402 +#: ../../reference/engine-config.rst:440 msgid "peer_engine_enable_ssl_client_verification" msgstr "peer_engine_enable_ssl_client_verification" -#: ../../reference/engine-config.rst:402 +#: ../../reference/engine-config.rst:440 msgid "" "Whether enable certificate verification when send message to another " "engine" msgstr "作为客户端时，是否验证来自其他 SCQLEngine 的证书" -#: ../../reference/engine-config.rst:404 +#: ../../reference/engine-config.rst:442 msgid "peer_engine_ssl_client_ca_certificate" msgstr "peer_engine_ssl_client_ca_certificate" -#: ../../reference/engine-config.rst:404 +#: ../../reference/engine-config.rst:442 msgid "" "The trusted CA file to verify certificate when send message to another " "engine" msgstr "可信 CA 文件，作为客户端时，用于验证来自其他 SCQLEngine 的证书" -#: ../../reference/engine-config.rst:406 +#: ../../reference/engine-config.rst:444 msgid "link_recv_timeout_ms" msgstr "link_recv_timeout_ms" -#: ../../reference/engine-config.rst:406 +#: ../../reference/engine-config.rst:444 msgid "30000" msgstr "30000" -#: ../../reference/engine-config.rst:406 +#: ../../reference/engine-config.rst:444 msgid "The max time that engine will wait for message come from another engine" msgstr "等待其他 SCQLEngine 消息的最大响应时间" -#: ../../reference/engine-config.rst:408 -msgid "scdb_protocol" -msgstr "scdb_protocol" +#: ../../reference/engine-config.rst:446 +msgid "driver_protocol" +msgstr "driver_protocol" -#: ../../reference/engine-config.rst:408 -msgid "The rpc protocol between engine and SCDB" -msgstr "SCQLEngine 与 SCDB 之间的 rpc 协议" +#: ../../reference/engine-config.rst:446 +msgid "The rpc protocol between engine and Driver" +msgstr "SCQLEngine 与 Driver 之间的 rpc 协议" -#: ../../reference/engine-config.rst:410 -msgid "scdb_connection_type" -msgstr "scdb_connection_type" +#: ../../reference/engine-config.rst:448 +msgid "driver_connection_type" +msgstr "driver_connection_type" -#: ../../reference/engine-config.rst:410 -msgid "The rpc connection type between engine and SCDB" -msgstr "SCQLEngine 与 SCDB 之间的 rpc 连接类型" +#: ../../reference/engine-config.rst:448 +msgid "The rpc connection type between engine and Driver" +msgstr "SCQLEngine 与 Driver 之间的 rpc 连接类型" -#: ../../reference/engine-config.rst:412 -msgid "scdb_timeout_ms" -msgstr "scdb_timeout_ms" +#: ../../reference/engine-config.rst:450 +msgid "driver_timeout_ms" +msgstr "driver_timeout_ms" -#: ../../reference/engine-config.rst:412 +#: ../../reference/engine-config.rst:450 msgid "5000" msgstr "5000" -#: ../../reference/engine-config.rst:412 -msgid "The rpc timeout between engine and SCDB, unit: ms" -msgstr "SCQLEngine 与 SCDB 之间的 rpc 超时时间，单位：ms" +#: ../../reference/engine-config.rst:450 +msgid "The rpc timeout between engine and Driver, unit: ms" +msgstr "SCQLEngine 与 Driver 之间的 rpc 超时时间，单位：ms" -#: ../../reference/engine-config.rst:414 -msgid "scdb_max_retry" -msgstr "scdb_max_retry" +#: ../../reference/engine-config.rst:452 +msgid "driver_max_retry" +msgstr "driver_max_retry" -#: ../../reference/engine-config.rst:414 -msgid "Rpc max retries(not including the first rpc) between engine and SCDB" -msgstr "SCQLEngine 和 SCDB 之间的 rpc 最大重试次数（不包括第一个 rpc）" +#: ../../reference/engine-config.rst:452 +msgid "Rpc max retries(not including the first rpc) between engine and Driver" +msgstr "SCQLEngine 和 Driver 之间的 rpc 最大重试次数（不包括第一个 rpc）" -#: ../../reference/engine-config.rst:416 -msgid "scdb_enable_ssl_as_client" -msgstr "scdb_enable_ssl_as_client" +#: ../../reference/engine-config.rst:454 +msgid "driver_enable_ssl_as_client" +msgstr "driver_enable_ssl_as_client" -#: ../../reference/engine-config.rst:416 -msgid "Whether enable ssl encryption when send message to SCDB" -msgstr "作为客户端，向 SCDB 发送消息时是否启用 ssl 加密" +#: ../../reference/engine-config.rst:454 +msgid "Whether enable ssl encryption when send message to Driver" +msgstr "作为客户端，向 Driver 发送消息时是否启用 ssl 加密" -#: ../../reference/engine-config.rst:418 -msgid "scdb_enable_ssl_client_verification" -msgstr "scdb_enable_ssl_client_verification" +#: ../../reference/engine-config.rst:456 +msgid "driver_enable_ssl_client_verification" +msgstr "driver_enable_ssl_client_verification" -#: ../../reference/engine-config.rst:418 -msgid "Whether enable certificate verification when send message to SCDB" -msgstr "作为客户端，是否验证 SCDB 的证书" +#: ../../reference/engine-config.rst:456 +msgid "Whether enable certificate verification when send message to Driver" +msgstr "作为客户端，是否验证 Driver 的证书" -#: ../../reference/engine-config.rst:420 -msgid "scdb_ssl_client_ca_certificate" -msgstr "scdb_ssl_client_ca_certificate" +#: ../../reference/engine-config.rst:458 +msgid "driver_ssl_client_ca_certificate" +msgstr "driver_ssl_client_ca_certificate" -#: ../../reference/engine-config.rst:420 -msgid "The trusted CA file to verify certificate when send message to SCDB" -msgstr "可信 CA 文件，作为客户端时，用于验证 SCDB 的证书" +#: ../../reference/engine-config.rst:458 +msgid "The trusted CA file to verify certificate when send message to Driver" +msgstr "可信 CA 文件，作为客户端时，用于验证 Driver 的证书" -#: ../../reference/engine-config.rst:422 +#: ../../reference/engine-config.rst:460 msgid "listen_port" msgstr "listen_port" -#: ../../reference/engine-config.rst:422 +#: ../../reference/engine-config.rst:460 msgid "8003" msgstr "8003" -#: ../../reference/engine-config.rst:422 +#: ../../reference/engine-config.rst:460 msgid "The listening port of engine service" msgstr "SCQLEngine 作为服务器的监听端口" -#: ../../reference/engine-config.rst:424 +#: ../../reference/engine-config.rst:462 msgid "enable_builtin_service" msgstr "enable_builtin_service" -#: ../../reference/engine-config.rst:424 +#: ../../reference/engine-config.rst:462 msgid "Whether enable brpc builtin service" msgstr "是否启用 brpc 内置服务" -#: ../../reference/engine-config.rst:426 +#: ../../reference/engine-config.rst:464 msgid "internal_port" msgstr "internal_port" -#: ../../reference/engine-config.rst:426 +#: ../../reference/engine-config.rst:464 msgid "9527" msgstr "9527" -#: ../../reference/engine-config.rst:426 +#: ../../reference/engine-config.rst:464 msgid "The listening port of brpc builtin services" msgstr " brpc 内置服务的监听端口" -#: ../../reference/engine-config.rst:428 +#: ../../reference/engine-config.rst:466 msgid "idle_timeout_s" msgstr "idle_timeout_s" -#: ../../reference/engine-config.rst:428 +#: ../../reference/engine-config.rst:466 msgid "30" msgstr "30" -#: ../../reference/engine-config.rst:428 +#: ../../reference/engine-config.rst:466 msgid "" -"Idle connection close delay in seconds between the engine and SCDB, unit:" -" s" -msgstr "SCQLEngine 与 SCDB 之间的空闲连接关闭延迟（单位：秒）" +"Idle connection close delay in seconds between the engine and Driver, " +"unit: s" +msgstr "SCQLEngine 与 Driver 之间的空闲连接关闭延迟（单位：秒）" -#: ../../reference/engine-config.rst:430 +#: ../../reference/engine-config.rst:468 msgid "server_enable_ssl" msgstr "server_enable_ssl" -#: ../../reference/engine-config.rst:430 +#: ../../reference/engine-config.rst:468 msgid "Whether enable SSL when engine work as a server" msgstr "SCQLEngine 作为服务器时是否启用SSL" -#: ../../reference/engine-config.rst:432 +#: ../../reference/engine-config.rst:470 msgid "server_ssl_certificate" msgstr "server_ssl_certificate" -#: ../../reference/engine-config.rst:432 +#: ../../reference/engine-config.rst:470 msgid "Certificate file path to enable SSL when engine work as a server" msgstr "SCQLEngine 作为服务器时启用 SSL 的证书文件路径" -#: ../../reference/engine-config.rst:434 +#: ../../reference/engine-config.rst:472 msgid "server_ssl_private_key" msgstr "server_ssl_private_key" -#: ../../reference/engine-config.rst:434 +#: ../../reference/engine-config.rst:472 msgid "Private key file path to enable SSL when engine work as a server" msgstr "SCQLEngine 作为服务器时启用 SSL 的私钥文件路径" -#: ../../reference/engine-config.rst:436 +#: ../../reference/engine-config.rst:474 msgid "enable_client_authorization" msgstr "enable_client_authorization" -#: ../../reference/engine-config.rst:436 +#: ../../reference/engine-config.rst:474 msgid "Whether check requests' http header when engine work as a server" msgstr "SCQLEngine 作为服务器时是否检查请求的 http 头" -#: ../../reference/engine-config.rst:438 +#: ../../reference/engine-config.rst:476 msgid "auth_credential" msgstr "auth_credential" -#: ../../reference/engine-config.rst:438 +#: ../../reference/engine-config.rst:476 msgid "Authorization credential used to check requests' http header" msgstr "SCQLEngine 作为服务器时用于检查请求的 http 头的 凭证" -#: ../../reference/engine-config.rst:440 -msgid "enable_scdb_authorization" -msgstr "enable_scdb_authorization" +#: ../../reference/engine-config.rst:478 +msgid "enable_driver_authorization" +msgstr "enable_driver_authorization" -#: ../../reference/engine-config.rst:440 -msgid "Whether to authenticate the identity of SCDB" -msgstr "是否启动 SCDB 身份认证" +#: ../../reference/engine-config.rst:478 +msgid "Whether to authenticate the identity of Driver" +msgstr "是否启动 Driver 身份认证" -#: ../../reference/engine-config.rst:442 +#: ../../reference/engine-config.rst:480 msgid "engine_credential" msgstr "engine_credential" -#: ../../reference/engine-config.rst:442 -msgid "Credential used to authenticate SCDB" -msgstr "用于验证 SCDB 的凭证" +#: ../../reference/engine-config.rst:480 +msgid "Credential used to authenticate Driver" +msgstr "用于验证 Driver 的凭证" -#: ../../reference/engine-config.rst:444 +#: ../../reference/engine-config.rst:482 msgid "session_timeout_s" msgstr "session_timeout_s" -#: ../../reference/engine-config.rst:444 +#: ../../reference/engine-config.rst:482 msgid "1800" msgstr "1800" -#: ../../reference/engine-config.rst:444 -msgid "Expiration duration of a session between engine and SCDB, unit: s" -msgstr "SCQLEngine 与 SCDB 之间的会话过期时间，单位：秒" +#: ../../reference/engine-config.rst:482 +msgid "Expiration duration of a session between engine and Driver, unit: s" +msgstr "SCQLEngine 与 Driver 之间的会话过期时间，单位：秒" -#: ../../reference/engine-config.rst:446 +#: ../../reference/engine-config.rst:484 msgid "datasource_router" msgstr "datasource_router" -#: ../../reference/engine-config.rst:446 +#: ../../reference/engine-config.rst:484 msgid "embed" msgstr "embed" -#: ../../reference/engine-config.rst:446 +#: ../../reference/engine-config.rst:484 msgid "The datasource router type" msgstr "数据源路由类型" -#: ../../reference/engine-config.rst:448 +#: ../../reference/engine-config.rst:486 msgid "embed_router_conf" msgstr "embed_router_conf" -#: ../../reference/engine-config.rst:448 +#: ../../reference/engine-config.rst:486 msgid "Configuration for embed router in json format" msgstr "数据源的路由配置，其类型为 json 字符串格式" -#: ../../reference/engine-config.rst:450 +#: ../../reference/engine-config.rst:488 msgid "db_connection_info" msgstr "db_connection_info" -#: ../../reference/engine-config.rst:450 +#: ../../reference/engine-config.rst:488 msgid "Connection string used to connect to mysql" msgstr "用于连接 MySQL 数据库的连接串" -#: ../../reference/engine-config.rst:452 +#: ../../reference/engine-config.rst:490 msgid "enable_he_schema_type_ou" msgstr "enable_he_schema_type_ou" -#: ../../reference/engine-config.rst:452 +#: ../../reference/engine-config.rst:490 msgid "" "Whether to use OU to speed up HeSum, use ZPaillier by default for " "security, see: `heu/ou`_" msgstr "是否使用OU算法来加速 HeSum, 考虑到更优的安全性，默认使用 ZPaillier, 参见: `heu/ou`_" -#: ../../reference/engine-config.rst:454 +#: ../../reference/engine-config.rst:492 msgid "enable_self_auth" msgstr "enable_self_auth" -#: ../../reference/engine-config.rst:454 +#: ../../reference/engine-config.rst:492 msgid "Whether enable self identity authentication" msgstr "是否启用自我身份认证" -#: ../../reference/engine-config.rst:456 +#: ../../reference/engine-config.rst:494 msgid "private_key_pem_path" msgstr "private_key_pem_path" -#: ../../reference/engine-config.rst:456 +#: ../../reference/engine-config.rst:494 msgid "Path to private key pem file" msgstr "私钥 pem 文件的路径" -#: ../../reference/engine-config.rst:458 +#: ../../reference/engine-config.rst:496 msgid "enable_peer_auth" msgstr "enable_peer_auth" -#: ../../reference/engine-config.rst:458 +#: ../../reference/engine-config.rst:496 msgid "Whether enable peer parties identity authentication" msgstr "是否启用对端身份认证" -#: ../../reference/engine-config.rst:460 +#: ../../reference/engine-config.rst:498 msgid "authorized_profile_path" msgstr "authorized_profile_path" -#: ../../reference/engine-config.rst:460 +#: ../../reference/engine-config.rst:498 msgid "Path to authorized profile, in json format" msgstr "数据源的路由配置，其类型为 json 字符串格式" -#: ../../reference/engine-config.rst:466 +#: ../../reference/engine-config.rst:504 msgid "Config for datasource" msgstr "数据源配置" -#: ../../reference/engine-config.rst:467 +#: ../../reference/engine-config.rst:505 msgid "" "datasources(MySQL/SQLite3/PostgreSQL/CSVDB/ArrowSQL) are where the " "SCQLEngine gets its data from." msgstr "SCQLEngine 支持多种数据源，包括 MySQL/SQLite3/PostgreSQL/CSVDB/ArrowSQL 。" -#: ../../reference/engine-config.rst:469 +#: ../../reference/engine-config.rst:507 msgid "" "``datasource_router`` is design to support multi datasources, currently " "only supported: embed, which is initialized with ``embed_router_conf`` " @@ -1270,7 +1328,7 @@ msgstr "" "``embed_router_conf`` 来初始化，``embed_router_conf`` 是一个 json " "类型的字符串，一个典型的配置项如下所示：" -#: ../../reference/engine-config.rst:487 +#: ../../reference/engine-config.rst:525 msgid "" "if ``embed_router_conf`` is empty, embed_router will try to initialized " "with ``db_connection_info``." @@ -1278,11 +1336,11 @@ msgstr "" "如果 ``embed_router_conf`` 为空， `embed_router` 则会尝试通过 ``db_connection_info``" " 来初始化。" -#: ../../reference/engine-config.rst:490 +#: ../../reference/engine-config.rst:528 msgid "Embed router" msgstr "Embed router" -#: ../../reference/engine-config.rst:491 +#: ../../reference/engine-config.rst:529 msgid "" "datasources in embed_router_conf contain information for connecting " "MySQL/SQLite3/PostgreSQL/CSVDB/ArrowSQL:" @@ -1290,95 +1348,95 @@ msgstr "" "embed_router_conf 中的 datasources 包含用于连接 " "MySQL/SQLite3/PostgreSQL/CSVDB/ArrowSQL 数据源的信息:" -#: ../../reference/engine-config.rst:493 +#: ../../reference/engine-config.rst:531 msgid "id: unique id of datasource." msgstr "id：数据源的唯一ID。" -#: ../../reference/engine-config.rst:495 +#: ../../reference/engine-config.rst:533 msgid "name: custom description help to distinguish datasources." msgstr "name：自定义描述，有助于区分数据源。" -#: ../../reference/engine-config.rst:497 +#: ../../reference/engine-config.rst:535 msgid "" "kind: datasource type, currently support " "MySQL/SQLite3/PostgreSQL/CSVDB/ArrowSQL." msgstr "kind：数据源类型，目前支持 MySQL/SQLite3/PostgreSQL/CSVDB/ArrowSQL 。" -#: ../../reference/engine-config.rst:499 +#: ../../reference/engine-config.rst:537 msgid "" "connection_str: string used to connect " "MySQL/SQLite3/PostgreSQL/CSVDB/ArrowSQL." msgstr "connection_str：用于连接 MySQL/SQLite3/PostgreSQL/CSVDB/ArrowSQL 数据库的连接串。" -#: ../../reference/engine-config.rst:508 +#: ../../reference/engine-config.rst:546 msgid "MySQL Connection string format:" msgstr "MySQL 连接串格式：" -#: ../../reference/engine-config.rst:502 +#: ../../reference/engine-config.rst:540 msgid " == | ';' " msgstr "" -#: ../../reference/engine-config.rst:504 ../../reference/engine-config.rst:522 +#: ../../reference/engine-config.rst:542 ../../reference/engine-config.rst:560 msgid " == '=' " msgstr "" -#: ../../reference/engine-config.rst:506 +#: ../../reference/engine-config.rst:544 msgid "" " == 'host' | 'port' | 'user' | 'password' | 'db' | 'compress' | " "'auto-reconnect' | 'reset' | 'fail-readonly'" msgstr "" -#: ../../reference/engine-config.rst:508 ../../reference/engine-config.rst:526 +#: ../../reference/engine-config.rst:546 ../../reference/engine-config.rst:564 msgid " == [~;]*" msgstr "" -#: ../../reference/engine-config.rst:511 +#: ../../reference/engine-config.rst:549 msgid "MySQL Connection string e.g:" msgstr "MySQL 连接串示例：" -#: ../../reference/engine-config.rst:511 ../../reference/engine-config.rst:529 +#: ../../reference/engine-config.rst:549 ../../reference/engine-config.rst:567 msgid "``db=${db};user=${user};password=${password};host=${host}``" msgstr "``db=${db};user=${user};password=${password};host=${host}``" -#: ../../reference/engine-config.rst:514 +#: ../../reference/engine-config.rst:552 msgid "SQLite3 Connection string format:" msgstr "SQLite3 连接串格式：" -#: ../../reference/engine-config.rst:514 +#: ../../reference/engine-config.rst:552 msgid "more infos: https://www.sqlite.org/c3ref/open.html" msgstr "参考：https://www.sqlite.org/c3ref/open.html" -#: ../../reference/engine-config.rst:517 +#: ../../reference/engine-config.rst:555 msgid "SQLite3 Connection string e.g:" msgstr "SQLite3 连接串示例" -#: ../../reference/engine-config.rst:517 +#: ../../reference/engine-config.rst:555 msgid "``file:data_test.db?mode=memory&cache=shared``" msgstr "``file:data_test.db?mode=memory&cache=shared``" -#: ../../reference/engine-config.rst:526 +#: ../../reference/engine-config.rst:564 msgid "PostgreSQL Connection string format:" msgstr "PostgreSQL 连接串格式：" -#: ../../reference/engine-config.rst:520 +#: ../../reference/engine-config.rst:558 msgid " == | ' ' " msgstr "" -#: ../../reference/engine-config.rst:524 +#: ../../reference/engine-config.rst:562 msgid "" " == 'host' | 'port' | 'user' | 'password' | 'dbname' | " "'connect_timeout'" msgstr "" -#: ../../reference/engine-config.rst:529 +#: ../../reference/engine-config.rst:567 msgid "PostgreSQL Connection string e.g:" msgstr "PostgreSQL 连接串示例：" -#: ../../reference/engine-config.rst:532 +#: ../../reference/engine-config.rst:570 msgid "CSVDB Connection string format:" msgstr "CSVDB 连接串格式：" -#: ../../reference/engine-config.rst:532 +#: ../../reference/engine-config.rst:570 msgid "" "Since connection_str is an object in another json object, the format is a" " converted json string corresponding to `CsvdbConf " @@ -1388,35 +1446,35 @@ msgstr "" "`_" " 结构体转换后的的json字符串 " -#: ../../reference/engine-config.rst:535 +#: ../../reference/engine-config.rst:573 msgid "CSVDB Connection string e.g:" msgstr "CSVDB连接语句示例:" -#: ../../reference/engine-config.rst:535 +#: ../../reference/engine-config.rst:573 msgid "\"{\\\\\\\"db_name\\\\\\\":\\\\\\\"csvdb\\\\\\\",\\\\\\\"tables\\\\\\\":[{\\\\\\\"table_name\\\\\\\":\\\\\\\"staff\\\\\\\",\\\\\\\"data_path\\\\\\\":\\\\\\\"test.csv\\\\\\\",\\\\\\\"columns\\\\\\\":[{\\\\\\\"column_name\\\\\\\":\\\\\\\"id\\\\\\\",\\\\\\\"column_type\\\\\\\":\\\\\\\"1\\\\\\\"}]}]}\"" msgstr "\"{\\\\\\\"db_name\\\\\\\":\\\\\\\"csvdb\\\\\\\",\\\\\\\"tables\\\\\\\":[{\\\\\\\"table_name\\\\\\\":\\\\\\\"staff\\\\\\\",\\\\\\\"data_path\\\\\\\":\\\\\\\"test.csv\\\\\\\",\\\\\\\"columns\\\\\\\":[{\\\\\\\"column_name\\\\\\\":\\\\\\\"id\\\\\\\",\\\\\\\"column_type\\\\\\\":\\\\\\\"1\\\\\\\"}]}]}\"" -#: ../../reference/engine-config.rst:540 +#: ../../reference/engine-config.rst:578 msgid "ArrowSQL Connection string format:" msgstr "ArrowSQL 连接串格式：" -#: ../../reference/engine-config.rst:538 +#: ../../reference/engine-config.rst:576 msgid "grpc+://host:port" msgstr "" -#: ../../reference/engine-config.rst:540 +#: ../../reference/engine-config.rst:578 msgid " == 'tcp' | 'tls'" msgstr "" -#: ../../reference/engine-config.rst:546 +#: ../../reference/engine-config.rst:584 msgid "ArrowSQL Connection string e.g:" msgstr "ArrowSQL 连接串示例：" -#: ../../reference/engine-config.rst:543 +#: ../../reference/engine-config.rst:581 msgid "``grpc+tcp://127.0.0.1:6666``" msgstr "" -#: ../../reference/engine-config.rst:546 +#: ../../reference/engine-config.rst:584 msgid "" "As a datasource embedded in SCQLEngine, ArrowSQL requires an additional " "gRPC server which provides the corresponding interface for executing an " @@ -1426,11 +1484,11 @@ msgstr "" "作为 SCQLEngine 内嵌的数据源，ArrowSQL 依赖额外的 gRPC 服务，该服务需要提供相应的接口，用于执行 `Arrow " "Flight SQL ` 即时查询" -#: ../../reference/engine-config.rst:549 +#: ../../reference/engine-config.rst:587 msgid "Routing rules" msgstr "路由规则" -#: ../../reference/engine-config.rst:550 +#: ../../reference/engine-config.rst:588 msgid "" "embed_router's rules support wildcard ``*`` , when given a table in " "format: *database_name:table_name*, embed_router will route to the " @@ -1439,7 +1497,7 @@ msgstr "" "embed_router 的规则支持通配符 ``*`` ，当给定一个 *database_name:table_name* " "的数据表时，embed_router 将通过以下方式路由到对应的数据源：" -#: ../../reference/engine-config.rst:553 +#: ../../reference/engine-config.rst:591 msgid "" "find the exact rules first, whose ``${db}:${table}`` equals to " "*database_name:table_name*;" @@ -1447,15 +1505,15 @@ msgstr "" "在 `embed_router_conf` 的 `rules` 中查找 `${db}:${table}` 与 " "`database_name:table_name` 完全相等的 rule" -#: ../../reference/engine-config.rst:554 +#: ../../reference/engine-config.rst:592 msgid "try the database_name:\\* rules;" msgstr "在 `embed_router_conf` 的 `rules` 中查找 `${db}` 与 `database_name` 完全相等的 rule" -#: ../../reference/engine-config.rst:555 +#: ../../reference/engine-config.rst:593 msgid "try \\*:table_name in the end." msgstr "在 `embed_router_conf` 的 `rules` 中查找 `${table}` 与 `table_name` 完全相等的 rule" -#: ../../reference/engine-config.rst:557 +#: ../../reference/engine-config.rst:595 msgid "" "Once found, SCQLEngine will try to connect database with datasource's " "information correspond to the *datasource_id*." @@ -1463,44 +1521,45 @@ msgstr "" "一旦找到对应的 rule ，SCQLEngine 将根据 rule 中 datasource_id 在 datasources 中找到 " "对应的数据源信息，并根据这些信息连接对应的数据库。" -#: ../../reference/engine-config.rst:560 +#: ../../reference/engine-config.rst:598 msgid "Config for Brpc server" msgstr "Brpc 服务器配置" -#: ../../reference/engine-config.rst:561 +#: ../../reference/engine-config.rst:599 msgid "" -"SCQLEngine uses **Brpc** to communicate with SCDB and other peer " +"SCQLEngine uses **Brpc** to communicate with Driver and other peer " "SCQLEngines, each SCQLEngine will start a Brpc service on *local-" "host:listen_port* to receive data from outside. If you want to enable " "Brpc builtin services, add FLAGS:" msgstr "" -"SCQLEngine 使用 Brpc 与 SCDB 以及其他的 SCQLEngine 进行通信，每个 SCQLEngine 都会在 local-" +"SCQLEngine 使用 Brpc 与 Driver 以及其他的 SCQLEngine 进行通信，每个 SCQLEngine 都会在 local-" "host:listen_port 上启动 Brpc 服务以接收来自外部的数据。如果要启用 Brpc 内置服务，请添加 FLAGS：" -#: ../../reference/engine-config.rst:572 +#: ../../reference/engine-config.rst:610 msgid "Config for SSL" msgstr "SSL配置" -#: ../../reference/engine-config.rst:573 +#: ../../reference/engine-config.rst:611 msgid "" "If you want to enable SSL in SCQLEngine, add FLAGS as follows. " -"Additionally, it may be necessary to configure SCDB work with TLS please " -"refer :ref:`Config for TLS in SCDB `." +"Additionally, it may be necessary to configure the Driver to work with " +"TLS, please refer :ref:`TLS in SCDB ` or :ref:`TLS in " +"SCQLBroker `." msgstr "" -"如果要在 Engine 中启用 SSL，请添加 FLAGS，如下所示。 此外，可能需要配置 SCDB 与 TLS 一起运行，请参考 " +"如果要在 SCQLEngine 中启用 SSL，请添加 FLAGS，如下所示。 此外，也可能需要配置 Driver 在 TLS 下运行，请参考 " ":ref:`SCDB 的 TLS 配置 `。" -#: ../../reference/engine-config.rst:585 +#: ../../reference/engine-config.rst:625 msgid "" "The audit log in SCQLEngine is used to record the SCQLEngine activities " -"during the execution of tasks from SCDB. Just like the audit in SCDB, it " -"also can be divided into two types: common audit log and detail audit " -"log." +"during the execution of tasks from Driver. Just like the audit in Driver," +" it also can be divided into two types: common audit log and detail audit" +" log." msgstr "" -"SCQLEngine 的审计日志是用来记录 SCQLEngine 在执行 SCDB 下发任务过程中所产生的一系列事件，和 SCDB " +"SCQLEngine 的审计日志是用来记录 SCQLEngine 在执行 Driver 下发任务过程中所产生的一系列事件，和 Driver " "一样，它也有两种类型：基础审计日志和详补充审计日志" -#: ../../reference/engine-config.rst:587 +#: ../../reference/engine-config.rst:627 msgid "" "The common audit is used to record some basic information about a task, " "while the detail audit is used to record more detailed information of the" @@ -1513,7 +1572,7 @@ msgstr "" "`_" " 。" -#: ../../reference/engine-config.rst:589 +#: ../../reference/engine-config.rst:629 msgid "" "The log file is rotated in every 24:00:00 in local time, and the filename" " is generated in the format ``name-date.ext``, where `name` is the " @@ -1525,7 +1584,7 @@ msgstr "" "，其中 `name` 是在 ``audit_log_file`` 中设置的不带后缀的文件名， `date` 是当前的日期（格式为 `YYYY-" "MM-DD`）， `ext` 是在 ``audit_log_file`` 中设置的后缀名。" -#: ../../reference/engine-config.rst:592 +#: ../../reference/engine-config.rst:632 msgid "" "For example, if you set ``audit_log_file`` as `audit/audit.log`, a backup" " created on Nov 11 2016 would be saved to `/audit/audit_2016-11-04.log`" @@ -1533,22 +1592,19 @@ msgstr "" "例如，通过设置 ``audit_log_file`` 为 `audit/audit.log`，在2016年11月4日 24:00:00 " "归档的审计日志会保存至 `./audit/audit_2016-11-04.log` 。" -#: ../../reference/engine-config.rst:595 +#: ../../reference/engine-config.rst:635 msgid "Config for party authentication" msgstr "参与方身份验证配置" -#: ../../reference/engine-config.rst:596 +#: ../../reference/engine-config.rst:636 msgid "" "For security, SCQLEngine enables party authentication by default. " -"SCQLEngine will check it's public key in the SCDB request matches the " +"SCQLEngine will check it's public key in the Driver request matches the " "local public key in ``private_key_pem_path``, and that the other " "participant's public key also matches the one in " "``authorized_profile_path``." msgstr "" -"安全起见，SCQLEngine 默认启用参与方身份验证。 SCQLEngine 将检查 SCDB 请求中自身的公钥是否与 " +"安全起见，SCQLEngine 默认启用参与方身份验证。 SCQLEngine 将检查 Driver 请求中自身的公钥是否与 " "``private_key_pem_path`` 中的本地公钥匹配，并且其他参与者的公钥也与 " "``authorized_profile_path`` 中的公钥匹配。" -#~ msgid "Database kind in SCDB, supports MYSQL/SQLite3" -#~ msgstr "SCDB的数据库类型支持 MYSQL/SQLite3 " - diff --git a/docs/locales/zh_CN/LC_MESSAGES/topics/ccl/intro.po b/docs/locales/zh_CN/LC_MESSAGES/topics/ccl/intro.po index 3a38fadc..b821ce61 100644 --- a/docs/locales/zh_CN/LC_MESSAGES/topics/ccl/intro.po +++ b/docs/locales/zh_CN/LC_MESSAGES/topics/ccl/intro.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: SCQL \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-10-11 20:36+0800\n" +"POT-Creation-Date: 2023-12-04 16:14+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language: zh_CN\n" @@ -16,7 +16,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.13.0\n" +"Generated-By: Babel 2.12.1\n" #: ../../topics/ccl/intro.rst:2 msgid "SCQL CCL" @@ -170,7 +170,8 @@ msgid "" "overview `." msgstr "" "请用户根据自己的场景需求和隐私保护需要设置 CCL。攻击者可能会构造满足 CCL 约束的 " -"Query，通过复杂查询或者多次查询方式，从结果推测原始数据敏感信息，相关风险描述和建议见 :doc:`SCQL 安全性说明 `." +"Query，通过复杂查询或者多次查询方式，从结果推测原始数据敏感信息，相关风险描述和建议见 :doc:`SCQL 安全性说明 " +"`." #: ../../topics/ccl/intro.rst:35 msgid "Advantages of CCL" @@ -247,10 +248,13 @@ msgstr "" msgid "" "When the CCL constraints of the JOIN keys are both " "``PLAINTEXT_AFTER_JOIN`` or ``PLAINTEXT``, the CCL constraint type of the" -" intersection result is ``PLAINTEXT``." +" intersection result is ``PLAINTEXT`` for **InnerJoin**; for " +"**LeftOuterJoin**, only the intersection of the right JOIN key becomes " +"``PLAINTEXT``; for **RightOutJoin**, the intersection of the left JOIN " +"key becomes ``PLAINTEXT``." msgstr "" "当 JOIN keys 的 CCL constraint 均为 ``PLAINTEXT_AFTER_JOIN`` 或 ``PLAINTEXT`` " -"时，则 JOIN keys 的交集的 CCL constraint 类型为 ``PLAINTEXT``。" +"时，则对于 **InnerJoin** ， JOIN keys 交集结果的 CCL 变为 ``PLAINTEXT`` ，对于 **LeftOuterJoin** ，只有右 JOIN keys 的交集结果的 CCL 变为 ``PLAINTEXT`` ， 对于 **RightOuterJoin** ，则是左 JOIN keys 的交集结果变为 ``PLAINTEXT`` 。" #: ../../topics/ccl/intro.rst:64 msgid "**Group By**" diff --git a/docs/locales/zh_CN/LC_MESSAGES/topics/deployment/how-to-deploy-p2p-cluster.po b/docs/locales/zh_CN/LC_MESSAGES/topics/deployment/how-to-deploy-p2p-cluster.po index 005e8be9..8fdd1ab8 100644 --- a/docs/locales/zh_CN/LC_MESSAGES/topics/deployment/how-to-deploy-p2p-cluster.po +++ b/docs/locales/zh_CN/LC_MESSAGES/topics/deployment/how-to-deploy-p2p-cluster.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: SCQL \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-17 16:22+0800\n" +"POT-Creation-Date: 2023-12-04 16:14+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,7 +18,7 @@ msgstr "" "Generated-By: Babel 2.12.1\n" #: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:3 -msgid "Deployment in P2P Mode" +msgid "P2P Deployment" msgstr "P2P 模式部署" #: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:5 @@ -132,7 +132,7 @@ msgid "" "following code in:" msgstr "在工作区中创建一个名为 ``config.yml`` 的文件，并粘贴如下代码：" -#: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:85 +#: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:89 msgid "" "For Bob, the **party_code** should be ``bob``, and the ``brokeralice`` in" " **conn_str** should be replaced by ``brokerbob``." @@ -140,75 +140,83 @@ msgstr "" "对于 Bob，**party_code** 应该是 ``bob``，而 **conn_str** 中的 ``brokeralice`` 应该替换为" " ``brokerbob``。" -#: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:87 +#: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:91 +msgid "" +"The ``__ENGINE_URL__`` should be replaced by **machine host/ip + engine " +"published port**, like: http://30.30.30.30:8003." +msgstr "" +"将 ``__ENGINE_URL__`` 替换为 **机器的对外 host/ip + 引擎对外端口**，如： http://30.30.30.30:8003 " + +#: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:93 msgid "" "The ``__MYSQL_ROOT_PASSWORD__`` should be replaced with the password set " "by the corresponding party, and please replace this placeholder in the " "same way for subsequent files." msgstr "``__MYSQL_ROOT_PASSWORD__`` 应替换为对应参与方选择的密码，后续文件请以同样的方式替换此占位符。" -#: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:89 +#: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:95 msgid "" "See :ref:`SCQLBroker configuration options " "` for more." msgstr "请参阅：:ref:`SCQLBroker 配置选项 ` 了解更多信息。" -#: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:93 +#: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:99 msgid "1.4 Set SCQLEngine Config" msgstr "1.4 配置 SCQLEngine" -#: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:95 +#: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:101 msgid "" "Create a file called ``gflags.conf`` in your workspace and paste the " "following code in:" msgstr "在工作区中创建一个名为 ``gflags.conf`` 的文件，并粘贴如下代码：" -#: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:114 +#: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:118 msgid "" "The ``connection_str`` specified in ``embed_router_conf`` is utilized to " "connect database named **alice** as set in `1.2 Prepare Meta Data and " "Source Data`_, For Bob it should be set to connect database named " "**bob**." msgstr "" -"``embed_router_conf`` 中指定的 ``connection_str`` 用于连接名为 **alice** 的数据库，如 `1.2 " -"准备元数据和源数据`_ 中设置的那样，对于 Bob，应设置为连接名为 **bob** 的数据库。" +"``embed_router_conf`` 中指定的 ``connection_str`` 用于连接名为 **alice** 的数据库，如 " +"`1.2 准备元数据和源数据`_ 中设置的那样，对于 Bob，应设置为连接名为 **bob** 的数据库。" -#: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:116 -#: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:182 +#: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:120 +#: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:184 msgid "" "Please remember to replace ``__MYSQL_ROOT_PASSWORD__`` with the same " "password :ref:`as before `" -msgstr "请勿忘记将 ``__MYSQL_ROOT_PASSWORD__`` 替换为与 :ref:`前面 ` 相同的密码" +msgstr "" +"请勿忘记将 ``__MYSQL_ROOT_PASSWORD__`` 替换为与 :ref:`前面 ` " +"相同的密码" -#: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:118 +#: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:122 msgid "" "See :ref:`Engine configuration options ` for more " "config information" msgstr "请参阅 :ref:`引擎配置选项 ` 了解更多配置信息" -#: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:122 +#: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:126 msgid "1.5 Create docker-compose file" msgstr "1.5 创建 docker-compose 文件" -#: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:124 +#: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:128 msgid "" "Create a file called ``docker-compose.yaml`` in your workspace and paste " "the following code in:" msgstr "在您的工作区中创建一个名为 ``docker-compose.yaml`` 的文件，并粘贴以下代码：" -#: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:180 -#, fuzzy +#: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:182 msgid "" "``__INTRA_PORT__``, ``__INTER_PORT__`` and ``__ENGINE_PORT__`` are " -"published ports on the host machine, you need to replace it with an " -"accessible port number. In this case, we have designated them as " -"``8080``, ``8081`` and ``8003``" +"published ports on the host machine, you should replace them with " +"accessible port numbers, in particular, the ``__ENGINE_PORT__`` should be" +" the same port in :ref:`__ENGINE_URL__ `. In this " +"case, we have designated them as ``8080``, ``8081`` and ``8003``" msgstr "" "``__INTRA_PORT__``, ``__INTER_PORT__`` 和 ``__ENGINE_PORT__`` " -"作为监听端口，您需要替换为可访问的端口，这里我们指定为 ``8080``, ``8081`` 和 ``8003``" +"作为监听端口，您需要替换为可访问的端口，尤其注意 ``__ENGINE_PORT__`` 需要和 :ref:`__ENGINE_URL__ ` 中的端口保持一致，这里我们指定为 ``8080``, ``8081`` 和 ``8003``" -#: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:184 -#, fuzzy +#: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:186 msgid "" "Container *mysql* are initialized by ``alice_init.sql`` and " "``broker_init_alice.sql`` as set in `1.2 Prepare Meta Data and Source " @@ -219,29 +227,29 @@ msgstr "" "`1.2 准备元数据和源数据`_ 中设置。 对于 Bob，请使用 ``bob_init.sql`` 和 " "``broker_init_bob.sql``。" -#: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:186 +#: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:188 msgid "If you use your own database service, container *mysql* can be deleted" msgstr "" "如果您使用自己的数据库服务，则 *mysql* 容器可以删除，修改 SCQLBroker 和 SCQLEngine 配置中的 conn_str " "，指定可用的数据库连接信息即可" -#: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:190 +#: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:192 msgid "1.6 Prepare Party Auth Files" msgstr "1.6 准备身份验证文件" -#: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:192 +#: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:194 msgid "" "Parties are identified by private-public key pairs, so we need to " "generate these files." msgstr "参与方身份通过私钥-公钥对进行识别，因此我们需要生成这些文件。" -#: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:194 +#: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:196 msgid "" "Create a file called ``party_info.json`` in your workspace and paste the " "following code in:" msgstr "在您的工作区中创建一个名为 ``party_info.json`` 的文件，并粘贴以下代码：" -#: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:214 +#: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:216 msgid "" "``__ALICE_BROKER_URL__`` should be replaced by ``Alice machine host/ip + " "Alice __INTER_PORT__``, like: http://30.30.30.30:8081, do the same for " @@ -251,50 +259,49 @@ msgstr "" "__INTER_PORT__``，如：http://30.30.30.30:8081，对 ``__BOB_BROKER_URL__`` " "执行相同操作。" -#: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:217 +#: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:219 msgid "Create other files:" msgstr "创建其他文件" -#: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:231 +#: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:230 msgid "" -"Then you need to replace ``__XXX_PUBLIC_KEY__`` in party_info.json and " -"authorized_profile.json with corresponding public keys." +"Then you need to replace ``__XXX_PUBLIC_KEY__`` in party_info.json with " +"corresponding public keys." msgstr "" -"然后您需要将 party_info.json 和 authorized_profile.json 中的 " -"``__XXX_PUBLIC_KEY__`` 占位符替换为相应的真实公钥。" +"然后您需要将 party_info.json 中的 ``__XXX_PUBLIC_KEY__`` 占位符替换为相应的真实公钥。" -#: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:235 +#: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:234 msgid "1.6 Start Services" msgstr "1.6 启动服务" -#: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:237 +#: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:236 msgid "The file your workspace should be as follows:" msgstr "您的工作区文件应如下所示：" -#: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:251 +#: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:249 msgid "Then you can start services by running docker compose up" msgstr "然后您可以运行 docker compose up 来启动引擎服务" -#: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:263 +#: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:261 msgid "You can use docker logs to check whether services works well" msgstr "您可以使用 docker logs 检查引擎是否正常工作" -#: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:278 +#: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:276 msgid "Step 2: Deployment for Bob" msgstr "步骤二：部署 Bob 环境" -#: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:280 +#: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:278 msgid "" "It is basically the same as `Step 1: Deployment for Alice`_, but some " "characters and files related to ``alice`` need to be replaced with " "``bob``." msgstr "与 `步骤一：部署 Alice 环境`_ 基本相同，但与 ``alice`` 相关的一些字符和文件需要替换为 ``bob`` 。" -#: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:284 +#: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:282 msgid "Step 3: SCQL Test" msgstr "步骤三：测试 SCQL" -#: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:286 +#: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:284 msgid "" "Here we use brokerctl to submit a query to SCQLBroker for testing, you " "can also submit queries directly to SCQLBroker by sending a POST request." @@ -302,15 +309,15 @@ msgstr "" "这里我们使用 brokerctl 向 SCQLBroker 提交查询进行测试，您也可以通过发送 POST 请求直接向 SCQLBroker " "提交查询。" -#: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:290 +#: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:288 msgid "3.1 Build brokerctl" msgstr "3.1 构建 brokerctl" -#: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:307 +#: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:305 msgid "3.2 Submit Query" msgstr "3.2 提交查询" -#: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:309 +#: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:307 msgid "" "You can start to use brokerctl to submit requests to SCQLBroker and fetch" " the results back. it's similar to what you can do in :doc:`/intro/p2p-" @@ -319,7 +326,7 @@ msgstr "" "您可以开始使用 brokerctl 向 SCQLBroker 提交请求并获取结果。这与您在 :doc:`/intro/p2p-tutorial` " "中可以执行的操作类似。" -#: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:331 +#: ../../topics/deployment/how-to-deploy-p2p-cluster.rst:329 msgid "" "You need to replace ``__ALICE_INTRA_URL__`` or ``__BOB_INTRA_URL__`` with" " the actual IntraServer address, like: http://30.30.30.30:8080." @@ -327,3 +334,6 @@ msgstr "" "您需要将 ``__ALICE_INTRA_URL__`` 或 ``__BOB_INTRA_URL__`` 替换为实际的 IntraServer " "地址，例如：http://30.30.30.30:8080。" +#~ msgid "Deployment in P2P Mode" +#~ msgstr "P2P 模式部署" +