From 7f9f5df487a675b43e8115afea83d448ed2e3c9e Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 12 May 2020 04:07:15 +0200 Subject: [PATCH 1/2] Update java-driver-core to 4.6.1 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index d7a8c27d5..00c963a00 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -39,7 +39,7 @@ object Dependencies { object Versions { - val datastaxJavaDriverCore = "4.6.0" + val datastaxJavaDriverCore = "4.6.1" val doobie = "0.9.0" val grpc = "1.29.0" val http4s = "0.21.4" From 0da9efb5c83cda55d7f0d23830f97c260f6f4567 Mon Sep 17 00:00:00 2001 From: Janecek Jakub Date: Tue, 12 May 2020 11:14:46 +0200 Subject: [PATCH 2/2] fix: Remove deprecated property and add missing property --- .../sst/datastax/CassandraDatastaxDriverModule.scala | 2 +- .../scala/com/avast/sst/datastax/config/advanced.scala | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/cassandra-datastax-driver/src/main/scala/com/avast/sst/datastax/CassandraDatastaxDriverModule.scala b/cassandra-datastax-driver/src/main/scala/com/avast/sst/datastax/CassandraDatastaxDriverModule.scala index f846c4755..140006bc9 100644 --- a/cassandra-datastax-driver/src/main/scala/com/avast/sst/datastax/CassandraDatastaxDriverModule.scala +++ b/cassandra-datastax-driver/src/main/scala/com/avast/sst/datastax/CassandraDatastaxDriverModule.scala @@ -149,7 +149,7 @@ object CassandraDatastaxDriverModule { stringProperty(NETTY_ADMIN_SHUTDOWN_UNIT)(cfg.advanced.netty.adminGroup.shutdown.unit), durationProperty(NETTY_TIMER_TICK_DURATION)(cfg.advanced.netty.timer.tickDuration), intProperty(NETTY_TIMER_TICKS_PER_WHEEL)(cfg.advanced.netty.timer.ticksPerWheel), - intProperty(COALESCER_MAX_RUNS)(cfg.advanced.coalescer.maxRunsWithNoWork) + durationProperty(COALESCER_INTERVAL)(cfg.advanced.coalescer.rescheduleInterval) ).foldRight(DriverConfigLoader.programmaticBuilder()) { (w, b) => w(b) } val loader = cfg.profiles diff --git a/cassandra-datastax-driver/src/main/scala/com/avast/sst/datastax/config/advanced.scala b/cassandra-datastax-driver/src/main/scala/com/avast/sst/datastax/config/advanced.scala index c7e9308d2..8218ab5ff 100644 --- a/cassandra-datastax-driver/src/main/scala/com/avast/sst/datastax/config/advanced.scala +++ b/cassandra-datastax-driver/src/main/scala/com/avast/sst/datastax/config/advanced.scala @@ -804,14 +804,10 @@ object TimerConfig { /** The component that coalesces writes on the connections. * This is exposed mainly to facilitate tuning during development. You shouldn't have to adjust this. * - * @param maxRunsWithNoWork How many times the coalescer is allowed to reschedule itself when it did no work. * @param rescheduleInterval The reschedule interval. */ -final case class CoalescerConfig( - maxRunsWithNoWork: Int = CoalescerConfig.Default.maxRunsWithNoWork, - rescheduleInterval: Duration = CoalescerConfig.Default.rescheduleInterval -) +final case class CoalescerConfig(rescheduleInterval: Duration = CoalescerConfig.Default.rescheduleInterval) object CoalescerConfig { - val Default: CoalescerConfig = CoalescerConfig(5, 10.microseconds) + val Default: CoalescerConfig = CoalescerConfig(10.microseconds) }