merged with main

deephaven · Apr 10, 2023 · 49eaed4 · 49eaed4
2 parents 2312f56 + 16e9bda
commit 49eaed4
Show file tree

Hide file tree

Showing 401 changed files with 41,670 additions and 14,082 deletions.
diff --git a/Base/build.gradle b/Base/build.gradle
@@ -48,7 +48,7 @@ artifacts {
 spotless {
     java {
         targetExclude(
-                'src/test/java/io/deephaven/base/ringbuffer/AggregatingDoubleRingBufferTest.java'
+                '**/ringbuffer/Aggregating*RingBuffer*.java'
         )
     }
 }
diff --git a/Base/src/main/java/io/deephaven/base/ringbuffer/AggregatingDoubleRingBuffer.java b/Base/src/main/java/io/deephaven/base/ringbuffer/AggregatingDoubleRingBuffer.java
@@ -696,8 +696,7 @@ void fixupTree(final long r1Head, final long r1Tail, final long r2Head, final lo
      * <p>
      * The provided ranges ore closed-interval. The head and tail are both included in the range.
      */
-    private void evaluateThreeRanges(int r1h, int r1t, int r2h, int r2t, int r3h, int r3t,
-            DoubleFunction evalFunction) {
+    private void evaluateThreeRanges(int r1h, int r1t, int r2h, int r2t, int r3h, int r3t, DoubleFunction evalFunction) {
         while (true) {
             if (r1t >= r2h) {
                 // r1 and r2 overlap. Collapse them together and call the two range version.

diff --git a/Base/src/main/java/io/deephaven/base/ringbuffer/AggregatingObjectRingBuffer.java b/Base/src/main/java/io/deephaven/base/ringbuffer/AggregatingObjectRingBuffer.java
@@ -696,8 +696,7 @@ void fixupTree(final long r1Head, final long r1Tail, final long r2Head, final lo
      * <p>
      * The provided ranges ore closed-interval. The head and tail are both included in the range.
      */
-    private void evaluateThreeRanges(int r1h, int r1t, int r2h, int r2t, int r3h, int r3t,
-            ObjectFunction<T> evalFunction) {
+    private void evaluateThreeRanges(int r1h, int r1t, int r2h, int r2t, int r3h, int r3t, ObjectFunction<T> evalFunction) {
         while (true) {
             if (r1t >= r2h) {
                 // r1 and r2 overlap. Collapse them together and call the two range version.

diff --git a/ParquetHadoop/build.gradle b/ParquetHadoop/build.gradle
@@ -17,8 +17,10 @@ tasks.withType(License) {
 }
 
 dependencies {
-    api('org.apache.parquet:parquet-hadoop:1.12.3')
+    // TODO(deephaven-core#3148): LZ4_RAW parquet support
+    api('org.apache.parquet:parquet-hadoop:1.13.0')
 
+    // TODO(deephaven-core#806): Remove dependency on hadoop-common
     api('org.apache.hadoop:hadoop-common:3.3.3') {
         // do not take any dependencies of this project,
         // we just want a few classes (Configuration, Path) for

diff --git a/ParquetHadoop/src/main/java/io/deephaven/parquet/base/tempfix/ParquetMetadataConverter.java b/ParquetHadoop/src/main/java/io/deephaven/parquet/base/tempfix/ParquetMetadataConverter.java
@@ -19,6 +19,7 @@
 package io.deephaven.parquet.base.tempfix;
 
 /*
+TODO(deephaven-core#901): Remove the hacked ParquetMetadataConverter.java and the need for the ParquetHadoop module.
 NOTE this only exists for this line, inside addRowGroup
 Without it the page offset is not being saved properly
             if (columnMetaData.getDictionaryPageOffset() >= 0) {

diff --git a/ParquetHadoop/src/main/java/io/deephaven/parquet/compress/codec/ZstdCodec.java b/ParquetHadoop/src/main/java/io/deephaven/parquet/compress/codec/ZstdCodec.java
diff --git a/...etHadoop/src/main/java/io/deephaven/parquet/compress/codec/zstd/ZstdCompressorStream.java b/...etHadoop/src/main/java/io/deephaven/parquet/compress/codec/zstd/ZstdCompressorStream.java
diff --git a/...Hadoop/src/main/java/io/deephaven/parquet/compress/codec/zstd/ZstdDecompressorStream.java b/...Hadoop/src/main/java/io/deephaven/parquet/compress/codec/zstd/ZstdDecompressorStream.java
diff --git a/authorization-codegen/protoc-gen-contextual-auth-wiring b/authorization-codegen/protoc-gen-contextual-auth-wiring
@@ -1,2 +1,2 @@
 # protoc-gen-contextual-auth-wiring
-java -cp authorization-codegen/build/libs/deephaven-authorization-codegen-0.23.0-all.jar io.deephaven.auth.codegen.GenerateContextualAuthWiring
+java -cp authorization-codegen/build/libs/deephaven-authorization-codegen-0.24.0-all.jar io.deephaven.auth.codegen.GenerateContextualAuthWiring
diff --git a/authorization-codegen/protoc-gen-service-auth-wiring b/authorization-codegen/protoc-gen-service-auth-wiring
@@ -1,2 +1,2 @@
 # protoc-gen-service-auth-wiring
-java -cp authorization-codegen/build/libs/deephaven-authorization-codegen-0.23.0-all.jar io.deephaven.auth.codegen.GenerateServiceAuthWiring
+java -cp authorization-codegen/build/libs/deephaven-authorization-codegen-0.24.0-all.jar io.deephaven.auth.codegen.GenerateServiceAuthWiring
diff --git a/authorization/src/main/java/io/deephaven/auth/codegen/impl/ConsoleServiceAuthWiring.java b/authorization/src/main/java/io/deephaven/auth/codegen/impl/ConsoleServiceAuthWiring.java
@@ -11,6 +11,7 @@
 import io.deephaven.auth.ServiceAuthWiring;
 import io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest;
 import io.deephaven.proto.backplane.script.grpc.BindTableToVariableRequest;
+import io.deephaven.proto.backplane.script.grpc.CancelAutoCompleteRequest;
 import io.deephaven.proto.backplane.script.grpc.CancelCommandRequest;
 import io.deephaven.proto.backplane.script.grpc.ConsoleServiceGrpc;
 import io.deephaven.proto.backplane.script.grpc.ExecuteCommandRequest;
@@ -52,6 +53,8 @@ default ServerServiceDefinition intercept(ConsoleServiceGrpc.ConsoleServiceImplB
         serviceBuilder.addMethod(ServiceAuthWiring.intercept(
                 service, "AutoCompleteStream", this::onCallStartedAutoCompleteStream,
                 this::onMessageReceivedAutoCompleteStream));
+        serviceBuilder.addMethod(ServiceAuthWiring.intercept(
+                service, "CancelAutoComplete", null, this::onMessageReceivedCancelAutoComplete));
         serviceBuilder.addMethod(ServiceAuthWiring.intercept(
                 service, "OpenAutoCompleteStream", null, this::onMessageReceivedOpenAutoCompleteStream));
         serviceBuilder.addMethod(ServiceAuthWiring.intercept(
@@ -141,6 +144,16 @@ void onMessageReceivedBindTableToVariable(AuthContext authContext,
      */
     void onMessageReceivedAutoCompleteStream(AuthContext authContext, AutoCompleteRequest request);
 
+    /**
+     * Authorize a request to CancelAutoComplete.
+     *
+     * @param authContext the authentication context of the request
+     * @param request the request to authorize
+     * @throws io.grpc.StatusRuntimeException if the user is not authorized to invoke CancelAutoComplete
+     */
+    void onMessageReceivedCancelAutoComplete(AuthContext authContext,
+            CancelAutoCompleteRequest request);
+
     /**
      * Authorize a request to OpenAutoCompleteStream.
      *
@@ -187,6 +200,9 @@ public void onCallStartedAutoCompleteStream(AuthContext authContext) {}
         public void onMessageReceivedAutoCompleteStream(AuthContext authContext,
                 AutoCompleteRequest request) {}
 
+        public void onMessageReceivedCancelAutoComplete(AuthContext authContext,
+                CancelAutoCompleteRequest request) {}
+
         public void onMessageReceivedOpenAutoCompleteStream(AuthContext authContext,
                 AutoCompleteRequest request) {}
 
@@ -238,6 +254,11 @@ public void onMessageReceivedAutoCompleteStream(AuthContext authContext,
             ServiceAuthWiring.operationNotAllowed();
         }
 
+        public void onMessageReceivedCancelAutoComplete(AuthContext authContext,
+                CancelAutoCompleteRequest request) {
+            ServiceAuthWiring.operationNotAllowed();
+        }
+
         public void onMessageReceivedOpenAutoCompleteStream(AuthContext authContext,
                 AutoCompleteRequest request) {
             ServiceAuthWiring.operationNotAllowed();
@@ -313,6 +334,13 @@ public void onMessageReceivedAutoCompleteStream(AuthContext authContext,
             }
         }
 
+        public void onMessageReceivedCancelAutoComplete(AuthContext authContext,
+                CancelAutoCompleteRequest request) {
+            if (delegate != null) {
+                delegate.onMessageReceivedCancelAutoComplete(authContext, request);
+            }
+        }
+
         public void onMessageReceivedOpenAutoCompleteStream(AuthContext authContext,
                 AutoCompleteRequest request) {
             if (delegate != null) {

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
@@ -28,6 +28,7 @@
 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.NaturalJoinTablesRequest;
 import io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest;
 import io.deephaven.proto.backplane.grpc.SeekRowRequest;
@@ -466,6 +467,17 @@ void checkPermissionExportedTableUpdates(AuthContext authContext,
     void checkPermissionSeekRow(AuthContext authContext, SeekRowRequest request,
             List<Table> sourceTables);
 
+    /**
+     * Authorize a request to MetaTable.
+     *
+     * @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 MetaTable
+     */
+    void checkPermissionMetaTable(AuthContext authContext, MetaTableRequest request,
+            List<Table> sourceTables);
+
     class AllowAll implements TableServiceContextualAuthWiring {
         public void checkPermissionGetExportedTableCreationResponse(AuthContext authContext,
                 Ticket request, List<Table> sourceTables) {}
@@ -580,6 +592,9 @@ public void checkPermissionExportedTableUpdates(AuthContext authContext,
 
         public void checkPermissionSeekRow(AuthContext authContext, SeekRowRequest request,
                 List<Table> sourceTables) {}
+
+        public void checkPermissionMetaTable(AuthContext authContext, MetaTableRequest request,
+                List<Table> sourceTables) {}
     }
 
     class DenyAll implements TableServiceContextualAuthWiring {
@@ -772,6 +787,11 @@ public void checkPermissionSeekRow(AuthContext authContext, SeekRowRequest reque
                 List<Table> sourceTables) {
             ServiceAuthWiring.operationNotAllowed();
         }
+
+        public void checkPermissionMetaTable(AuthContext authContext, MetaTableRequest request,
+                List<Table> sourceTables) {
+            ServiceAuthWiring.operationNotAllowed();
+        }
     }
 
     class TestUseOnly implements TableServiceContextualAuthWiring {
@@ -1042,5 +1062,12 @@ public void checkPermissionSeekRow(AuthContext authContext, SeekRowRequest reque
                 delegate.checkPermissionSeekRow(authContext, request, sourceTables);
             }
         }
+
+        public void checkPermissionMetaTable(AuthContext authContext, MetaTableRequest request,
+                List<Table> sourceTables) {
+            if (delegate != null) {
+                delegate.checkPermissionMetaTable(authContext, request, sourceTables);
+            }
+        }
     }
 }