Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGES.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
0.5.0
-----
* Upgrade sidecar version to 0.4.0
* Regenerate bloom filters for CQLSSTableWriter (CASSANALYTICS-167)
* Avoid Spark 4 partitioning warnings during bulk reads (CASSANALYTICS-171)
* Spark 4.0 Support (CASSANALYTICS-34)
Expand Down
4 changes: 4 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,10 @@ subprojects {

repositories {
mavenCentral()
// Confluent repository for kafka-avro-serializer (transitive dep of sidecar-server)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Can we instead exclude the transitive dependency since it is not required for Analytics to function ?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Integration tests are failing without this

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

but maybe we should just exclude the dependency from the sidecar dependency?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

maven {
url 'https://packages.confluent.io/maven/'
}
// for dtest-jars
mavenLocal {
url Paths.get(dependencyLocation)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -738,6 +738,7 @@ static InstanceMetadata buildInstanceMetadata(Vertx vertx,
hostName = ipAddress;
}
int port = tryGetIntConfig(config, "native_transport_port", 9042);
int storagePort = tryGetIntConfig(config, "storage_port", 7000);
String[] dataDirectories = (String[]) config.get("data_file_directories");
String stagingDir = stagingDir(dataDirectories);

Expand All @@ -762,6 +763,7 @@ static InstanceMetadata buildInstanceMetadata(Vertx vertx,
.id(config.num())
.host(hostName)
.port(port)
.storagePort(storagePort)
.dataDirs(Arrays.asList(dataDirectories))
.cdcDir(config.getString("cdc_raw_directory"))
.commitlogDir(config.getString("commitlog_directory"))
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ description=Apache Cassandra Analytics
analyticsJDKLevel=17
cassandra40Version=4.0.17
cassandra50Version=5.0.5
sidecarVersion=0.2.0
sidecarVersion=0.4.0
intellijVersion=9.0.4
junitVersion=5.10.2
assertjCoreVersion=3.24.2
Expand Down
Loading