From f62e79ab96b3b86b4425c0a816eaa70ea0b12101 Mon Sep 17 00:00:00 2001 From: Timm Fitschen <t.fitschen@indiscale.com> Date: Fri, 21 Oct 2022 00:31:58 +0200 Subject: [PATCH] WIP: SELECT for GRPC API --- caosdb-proto | 2 +- .../org/caosdb/server/grpc/CaosDBToGrpcConverters.java | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/caosdb-proto b/caosdb-proto index 0b301401..fd60795f 160000 --- a/caosdb-proto +++ b/caosdb-proto @@ -1 +1 @@ -Subproject commit 0b301401cf28d7a3edeb2c55e418f072b83cf5a7 +Subproject commit fd60795f62335368255797db43eb0429ec1705fc diff --git a/src/main/java/org/caosdb/server/grpc/CaosDBToGrpcConverters.java b/src/main/java/org/caosdb/server/grpc/CaosDBToGrpcConverters.java index 12cbc921..0494e348 100644 --- a/src/main/java/org/caosdb/server/grpc/CaosDBToGrpcConverters.java +++ b/src/main/java/org/caosdb/server/grpc/CaosDBToGrpcConverters.java @@ -45,6 +45,8 @@ import org.caosdb.api.entity.v1.MessageCode; import org.caosdb.api.entity.v1.Parent; import org.caosdb.api.entity.v1.ReferenceDataType; import org.caosdb.api.entity.v1.ScalarValue; +import org.caosdb.api.entity.v1.SelectQueryColumn; +import org.caosdb.api.entity.v1.SelectQueryHeader; import org.caosdb.api.entity.v1.SelectQueryResult; import org.caosdb.api.entity.v1.SpecialValue; import org.caosdb.api.entity.v1.Version; @@ -595,6 +597,14 @@ public class CaosDBToGrpcConverters { RetrieveContainer container) { // TODO(tf) SelectQueryResult.Builder result = SelectQueryResult.newBuilder(); + result.setHeader(convertSelectQueryHeader(container)); + return result; + } + + private SelectQueryHeader.Builder convertSelectQueryHeader(RetrieveContainer container) { + SelectQueryHeader.Builder result = SelectQueryHeader.newBuilder(); + // TODO(tf) + result.addColumns(SelectQueryColumn.newBuilder().setName("col1")); return result; } } -- GitLab