Skip to content

Commit ad255db

Browse files
updates
Co-authored-by: Thomas Chow <[email protected]>
1 parent d237756 commit ad255db

File tree

4 files changed

+19
-25
lines changed

4 files changed

+19
-25
lines changed

.bazelrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ build --java_language_version=11
44
build --java_runtime_version=11
55
build --remote_cache=https://storage.googleapis.com/zipline-bazel-cache
66
test --test_output=errors
7-
test --test_timeout=900
7+
test --test_timeout=900

.github/workflows/test_scala_non_spark.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,6 @@ jobs:
115115
bazel test \
116116
--remote_cache=https://storage.googleapis.com/zipline-bazel-cache \
117117
--google_credentials=bazel-cache-key.json \
118-
--java_toolchain=@bazel_tools//tools/jdk:toolchain_java17 \
119-
--javabase=@bazel_tools//tools/jdk:jdk17 \
118+
--java_language_version=17 \
119+
--java_runtime_version=17 \
120120
//cloud_aws:tests

cloud_aws/src/main/scala/ai/chronon/integrations/aws/AwsApiImpl.scala

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
package ai.chronon.integrations.aws
22

3-
import ai.chronon.online.Api
4-
import ai.chronon.online.ExternalSourceRegistry
5-
import ai.chronon.online.GroupByServingInfoParsed
6-
import ai.chronon.online.KVStore
7-
import ai.chronon.online.LoggableResponse
8-
import ai.chronon.online.Serde
3+
import ai.chronon.online._
94
import software.amazon.awssdk.regions.Region
105
import software.amazon.awssdk.services.dynamodb.DynamoDbClient
11-
import software.amazon.awssdk.core.SdkClient
126

137
import java.net.URI
148

