Skip to content

Commit 743015c

Browse files
josh-wongjosh-wong
committed
Merge branch 'main' into feature/add-support-dropdown
2 parents 9377f6c + d6cb4b5 commit 743015c

25 files changed

+124
-38
lines changed

‎docs/configurations.mdx‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ The following performance-related configurations are available for the Consensus
4949

5050
| Name | Description | Default |
5151
|----------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------|
52-
| `scalar.db.consensus_commit.parallel_executor_count` | Number of executors (threads) for parallel execution. | `128` |
52+
| `scalar.db.consensus_commit.parallel_executor_count` | Number of executors (threads) for parallel execution. This number refers to the total number of threads across transactions in a ScalarDB Cluster node or a ScalarDB process. | `128` |
5353
| `scalar.db.consensus_commit.parallel_preparation.enabled` | Whether or not the preparation phase is executed in parallel. | `true` |
5454
| `scalar.db.consensus_commit.parallel_validation.enabled` | Whether or not the validation phase (in `EXTRA_READ`) is executed in parallel. | The value of `scalar.db.consensus_commit.parallel_commit.enabled` |
5555
| `scalar.db.consensus_commit.parallel_commit.enabled` | Whether or not the commit phase is executed in parallel. | `true` |
@@ -94,7 +94,8 @@ Select a database to see the configurations available for each storage.
9494
| `scalar.db.jdbc.admin.connection_pool.min_idle` | Minimum number of idle connections in the connection pool for admin. | `5` |
9595
| `scalar.db.jdbc.admin.connection_pool.max_idle` | Maximum number of connections that can remain idle in the connection pool for admin. | `10` |
9696
| `scalar.db.jdbc.admin.connection_pool.max_total` | Maximum total number of idle and borrowed connections that can be active at the same time for the connection pool for admin. Use a negative value for no limit. | `25` |
97-
| `scalar.db.jdbc.oracle.time_column.default_date_component` | Value of the date component used for storing `TIME` data in Oracle. Since Oracle has no data type to only store a time without a date component, ScalarDB stores `TIME` data with the same date component value for ease of comparison and sorting. | `1970-01-01` |
97+
| `scalar.db.jdbc.oracle.time_column.default_date_component` | Value of the date component used for storing `TIME` data in Oracle. Since Oracle has no data type to only store a time without a date component, ScalarDB stores `TIME` data with the same date component value for ease of comparison and sorting. | `1970-01-01` |
98+
9899
:::note
99100

100101
#### SQLite3
@@ -240,7 +241,7 @@ In this example configuration, the app (ScalarDB library with Consensus Commit)
240241

241242
:::warning
242243

