Checker framework fixes

Bit-Quill · Feb 17, 2024 · 711978e · 711978e
1 parent 8c4d414
commit 711978e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/...ver/flight-sql/src/main/java/org/apache/arrow/adbc/driver/flightsql/BaseFlightReader.java b/...ver/flight-sql/src/main/java/org/apache/arrow/adbc/driver/flightsql/BaseFlightReader.java
@@ -31,6 +31,7 @@
 import org.apache.arrow.flight.Location;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.util.AutoCloseables;
+import org.apache.arrow.util.Preconditions;
 import org.apache.arrow.vector.VectorSchemaRoot;
 import org.apache.arrow.vector.VectorUnloader;
 import org.apache.arrow.vector.ipc.ArrowReader;
@@ -64,7 +65,7 @@ protected BaseFlightReader(
 
   @Override
   public boolean loadNextBatch() throws IOException {
-    assert (currentStream != null);
+    Preconditions.checkNotNull(currentStream);
     if (!currentStream.next()) {
       if (nextEndpointIndex >= flightEndpoints.size()) {
         return false;
@@ -93,7 +94,7 @@ public boolean loadNextBatch() throws IOException {
 
   @Override
   protected Schema readSchema() throws IOException {
-    assert (schema != null);
+    Preconditions.checkNotNull(currentStream);
     return schema;
   }
 

diff --git a/...light-sql/src/main/java/org/apache/arrow/adbc/driver/flightsql/GetInfoMetadataReader.java b/...light-sql/src/main/java/org/apache/arrow/adbc/driver/flightsql/GetInfoMetadataReader.java
@@ -34,6 +34,7 @@
 import org.apache.arrow.flight.Location;
 import org.apache.arrow.flight.sql.impl.FlightSql;
 import org.apache.arrow.memory.BufferAllocator;
+import org.apache.arrow.util.Preconditions;
 import org.apache.arrow.vector.UInt4Vector;
 import org.apache.arrow.vector.VarCharVector;
 import org.apache.arrow.vector.VectorSchemaRoot;
@@ -74,12 +75,14 @@ void accept(
     SUPPORTED_CODES.put(
         FlightSql.SqlInfo.FLIGHT_SQL_SERVER_NAME.getNumber(),
         (b, sqlInfo, srcIndex, dstIndex) -> {
+          Preconditions.checkNotNull(b.infoCodes);
           b.infoCodes.setSafe(dstIndex, AdbcInfoCode.VENDOR_NAME.getValue());
           b.setStringValue(dstIndex, sqlInfo.getVarCharVector(STRING_VALUE_TYPE_ID).get(srcIndex));
         });
     SUPPORTED_CODES.put(
         FlightSql.SqlInfo.FLIGHT_SQL_SERVER_VERSION.getNumber(),
         (b, sqlInfo, srcIndex, dstIndex) -> {
+          Preconditions.checkNotNull(b.infoCodes);
           b.infoCodes.setSafe(dstIndex, AdbcInfoCode.VENDOR_VERSION.getValue());
           b.setStringValue(dstIndex, sqlInfo.getVarCharVector(STRING_VALUE_TYPE_ID).get(srcIndex));
         });
@@ -126,6 +129,7 @@ static GetInfoMetadataReader CreateGetInfoMetadataReader(
   }
 
   void setStringValue(int index, byte[] value) {
+    Preconditions.checkNotNull(infoValues, stringValues);
     infoValues.setValueCount(index + 1);
     infoValues.setTypeId(index, STRING_VALUE_TYPE_ID);
     stringValues.setSafe(index, value);