Skip to content

Conversation

@feeblefakie
Copy link
Contributor

This is an automated backport of the following:

Please merge this PR after all checks have passed.

Co-authored-by: Peckstadt Yves <[email protected]>
Co-authored-by: Toshihiro Suzuki <[email protected]>
@inv-jishnu inv-jishnu requested a review from brfrn169 May 28, 2025 09:26
@inv-jishnu
Copy link
Contributor

inv-jishnu commented May 28, 2025

@brfrn169 san,
I have made a slight modification to the implementation as gradle check CI failed : https://github.com/scalar-labs/scalardb/actions/runs/15295142069/job/43022369443
Please take a look at when you get a chance and let me know if any further change is required.
Thank you.

File configFile = new File(configFilePath);
StorageFactory storageFactory = StorageFactory.create(configFile);
try (DistributedStorageAdmin storageAdmin = storageFactory.getStorageAdmin()) {
DistributedStorageAdmin storageAdmin = null;
Copy link
Collaborator

@brfrn169 brfrn169 May 28, 2025

Choose a reason for hiding this comment

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

@inv-jishnu Sorry, why do we need this change only for the 3.12 branch?

Copy link
Contributor

Choose a reason for hiding this comment

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

@brfrn169 san,

As I mentioned above there was a CI failure

> Task :data-loader:cli:compileJava FAILED
/home/runner/work/scalardb/scalardb/data-loader/cli/src/main/java/com/scalar/db/dataloader/cli/command/dataimport/ImportCommand.java:99: error: incompatible types: try-with-resources not applicable to variable type
    try (DistributedStorageAdmin storageAdmin = storageFactory.getStorageAdmin()) {
                                 ^
    (DistributedStorageAdmin cannot be converted to AutoCloseable)
Note: /home/runner/work/scalardb/scalardb/data-loader/cli/src/main/java/com/scalar/db/dataloader/cli/command/dataexport/ScanOrderingConverter.java uses or overrides a deprecated API.
Note: Recompile with -Xlint:deprecation for details.
1 error

I thought there may have been an update in DistributedStorageAdmin implementation. This only happened in 3.12 branch. Hence I changed the implementation.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Ah, yes. Thanks!

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!

@brfrn169 brfrn169 merged commit 1dbbbf4 into 3.12 May 28, 2025
28 checks passed
@brfrn169 brfrn169 deleted the 3.12-pull-2618 branch May 28, 2025 13:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants