This is an automated email from the ASF dual-hosted git repository. ycai pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra-analytics.git
commit 6f8f404535d4cff9272091f669f985ce11cee7d2 Author: Yuriy Semchyshyn <[email protected]> AuthorDate: Tue Jul 18 18:58:00 2023 -0500 CASSANDRA-18684: Minor Refactoring to Improve Code Reusability patch by Yuriy Semchyshyn; reviewed by Dinesh Joshi, Yifan Cai for CASSANDRA-18684 --- CHANGES.txt | 1 + .../spark/bulkwriter/CassandraClusterInfo.java | 21 +++++++++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index f36e3d4..afbb30a 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 1.0.0 + * Minor Refactoring to Improve Code Reusability (CASSANDRA-18684) * Fix cassandra-analytics-core-example (CASSANDRA-18662) * Added caching of Node Settings to improve efficiency (CASSANDRA-18633) * Upgrade to JUnit 5 (CASSANDRA-18599) diff --git a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/CassandraClusterInfo.java b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/CassandraClusterInfo.java index cc04161..e6f145e 100644 --- a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/CassandraClusterInfo.java +++ b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/CassandraClusterInfo.java @@ -344,14 +344,8 @@ public class CassandraClusterInfo implements ClusterInfo, Closeable return null; } - public String getVersionFromSidecar() + protected List<NodeSettings> getAllNodeSettings() { - NodeSettings nodeSettings = this.nodeSettings.get(); - if (nodeSettings != null) - { - return nodeSettings.releaseVersion(); - } - List<NodeSettings> allNodeSettings = FutureUtils.bestEffortGet(allNodeSettingFutures, conf.getSidecarRequestMaxRetryDelayInSeconds(), TimeUnit.SECONDS); @@ -367,7 +361,18 @@ public class CassandraClusterInfo implements ClusterInfo, Closeable allNodeSettings.size(), allNodeSettingFutures.size()); } - return getLowestVersion(allNodeSettings); + return allNodeSettings; + } + + public String getVersionFromSidecar() + { + NodeSettings nodeSettings = this.nodeSettings.get(); + if (nodeSettings != null) + { + return nodeSettings.releaseVersion(); + } + + return getLowestVersion(getAllNodeSettings()); } protected RingResponse getRingResponse() --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
