Merge branch 'main' into bump-t-digest

deephaven · Dec 13, 2022 · ce37ef7 · ce37ef7
2 parents de0db68 + 500395f
commit ce37ef7
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 13 deletions.
diff --git a/ParquetHadoop/build.gradle b/ParquetHadoop/build.gradle
@@ -48,7 +48,7 @@ dependencies {
      * lz4-pure-java - note that we can't _easily_ use aircompressor here, as the service loader sees
      * the copy in hadoop-common. TODO use config instead of service loader
      */
-    runtimeOnly('com.fasterxml.woodstox:woodstox-core:6.3.1') {
+    runtimeOnly('com.fasterxml.woodstox:woodstox-core:6.4.0') {
         because 'hadoop-common required dependency for Configuration'
     }
     runtimeOnly('org.apache.hadoop.thirdparty:hadoop-shaded-guava:1.1.1') {

diff --git a/buildSrc/src/main/groovy/Classpaths.groovy b/buildSrc/src/main/groovy/Classpaths.groovy
@@ -119,7 +119,7 @@ class Classpaths {
 
     static final String JETTY11_GROUP = 'org.eclipse.jetty'
     static final String JETTY11_NAME = 'jetty-bom'
-    static final String JETTY11_VERSION = '11.0.12'
+    static final String JETTY11_VERSION = '11.0.13'
 
     static final String GUAVA_GROUP = 'com.google.guava'
     static final String GUAVA_NAME = 'guava'

diff --git a/buildSrc/src/main/groovy/io.deephaven.java-classpath-conventions.gradle b/buildSrc/src/main/groovy/io.deephaven.java-classpath-conventions.gradle
@@ -6,7 +6,7 @@ plugins {
 // TODO(deephaven-core#1162): Adopt java-platform to manage versions
 ext {
     depAnnotations = 'com.intellij:annotations:5.1'
-    depCommonsCompress = 'org.apache.commons:commons-compress:1.21'
+    depCommonsCompress = 'org.apache.commons:commons-compress:1.22'
     depCommonsLang3 = 'org.apache.commons:commons-lang3:3.9'
     depCommonsIo = 'commons-io:commons-io:2.11.0'
     depJdom2 = 'org.jdom:jdom2:2.0.6.1'
@@ -17,7 +17,6 @@ configurations {
 
     commonsIo
     jdom
-    httpClient
     math3
     jama.extendsFrom math3
     dxCompile
@@ -48,7 +47,6 @@ dependencies {
 
     // First, one-off configurations for stuff we need "here and there"
     jdom 'org.jdom:jdom2:2.0.6.1'
-    httpClient 'org.apache.httpcomponents:httpclient:4.5.6'
     commonsLang3 'org.apache.commons:commons-lang3:3.9'
     commonsText 'org.apache.commons:commons-text:1.10.0'
     commonsIo 'commons-io:commons-io:2.11.0'

diff --git a/engine/context/build.gradle b/engine/context/build.gradle
@@ -20,7 +20,7 @@ dependencies {
     implementation project(':table-api')
     implementation project(':IO')
 
-    implementation 'com.github.f4b6a3:uuid-creator:3.6.0'
+    implementation 'com.github.f4b6a3:uuid-creator:5.2.0'
 
     Classpaths.inheritCommonsText(project, 'implementation')
 

diff --git a/engine/table/build.gradle b/engine/table/build.gradle
@@ -48,7 +48,7 @@ dependencies {
     implementation project(':Net')
     implementation project(':FishUtil')
 
-    implementation 'com.github.f4b6a3:uuid-creator:3.6.0'
+    implementation 'com.github.f4b6a3:uuid-creator:5.2.0'
     implementation 'com.tdunning:t-digest:3.3'
     implementation 'com.squareup:javapoet:1.13.0'
 

diff --git a/server/build.gradle b/server/build.gradle
@@ -33,7 +33,7 @@ dependencies {
     api(project(':application-mode')) {
         because 'downstream dagger compile, see deephaven-core#1722'
     }
-    implementation 'com.github.f4b6a3:uuid-creator:3.6.0'
+    implementation 'com.github.f4b6a3:uuid-creator:5.2.0'
 
     api(project(':Configuration')) {
         because 'jetty/netty implementations will access the configuration in their main()s'

diff --git a/...r/src/main/java/io/deephaven/server/partitionedtable/PartitionedTableServiceGrpcImpl.java b/...r/src/main/java/io/deephaven/server/partitionedtable/PartitionedTableServiceGrpcImpl.java
@@ -14,8 +14,10 @@
 import io.deephaven.proto.backplane.grpc.PartitionByRequest;
 import io.deephaven.proto.backplane.grpc.PartitionByResponse;
 import io.deephaven.proto.backplane.grpc.PartitionedTableServiceGrpc;
+import io.deephaven.server.auth.AuthorizationProvider;
 import io.deephaven.server.session.SessionService;
 import io.deephaven.server.session.SessionState;
+import io.deephaven.server.session.TicketResolverBase;
 import io.deephaven.server.session.TicketRouter;
 import io.grpc.stub.StreamObserver;
 
@@ -34,17 +36,20 @@ public class PartitionedTableServiceGrpcImpl extends PartitionedTableServiceGrpc
     private final SessionService sessionService;
     private final UpdateGraphProcessor updateGraphProcessor;
     private final PartitionedTableServiceContextualAuthWiring authWiring;
+    private final TicketResolverBase.AuthTransformation authorizationTransformation;
 
     @Inject
     public PartitionedTableServiceGrpcImpl(
             TicketRouter ticketRouter,
             SessionService sessionService,
             UpdateGraphProcessor updateGraphProcessor,
+            AuthorizationProvider authorizationProvider,
             PartitionedTableServiceContextualAuthWiring authWiring) {
         this.ticketRouter = ticketRouter;
         this.sessionService = sessionService;
         this.updateGraphProcessor = updateGraphProcessor;
         this.authWiring = authWiring;
+        this.authorizationTransformation = authorizationProvider.getTicketTransformation();
     }
 
     @Override
@@ -86,14 +91,15 @@ public void merge(MergeRequest request, StreamObserver<ExportedTableCreationResp
                     .onError(responseObserver)
                     .submit(() -> {
                         authWiring.checkPermissionMerge(session.getAuthContext(), request,
-                                Collections.singletonList((Table) partitionedTable.get()));
-                        final Table merged;
+                                Collections.singletonList(partitionedTable.get().table()));
+                        Table merged;
                         if (partitionedTable.get().table().isRefreshing()) {
                             merged = updateGraphProcessor.sharedLock()
                                     .computeLocked(partitionedTable.get()::merge);
                         } else {
                             merged = partitionedTable.get().merge();
                         }
+                        merged = authorizationTransformation.transform(merged);
                         final ExportedTableCreationResponse response =
                                 buildTableCreationResponse(request.getResultId(), merged);
                         safelyExecute(() -> {
@@ -120,10 +126,10 @@ public void getTable(GetTableRequest request, StreamObserver<ExportedTableCreati
                     .require(partitionedTable, keys)
                     .onError(responseObserver)
                     .submit(() -> {
-                        authWiring.checkPermissionGetTable(session.getAuthContext(), request,
-                                List.of((Table) partitionedTable.get(), keys.get()));
-                        final Table table;
+                        Table table;
                         Table keyTable = keys.get();
+                        authWiring.checkPermissionGetTable(session.getAuthContext(), request,
+                                List.of(partitionedTable.get().table(), keyTable));
                         if (!keyTable.isRefreshing()) {
                             long keyTableSize = keyTable.size();
                             if (keyTableSize != 1) {
@@ -161,6 +167,7 @@ public void getTable(GetTableRequest request, StreamObserver<ExportedTableCreati
                                         .get(requestedRow.getRowSet().firstRowKey());
                             });
                         }
+                        table = authorizationTransformation.transform(table);
                         final ExportedTableCreationResponse response =
                                 buildTableCreationResponse(request.getResultId(), table);
                         safelyExecute(() -> {