243-
This configuration exists only for development purposes and isn’t suitable for a production environment. This is because the app needs to implement the [Scalar Admin](https://github.com/scalar-labs/scalar-admin) interface to take transactionally consistent backups for ScalarDB, which requires additional configurations.
244+
This configuration exists only for development purposes and isn't suitable for a production environment. This is because the app needs to implement the [Scalar Admin](https://github.com/scalar-labs/scalar-admin) interface to take transactionally consistent backups for ScalarDB, which requires additional configurations.
244245

245246
:::
246247

‎docs/scalardb-analytics/version-compatibility.mdx‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎docs/scalardb-cluster/encrypt-data-at-rest.mdx‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,17 @@ If you enable the encryption feature, enabling wire encryption to protect your d
109109

110110
This tutorial explains how to encrypt data stored through ScalarDB by using HashiCorp Vault encryption.
111111

112+
### Prerequisites
113+
114+
- OpenJDK LTS version (8, 11, 17, or 21) from [Eclipse Temurin](https://adoptium.net/temurin/releases/)
115+
- [Docker](https://www.docker.com/get-started/) 20.10 or later with [Docker Compose](https://docs.docker.com/compose/install/) V2 or later
116+
117+
:::note
118+
119+
This tutorial has been tested with OpenJDK from Eclipse Temurin. ScalarDB itself, however, has been tested with JDK distributions from various vendors. For details about the requirements for ScalarDB, including compatible JDK distributions, please see [Requirements](../requirements.mdx).
120+
121+
:::
122+
112123
<WarningLicenseKeyContact product="ScalarDB Cluster" />
113124

114125
### Step 1. Install HashiCorp Vault

‎docs/scalardb-cluster/scalardb-auth-with-sql.mdx‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,17 @@ If you enable authentication and authorization, enabling wire encryption to prot
145145

146146
This tutorial explains how to use authentication and authorization.
147147

148+
### Prerequisites
149+
150+
- OpenJDK LTS version (8, 11, 17, or 21) from [Eclipse Temurin](https://adoptium.net/temurin/releases/)
151+
- [Docker](https://www.docker.com/get-started/) 20.10 or later with [Docker Compose](https://docs.docker.com/compose/install/) V2 or later
152+
153+
:::note
154+
155+
This tutorial has been tested with OpenJDK from Eclipse Temurin. ScalarDB itself, however, has been tested with JDK distributions from various vendors. For details about the requirements for ScalarDB, including compatible JDK distributions, please see [Requirements](../requirements.mdx).
156+
157+
:::
158+
148159
<WarningLicenseKeyContact product="ScalarDB Cluster" />
149160

150161
### 1. Create the ScalarDB Cluster configuration file

‎docs/scalardb-cluster/scalardb-cluster-configurations.mdx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ The following performance-related configurations are available for the Consensus
6969

7070
| Name | Description | Default |
7171
|----------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------|
72-
| `scalar.db.consensus_commit.parallel_executor_count` | Number of executors (threads) for parallel execution. | `128` |
72+
| `scalar.db.consensus_commit.parallel_executor_count` | Number of executors (threads) for parallel execution. This number refers to the total number of threads across transactions in a ScalarDB Cluster node or a ScalarDB process. | `128` |
7373
| `scalar.db.consensus_commit.parallel_preparation.enabled` | Whether or not the preparation phase is executed in parallel. | `true` |
7474
| `scalar.db.consensus_commit.parallel_validation.enabled` | Whether or not the validation phase (in `EXTRA_READ`) is executed in parallel. | The value of `scalar.db.consensus_commit.parallel_commit.enabled` |
7575
| `scalar.db.consensus_commit.parallel_commit.enabled` | Whether or not the commit phase is executed in parallel. | `true` |

‎docusaurus.config.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -392,6 +392,8 @@ const config = {
392392
// Optional: see doc section below
393393
contextualSearch: true,
394394

395+
insights: true,
396+
395397
// Optional: Specify domains where the navigation should occur through window.location instead on history.push. Useful when our Algolia config crawls multiple documentation sites and we want to navigate with window.location.href to them.
396398
// externalUrlRegex: 'external\\.com|domain\\.com',
397399

‎i18n/versioned_docs/ja-jp/docusaurus-plugin-content-docs/current/configurations.mdx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Consensus Commit トランザクションマネージャーでは、次のパフ
5252

5353
| 名前 | 説明 | デフォルト |
5454
|----------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------|
55-
| `scalar.db.consensus_commit.parallel_executor_count` | 並列実行のためのエグゼキュータ（スレッド）の数。 | `128` |
55+
| `scalar.db.consensus_commit.parallel_executor_count` | 並列実行のためのエグゼキュータ (スレッド) の数。この数値は、ScalarDB Cluster ノード内または ScalarDB プロセス内のトランザクション全体のスレッド数の合計を示します。 | `128` |
5656
| `scalar.db.consensus_commit.parallel_preparation.enabled` | 準備フェーズが並行して実行されるかどうか。 | `true` |
5757
| `scalar.db.consensus_commit.parallel_validation.enabled` | 検証フェーズ (`EXTRA_READ` 内) が並列で実行されるかどうか。 | `scalar.db.consensus_commit.parallel_commit.enabled` の値 |
5858
| `scalar.db.consensus_commit.parallel_commit.enabled` | コミットフェーズが並列で実行されるかどうか。 | `true` |

‎i18n/versioned_docs/ja-jp/docusaurus-plugin-content-docs/current/scalardb-cluster/encrypt-data-at-rest.mdx‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,17 @@ HashiCorp Vault 暗号化を使用するには、ScalarDB Cluster ノード設
112112

113113
このチュートリアルでは、HashiCorp Vault 暗号化を使用して ScalarDB で保存されたデータを暗号化する方法について説明します。
114114

115+
## 前提条件
116+
117+
- [Eclipse Temurin](https://adoptium.net/temurin/releases/) の OpenJDK LTS バージョン (8、11、17、または 21)
118+
- [Docker](https://www.docker.com/get-started/) 20.10以降と [Docker Compose](https://docs.docker.com/compose/install/) V2以降
119+
120+
:::note
121+
122+
このチュートリアルは、Eclipse Temurin の OpenJDK でテストされています。ただし、ScalarDB 自体は、さまざまなベンダーの JDK ディストリビューションでテストされています。互換性のある JDK ディストリビューションを含む ScalarDB の要件の詳細については、[要件](./requirements.mdx)を参照してください。
123+
124+
:::
125+
115126
<WarningLicenseKeyContact product="ScalarDB Cluster" />
116127

117128
### ステップ 1. HashiCorp Vault をインストールします

‎i18n/versioned_docs/ja-jp/docusaurus-plugin-content-docs/current/scalardb-cluster/scalardb-auth-with-sql.mdx‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,17 @@ ScalarDB Cluster には、ユーザーを認証および認可するメカニズ
148148

149149
このチュートリアルでは、認証と認可の使用方法を説明します。
150150

151+
## 前提条件
152+
153+
- [Eclipse Temurin](https://adoptium.net/temurin/releases/) の OpenJDK LTS バージョン (8、11、17、または 21)
154+
- [Docker](https://www.docker.com/get-started/) 20.10以降と [Docker Compose](https://docs.docker.com/compose/install/) V2以降
155+
156+
:::note
157+
158+
このチュートリアルは、Eclipse Temurin の OpenJDK でテストされています。ただし、ScalarDB 自体は、さまざまなベンダーの JDK ディストリビューションでテストされています。互換性のある JDK ディストリビューションを含む ScalarDB の要件の詳細については、[要件](./requirements.mdx)を参照してください。
159+
160+
:::
161+
151162
<WarningLicenseKeyContact product="ScalarDB Cluster" />
152163

153164
### 1. ScalarDB Cluster 設定ファイルを作成する

‎i18n/versioned_docs/ja-jp/docusaurus-plugin-content-docs/current/scalardb-cluster/scalardb-cluster-configurations.mdx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ scalar.db.transaction_manager=consensus-commit
7171

7272
| 名前 | 説明 | デフォルト |
7373
|----------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------|
74-
| `scalar.db.consensus_commit.parallel_executor_count` | 並列実行のためのエグゼキュータ（スレッド）の数。 | `128` |
74+
| `scalar.db.consensus_commit.parallel_executor_count` | 並列実行のためのエグゼキュータ (スレッド) の数。この数値は、ScalarDB Cluster ノード内または ScalarDB プロセス内のトランザクション全体のスレッド数の合計を示します。 | `128` |
7575
| `scalar.db.consensus_commit.parallel_preparation.enabled` | 準備フェーズが並行して実行されるかどうか。 | `true` |
7676
| `scalar.db.consensus_commit.parallel_validation.enabled` | 検証フェーズ (`EXTRA_READ` 内) が並列で実行されるかどうか。 | `scalar.db.consensus_commit.parallel_commit.enabled` の値 |
7777
| `scalar.db.consensus_commit.parallel_commit.enabled` | コミットフェーズが並列で実行されるかどうか。 | `true` |

0 commit comments

Comments
 (0)