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
The following commit(s) were added to refs/heads/trunk by this push: new 466e7bf CASSANDRA-19616: Integrate with the latest sidecar client (#56) 466e7bf is described below commit 466e7bf5e160d1667c12ea1de1b79ba27670aba4 Author: Yifan Cai <52585731+yifa...@users.noreply.github.com> AuthorDate: Fri May 3 10:11:18 2024 -0700 CASSANDRA-19616: Integrate with the latest sidecar client (#56) The patch updates the analytics code to consume the latest sidecar client after CASSANDRASC-127 Patch by Yifan Cai; Reviewed by Francisco Guerrero for CASSANDRA-19616 --- CHANGES.txt | 1 + .../main/java/org/apache/cassandra/clients/Sidecar.java | 2 +- .../spark/bulkwriter/CassandraBulkSourceRelation.java | 8 ++++---- .../cassandra/spark/bulkwriter/CassandraClusterInfo.java | 16 ++++++++-------- .../apache/cassandra/spark/bulkwriter/ClusterInfo.java | 2 +- .../spark/bulkwriter/ImportCompletionCoordinator.java | 2 +- .../apache/cassandra/spark/bulkwriter/RecordWriter.java | 2 +- .../apache/cassandra/spark/bulkwriter/RingInstance.java | 4 ++-- .../spark/bulkwriter/SidecarDataTransferApi.java | 4 ++-- .../spark/bulkwriter/blobupload/BlobDataTransferApi.java | 14 +++++++------- .../spark/bulkwriter/blobupload/BlobStreamSession.java | 4 ++-- .../spark/bulkwriter/blobupload/CreatedRestoreSlice.java | 2 +- .../spark/bulkwriter/token/TokenRangeMapping.java | 2 +- .../java/org/apache/cassandra/spark/common/Digest.java | 2 +- .../org/apache/cassandra/spark/common/MD5Digest.java | 4 ++-- .../apache/cassandra/spark/common/XXHash32Digest.java | 4 ++-- .../apache/cassandra/spark/data/CassandraDataLayer.java | 8 ++++---- .../cassandra/spark/data/SidecarProvisionedSSTable.java | 2 +- .../storage/extensions/StorageTransportHandler.java | 2 +- .../cassandra/spark/validation/CassandraValidation.java | 2 +- .../cassandra/spark/validation/SidecarValidation.java | 2 +- .../bulkwriter/ImportCompletionCoordinatorTest.java | 6 +++--- .../spark/bulkwriter/MockBulkWriterContext.java | 2 +- .../spark/bulkwriter/RingInstanceSerializationTest.java | 4 ++-- .../cassandra/spark/bulkwriter/RingInstanceTest.java | 2 +- .../spark/bulkwriter/TokenRangeMappingUtils.java | 4 ++-- .../bulkwriter/blobupload/BlobStreamSessionTest.java | 4 ++-- .../bulkwriter/blobupload/CreatedRestoreSliceTest.java | 2 +- .../spark/data/SidecarProvisionedSSTableTest.java | 2 +- cassandra-analytics-integration-framework/build.gradle | 2 +- .../cassandra/sidecar/testing/LocalhostResolver.java | 3 ++- .../testing/SharedClusterIntegrationTestBase.java | 10 +++++----- .../sidecar/testing/TemporaryCqlSessionProvider.java | 2 +- .../apache/cassandra/analytics/ResiliencyTestBase.java | 2 +- .../org/apache/cassandra/analytics/SparkTestUtils.java | 2 +- scripts/build-sidecar.sh | 2 +- 36 files changed, 70 insertions(+), 68 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 723135d..c00c881 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 1.0.0 + * Integrate with the latest sidecar client (CASSANDRA-19616) * Support bulk write via S3 (CASSANDRA-19563) * Support UDTs in the Bulk Writer (CASSANDRA-19340) * Fix bulk reads of multiple tables that potentially have the same data file name (CASSANDRA-19507) diff --git a/cassandra-analytics-core/src/main/java/org/apache/cassandra/clients/Sidecar.java b/cassandra-analytics-core/src/main/java/org/apache/cassandra/clients/Sidecar.java index 4f73640..e692ab2 100644 --- a/cassandra-analytics-core/src/main/java/org/apache/cassandra/clients/Sidecar.java +++ b/cassandra-analytics-core/src/main/java/org/apache/cassandra/clients/Sidecar.java @@ -32,7 +32,7 @@ import java.util.stream.Collectors; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import o.a.c.sidecar.client.shaded.common.NodeSettings; +import o.a.c.sidecar.client.shaded.common.response.NodeSettings; import o.a.c.sidecar.client.shaded.io.vertx.core.Vertx; import o.a.c.sidecar.client.shaded.io.vertx.core.VertxOptions; import org.apache.cassandra.secrets.SecretsProvider; diff --git a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/CassandraBulkSourceRelation.java b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/CassandraBulkSourceRelation.java index 50a0119..8f5e78e 100644 --- a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/CassandraBulkSourceRelation.java +++ b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/CassandraBulkSourceRelation.java @@ -24,19 +24,19 @@ import java.util.Collections; import java.util.HashMap; import java.util.Iterator; import java.util.List; -import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; import java.util.UUID; +import java.util.concurrent.TimeUnit; import java.util.function.Consumer; +import java.util.stream.Collectors; import javax.validation.constraints.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import o.a.c.sidecar.client.shaded.common.data.CreateRestoreJobRequestPayload; import o.a.c.sidecar.client.shaded.common.data.RestoreJobSecrets; import o.a.c.sidecar.client.shaded.common.data.RestoreJobStatus; -import o.a.c.sidecar.client.shaded.common.data.UpdateRestoreJobRequestPayload; +import o.a.c.sidecar.client.shaded.common.request.data.CreateRestoreJobRequestPayload; +import o.a.c.sidecar.client.shaded.common.request.data.UpdateRestoreJobRequestPayload; import org.apache.cassandra.spark.bulkwriter.blobupload.BlobStreamResult; import org.apache.cassandra.spark.bulkwriter.token.ReplicaAwareFailureHandler; import org.apache.cassandra.spark.common.client.ClientException; 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 9ba7824..c208ed4 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 @@ -43,14 +43,14 @@ import com.google.common.collect.Range; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import o.a.c.sidecar.client.shaded.common.NodeSettings; -import o.a.c.sidecar.client.shaded.common.data.GossipInfoResponse; -import o.a.c.sidecar.client.shaded.common.data.RingEntry; -import o.a.c.sidecar.client.shaded.common.data.SchemaResponse; -import o.a.c.sidecar.client.shaded.common.data.TimeSkewResponse; -import o.a.c.sidecar.client.shaded.common.data.TokenRangeReplicasResponse; -import o.a.c.sidecar.client.shaded.common.data.TokenRangeReplicasResponse.ReplicaInfo; -import o.a.c.sidecar.client.shaded.common.data.TokenRangeReplicasResponse.ReplicaMetadata; +import o.a.c.sidecar.client.shaded.common.response.GossipInfoResponse; +import o.a.c.sidecar.client.shaded.common.response.NodeSettings; +import o.a.c.sidecar.client.shaded.common.response.SchemaResponse; +import o.a.c.sidecar.client.shaded.common.response.TimeSkewResponse; +import o.a.c.sidecar.client.shaded.common.response.TokenRangeReplicasResponse; +import o.a.c.sidecar.client.shaded.common.response.TokenRangeReplicasResponse.ReplicaInfo; +import o.a.c.sidecar.client.shaded.common.response.TokenRangeReplicasResponse.ReplicaMetadata; +import o.a.c.sidecar.client.shaded.common.response.data.RingEntry; import org.apache.cassandra.bridge.CassandraBridge; import org.apache.cassandra.bridge.CassandraBridgeFactory; import org.apache.cassandra.bridge.CassandraVersionFeatures; diff --git a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/ClusterInfo.java b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/ClusterInfo.java index 2c1700d..906ce3c 100644 --- a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/ClusterInfo.java +++ b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/ClusterInfo.java @@ -23,7 +23,7 @@ import java.io.Serializable; import java.util.List; import java.util.Map; -import o.a.c.sidecar.client.shaded.common.data.TimeSkewResponse; +import o.a.c.sidecar.client.shaded.common.response.TimeSkewResponse; import org.apache.cassandra.spark.bulkwriter.token.TokenRangeMapping; import org.apache.cassandra.spark.common.client.InstanceState; import org.apache.cassandra.spark.data.partitioner.Partitioner; diff --git a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/ImportCompletionCoordinator.java b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/ImportCompletionCoordinator.java index 94ea6d0..1133bc5 100644 --- a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/ImportCompletionCoordinator.java +++ b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/ImportCompletionCoordinator.java @@ -40,7 +40,7 @@ import com.google.common.collect.Range; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import o.a.c.sidecar.client.shaded.common.data.CreateSliceRequestPayload; +import o.a.c.sidecar.client.shaded.common.request.data.CreateSliceRequestPayload; import org.apache.cassandra.sidecar.client.SidecarInstance; import org.apache.cassandra.spark.bulkwriter.blobupload.BlobDataTransferApi; import org.apache.cassandra.spark.bulkwriter.blobupload.BlobStreamResult; diff --git a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/RecordWriter.java b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/RecordWriter.java index 44af5c5..aa0104a 100644 --- a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/RecordWriter.java +++ b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/RecordWriter.java @@ -49,7 +49,7 @@ import com.google.common.collect.Range; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import o.a.c.sidecar.client.shaded.common.data.TimeSkewResponse; +import o.a.c.sidecar.client.shaded.common.response.TimeSkewResponse; import org.apache.cassandra.spark.bulkwriter.token.ReplicaAwareFailureHandler; import org.apache.cassandra.spark.bulkwriter.token.TokenRangeMapping; import org.apache.cassandra.spark.bulkwriter.util.TaskContextUtils; diff --git a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/RingInstance.java b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/RingInstance.java index 40cf314..7efe001 100644 --- a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/RingInstance.java +++ b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/RingInstance.java @@ -25,8 +25,8 @@ import java.io.ObjectOutputStream; import java.io.Serializable; import java.util.Objects; -import o.a.c.sidecar.client.shaded.common.data.RingEntry; -import o.a.c.sidecar.client.shaded.common.data.TokenRangeReplicasResponse.ReplicaMetadata; +import o.a.c.sidecar.client.shaded.common.response.data.RingEntry; +import o.a.c.sidecar.client.shaded.common.response.TokenRangeReplicasResponse.ReplicaMetadata; import org.apache.cassandra.spark.common.model.CassandraInstance; import org.jetbrains.annotations.Nullable; diff --git a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/SidecarDataTransferApi.java b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/SidecarDataTransferApi.java index 189fe10..1d1940c 100644 --- a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/SidecarDataTransferApi.java +++ b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/SidecarDataTransferApi.java @@ -27,11 +27,11 @@ import java.util.concurrent.ExecutionException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import o.a.c.sidecar.client.shaded.common.data.SSTableImportResponse; +import o.a.c.sidecar.client.shaded.common.request.ImportSSTableRequest; +import o.a.c.sidecar.client.shaded.common.response.SSTableImportResponse; import org.apache.cassandra.bridge.CassandraBridge; import org.apache.cassandra.sidecar.client.SidecarClient; import org.apache.cassandra.sidecar.client.SidecarInstanceImpl; -import org.apache.cassandra.sidecar.client.request.ImportSSTableRequest; import org.apache.cassandra.spark.common.Digest; import org.apache.cassandra.spark.common.client.ClientException; import org.apache.cassandra.spark.common.model.CassandraInstance; diff --git a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/blobupload/BlobDataTransferApi.java b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/blobupload/BlobDataTransferApi.java index 55eebed..8791bb9 100644 --- a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/blobupload/BlobDataTransferApi.java +++ b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/blobupload/BlobDataTransferApi.java @@ -27,17 +27,17 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import io.netty.handler.codec.http.HttpResponseStatus; -import o.a.c.sidecar.client.shaded.common.data.CreateRestoreJobRequestPayload; -import o.a.c.sidecar.client.shaded.common.data.CreateRestoreJobResponsePayload; -import o.a.c.sidecar.client.shaded.common.data.CreateSliceRequestPayload; -import o.a.c.sidecar.client.shaded.common.data.RestoreJobSummaryResponsePayload; -import o.a.c.sidecar.client.shaded.common.data.UpdateRestoreJobRequestPayload; +import o.a.c.sidecar.client.shaded.common.request.CreateRestoreJobSliceRequest; +import o.a.c.sidecar.client.shaded.common.request.Request; +import o.a.c.sidecar.client.shaded.common.request.data.CreateRestoreJobRequestPayload; +import o.a.c.sidecar.client.shaded.common.request.data.CreateRestoreJobResponsePayload; +import o.a.c.sidecar.client.shaded.common.request.data.CreateSliceRequestPayload; +import o.a.c.sidecar.client.shaded.common.request.data.RestoreJobSummaryResponsePayload; +import o.a.c.sidecar.client.shaded.common.request.data.UpdateRestoreJobRequestPayload; import org.apache.cassandra.sidecar.client.HttpResponse; import org.apache.cassandra.sidecar.client.HttpResponseImpl; import org.apache.cassandra.sidecar.client.SidecarClient; import org.apache.cassandra.sidecar.client.SidecarInstance; -import org.apache.cassandra.sidecar.client.request.CreateRestoreJobSliceRequest; -import org.apache.cassandra.sidecar.client.request.Request; import org.apache.cassandra.sidecar.client.retry.RetryAction; import org.apache.cassandra.sidecar.client.retry.RetryPolicy; import org.apache.cassandra.spark.bulkwriter.JobInfo; diff --git a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/blobupload/BlobStreamSession.java b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/blobupload/BlobStreamSession.java index 275ee0e..9d3ff95 100644 --- a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/blobupload/BlobStreamSession.java +++ b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/blobupload/BlobStreamSession.java @@ -29,8 +29,8 @@ import com.google.common.collect.Range; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import o.a.c.sidecar.client.shaded.common.data.CreateSliceRequestPayload; -import o.a.c.sidecar.client.shaded.common.data.RestoreJobSummaryResponsePayload; +import o.a.c.sidecar.client.shaded.common.request.data.CreateSliceRequestPayload; +import o.a.c.sidecar.client.shaded.common.request.data.RestoreJobSummaryResponsePayload; import org.apache.cassandra.bridge.CassandraBridge; import org.apache.cassandra.bridge.CassandraBridgeFactory; import org.apache.cassandra.clients.Sidecar; diff --git a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/blobupload/CreatedRestoreSlice.java b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/blobupload/CreatedRestoreSlice.java index c1cec7d..e1da5c3 100644 --- a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/blobupload/CreatedRestoreSlice.java +++ b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/blobupload/CreatedRestoreSlice.java @@ -30,7 +30,7 @@ import org.slf4j.LoggerFactory; // Note: Must use the sidecar shaded jackson to ser/deser sidecar objects import o.a.c.sidecar.client.shaded.com.fasterxml.jackson.core.JsonProcessingException; import o.a.c.sidecar.client.shaded.com.fasterxml.jackson.databind.ObjectMapper; -import o.a.c.sidecar.client.shaded.common.data.CreateSliceRequestPayload; +import o.a.c.sidecar.client.shaded.common.request.data.CreateSliceRequestPayload; import org.apache.cassandra.spark.bulkwriter.token.ConsistencyLevel; import org.apache.cassandra.spark.common.model.CassandraInstance; import org.apache.cassandra.spark.data.ReplicationFactor; diff --git a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/token/TokenRangeMapping.java b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/token/TokenRangeMapping.java index f91bf24..6e5ecac 100644 --- a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/token/TokenRangeMapping.java +++ b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/token/TokenRangeMapping.java @@ -35,7 +35,7 @@ import com.google.common.collect.Range; import com.google.common.collect.RangeMap; import com.google.common.collect.TreeRangeMap; -import o.a.c.sidecar.client.shaded.common.data.TokenRangeReplicasResponse.ReplicaMetadata; +import o.a.c.sidecar.client.shaded.common.response.TokenRangeReplicasResponse.ReplicaMetadata; import org.apache.cassandra.spark.bulkwriter.RingInstance; import org.apache.cassandra.spark.common.model.CassandraInstance; import org.apache.cassandra.spark.data.ReplicationFactor; diff --git a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/common/Digest.java b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/common/Digest.java index 5dcbcce..440cc1c 100644 --- a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/common/Digest.java +++ b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/common/Digest.java @@ -32,5 +32,5 @@ public interface Digest /** * @return the digest translated to Sidecar digest */ - o.a.c.sidecar.client.shaded.common.data.Digest toSidecarDigest(); + o.a.c.sidecar.client.shaded.common.request.data.Digest toSidecarDigest(); } diff --git a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/common/MD5Digest.java b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/common/MD5Digest.java index e0f019d..523b91e 100644 --- a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/common/MD5Digest.java +++ b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/common/MD5Digest.java @@ -54,9 +54,9 @@ public class MD5Digest implements Digest * {@inheritDoc} */ @Override - public o.a.c.sidecar.client.shaded.common.data.Digest toSidecarDigest() + public o.a.c.sidecar.client.shaded.common.request.data.Digest toSidecarDigest() { - return new o.a.c.sidecar.client.shaded.common.data.MD5Digest(value); + return new o.a.c.sidecar.client.shaded.common.request.data.MD5Digest(value); } @Override diff --git a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/common/XXHash32Digest.java b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/common/XXHash32Digest.java index 746a350..56313e0 100644 --- a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/common/XXHash32Digest.java +++ b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/common/XXHash32Digest.java @@ -63,9 +63,9 @@ public class XXHash32Digest implements Digest } @Override - public o.a.c.sidecar.client.shaded.common.data.Digest toSidecarDigest() + public o.a.c.sidecar.client.shaded.common.request.data.Digest toSidecarDigest() { - return new o.a.c.sidecar.client.shaded.common.data.XXHash32Digest(value, seedHex); + return new o.a.c.sidecar.client.shaded.common.request.data.XXHash32Digest(value, seedHex); } @Override diff --git a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/data/CassandraDataLayer.java b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/data/CassandraDataLayer.java index 5bd2a1d..8154b01 100644 --- a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/data/CassandraDataLayer.java +++ b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/data/CassandraDataLayer.java @@ -57,10 +57,10 @@ import org.slf4j.LoggerFactory; import com.esotericsoftware.kryo.Kryo; import com.esotericsoftware.kryo.io.Input; import com.esotericsoftware.kryo.io.Output; -import o.a.c.sidecar.client.shaded.common.NodeSettings; -import o.a.c.sidecar.client.shaded.common.data.ListSnapshotFilesResponse; -import o.a.c.sidecar.client.shaded.common.data.RingResponse; -import o.a.c.sidecar.client.shaded.common.data.SchemaResponse; +import o.a.c.sidecar.client.shaded.common.response.ListSnapshotFilesResponse; +import o.a.c.sidecar.client.shaded.common.response.NodeSettings; +import o.a.c.sidecar.client.shaded.common.response.RingResponse; +import o.a.c.sidecar.client.shaded.common.response.SchemaResponse; import org.apache.cassandra.bridge.BigNumberConfig; import org.apache.cassandra.bridge.BigNumberConfigImpl; import org.apache.cassandra.bridge.CassandraBridge; diff --git a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/data/SidecarProvisionedSSTable.java b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/data/SidecarProvisionedSSTable.java index db9e2fd..ae446a5 100644 --- a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/data/SidecarProvisionedSSTable.java +++ b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/data/SidecarProvisionedSSTable.java @@ -31,7 +31,7 @@ import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import org.apache.commons.io.IOUtils; -import o.a.c.sidecar.client.shaded.common.data.ListSnapshotFilesResponse; +import o.a.c.sidecar.client.shaded.common.response.ListSnapshotFilesResponse; import o.a.c.sidecar.client.shaded.common.utils.HttpRange; import org.apache.cassandra.clients.Sidecar; import org.apache.cassandra.clients.SidecarStreamConsumerAdapter; diff --git a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/transports/storage/extensions/StorageTransportHandler.java b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/transports/storage/extensions/StorageTransportHandler.java index 954f7de..f0a422e 100644 --- a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/transports/storage/extensions/StorageTransportHandler.java +++ b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/transports/storage/extensions/StorageTransportHandler.java @@ -27,7 +27,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import o.a.c.sidecar.client.shaded.common.data.RestoreJobSecrets; -import o.a.c.sidecar.client.shaded.common.data.UpdateRestoreJobRequestPayload; +import o.a.c.sidecar.client.shaded.common.request.data.UpdateRestoreJobRequestPayload; import org.apache.cassandra.spark.bulkwriter.CancelJobEvent; import org.apache.cassandra.spark.bulkwriter.JobInfo; import org.apache.cassandra.spark.bulkwriter.TransportContext; diff --git a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/validation/CassandraValidation.java b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/validation/CassandraValidation.java index 5eb9f04..c85627d 100644 --- a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/validation/CassandraValidation.java +++ b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/validation/CassandraValidation.java @@ -21,7 +21,7 @@ package org.apache.cassandra.spark.validation; import java.util.concurrent.TimeUnit; -import o.a.c.sidecar.client.shaded.common.data.HealthResponse; +import o.a.c.sidecar.client.shaded.common.response.HealthResponse; import org.apache.cassandra.sidecar.client.SidecarClient; /** diff --git a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/validation/SidecarValidation.java b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/validation/SidecarValidation.java index 6c46d28..a7aac1e 100644 --- a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/validation/SidecarValidation.java +++ b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/validation/SidecarValidation.java @@ -21,7 +21,7 @@ package org.apache.cassandra.spark.validation; import java.util.concurrent.TimeUnit; -import o.a.c.sidecar.client.shaded.common.data.HealthResponse; +import o.a.c.sidecar.client.shaded.common.response.HealthResponse; import org.apache.cassandra.sidecar.client.SidecarClient; /** diff --git a/cassandra-analytics-core/src/test/java/org/apache/cassandra/spark/bulkwriter/ImportCompletionCoordinatorTest.java b/cassandra-analytics-core/src/test/java/org/apache/cassandra/spark/bulkwriter/ImportCompletionCoordinatorTest.java index 8d35f8d..59b31ca 100644 --- a/cassandra-analytics-core/src/test/java/org/apache/cassandra/spark/bulkwriter/ImportCompletionCoordinatorTest.java +++ b/cassandra-analytics-core/src/test/java/org/apache/cassandra/spark/bulkwriter/ImportCompletionCoordinatorTest.java @@ -43,12 +43,12 @@ import com.google.common.collect.Range; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import o.a.c.sidecar.client.shaded.common.data.CreateSliceRequestPayload; -import o.a.c.sidecar.client.shaded.common.data.RingEntry; +import o.a.c.sidecar.client.shaded.common.request.Request; +import o.a.c.sidecar.client.shaded.common.request.data.CreateSliceRequestPayload; +import o.a.c.sidecar.client.shaded.common.response.data.RingEntry; import org.apache.cassandra.sidecar.client.SidecarClient; import org.apache.cassandra.sidecar.client.SidecarInstanceImpl; import org.apache.cassandra.sidecar.client.exception.RetriesExhaustedException; -import org.apache.cassandra.sidecar.client.request.Request; import org.apache.cassandra.spark.bulkwriter.ImportCompletionCoordinator.RequestAndInstance; import org.apache.cassandra.spark.bulkwriter.blobupload.BlobDataTransferApi; import org.apache.cassandra.spark.bulkwriter.blobupload.BlobStreamResult; diff --git a/cassandra-analytics-core/src/test/java/org/apache/cassandra/spark/bulkwriter/MockBulkWriterContext.java b/cassandra-analytics-core/src/test/java/org/apache/cassandra/spark/bulkwriter/MockBulkWriterContext.java index 205d412..d863ea6 100644 --- a/cassandra-analytics-core/src/test/java/org/apache/cassandra/spark/bulkwriter/MockBulkWriterContext.java +++ b/cassandra-analytics-core/src/test/java/org/apache/cassandra/spark/bulkwriter/MockBulkWriterContext.java @@ -41,7 +41,7 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Range; import org.apache.commons.lang3.tuple.Pair; -import o.a.c.sidecar.client.shaded.common.data.TimeSkewResponse; +import o.a.c.sidecar.client.shaded.common.response.TimeSkewResponse; import org.apache.cassandra.bridge.CassandraBridge; import org.apache.cassandra.bridge.CassandraBridgeFactory; import org.apache.cassandra.bridge.CassandraVersion; diff --git a/cassandra-analytics-core/src/test/java/org/apache/cassandra/spark/bulkwriter/RingInstanceSerializationTest.java b/cassandra-analytics-core/src/test/java/org/apache/cassandra/spark/bulkwriter/RingInstanceSerializationTest.java index dc10910..d15db89 100644 --- a/cassandra-analytics-core/src/test/java/org/apache/cassandra/spark/bulkwriter/RingInstanceSerializationTest.java +++ b/cassandra-analytics-core/src/test/java/org/apache/cassandra/spark/bulkwriter/RingInstanceSerializationTest.java @@ -21,8 +21,8 @@ package org.apache.cassandra.spark.bulkwriter; import org.junit.jupiter.api.Test; -import o.a.c.sidecar.client.shaded.common.data.RingEntry; -import o.a.c.sidecar.client.shaded.common.data.TokenRangeReplicasResponse.ReplicaMetadata; +import o.a.c.sidecar.client.shaded.common.response.TokenRangeReplicasResponse.ReplicaMetadata; +import o.a.c.sidecar.client.shaded.common.response.data.RingEntry; import static org.apache.cassandra.spark.utils.SerializationUtils.deserialize; import static org.apache.cassandra.spark.utils.SerializationUtils.serialize; diff --git a/cassandra-analytics-core/src/test/java/org/apache/cassandra/spark/bulkwriter/RingInstanceTest.java b/cassandra-analytics-core/src/test/java/org/apache/cassandra/spark/bulkwriter/RingInstanceTest.java index 62ba339..f08a2a5 100644 --- a/cassandra-analytics-core/src/test/java/org/apache/cassandra/spark/bulkwriter/RingInstanceTest.java +++ b/cassandra-analytics-core/src/test/java/org/apache/cassandra/spark/bulkwriter/RingInstanceTest.java @@ -39,7 +39,7 @@ import com.google.common.collect.Multimap; import com.google.common.collect.Range; import org.junit.jupiter.api.Test; -import o.a.c.sidecar.client.shaded.common.data.RingEntry; +import o.a.c.sidecar.client.shaded.common.response.data.RingEntry; import org.apache.cassandra.spark.bulkwriter.token.ConsistencyLevel; import org.apache.cassandra.spark.bulkwriter.token.ReplicaAwareFailureHandler; import org.apache.cassandra.spark.bulkwriter.token.TokenRangeMapping; diff --git a/cassandra-analytics-core/src/test/java/org/apache/cassandra/spark/bulkwriter/TokenRangeMappingUtils.java b/cassandra-analytics-core/src/test/java/org/apache/cassandra/spark/bulkwriter/TokenRangeMappingUtils.java index 43fa5b1..bab7db5 100644 --- a/cassandra-analytics-core/src/test/java/org/apache/cassandra/spark/bulkwriter/TokenRangeMappingUtils.java +++ b/cassandra-analytics-core/src/test/java/org/apache/cassandra/spark/bulkwriter/TokenRangeMappingUtils.java @@ -33,8 +33,8 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Multimap; import com.google.common.collect.Range; -import o.a.c.sidecar.client.shaded.common.data.RingEntry; -import o.a.c.sidecar.client.shaded.common.data.TokenRangeReplicasResponse.ReplicaMetadata; +import o.a.c.sidecar.client.shaded.common.response.TokenRangeReplicasResponse.ReplicaMetadata; +import o.a.c.sidecar.client.shaded.common.response.data.RingEntry; import org.apache.cassandra.spark.bulkwriter.token.TokenRangeMapping; import org.apache.cassandra.spark.common.client.InstanceStatus; import org.apache.cassandra.spark.data.ReplicationFactor; diff --git a/cassandra-analytics-core/src/test/java/org/apache/cassandra/spark/bulkwriter/blobupload/BlobStreamSessionTest.java b/cassandra-analytics-core/src/test/java/org/apache/cassandra/spark/bulkwriter/blobupload/BlobStreamSessionTest.java index 0dc1ff1..01c4960 100644 --- a/cassandra-analytics-core/src/test/java/org/apache/cassandra/spark/bulkwriter/blobupload/BlobStreamSessionTest.java +++ b/cassandra-analytics-core/src/test/java/org/apache/cassandra/spark/bulkwriter/blobupload/BlobStreamSessionTest.java @@ -37,9 +37,9 @@ import org.apache.commons.io.FileUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -import o.a.c.sidecar.client.shaded.common.data.CreateSliceRequestPayload; import o.a.c.sidecar.client.shaded.common.data.RestoreJobSecrets; -import o.a.c.sidecar.client.shaded.common.data.RestoreJobSummaryResponsePayload; +import o.a.c.sidecar.client.shaded.common.request.data.CreateSliceRequestPayload; +import o.a.c.sidecar.client.shaded.common.request.data.RestoreJobSummaryResponsePayload; import org.apache.cassandra.bridge.CassandraBridge; import org.apache.cassandra.bridge.SSTableSummary; import org.apache.cassandra.sidecar.client.SidecarClient; diff --git a/cassandra-analytics-core/src/test/java/org/apache/cassandra/spark/bulkwriter/blobupload/CreatedRestoreSliceTest.java b/cassandra-analytics-core/src/test/java/org/apache/cassandra/spark/bulkwriter/blobupload/CreatedRestoreSliceTest.java index 1c02633..ecb8d47 100644 --- a/cassandra-analytics-core/src/test/java/org/apache/cassandra/spark/bulkwriter/blobupload/CreatedRestoreSliceTest.java +++ b/cassandra-analytics-core/src/test/java/org/apache/cassandra/spark/bulkwriter/blobupload/CreatedRestoreSliceTest.java @@ -23,7 +23,7 @@ import java.math.BigInteger; import org.junit.jupiter.api.Test; -import o.a.c.sidecar.client.shaded.common.data.CreateSliceRequestPayload; +import o.a.c.sidecar.client.shaded.common.request.data.CreateSliceRequestPayload; import static org.assertj.core.api.Assertions.assertThat; diff --git a/cassandra-analytics-core/src/test/java/org/apache/cassandra/spark/data/SidecarProvisionedSSTableTest.java b/cassandra-analytics-core/src/test/java/org/apache/cassandra/spark/data/SidecarProvisionedSSTableTest.java index c24c5e8..c418d43 100644 --- a/cassandra-analytics-core/src/test/java/org/apache/cassandra/spark/data/SidecarProvisionedSSTableTest.java +++ b/cassandra-analytics-core/src/test/java/org/apache/cassandra/spark/data/SidecarProvisionedSSTableTest.java @@ -26,7 +26,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; -import o.a.c.sidecar.client.shaded.common.data.ListSnapshotFilesResponse; +import o.a.c.sidecar.client.shaded.common.response.ListSnapshotFilesResponse; import org.apache.cassandra.clients.Sidecar; import org.apache.cassandra.sidecar.client.SidecarClient; import org.apache.cassandra.sidecar.client.SidecarInstanceImpl; diff --git a/cassandra-analytics-integration-framework/build.gradle b/cassandra-analytics-integration-framework/build.gradle index 63d66c7..aca0b9f 100644 --- a/cassandra-analytics-integration-framework/build.gradle +++ b/cassandra-analytics-integration-framework/build.gradle @@ -93,5 +93,5 @@ dependencies { exclude(group: 'org.slf4j') exclude(group: 'ch.qos.logback') } - api(group: 'org.apache.cassandra.sidecar', name: 'common', version: "${sidecarVersion}") + api(group: 'org.apache.cassandra.sidecar', name: 'server-common', version: "${sidecarVersion}") } diff --git a/cassandra-analytics-integration-framework/src/main/java/org/apache/cassandra/sidecar/testing/LocalhostResolver.java b/cassandra-analytics-integration-framework/src/main/java/org/apache/cassandra/sidecar/testing/LocalhostResolver.java index 252e2dc..99eeb76 100644 --- a/cassandra-analytics-integration-framework/src/main/java/org/apache/cassandra/sidecar/testing/LocalhostResolver.java +++ b/cassandra-analytics-integration-framework/src/main/java/org/apache/cassandra/sidecar/testing/LocalhostResolver.java @@ -25,7 +25,8 @@ import java.util.regex.Pattern; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.cassandra.sidecar.common.dns.DnsResolver; +import org.apache.cassandra.sidecar.common.server.dns.DnsResolver; + /** * A {@link DnsResolver} instance used for tests that provides fast DNS resolution, to avoid blocking diff --git a/cassandra-analytics-integration-framework/src/main/java/org/apache/cassandra/sidecar/testing/SharedClusterIntegrationTestBase.java b/cassandra-analytics-integration-framework/src/main/java/org/apache/cassandra/sidecar/testing/SharedClusterIntegrationTestBase.java index 3257338..67864a4 100644 --- a/cassandra-analytics-integration-framework/src/main/java/org/apache/cassandra/sidecar/testing/SharedClusterIntegrationTestBase.java +++ b/cassandra-analytics-integration-framework/src/main/java/org/apache/cassandra/sidecar/testing/SharedClusterIntegrationTestBase.java @@ -70,11 +70,11 @@ import org.apache.cassandra.sidecar.cluster.InstancesConfig; import org.apache.cassandra.sidecar.cluster.InstancesConfigImpl; import org.apache.cassandra.sidecar.cluster.instance.InstanceMetadata; import org.apache.cassandra.sidecar.cluster.instance.InstanceMetadataImpl; -import org.apache.cassandra.sidecar.common.CQLSessionProvider; -import org.apache.cassandra.sidecar.common.JmxClient; -import org.apache.cassandra.sidecar.common.dns.DnsResolver; -import org.apache.cassandra.sidecar.common.utils.DriverUtils; -import org.apache.cassandra.sidecar.common.utils.SidecarVersionProvider; +import org.apache.cassandra.sidecar.common.server.CQLSessionProvider; +import org.apache.cassandra.sidecar.common.server.JmxClient; +import org.apache.cassandra.sidecar.common.server.dns.DnsResolver; +import org.apache.cassandra.sidecar.common.server.utils.DriverUtils; +import org.apache.cassandra.sidecar.common.server.utils.SidecarVersionProvider; import org.apache.cassandra.sidecar.config.JmxConfiguration; import org.apache.cassandra.sidecar.config.KeyStoreConfiguration; import org.apache.cassandra.sidecar.config.S3ClientConfiguration; diff --git a/cassandra-analytics-integration-framework/src/main/java/org/apache/cassandra/sidecar/testing/TemporaryCqlSessionProvider.java b/cassandra-analytics-integration-framework/src/main/java/org/apache/cassandra/sidecar/testing/TemporaryCqlSessionProvider.java index e303f3b..766c04a 100644 --- a/cassandra-analytics-integration-framework/src/main/java/org/apache/cassandra/sidecar/testing/TemporaryCqlSessionProvider.java +++ b/cassandra-analytics-integration-framework/src/main/java/org/apache/cassandra/sidecar/testing/TemporaryCqlSessionProvider.java @@ -34,7 +34,7 @@ import com.datastax.driver.core.exceptions.DriverException; import com.datastax.driver.core.exceptions.DriverInternalError; import com.datastax.driver.core.policies.ExponentialReconnectionPolicy; import com.datastax.driver.core.policies.ReconnectionPolicy; -import org.apache.cassandra.sidecar.common.CQLSessionProvider; +import org.apache.cassandra.sidecar.common.server.CQLSessionProvider; import org.jetbrains.annotations.Nullable; /** diff --git a/cassandra-analytics-integration-tests/src/test/java/org/apache/cassandra/analytics/ResiliencyTestBase.java b/cassandra-analytics-integration-tests/src/test/java/org/apache/cassandra/analytics/ResiliencyTestBase.java index 084fac5..742c5f6 100644 --- a/cassandra-analytics-integration-tests/src/test/java/org/apache/cassandra/analytics/ResiliencyTestBase.java +++ b/cassandra-analytics-integration-tests/src/test/java/org/apache/cassandra/analytics/ResiliencyTestBase.java @@ -41,7 +41,7 @@ import org.apache.cassandra.distributed.api.IInstance; import org.apache.cassandra.distributed.api.IInstanceConfig; import org.apache.cassandra.distributed.api.Row; import org.apache.cassandra.distributed.api.SimpleQueryResult; -import org.apache.cassandra.sidecar.common.JmxClient; +import org.apache.cassandra.sidecar.common.server.JmxClient; import org.apache.cassandra.sidecar.testing.QualifiedName; import org.apache.cassandra.spark.bulkwriter.DecoratedKey; import org.apache.cassandra.spark.bulkwriter.Tokenizer; diff --git a/cassandra-analytics-integration-tests/src/test/java/org/apache/cassandra/analytics/SparkTestUtils.java b/cassandra-analytics-integration-tests/src/test/java/org/apache/cassandra/analytics/SparkTestUtils.java index a4a4734..246e15e 100644 --- a/cassandra-analytics-integration-tests/src/test/java/org/apache/cassandra/analytics/SparkTestUtils.java +++ b/cassandra-analytics-integration-tests/src/test/java/org/apache/cassandra/analytics/SparkTestUtils.java @@ -32,7 +32,7 @@ import java.util.stream.IntStream; import org.apache.cassandra.distributed.api.ICluster; import org.apache.cassandra.distributed.api.IInstance; import org.apache.cassandra.distributed.shared.JMXUtil; -import org.apache.cassandra.sidecar.common.dns.DnsResolver; +import org.apache.cassandra.sidecar.common.server.dns.DnsResolver; import org.apache.cassandra.sidecar.testing.MtlsTestHelper; import org.apache.cassandra.sidecar.testing.QualifiedName; import org.apache.cassandra.spark.KryoRegister; diff --git a/scripts/build-sidecar.sh b/scripts/build-sidecar.sh index a639701..4e30386 100755 --- a/scripts/build-sidecar.sh +++ b/scripts/build-sidecar.sh @@ -24,7 +24,7 @@ else SCRIPT_DIR=$( dirname -- "$( readlink -f -- "$0"; )"; ) SIDECAR_REPO="${SIDECAR_REPO:-https://github.com/apache/cassandra-sidecar.git}" SIDECAR_BRANCH="${SIDECAR_BRANCH:-trunk}" - SIDECAR_COMMIT="${SIDECAR_COMMIT:-4a6b8c9cfe0c6286d12c7d561941a24c25a206ef}" + SIDECAR_COMMIT="${SIDECAR_COMMIT:-55866caa2c4601b1d59a8532a97310a9e819931f}" SIDECAR_JAR_DIR="$(dirname "${SCRIPT_DIR}/")/dependencies" SIDECAR_JAR_DIR=${CASSANDRA_DEP_DIR:-$SIDECAR_JAR_DIR} SIDECAR_BUILD_DIR="${SIDECAR_JAR_DIR}/sidecar-build" --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org