From 35ac69772bb5b2361d3aeffd12e5474a60f71663 Mon Sep 17 00:00:00 2001 From: Benjamin Gaidioz Date: Mon, 17 Feb 2025 10:15:34 +0100 Subject: [PATCH] Made the cache parameterized --- .../das/server/grpc/TablesServiceDASMockTestSpec.scala | 6 +++++- .../das/server/grpc/TablesServiceHighConcurrencySpec.scala | 6 +++++- .../das/server/grpc/TablesServiceIntegrationSpec.scala | 6 +++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/test/scala/com/rawlabs/das/server/grpc/TablesServiceDASMockTestSpec.scala b/src/test/scala/com/rawlabs/das/server/grpc/TablesServiceDASMockTestSpec.scala index 0242379..91fc52d 100644 --- a/src/test/scala/com/rawlabs/das/server/grpc/TablesServiceDASMockTestSpec.scala +++ b/src/test/scala/com/rawlabs/das/server/grpc/TablesServiceDASMockTestSpec.scala @@ -14,26 +14,30 @@ package com.rawlabs.das.server.grpc import java.io.File import java.nio.file.Files + import scala.concurrent._ import scala.concurrent.duration._ import scala.jdk.CollectionConverters._ import scala.util.Try + import org.scalatest.BeforeAndAfterAll import org.scalatest.concurrent.ScalaFutures import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec + import com.rawlabs.das.sdk.DASSettings +import com.rawlabs.das.server.cache.QueryResultCache import com.rawlabs.das.server.manager.DASSdkManager import com.rawlabs.protocol.das.v1.common.DASId import com.rawlabs.protocol.das.v1.query._ import com.rawlabs.protocol.das.v1.services._ import com.rawlabs.protocol.das.v1.tables._ import com.rawlabs.protocol.das.v1.types.{Value, ValueInt, ValueString} + import akka.actor.typed.scaladsl.Behaviors import akka.actor.typed.{ActorSystem, Scheduler} import akka.stream.Materializer import akka.util.Timeout -import com.rawlabs.das.server.cache.QueryResultCache import io.grpc.inprocess.{InProcessChannelBuilder, InProcessServerBuilder} import io.grpc.{ManagedChannel, Server, StatusRuntimeException} diff --git a/src/test/scala/com/rawlabs/das/server/grpc/TablesServiceHighConcurrencySpec.scala b/src/test/scala/com/rawlabs/das/server/grpc/TablesServiceHighConcurrencySpec.scala index 9d5f2b6..0056e76 100644 --- a/src/test/scala/com/rawlabs/das/server/grpc/TablesServiceHighConcurrencySpec.scala +++ b/src/test/scala/com/rawlabs/das/server/grpc/TablesServiceHighConcurrencySpec.scala @@ -15,26 +15,30 @@ package com.rawlabs.das.server.grpc import java.nio.file.Files import java.util.UUID import java.util.concurrent.{Executors, TimeUnit} + import scala.concurrent.duration._ import scala.concurrent.{Await, ExecutionContext, Future, Promise} import scala.util.{Random, Try} + import org.scalatest.BeforeAndAfterAll import org.scalatest.concurrent.{Futures, ScalaFutures} import org.scalatest.matchers.should.Matchers import org.scalatest.time.{Seconds, Span} import org.scalatest.wordspec.AnyWordSpec + import com.rawlabs.das.sdk.DASSettings +import com.rawlabs.das.server.cache.QueryResultCache import com.rawlabs.das.server.manager.DASSdkManager import com.rawlabs.protocol.das.v1.common.DASId import com.rawlabs.protocol.das.v1.query.{Operator, Qual, Query, SimpleQual} import com.rawlabs.protocol.das.v1.services._ import com.rawlabs.protocol.das.v1.tables._ import com.rawlabs.protocol.das.v1.types.{Value, ValueInt} + import akka.actor.typed.scaladsl.Behaviors import akka.actor.typed.{ActorRef, ActorSystem, Scheduler} import akka.stream.{Materializer, SystemMaterializer} import akka.util.Timeout -import com.rawlabs.das.server.cache.QueryResultCache import io.grpc.inprocess.{InProcessChannelBuilder, InProcessServerBuilder} import io.grpc.stub.{ClientCallStreamObserver, ClientResponseObserver} import io.grpc.{ManagedChannel, Server} diff --git a/src/test/scala/com/rawlabs/das/server/grpc/TablesServiceIntegrationSpec.scala b/src/test/scala/com/rawlabs/das/server/grpc/TablesServiceIntegrationSpec.scala index 2ea65b9..1ab42b4 100644 --- a/src/test/scala/com/rawlabs/das/server/grpc/TablesServiceIntegrationSpec.scala +++ b/src/test/scala/com/rawlabs/das/server/grpc/TablesServiceIntegrationSpec.scala @@ -14,20 +14,24 @@ package com.rawlabs.das.server.grpc import java.io.File import java.nio.file.Files + import scala.concurrent.ExecutionContext import scala.util.Try + import org.scalatest.BeforeAndAfterAll import org.scalatest.concurrent.ScalaFutures import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec + import com.rawlabs.das.sdk.DASSettings +import com.rawlabs.das.server.cache.QueryResultCache import com.rawlabs.das.server.manager.DASSdkManager import com.rawlabs.protocol.das.v1.common.DASId import com.rawlabs.protocol.das.v1.query.Query import com.rawlabs.protocol.das.v1.services._ import com.rawlabs.protocol.das.v1.tables._ + import akka.actor.typed.scaladsl.Behaviors -import com.rawlabs.das.server.cache.QueryResultCache // gRPC stubs import akka.actor.typed.{ActorSystem, Scheduler} import akka.stream.Materializer