Skip to content

Commit 10e1cd0

Browse files
bgaidiozbgaidioz
authored
Fixed imports and test code (#34)
* Fixed weird imports. * Homogenize the `all_types` functions parameters. Also added missing `INTERVAL[]` and `DECIMAL[]` types.
1 parent 28a7a42 commit 10e1cd0

File tree

3 files changed

+92
-20
lines changed

3 files changed

+92
-20
lines changed

‎src/main/scala/com/rawlabs/das/mock/functions/AllTypesFunction.scala

+82-12
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ class AllTypesFunction extends DASMockFunction {
321321
listValue.addValues(Value.newBuilder().setByte(ValueByte.newBuilder().setV(20)))
322322
listValue.addValues(Value.newBuilder().setByte(ValueByte.newBuilder().setV(30)))
323323
RecordItem(
324-
"list_of_byte_value",
324+
"list_of_bytes_value",
325325
Type.newBuilder().setList(listType).build(),
326326
Value.newBuilder().setList(listValue).build())
327327
},
@@ -335,7 +335,7 @@ class AllTypesFunction extends DASMockFunction {
335335
listValue.addValues(Value.newBuilder().setShort(ValueShort.newBuilder().setV(200)))
336336
listValue.addValues(Value.newBuilder().setShort(ValueShort.newBuilder().setV(300)))
337337
RecordItem(
338-
"list_of_short_value",
338+
"list_of_shorts_value",
339339
Type.newBuilder().setList(listType).build(),
340340
Value.newBuilder().setList(listValue).build())
341341
},
@@ -353,7 +353,7 @@ class AllTypesFunction extends DASMockFunction {
353353
listValue.addValues(Value.newBuilder().setInt(ValueInt.newBuilder().setV(3)))
354354

355355
RecordItem(
356-
"list_of_int_value",
356+
"list_of_ints_value",
357357
Type
358358
.newBuilder()
359359
.setList(listType)
@@ -373,7 +373,7 @@ class AllTypesFunction extends DASMockFunction {
373373
listValue.addValues(Value.newBuilder().setLong(ValueLong.newBuilder().setV(200000L)))
374374
listValue.addValues(Value.newBuilder().setLong(ValueLong.newBuilder().setV(300000L)))
375375
RecordItem(
376-
"list_of_long_value",
376+
"list_of_longs_value",
377377
Type.newBuilder().setList(listType).build(),
378378
Value.newBuilder().setList(listValue).build())
379379
},
@@ -387,7 +387,7 @@ class AllTypesFunction extends DASMockFunction {
387387
listValue.addValues(Value.newBuilder().setFloat(ValueFloat.newBuilder().setV(4.56f)))
388388
listValue.addValues(Value.newBuilder().setFloat(ValueFloat.newBuilder().setV(7.89f)))
389389
RecordItem(
390-
"list_of_float_value",
390+
"list_of_floats_value",
391391
Type.newBuilder().setList(listType).build(),
392392
Value.newBuilder().setList(listValue).build())
393393
},
@@ -401,11 +401,28 @@ class AllTypesFunction extends DASMockFunction {
401401
listValue.addValues(Value.newBuilder().setDouble(ValueDouble.newBuilder().setV(4.56)))
402402
listValue.addValues(Value.newBuilder().setDouble(ValueDouble.newBuilder().setV(7.89)))
403403
RecordItem(
404-
"list_of_double_value",
404+
"list_of_doubles_value",
405405
Type.newBuilder().setList(listType).build(),
406406
Value.newBuilder().setList(listValue).build())
407407
},
408408

409+
// List of decimals
410+
{
411+
val listType = ListType.newBuilder().setNullable(true)
412+
listType.setInnerType(
413+
Type
414+
.newBuilder()
415+
.setDecimal(DecimalType.newBuilder().setNullable(true))
416+
.build())
417+
val listValue = ValueList.newBuilder()
418+
listValue.addValues(Value.newBuilder().setDecimal(ValueDecimal.newBuilder().setV("1.23")))
419+
listValue.addValues(Value.newBuilder().setDecimal(ValueDecimal.newBuilder().setV("4.56")))
420+
listValue.addValues(Value.newBuilder().setDecimal(ValueDecimal.newBuilder().setV("7.89")))
421+
RecordItem(
422+
"list_of_decimals_value",
423+
Type.newBuilder().setList(listType).build(),
424+
Value.newBuilder().setList(listValue).build())
425+
},
409426
// List of strings
410427
{
411428
val listType = ListType.newBuilder().setNullable(true)
@@ -415,7 +432,7 @@ class AllTypesFunction extends DASMockFunction {
415432
listValue.addValues(Value.newBuilder().setString(ValueString.newBuilder().setV("bar")))
416433
listValue.addValues(Value.newBuilder().setString(ValueString.newBuilder().setV("baz")))
417434
RecordItem(
418-
"list_of_string_value",
435+
"list_of_strings_value",
419436
Type.newBuilder().setList(listType).build(),
420437
Value.newBuilder().setList(listValue).build())
421438
},
@@ -429,7 +446,7 @@ class AllTypesFunction extends DASMockFunction {
429446
listValue.addValues(Value.newBuilder().setBool(ValueBool.newBuilder().setV(false)))
430447
listValue.addValues(Value.newBuilder().setBool(ValueBool.newBuilder().setV(true)))
431448
RecordItem(
432-
"list_of_bool_value",
449+
"list_of_bools_value",
433450
Type.newBuilder().setList(listType).build(),
434451
Value.newBuilder().setList(listValue).build())
435452
},
@@ -443,7 +460,7 @@ class AllTypesFunction extends DASMockFunction {
443460
listValue.addValues(Value.newBuilder().setDate(ValueDate.newBuilder().setYear(2022).setMonth(2).setDay(20)))
444461
listValue.addValues(Value.newBuilder().setDate(ValueDate.newBuilder().setYear(2022).setMonth(3).setDay(25)))
445462
RecordItem(
446-
"list_of_date_value",
463+
"list_of_dates_value",
447464
Type.newBuilder().setList(listType).build(),
448465
Value.newBuilder().setList(listValue).build())
449466
},
@@ -460,7 +477,7 @@ class AllTypesFunction extends DASMockFunction {
460477
listValue.addValues(
461478
Value.newBuilder().setTime(ValueTime.newBuilder().setHour(15).setMinute(0).setSecond(0).setNano(0)))
462479
RecordItem(
463-
"list_of_time_value",
480+
"list_of_times_value",
464481
Type.newBuilder().setList(listType).build(),
465482
Value.newBuilder().setList(listValue).build())
466483
},
@@ -510,11 +527,64 @@ class AllTypesFunction extends DASMockFunction {
510527
.setSecond(0)
511528
.setNano(0)))
512529
RecordItem(
513-
"list_of_timestamp_value",
530+
"list_of_timestamps_value",
514531
Type.newBuilder().setList(listType).build(),
515532
Value.newBuilder().setList(listValue).build())
516533
},
517534

535+
// List of intervals
536+
{
537+
val listType = ListType.newBuilder().setNullable(true)
538+
listType.setInnerType(
539+
Type
540+
.newBuilder()
541+
.setInterval(IntervalType.newBuilder().setNullable(true))
542+
.build())
543+
val listValue = ValueList.newBuilder()
544+
listValue.addValues(
545+
Value
546+
.newBuilder()
547+
.setInterval(
548+
ValueInterval
549+
.newBuilder()
550+
.setYears(1)
551+
.setMonths(2)
552+
.setDays(3)
553+
.setHours(4)
554+
.setMinutes(5)
555+
.setSeconds(6)
556+
.setMicros(123456)))
557+
listValue.addValues(
558+
Value
559+
.newBuilder()
560+
.setInterval(
561+
ValueInterval
562+
.newBuilder()
563+
.setYears(10)
564+
.setMonths(2)
565+
.setDays(3)
566+
.setHours(4)
567+
.setMinutes(5)
568+
.setSeconds(6)
569+
.setMicros(123456)))
570+
listValue.addValues(
571+
Value
572+
.newBuilder()
573+
.setInterval(
574+
ValueInterval
575+
.newBuilder()
576+
.setYears(100)
577+
.setMonths(2)
578+
.setDays(3)
579+
.setHours(4)
580+
.setMinutes(5)
581+
.setSeconds(6)
582+
.setMicros(123456)))
583+
RecordItem(
584+
"list_of_intervals_value",
585+
Type.newBuilder().setList(listType).build(),
586+
Value.newBuilder().setList(listValue).build())
587+
},
518588
// List of binary values
519589
{
520590
val listType = ListType.newBuilder().setNullable(true)
@@ -524,7 +594,7 @@ class AllTypesFunction extends DASMockFunction {
524594
listValue.addValues(Value.newBuilder().setBinary(ValueBinary.newBuilder().setV(ByteString.copyFromUtf8("def"))))
525595
listValue.addValues(Value.newBuilder().setBinary(ValueBinary.newBuilder().setV(ByteString.copyFromUtf8("ghi"))))
526596
RecordItem(
527-
"list_of_binary_value",
597+
"list_of_binarys_value",
528598
Type.newBuilder().setList(listType).build(),
529599
Value.newBuilder().setList(listValue).build())
530600
},

‎src/main/scala/com/rawlabs/das/server/grpc/FunctionServiceGrpcImpl.scala

+4-3
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212

1313
package com.rawlabs.das.server.grpc
1414

15+
import scala.jdk.CollectionConverters._
16+
import scala.jdk.OptionConverters._
17+
1518
import com.rawlabs.das.sdk._
1619
import com.rawlabs.das.sdk.{
1720
DASSdkInvalidArgumentException,
@@ -20,13 +23,11 @@ import com.rawlabs.das.sdk.{
2023
DASSdkUnsupportedException
2124
}
2225
import com.rawlabs.das.server.manager.DASSdkManager
23-
import com.rawlabs.protocol.das.v1.common.{DASId, Environment}
26+
import com.rawlabs.protocol.das.v1.common.DASId
2427
import com.rawlabs.protocol.das.v1.functions.FunctionId
2528
import com.rawlabs.protocol.das.v1.services._
2629
import com.typesafe.scalalogging.StrictLogging
2730

28-
import _root_.scala.jdk.CollectionConverters._
29-
import _root_.scala.jdk.OptionConverters._
3031
import io.grpc.Status
3132
import io.grpc.stub.StreamObserver
3233

‎src/main/scala/com/rawlabs/das/server/grpc/TableServiceGrpcImpl.scala

+6-5
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@
1212

1313
package com.rawlabs.das.server.grpc
1414

15+
import scala.concurrent.ExecutionContext
16+
import scala.concurrent.duration.{DurationInt, FiniteDuration}
17+
import scala.jdk.CollectionConverters._
18+
import scala.jdk.OptionConverters._
19+
import scala.util.{Failure, Success}
20+
1521
import org.apache.pekko.NotUsed
1622
import org.apache.pekko.stream.scaladsl.{Keep, Sink, Source}
1723
import org.apache.pekko.stream.{KillSwitches, Materializer, UniqueKillSwitch}
@@ -24,11 +30,6 @@ import com.rawlabs.protocol.das.v1.services._
2430
import com.rawlabs.protocol.das.v1.tables._
2531
import com.typesafe.scalalogging.StrictLogging
2632

27-
import _root_.scala.concurrent.ExecutionContext
28-
import _root_.scala.concurrent.duration.{DurationInt, FiniteDuration}
29-
import _root_.scala.jdk.CollectionConverters._
30-
import _root_.scala.jdk.OptionConverters._
31-
import _root_.scala.util.{Failure, Success}
3233
import io.grpc.stub.{ServerCallStreamObserver, StreamObserver}
3334
import io.grpc.{Status, StatusRuntimeException}
3435

0 commit comments

Comments
 (0)