OperatorHelper updated.

lbooker42 · Feb 14, 2024 · 4c0e3f3 · 4c0e3f3
1 parent b1a38b3
commit 4c0e3f3
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 11 deletions.
diff --git a/...zation/src/main/java/io/deephaven/auth/codegen/impl/TableServiceContextualAuthWiring.java b/...zation/src/main/java/io/deephaven/auth/codegen/impl/TableServiceContextualAuthWiring.java
@@ -10,8 +10,43 @@
 import io.deephaven.auth.AuthContext;
 import io.deephaven.auth.ServiceAuthWiring;
 import io.deephaven.engine.table.Table;
-import io.deephaven.proto.backplane.grpc.*;
-
+import io.deephaven.proto.backplane.grpc.AggregateAllRequest;
+import io.deephaven.proto.backplane.grpc.AggregateRequest;
+import io.deephaven.proto.backplane.grpc.AjRajTablesRequest;
+import io.deephaven.proto.backplane.grpc.ApplyPreviewColumnsRequest;
+import io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest;
+import io.deephaven.proto.backplane.grpc.ColumnStatisticsRequest;
+import io.deephaven.proto.backplane.grpc.ComboAggregateRequest;
+import io.deephaven.proto.backplane.grpc.CreateInputTableRequest;
+import io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest;
+import io.deephaven.proto.backplane.grpc.DropColumnsRequest;
+import io.deephaven.proto.backplane.grpc.EmptyTableRequest;
+import io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest;
+import io.deephaven.proto.backplane.grpc.ExportedTableUpdatesRequest;
+import io.deephaven.proto.backplane.grpc.FetchTableRequest;
+import io.deephaven.proto.backplane.grpc.FilterTableRequest;
+import io.deephaven.proto.backplane.grpc.FlattenRequest;
+import io.deephaven.proto.backplane.grpc.HeadOrTailByRequest;
+import io.deephaven.proto.backplane.grpc.HeadOrTailRequest;
+import io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest;
+import io.deephaven.proto.backplane.grpc.MergeTablesRequest;
+import io.deephaven.proto.backplane.grpc.MetaTableRequest;
+import io.deephaven.proto.backplane.grpc.MultiJoinTablesRequest;
+import io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest;
+import io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest;
+import io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest;
+import io.deephaven.proto.backplane.grpc.SeekRowRequest;
+import io.deephaven.proto.backplane.grpc.SelectDistinctRequest;
+import io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest;
+import io.deephaven.proto.backplane.grpc.SnapshotTableRequest;
+import io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest;
+import io.deephaven.proto.backplane.grpc.SortTableRequest;
+import io.deephaven.proto.backplane.grpc.Ticket;
+import io.deephaven.proto.backplane.grpc.TimeTableRequest;
+import io.deephaven.proto.backplane.grpc.UngroupRequest;
+import io.deephaven.proto.backplane.grpc.UnstructuredFilterTableRequest;
+import io.deephaven.proto.backplane.grpc.UpdateByRequest;
+import io.deephaven.proto.backplane.grpc.WhereInRequest;
 import java.lang.Override;
 import java.util.List;
 
@@ -344,7 +379,7 @@ void checkPermissionRajTables(AuthContext authContext, AjRajTablesRequest reques
      * @param authContext the authentication context of the request
      * @param request the request to authorize
      * @param sourceTables the operation's source tables
-     * @throws io.grpc.StatusRuntimeException if the user is not authorized to invoke NaturalJoinTables
+     * @throws io.grpc.StatusRuntimeException if the user is not authorized to invoke MultiJoinTables
      */
     void checkPermissionMultiJoinTables(AuthContext authContext, MultiJoinTablesRequest request,
             List<Table> sourceTables);
@@ -654,8 +689,8 @@ public void checkPermissionRajTables(AuthContext authContext, AjRajTablesRequest
             checkPermission(authContext, sourceTables);
         }
 
-        public void checkPermissionMultiJoinTables(AuthContext authContext, MultiJoinTablesRequest request,
-                List<Table> sourceTables) {
+        public void checkPermissionMultiJoinTables(AuthContext authContext,
+                MultiJoinTablesRequest request, List<Table> sourceTables) {
             checkPermission(authContext, sourceTables);
         }
 
@@ -954,8 +989,8 @@ public void checkPermissionRajTables(AuthContext authContext, AjRajTablesRequest
             }
         }
 
-        public void checkPermissionMultiJoinTables(AuthContext authContext, MultiJoinTablesRequest request,
-                List<Table> sourceTables) {
+        public void checkPermissionMultiJoinTables(AuthContext authContext,
+                MultiJoinTablesRequest request, List<Table> sourceTables) {
             if (delegate != null) {
                 delegate.checkPermissionMultiJoinTables(authContext, request, sourceTables);
             }

diff --git a/proto/proto-backplane-grpc/src/main/java/io/deephaven/proto/util/OperationHelper.java b/proto/proto-backplane-grpc/src/main/java/io/deephaven/proto/util/OperationHelper.java
@@ -5,6 +5,7 @@
 
 import io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation;
 import io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.OpCase;
+import io.deephaven.proto.backplane.grpc.MultiJoinInput;
 import io.deephaven.proto.backplane.grpc.TableReference;
 
 import java.util.stream.Stream;
@@ -100,6 +101,10 @@ public static Stream<TableReference> getSourceIds(Operation op) {
                 return Stream.of(op.getRangeJoin().getLeftId(), op.getRangeJoin().getRightId());
             case COLUMN_STATISTICS:
                 return Stream.of(op.getColumnStatistics().getSourceId());
+            case MULTI_JOIN:
+                return op.getMultiJoin().getMultiJoinInputsList().isEmpty()
+                        ? op.getMultiJoin().getSourceIdsList().stream()
+                        : op.getMultiJoin().getMultiJoinInputsList().stream().map(MultiJoinInput::getSourceId);
             case OP_NOT_SET:
                 throw new IllegalStateException("Operation id not set");
             default:

diff --git a/server/src/main/java/io/deephaven/server/table/ops/MultiJoinGrpcImpl.java b/server/src/main/java/io/deephaven/server/table/ops/MultiJoinGrpcImpl.java
@@ -28,10 +28,10 @@ public MultiJoinGrpcImpl(
         super(authWiring::checkPermissionMultiJoinTables,
                 BatchTableRequest.Operation::getMultiJoin,
                 MultiJoinTablesRequest::getResultId,
-                (MultiDependencyFunction<MultiJoinTablesRequest>) request -> request.getMultiJoinInputsCount() > 0
-                        ? request.getMultiJoinInputsList().stream().map(MultiJoinInput::getSourceId)
-                                .collect(Collectors.toList())
-                        : request.getSourceIdsList());
+                (MultiDependencyFunction<MultiJoinTablesRequest>) request -> request.getMultiJoinInputsList().isEmpty()
+                        ? request.getSourceIdsList()
+                        : request.getMultiJoinInputsList().stream().map(MultiJoinInput::getSourceId)
+                                .collect(Collectors.toList()));
     }
 
     @Override