Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add documentation for the upgrade feature #1311

Merged
merged 6 commits into from
Dec 5, 2023
Merged

Conversation

Torch3333
Copy link
Contributor

@Torch3333 Torch3333 commented Nov 22, 2023

Description

Adds documentation for the upgrade feature that was added to the Admin API (admin.upgrade(...)) and Schema Loader (--upgrade command).

Related issues and/or PRs

Changes made

This adds sections for the upgrade feature to the api-guide, api-abstraction and Schema Loader documentations.

Checklist

The following is a best-effort checklist. If any items in this checklist are not applicable to this PR or are dependent on other, unmerged PRs, please still mark the checkboxes after you have read and understood each item.

  • I have commented my code, particularly in hard-to-understand areas.
  • I have updated the documentation to reflect the changes.
  • Any remaining open issues linked to this PR are documented and up-to-date (Jira, GitHub, etc.).
  • Tests (unit, integration, etc.) have been added for the changes.
  • My changes generate no new warnings.
  • Any dependent changes in other PRs have been merged and published.

Additional notes (optional)

N/A

Release notes

N/A

@Torch3333 Torch3333 changed the title Add documentation for upgrade Add documentation for the upgrade feature Nov 22, 2023
@Torch3333 Torch3333 marked this pull request as ready for review November 22, 2023 23:24
@Torch3333 Torch3333 self-assigned this Nov 22, 2023
Copy link
Contributor

@komamitsu komamitsu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! 👍

@@ -250,6 +250,18 @@ You can get table metadata as follows:
TableMetadata tableMetadata = admin.getTableMetadata("ns", "tbl");
```

### Upgrade the environment to support the latest ScalarDB API

You can upgrade the ScalarDB environment to support the latest version of the ScalarDB API. Typically,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[trivial] Maybe this is a matter of taste, but

you will be requested

"you will need" is a bit clearer?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree; it sounds better. Thanks.

Copy link
Contributor Author

@Torch3333 Torch3333 Nov 28, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I applied your suggestion and also updated Java files containing documentation for upgrade which use the same wording.
a36972b

Copy link
Collaborator

@brfrn169 brfrn169 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Thank you!

Copy link
Contributor

@kota2and3kan kota2and3kan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LTGM! Thank you!
I left a very minor comment.
Please take a look when you have time!

docs/schema-loader.md Outdated Show resolved Hide resolved
Copy link
Member

@josh-wong josh-wong left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've added some suggestions. PTAL!

docs/api-guide.md Outdated Show resolved Hide resolved
docs/api-guide.md Outdated Show resolved Hide resolved
Comment on lines 95 to 99
--upgrade Upgrades the ScalarDB environment to support the latest
version of the ScalarDB API. Typically, you will be
requested, as indicated on the release notes, to run
this command after updating the ScalarDB version of
your application environment.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
--upgrade Upgrades the ScalarDB environment to support the latest
version of the ScalarDB API. Typically, you will be
requested, as indicated on the release notes, to run
this command after updating the ScalarDB version of
your application environment.
--upgrade Upgrades the ScalarDB environment to support the latest
version of the ScalarDB API. Typically, you will need, as indicated in the release notes, to run
this command after updating the ScalarDB version that
your application environment uses.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you. This suggestion is similar to #1311 (comment) so I did not apply it.

Copy link
Member

@josh-wong josh-wong Nov 30, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I made some changes aside from the word need in my original suggestion. (Sorry, my other changes in my suggestion were a bit hard to see.)

Please see my new comment/suggestion, which also incorporates @feeblefakie's suggestion.

docs/schema-loader.md Outdated Show resolved Hide resolved
docs/schema-loader.md Outdated Show resolved Hide resolved
docs/storage-abstraction.md Outdated Show resolved Hide resolved
docs/storage-abstraction.md Outdated Show resolved Hide resolved
Co-authored-by: Josh Wong <joshua.wong@scalar-labs.com>
Co-authored-by: kota2and3kan <47254383+kota2and3kan@users.noreply.github.com>
@Torch3333 Torch3333 requested a review from josh-wong November 29, 2023 21:47
Copy link
Contributor

@feeblefakie feeblefakie left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overall, looking good.
I left one suggestion. There are several places that use the same expression, so I also left comments on those. (but I didn't do it for all the places.)

@@ -436,7 +436,7 @@ void importTable(String namespace, String table, Map<String, String> options)

/**
* Upgrades the ScalarDB environment to support the latest version of the ScalarDB API. Typically,
* you will be requested, as indicated on the release notes, to run this method after updating the
* you will need, as indicated on the release notes, to run this method after updating the
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
* you will need, as indicated on the release notes, to run this method after updating the
* as indicated on the release notes, you will need to run this method after updating the

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Torch3333 I didn't see that the wording in some of the non-.md files matched the same wording in the .md files, so I'm making a suggestion here.

My suggestion below (and in my other comments that contain this sentence revises that) addresses @feeblefakie's suggestion and applies other wording that is consistent with my original suggestion.

Suggested change
* you will need, as indicated on the release notes, to run this method after updating the
* as indicated in the release notes, you will need to run this method after updating the

@@ -250,6 +250,16 @@ You can get table metadata as follows:
TableMetadata tableMetadata = admin.getTableMetadata("ns", "tbl");
```

### Upgrade the environment to support the latest ScalarDB API

You can upgrade the ScalarDB environment to support the latest version of the ScalarDB API. Typically, you will need, as indicated in the release notes, to run this method after updating the ScalarDB version that your application environment uses.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ditto.

@@ -92,6 +92,12 @@ Create/Delete schemas in the storage defined in the config file
The replication strategy, must be SimpleStrategy or
NetworkTopologyStrategy (supported in Cassandra)
--ru=<ru> Base resource unit (supported in DynamoDB, Cosmos DB)
--upgrade Upgrades the ScalarDB environment to support the latest
version of the ScalarDB API. Typically, you will
need, as indicated on the release notes, to run
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ditto.