cloud_aws/src/test/scala/ai/chronon/integrations/aws/DynamoDBKVStoreTest.scala

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import io.circe.generic.semiauto._
88
import io.circe.parser._
99
import io.circe.syntax._
1010
import io.circe.{Decoder, Encoder}
11-
import org.scalatest.BeforeAndAfter
11+
import org.scalatest.BeforeAndAfterAll
1212
import org.scalatest.flatspec.AnyFlatSpec
1313
import org.scalatest.matchers.should.Matchers.convertToAnyShouldWrapper
1414
import software.amazon.awssdk.auth.credentials.{AwsBasicCredentials, StaticCredentialsProvider}
@@ -28,7 +28,7 @@ object DDBTestUtils {
2828
case class TimeSeries(joinName: String, featureName: String, tileTs: Long, metric: String, summary: Array[Double])
2929

3030
}
31-
class DynamoDBKVStoreTest extends AnyFlatSpec with BeforeAndAfter {
31+
class DynamoDBKVStoreTest extends AnyFlatSpec with BeforeAndAfterAll {
3232

3333
import DDBTestUtils._
3434
import DynamoDBKVStoreConstants._
@@ -58,7 +58,7 @@ class DynamoDBKVStoreTest extends AnyFlatSpec with BeforeAndAfter {
5858
series.asJson.noSpaces.getBytes(StandardCharsets.UTF_8)
5959
}
6060

61-
before {
61+
override def beforeAll(): Unit = {
6262
// Start the local DynamoDB instance
6363
server = ServerRunner.createServerFromCommandLineArgs(Array("-inMemory", "-port", "8000"))
6464
server.start()
@@ -75,9 +75,9 @@ class DynamoDBKVStoreTest extends AnyFlatSpec with BeforeAndAfter {
7575
.build()
7676
}
7777

78-
after {
79-
client.close()
80-
server.stop()
78+
override def afterAll(): Unit = {
79+
// client.close()
80+
// server.stop()
8181
}
8282

8383
// Test creation of a table with primary keys only (e.g. model)
@@ -118,20 +118,20 @@ class DynamoDBKVStoreTest extends AnyFlatSpec with BeforeAndAfter {
118118
buildModelPutRequest(model, dataset)
119119
}
120120

121-
val putResults = Await.result(kvStore.multiPut(putReqs), 1.second)
121+
val putResults = Await.result(kvStore.multiPut(putReqs), 1.minute)
122122
putResults.length shouldBe putReqs.length
123123
putResults.foreach(r => r shouldBe true)
124124

125125
// call list - first call is only for 10 elements
126126
val listReq1 = ListRequest(dataset, Map(listLimit -> 10))
127-
val listResults1 = Await.result(kvStore.list(listReq1), 1.second)
127+
val listResults1 = Await.result(kvStore.list(listReq1), 1.minute)
128128
listResults1.resultProps.contains(continuationKey) shouldBe true
129129
validateExpectedListResponse(listResults1.values, 10)
130130

131131
// call list - with continuation key
132132
val listReq2 =
133133
ListRequest(dataset, Map(listLimit -> 100, continuationKey -> listResults1.resultProps(continuationKey)))
134-
val listResults2 = Await.result(kvStore.list(listReq2), 1.second)
134+
val listResults2 = Await.result(kvStore.list(listReq2), 1.minute)
135135
listResults2.resultProps.contains(continuationKey) shouldBe false
136136
validateExpectedListResponse(listResults2.values, 100)
137137
}
@@ -151,17 +151,17 @@ class DynamoDBKVStoreTest extends AnyFlatSpec with BeforeAndAfter {
151151
val putReq2 = buildModelPutRequest(model2, dataset)
152152
val putReq3 = buildModelPutRequest(model3, dataset)
153153

154-
val putResults = Await.result(kvStore.multiPut(Seq(putReq1, putReq2, putReq3)), 1.second)
154+
val putResults = Await.result(kvStore.multiPut(Seq(putReq1, putReq2, putReq3)), 1.minute)
155155
putResults shouldBe Seq(true, true, true)
156156

157157
// let's try and read these
158158
val getReq1 = buildModelGetRequest(model1, dataset)
159159
val getReq2 = buildModelGetRequest(model2, dataset)
160160
val getReq3 = buildModelGetRequest(model3, dataset)
161161

162-
val getResult1 = Await.result(kvStore.multiGet(Seq(getReq1)), 1.second)
163-
val getResult2 = Await.result(kvStore.multiGet(Seq(getReq2)), 1.second)
164-
val getResult3 = Await.result(kvStore.multiGet(Seq(getReq3)), 1.second)
162+
val getResult1 = Await.result(kvStore.multiGet(Seq(getReq1)), 1.minute)
163+
val getResult2 = Await.result(kvStore.multiGet(Seq(getReq2)), 1.minute)
164+
val getResult3 = Await.result(kvStore.multiGet(Seq(getReq3)), 1.minute)
165165

166166
validateExpectedModelResponse(model1, getResult1)
167167
validateExpectedModelResponse(model2, getResult2)
@@ -181,13 +181,13 @@ class DynamoDBKVStoreTest extends AnyFlatSpec with BeforeAndAfter {
181181

182182
// write to the kv store and confirm the writes were successful
183183
val putRequests = points.map(p => buildTSPutRequest(p, dataset))
184-
val putResult = Await.result(kvStore.multiPut(putRequests), 1.second)
184+
val putResult = Await.result(kvStore.multiPut(putRequests), 1.minute)
185185
putResult.length shouldBe tsRange.length
186186
putResult.foreach(r => r shouldBe true)
187187

188188
// query in time range: 10/05/24 00:00 to 10/10
189189
val getRequest1 = buildTSGetRequest(points.head, dataset, 1728086400000L, 1728518400000L)
190-
val getResult1 = Await.result(kvStore.multiGet(Seq(getRequest1)), 1.second)
190+
val getResult1 = Await.result(kvStore.multiGet(Seq(getRequest1)), 1.minute)
191191
validateExpectedTimeSeriesResponse(points.head, 1728086400000L, 1728518400000L, getResult1)
192192
}
193193

0 commit comments

Comments
 (0)