Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed imports and test code #34

Merged
merged 2 commits into from
Mar 25, 2025
Merged

Fixed imports and test code #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17f91b5
Added missing column/parameter types to all_types
bgaidioz Mar 21, 2025
f51ac68
Fixed wrong imports in TableGrpcServiceImpl and FunctionGrpcServiceImpl
bgaidioz Mar 21, 2025
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
94 changes: 82 additions & 12 deletions src/main/scala/com/rawlabs/das/mock/functions/AllTypesFunction.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ class AllTypesFunction extends DASMockFunction {
listValue.addValues(Value.newBuilder().setByte(ValueByte.newBuilder().setV(20)))
listValue.addValues(Value.newBuilder().setByte(ValueByte.newBuilder().setV(30)))
RecordItem(
"list_of_byte_value",
"list_of_bytes_value",
Type.newBuilder().setList(listType).build(),
Value.newBuilder().setList(listValue).build())
},
Expand All @@ -335,7 +335,7 @@ class AllTypesFunction extends DASMockFunction {
listValue.addValues(Value.newBuilder().setShort(ValueShort.newBuilder().setV(200)))
listValue.addValues(Value.newBuilder().setShort(ValueShort.newBuilder().setV(300)))
RecordItem(
"list_of_short_value",
"list_of_shorts_value",
Type.newBuilder().setList(listType).build(),
Value.newBuilder().setList(listValue).build())
},
Expand All @@ -353,7 +353,7 @@ class AllTypesFunction extends DASMockFunction {
listValue.addValues(Value.newBuilder().setInt(ValueInt.newBuilder().setV(3)))

RecordItem(
"list_of_int_value",
"list_of_ints_value",
Type
.newBuilder()
.setList(listType)
Expand All @@ -373,7 +373,7 @@ class AllTypesFunction extends DASMockFunction {
listValue.addValues(Value.newBuilder().setLong(ValueLong.newBuilder().setV(200000L)))
listValue.addValues(Value.newBuilder().setLong(ValueLong.newBuilder().setV(300000L)))
RecordItem(
"list_of_long_value",
"list_of_longs_value",
Type.newBuilder().setList(listType).build(),
Value.newBuilder().setList(listValue).build())
},
Expand All @@ -387,7 +387,7 @@ class AllTypesFunction extends DASMockFunction {
listValue.addValues(Value.newBuilder().setFloat(ValueFloat.newBuilder().setV(4.56f)))
listValue.addValues(Value.newBuilder().setFloat(ValueFloat.newBuilder().setV(7.89f)))
RecordItem(
"list_of_float_value",
"list_of_floats_value",
Type.newBuilder().setList(listType).build(),
Value.newBuilder().setList(listValue).build())
},
Expand All @@ -401,11 +401,28 @@ class AllTypesFunction extends DASMockFunction {
listValue.addValues(Value.newBuilder().setDouble(ValueDouble.newBuilder().setV(4.56)))
listValue.addValues(Value.newBuilder().setDouble(ValueDouble.newBuilder().setV(7.89)))
RecordItem(
"list_of_double_value",
"list_of_doubles_value",
Type.newBuilder().setList(listType).build(),
Value.newBuilder().setList(listValue).build())
},

// List of decimals
{
val listType = ListType.newBuilder().setNullable(true)
listType.setInnerType(
Type
.newBuilder()
.setDecimal(DecimalType.newBuilder().setNullable(true))
.build())
val listValue = ValueList.newBuilder()
listValue.addValues(Value.newBuilder().setDecimal(ValueDecimal.newBuilder().setV("1.23")))
listValue.addValues(Value.newBuilder().setDecimal(ValueDecimal.newBuilder().setV("4.56")))
listValue.addValues(Value.newBuilder().setDecimal(ValueDecimal.newBuilder().setV("7.89")))
RecordItem(
"list_of_decimals_value",
Type.newBuilder().setList(listType).build(),
Value.newBuilder().setList(listValue).build())
},
// List of strings
{
val listType = ListType.newBuilder().setNullable(true)
Expand All @@ -415,7 +432,7 @@ class AllTypesFunction extends DASMockFunction {
listValue.addValues(Value.newBuilder().setString(ValueString.newBuilder().setV("bar")))
listValue.addValues(Value.newBuilder().setString(ValueString.newBuilder().setV("baz")))
RecordItem(
"list_of_string_value",
"list_of_strings_value",
Type.newBuilder().setList(listType).build(),
Value.newBuilder().setList(listValue).build())
},
Expand All @@ -429,7 +446,7 @@ class AllTypesFunction extends DASMockFunction {
listValue.addValues(Value.newBuilder().setBool(ValueBool.newBuilder().setV(false)))
listValue.addValues(Value.newBuilder().setBool(ValueBool.newBuilder().setV(true)))
RecordItem(
"list_of_bool_value",
"list_of_bools_value",
Type.newBuilder().setList(listType).build(),
Value.newBuilder().setList(listValue).build())
},
Expand All @@ -443,7 +460,7 @@ class AllTypesFunction extends DASMockFunction {
listValue.addValues(Value.newBuilder().setDate(ValueDate.newBuilder().setYear(2022).setMonth(2).setDay(20)))
listValue.addValues(Value.newBuilder().setDate(ValueDate.newBuilder().setYear(2022).setMonth(3).setDay(25)))
RecordItem(
"list_of_date_value",
"list_of_dates_value",
Type.newBuilder().setList(listType).build(),
Value.newBuilder().setList(listValue).build())
},
Expand All @@ -460,7 +477,7 @@ class AllTypesFunction extends DASMockFunction {
listValue.addValues(
Value.newBuilder().setTime(ValueTime.newBuilder().setHour(15).setMinute(0).setSecond(0).setNano(0)))
RecordItem(
"list_of_time_value",
"list_of_times_value",
Type.newBuilder().setList(listType).build(),
Value.newBuilder().setList(listValue).build())
},
Expand Down Expand Up @@ -510,11 +527,64 @@ class AllTypesFunction extends DASMockFunction {
.setSecond(0)
.setNano(0)))
RecordItem(
"list_of_timestamp_value",
"list_of_timestamps_value",
Type.newBuilder().setList(listType).build(),
Value.newBuilder().setList(listValue).build())
},

// List of intervals
{
val listType = ListType.newBuilder().setNullable(true)
listType.setInnerType(
Type
.newBuilder()
.setInterval(IntervalType.newBuilder().setNullable(true))
.build())
val listValue = ValueList.newBuilder()
listValue.addValues(
Value
.newBuilder()
.setInterval(
ValueInterval
.newBuilder()
.setYears(1)
.setMonths(2)
.setDays(3)
.setHours(4)
.setMinutes(5)
.setSeconds(6)
.setMicros(123456)))
listValue.addValues(
Value
.newBuilder()
.setInterval(
ValueInterval
.newBuilder()
.setYears(10)
.setMonths(2)
.setDays(3)
.setHours(4)
.setMinutes(5)
.setSeconds(6)
.setMicros(123456)))
listValue.addValues(
Value
.newBuilder()
.setInterval(
ValueInterval
.newBuilder()
.setYears(100)
.setMonths(2)
.setDays(3)
.setHours(4)
.setMinutes(5)
.setSeconds(6)
.setMicros(123456)))
RecordItem(
"list_of_intervals_value",
Type.newBuilder().setList(listType).build(),
Value.newBuilder().setList(listValue).build())
},
// List of binary values
{
val listType = ListType.newBuilder().setNullable(true)
Expand All @@ -524,7 +594,7 @@ class AllTypesFunction extends DASMockFunction {
listValue.addValues(Value.newBuilder().setBinary(ValueBinary.newBuilder().setV(ByteString.copyFromUtf8("def"))))
listValue.addValues(Value.newBuilder().setBinary(ValueBinary.newBuilder().setV(ByteString.copyFromUtf8("ghi"))))
RecordItem(
"list_of_binary_value",
"list_of_binarys_value",
Type.newBuilder().setList(listType).build(),
Value.newBuilder().setList(listValue).build())
},
Expand Down
7 changes: 4 additions & 3 deletions src/main/scala/com/rawlabs/das/server/grpc/FunctionServiceGrpcImpl.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@

package com.rawlabs.das.server.grpc

import scala.jdk.CollectionConverters._
import scala.jdk.OptionConverters._

import com.rawlabs.das.sdk._
import com.rawlabs.das.sdk.{
DASSdkInvalidArgumentException,
Expand All @@ -20,13 +23,11 @@ import com.rawlabs.das.sdk.{
DASSdkUnsupportedException
}
import com.rawlabs.das.server.manager.DASSdkManager
import com.rawlabs.protocol.das.v1.common.{DASId, Environment}
import com.rawlabs.protocol.das.v1.common.DASId
import com.rawlabs.protocol.das.v1.functions.FunctionId
import com.rawlabs.protocol.das.v1.services._
import com.typesafe.scalalogging.StrictLogging

import _root_.scala.jdk.CollectionConverters._
import _root_.scala.jdk.OptionConverters._
import io.grpc.Status
import io.grpc.stub.StreamObserver

Expand Down
11 changes: 6 additions & 5 deletions src/main/scala/com/rawlabs/das/server/grpc/TableServiceGrpcImpl.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@

package com.rawlabs.das.server.grpc

import scala.concurrent.ExecutionContext
import scala.concurrent.duration.{DurationInt, FiniteDuration}
import scala.jdk.CollectionConverters._
import scala.jdk.OptionConverters._
import scala.util.{Failure, Success}

import org.apache.pekko.NotUsed
import org.apache.pekko.stream.scaladsl.{Keep, Sink, Source}
import org.apache.pekko.stream.{KillSwitches, Materializer, UniqueKillSwitch}
Expand All @@ -24,11 +30,6 @@ import com.rawlabs.protocol.das.v1.services._
import com.rawlabs.protocol.das.v1.tables._
import com.typesafe.scalalogging.StrictLogging

import _root_.scala.concurrent.ExecutionContext
import _root_.scala.concurrent.duration.{DurationInt, FiniteDuration}
import _root_.scala.jdk.CollectionConverters._
import _root_.scala.jdk.OptionConverters._
import _root_.scala.util.{Failure, Success}
import io.grpc.stub.{ServerCallStreamObserver, StreamObserver}
import io.grpc.{Status, StatusRuntimeException}

Expand Down