@@ -439,6 +445,14 @@ $ java -jar scalardb-schema-loader-<VERSION>.jar --jdbc -j <JDBC_URL> -u <USER>

<div class="notice--info">{{ notice--info | markdownify }}</div>

### Upgrade the environment to support the latest ScalarDB API

You can upgrade the ScalarDB environment to support the latest version of the ScalarDB API. Typically, you will need, as indicated in the release notes, to run this method after updating the ScalarDB version that your application environment uses.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ditto.

@@ -405,6 +405,16 @@ You can get table metadata as follows:
TableMetadata tableMetadata = admin.getTableMetadata("ns", "tbl");
```

### Upgrade the environment to support the latest ScalarDB API

You can upgrade the ScalarDB environment to support the latest version of the ScalarDB API. Typically, you will need, as indicated in the release notes, to run this method after updating the ScalarDB version that your application environment uses.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ditto.

Copy link
Member

@josh-wong josh-wong left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Made some suggestions mostly in source code files based on a similar sentence in the Markdown files. PTAL!

@@ -436,7 +436,7 @@ void importTable(String namespace, String table, Map<String, String> options)

/**
* Upgrades the ScalarDB environment to support the latest version of the ScalarDB API. Typically,
* you will be requested, as indicated on the release notes, to run this method after updating the
* you will need, as indicated on the release notes, to run this method after updating the
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Torch3333 I didn't see that the wording in some of the non-.md files matched the same wording in the .md files, so I'm making a suggestion here.

My suggestion below (and in my other comments that contain this sentence revises that) addresses @feeblefakie's suggestion and applies other wording that is consistent with my original suggestion.

Suggested change
* you will need, as indicated on the release notes, to run this method after updating the
* as indicated in the release notes, you will need to run this method after updating the

Comment on lines 95 to 99
--upgrade Upgrades the ScalarDB environment to support the latest
version of the ScalarDB API. Typically, you will
need, as indicated on the release notes, to run
this command after updating the ScalarDB version of
your application environment.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I made some changes aside from the word need in my original suggestion. (Sorry, my other changes in my suggestion were a bit hard to see.)

I've also included @feeblefakie's suggestion in my suggestion below:

Suggested change
--upgrade Upgrades the ScalarDB environment to support the latest
version of the ScalarDB API. Typically, you will
need, as indicated on the release notes, to run
this command after updating the ScalarDB version of
your application environment.
--upgrade Upgrades the ScalarDB environment to support the
latest version of the ScalarDB API. Typically, as
indicated in the release notes, you will need to
run this command after updating the ScalarDB
version that your application environment uses.

@@ -436,7 +436,7 @@ void importTable(String namespace, String table, Map<String, String> options)

/**
* Upgrades the ScalarDB environment to support the latest version of the ScalarDB API. Typically,
* you will be requested, as indicated on the release notes, to run this method after updating the
* you will need, as indicated on the release notes, to run this method after updating the
* ScalarDB version of your application environment.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
* ScalarDB version of your application environment.
* ScalarDB version that your application environment uses.

Comment on lines 589 to 590
* you will need, as indicated on the release notes, to run this method after updating the
* ScalarDB version of your application environment.
Copy link
Member

@josh-wong josh-wong Nov 30, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Similar to my previous comment.

Suggested change
* you will need, as indicated on the release notes, to run this method after updating the
* ScalarDB version of your application environment.
* as indicated in the release notes, you will need to run this method after updating the
* ScalarDB version that your application environment uses.

Comment on lines 604 to 605
* you will need, as indicated on the release notes, to run this method after updating the
* ScalarDB version of your application environment.
Copy link
Member

@josh-wong josh-wong Nov 30, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Similar to my previous comment.

Suggested change
* you will need, as indicated on the release notes, to run this method after updating the
* ScalarDB version of your application environment.
* as indicated in the release notes, you will need to run this method after updating the
* ScalarDB version that your application environment uses.

Comment on lines 103 to 104
"Upgrades the ScalarDB environment to support the latest version of the ScalarDB API. Typically, you will need, as indicated on the release notes, to run this command after"
+ " updating the ScalarDB version of your application environment.",
Copy link
Member

@josh-wong josh-wong Nov 30, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Similar to my previous comment.

Suggested change
"Upgrades the ScalarDB environment to support the latest version of the ScalarDB API. Typically, you will need, as indicated on the release notes, to run this command after"
+ " updating the ScalarDB version of your application environment.",
"Upgrades the ScalarDB environment to support the latest version of the ScalarDB API. Typically, as indicated in the release notes, you will need to run this command after"
+ " updating the ScalarDB version that your application environment uses.",

…_for_upgrade

# Conflicts:
#	docs/api-guide.md
#	docs/schema-loader.md
#	docs/storage-abstraction.md
@Torch3333
Copy link
Contributor Author

@feeblefakie @josh-wong
Thank you again. I applied your suggestions. PTAL when you can 🙇

Copy link
Member

@josh-wong josh-wong left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've left a minor suggestion (an oversight on my part...). Other than that, LGTM! Thank you!

docs/schema-loader.md Outdated Show resolved Hide resolved
@brfrn169 brfrn169 requested a review from feeblefakie December 1, 2023 07:59
Co-authored-by: Josh Wong <joshua.wong@scalar-labs.com>
Copy link
Contributor

@feeblefakie feeblefakie left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Thank you!

@feeblefakie feeblefakie merged commit 00ae163 into master Dec 5, 2023
23 checks passed
@feeblefakie feeblefakie deleted the add_doc_for_upgrade branch December 5, 2023 08:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants