review feedback, try to simplify impl

deephaven · Oct 25, 2023 · e365136 · e365136
1 parent 1b55f1f
commit e365136
Show file tree

Hide file tree

Showing 13 changed files with 25 additions and 26 deletions.
diff --git a/Plot/src/main/java/io/deephaven/plot/Figure.java b/Plot/src/main/java/io/deephaven/plot/Figure.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2022 Deephaven Data Labs and Patent Pending
+ * Copyright (c) 2016-2023 Deephaven Data Labs and Patent Pending
  */
 /****************************************************************************************************************************
  ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY - Run GenerateFigureImmutable or "./gradlew :Generators:generateFigureImmutable" to regenerate

diff --git a/Plot/src/main/java/io/deephaven/plot/FigureImpl.java b/Plot/src/main/java/io/deephaven/plot/FigureImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2022 Deephaven Data Labs and Patent Pending
+ * Copyright (c) 2016-2023 Deephaven Data Labs and Patent Pending
  */
 /****************************************************************************************************************************
  ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY - Run GenerateFigureImmutable or "./gradlew :Generators:generateFigureImmutable" to regenerate

diff --git a/Plot/src/main/java/io/deephaven/plot/PlottingConvenience.java b/Plot/src/main/java/io/deephaven/plot/PlottingConvenience.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2022 Deephaven Data Labs and Patent Pending
+ * Copyright (c) 2016-2023 Deephaven Data Labs and Patent Pending
  */
 /****************************************************************************************************************************
  ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY - Run GeneratePlottingConvenience or "./gradlew :Generators:generatePlottingConvenience" to regenerate

diff --git a/Stats/src/main/java/io/deephaven/stats/StatsCPUCollector.java b/Stats/src/main/java/io/deephaven/stats/StatsCPUCollector.java
@@ -3,6 +3,7 @@
  */
 package io.deephaven.stats;
 
+import io.deephaven.base.verify.Assert;
 import io.deephaven.configuration.Configuration;
 import io.deephaven.internal.log.LoggerFactory;
 import io.deephaven.io.logger.Logger;
@@ -223,32 +224,31 @@ private boolean peekNextLong() {
      */
     private void readToBuffer(FileChannel fileChannel, String fileName) throws IOException {
         statBuffer.clear();
-        int nb = 0;
         fileChannel.position(0);
 
         // Filesystem entries in /proc can only be read all at once to avoid races, so using too big of a buffer isn't a
         // problem, but too small is. Attempt to read with the current buffer. If we filled the buffer we resize it and
         // read again from start.
         while (true) {
-            final int thisNb = fileChannel.read(statBuffer);
+            final int nb = fileChannel.read(statBuffer);
 
-            if (thisNb == -1) {
-                break;
+            if (nb == -1) {
+                // EOF means success, set position to zero and limit to the data read
+                statBuffer.flip();
+                return;
+            }
+            if (nb == 0) {
+                // zero bytes read is an error, proc isn't working correctly?
+                throw new IOException(fileName + " zero read");
             }
-            nb += thisNb;
             if (!statBuffer.hasRemaining()) {
                 // allocate larger read-buffer, and read again from start
                 statBuffer = ByteBuffer.allocate(statBuffer.capacity() * 2);
                 fileChannel.position(0);
+            } else {
+                Assert.eq(statBuffer.position(), "statBuffer.position()", nb, "nb");
             }
         }
-
-        if (nb == 0) {
-            throw new IOException(fileName + " zero read");
-        } else {
-            // Success, set position and limit to the data read
-            statBuffer.flip();
-        }
     }
 
     /**

diff --git a/engine/table/src/main/java/io/deephaven/libs/GroovyStaticImports.java b/engine/table/src/main/java/io/deephaven/libs/GroovyStaticImports.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2022 Deephaven Data Labs and Patent Pending
+ * Copyright (c) 2016-2023 Deephaven Data Labs and Patent Pending
  */
 /****************************************************************************************************************************
  ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY - Run GroovyStaticImportGenerator or "./gradlew :Generators:groovyStaticImportGenerator" to regenerate

diff --git a/...src/main/java/io/deephaven/server/hierarchicaltable/HierarchicalTableServiceGrpcImpl.java b/...src/main/java/io/deephaven/server/hierarchicaltable/HierarchicalTableServiceGrpcImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2023 Deephaven Data Labs and Patent Pending
+ * Copyright (c) 2016-2022 Deephaven Data Labs and Patent Pending
  */
 package io.deephaven.server.hierarchicaltable;
 

diff --git a/server/src/main/java/io/deephaven/server/notebook/FilesystemStorageServiceGrpcImpl.java b/server/src/main/java/io/deephaven/server/notebook/FilesystemStorageServiceGrpcImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2023 Deephaven Data Labs and Patent Pending
+ * Copyright (c) 2016-2022 Deephaven Data Labs and Patent Pending
  */
 package io.deephaven.server.notebook;
 

diff --git a/...r/src/main/java/io/deephaven/server/partitionedtable/PartitionedTableServiceGrpcImpl.java b/...r/src/main/java/io/deephaven/server/partitionedtable/PartitionedTableServiceGrpcImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2023 Deephaven Data Labs and Patent Pending
+ * Copyright (c) 2016-2022 Deephaven Data Labs and Patent Pending
  */
 package io.deephaven.server.partitionedtable;
 

diff --git a/server/src/main/java/io/deephaven/server/plugin/js/JsPluginModule.java b/server/src/main/java/io/deephaven/server/plugin/js/JsPluginModule.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2023 Deephaven Data Labs and Patent Pending
+ * Copyright (c) 2016-2022 Deephaven Data Labs and Patent Pending
  */
 package io.deephaven.server.plugin.js;
 

diff --git a/server/src/main/java/io/deephaven/server/plugin/js/JsPluginNoopConsumerModule.java b/server/src/main/java/io/deephaven/server/plugin/js/JsPluginNoopConsumerModule.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2023 Deephaven Data Labs and Patent Pending
+ * Copyright (c) 2016-2022 Deephaven Data Labs and Patent Pending
  */
 package io.deephaven.server.plugin.js;
 

diff --git a/server/src/test/java/io/deephaven/server/barrage/BarrageBlinkTableTest.java b/server/src/test/java/io/deephaven/server/barrage/BarrageBlinkTableTest.java
@@ -1,7 +1,6 @@
-/*
- * Copyright (c) 2016-2021 Deephaven Data Labs and Patent Pending
+/**
+ * Copyright (c) 2016-2022 Deephaven Data Labs and Patent Pending
  */
-
 package io.deephaven.server.barrage;
 
 import com.google.protobuf.ByteString;

diff --git a/table-api/src/main/java/io/deephaven/api/AsOfJoinMatch.java b/table-api/src/main/java/io/deephaven/api/AsOfJoinMatch.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2023 Deephaven Data Labs and Patent Pending
+ * Copyright (c) 2016-2022 Deephaven Data Labs and Patent Pending
  */
 package io.deephaven.api;
 

diff --git a/table-api/src/main/java/io/deephaven/api/RangeJoinMatch.java b/table-api/src/main/java/io/deephaven/api/RangeJoinMatch.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2023 Deephaven Data Labs and Patent Pending
+ * Copyright (c) 2016-2022 Deephaven Data Labs and Patent Pending
  */
 package io.deephaven.api;