This is an automated email from the ASF dual-hosted git repository.
bbotella pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra-sidecar.git
The following commit(s) were added to refs/heads/trunk by this push:
new f0556e22a CASSSIDECAR-497: Remove unused instance metadata fetcher
(#382)
f0556e22a is described below
commit f0556e22a833aab9366a02a1b05bcbc26e6e80cf
Author: Bernardo Botella <[email protected]>
AuthorDate: Fri Oct 2 09:53:15 2026 +0200
CASSSIDECAR-497: Remove unused instance metadata fetcher (#382)
* Remove unused instance metadata fetcher
* Updates changes.txt
---
CHANGES.txt | 1 +
.../cassandra/sidecar/db/CdcDatabaseAccessor.java | 6 +-----
.../cassandra/sidecar/db/CdcDatabaseAccessorTests.java | 17 ++---------------
3 files changed, 4 insertions(+), 20 deletions(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index 255a597d7..b36b0bba9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,6 @@
0.5.0
-----
+ * Remove unused Instance Metadata Fetcher from CdcDatabaseAccessor
(CASSSIDECAR-497)
* Fix IPV6 regex to recognize bracketed addresses in gossip info host headers
(CASSSIDECAR-503)
* CDC batch-write mixing a CDC-enabled and CDC-disabled table drops the CDC
table's mutation (CASSSIDECAR-499)
* Disable Netty wire logging on the HTTP server (CASSSIDECAR-496)
diff --git
a/server/src/main/java/org/apache/cassandra/sidecar/db/CdcDatabaseAccessor.java
b/server/src/main/java/org/apache/cassandra/sidecar/db/CdcDatabaseAccessor.java
index 31c6b046e..fad1cf059 100644
---
a/server/src/main/java/org/apache/cassandra/sidecar/db/CdcDatabaseAccessor.java
+++
b/server/src/main/java/org/apache/cassandra/sidecar/db/CdcDatabaseAccessor.java
@@ -43,7 +43,6 @@ import
org.apache.cassandra.sidecar.common.server.CQLSessionProvider;
import org.apache.cassandra.sidecar.db.schema.CdcStatesSchema;
import org.apache.cassandra.sidecar.db.schema.SidecarSchema;
import org.apache.cassandra.sidecar.utils.ByteBufUtils;
-import org.apache.cassandra.sidecar.utils.InstanceMetadataFetcher;
import org.apache.cassandra.sidecar.utils.TokenSplitUtil;
import org.apache.cassandra.spark.data.partitioner.Partitioner;
import org.apache.cassandra.spark.utils.TableIdentifier;
@@ -62,17 +61,14 @@ public class CdcDatabaseAccessor extends
DatabaseAccessor<CdcStatesSchema>
private static final Logger LOGGER =
LoggerFactory.getLogger(CdcDatabaseAccessor.class);
private final Provider<TokenSplitUtil> tokenSplitUtilProvider;
private volatile TokenSplitUtil tokenSplitUtil = null;
- private final InstanceMetadataFetcher instanceMetadataFetcher;
@Inject
public CdcDatabaseAccessor(SidecarSchema sidecarSchema,
CQLSessionProvider sessionProvider,
- Provider<TokenSplitUtil> tokenSplitUtilProvider,
- InstanceMetadataFetcher instanceMetadataFetcher)
+ Provider<TokenSplitUtil> tokenSplitUtilProvider)
{
super(sidecarSchema.tableSchema(CdcStatesSchema.class),
sessionProvider);
this.tokenSplitUtilProvider = tokenSplitUtilProvider;
- this.instanceMetadataFetcher = instanceMetadataFetcher;
}
protected TokenSplitUtil tokenSplitUtil()
diff --git
a/server/src/test/java/org/apache/cassandra/sidecar/db/CdcDatabaseAccessorTests.java
b/server/src/test/java/org/apache/cassandra/sidecar/db/CdcDatabaseAccessorTests.java
index 2db66cb24..728489e5a 100644
---
a/server/src/test/java/org/apache/cassandra/sidecar/db/CdcDatabaseAccessorTests.java
+++
b/server/src/test/java/org/apache/cassandra/sidecar/db/CdcDatabaseAccessorTests.java
@@ -44,11 +44,9 @@ import com.datastax.driver.core.Row;
import com.datastax.driver.core.Session;
import com.google.inject.Provider;
import org.apache.cassandra.bridge.TokenRange;
-import org.apache.cassandra.sidecar.cluster.instance.InstanceMetadata;
import org.apache.cassandra.sidecar.common.server.CQLSessionProvider;
import org.apache.cassandra.sidecar.db.schema.CdcStatesSchema;
import org.apache.cassandra.sidecar.db.schema.SidecarSchema;
-import org.apache.cassandra.sidecar.utils.InstanceMetadataFetcher;
import org.apache.cassandra.sidecar.utils.TokenSplitUtil;
import org.apache.cassandra.spark.data.partitioner.Partitioner;
import org.jetbrains.annotations.NotNull;
@@ -57,7 +55,6 @@ import static
org.apache.cassandra.sidecar.db.CdcDatabaseAccessor.await;
import static org.apache.cassandra.sidecar.utils.TokenSplitUtil.overlaps;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.mock;
@@ -145,8 +142,7 @@ class CdcDatabaseAccessorTests
CdcDatabaseAccessor db = new CdcDatabaseAccessor(mockSidecarSchema,
getMockCQLSessionProvider(datastore, mockCdcStatesSchema),
-
tokenSplitUtilProvider,
-
getMockInstanceMetaDataFetcher());
+
tokenSplitUtilProvider);
ByteBuffer[] buffers = new ByteBuffer[tokensBeforeShrink.size()];
for (int i = 0; i < tokensBeforeShrink.size(); i++)
@@ -195,8 +191,7 @@ class CdcDatabaseAccessorTests
CdcDatabaseAccessor db = new CdcDatabaseAccessor(mockSidecarSchema,
getMockCQLSessionProvider(datastore, mockCdcStatesSchema),
-
tokenSplitUtilProvider,
-
getMockInstanceMetaDataFetcher());
+
tokenSplitUtilProvider);
ByteBuffer[] buffers = new ByteBuffer[tokensBeforeExpansion.size()];
for (int i = 0; i < tokensBeforeExpansion.size(); i++)
@@ -396,14 +391,6 @@ class CdcDatabaseAccessorTests
}
}
- private InstanceMetadataFetcher getMockInstanceMetaDataFetcher()
- {
- InstanceMetadata instanceMeta = mock(InstanceMetadata.class);
- InstanceMetadataFetcher instanceMetadataFetcher =
mock(InstanceMetadataFetcher.class);
-
when(instanceMetadataFetcher.instance(anyString())).thenReturn(instanceMeta);
- return instanceMetadataFetcher;
- }
-
CQLSessionProvider getMockCQLSessionProvider(MockCdcStateV2 datastore,
CdcStatesSchema mockCdcStatesSchema)
{
PreparedStatement insertStmt = mock(PreparedStatement.class);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
