#853 Fetch all known blob info items on open

mrotteveel · mrotteveel · commit 1a3c139f2615 · 2025-04-01T15:03:17.000+02:00
Backport of #851
diff --git a/src/main/org/firebirdsql/gds/ClumpletReader.java b/src/main/org/firebirdsql/gds/ClumpletReader.java
@@ -27,6 +27,7 @@
 import java.sql.SQLException;
 import java.util.Arrays;
 
+import static org.firebirdsql.gds.ISCConstants.isc_spb_version;
 import static org.firebirdsql.gds.JaybirdErrorCodes.jb_clumpletReaderUsageError;
 import static org.firebirdsql.gds.JaybirdErrorCodes.jb_invalidClumpletStructure;
 
@@ -49,18 +50,13 @@ public ClumpletReader(Kind kind, byte[] buffer) {
     }
 
     public boolean isTagged() {
-        switch (kind) {
-        case Tpb:
-        case Tagged:
-        case WideTagged:
-        case SpbAttach:
-            return true;
-        }
-
-        return false;
+        return kind.isTagged();
     }
 
     public int getBufferTag() throws SQLException {
+        if (!isTagged()) {
+            throw usageMistake("buffer is not tagged");
+        }
         switch (kind) {
         case Tpb:
         case Tagged:
@@ -69,33 +65,16 @@ public int getBufferTag() throws SQLException {
                 throw invalidStructure("empty buffer");
             }
             return buffer[0];
-        case SpbStart:
-        case UnTagged:
-        case WideUnTagged:
-        case SpbSendItems:
-        case SpbReceiveItems:
-            throw usageMistake("buffer is not tagged");
         case SpbAttach:
             if (buffer.length == 0) {
                 throw invalidStructure("empty buffer");
-            }
-            switch (buffer[0]) {
-            case ISCConstants.isc_spb_version1:
-                // This is old SPB format, it's almost like DPB -
-                // buffer's tag is the first byte.
-                return buffer[0];
-            case ISCConstants.isc_spb_version:
-                // Buffer's tag is the second byte
+             }else if (buffer[0] == isc_spb_version) {
                 if (buffer.length == 1) {
-                    throw invalidStructure("buffer too short (1 byte)");
+                    throw invalidStructure("empty buffer");
                 }
                 return buffer[1];
-            case ISCConstants.isc_spb_version3:
-                // This is wide SPB attach format - buffer's tag is the first byte.
-                return buffer[0];
-            default:
-                throw invalidStructure("spb in service attach should begin with isc_spb_version1 or isc_spb_version");
             }
+            return buffer[0];
         default:
             throw new SQLException("Unexpected clumplet kind: " + kind);
         }
@@ -132,6 +111,7 @@ public ClumpletType getClumpletType(byte tag) throws SQLException {
             }
             return ClumpletType.StringSpb;
         case SpbReceiveItems:
+        case InfoItems:
             return ClumpletType.SingleTpb;
         case SpbStart:
             switch (tag) {
@@ -293,6 +273,15 @@ public ClumpletType getClumpletType(byte tag) throws SQLException {
                 break;
             }
             throw invalidStructure("wrong spb state");
+        case InfoResponse:
+            switch (tag) {
+            case ISCConstants.isc_info_end:
+            case ISCConstants.isc_info_truncated:
+            case ISCConstants.isc_info_flag_end:
+                return ClumpletType.SingleTpb;
+            default:
+                return ClumpletType.StringSpb;
+            }
         }
         throw invalidStructure("unknown reason");
     }
@@ -383,32 +372,26 @@ public int getClumpletSize(boolean wTag, boolean wLength, boolean wData) throws
     public void moveNext() throws SQLException {
         if (isEof()) {
             return; // no need to raise useless exceptions
+        } else if (kind == Kind.InfoResponse) {
+            int clumpTag = getClumpTag();
+            // terminating clumplet
+            if (clumpTag == ISCConstants.isc_info_end || clumpTag == ISCConstants.isc_info_truncated) {
+                position = getBufferLength();
+                return;
+            }
         }
         int cs = getClumpletSize(true, true, true);
         adjustSpbState();
         position += cs;
     }
 
-    public void rewind() throws SQLException {
-        if (buffer == null || buffer.length == 0) {
+    public void rewind() {
+        if (buffer.length == 0 || !isTagged()) {
             position = 0;
-            spbState = 0;
-            return;
-        }
-        switch (kind) {
-        case UnTagged:
-        case WideUnTagged:
-        case SpbStart:
-        case SpbSendItems:
-        case SpbReceiveItems:
-            position = 0;
-            break;
-        default:
-            if (kind == Kind.SpbAttach && getBufferLength() > 0 && buffer[0] != ISCConstants.isc_spb_version1) {
-                position = 2;
-            } else {
-                position = 1;
-            }
+        } else if (kind == Kind.SpbAttach && getBufferLength() > 0 && buffer[0] == isc_spb_version) {
+            position = 2;
+        } else {
+            position = 1;
         }
         spbState = 0;
     }
@@ -537,9 +520,7 @@ public boolean isEof() {
     }
 
     private int getBufferLength() {
-        if (buffer.length == 1 && kind != Kind.UnTagged && kind != Kind.SpbStart &&
-                kind != Kind.WideUnTagged && kind != Kind.SpbSendItems &&
-                kind != Kind.SpbReceiveItems) {
+        if (buffer.length == 1 && isTagged()) {
             return 0;
         }
         return buffer.length;
@@ -554,16 +535,30 @@ private static SQLException usageMistake(String message) {
     }
 
     public enum Kind {
-        EndOfList,
-        Tagged,
-        UnTagged,
-        SpbAttach,
-        SpbStart,
-        Tpb,
-        WideTagged,
-        WideUnTagged,
-        SpbSendItems,
-        SpbReceiveItems
+
+        Tagged(true),
+        UnTagged(false),
+        SpbAttach(true),
+        SpbStart(false),
+        Tpb(true),
+        WideTagged(true),
+        WideUnTagged(false),
+        SpbSendItems(false),
+        SpbReceiveItems(false),
+        InfoResponse(false),
+        InfoItems(false),
+        ;
+
+        private final boolean tagged;
+
+        Kind(boolean tagged) {
+            this.tagged = tagged;
+        }
+
+        public boolean isTagged() {
+            return tagged;
+        }
+
     }
 
     public enum ClumpletType {
diff --git a/src/main/org/firebirdsql/gds/ng/AbstractFbBlob.java b/src/main/org/firebirdsql/gds/ng/AbstractFbBlob.java
@@ -27,6 +27,7 @@
 import org.firebirdsql.jdbc.SQLStateConstants;
 import org.firebirdsql.logging.Logger;
 import org.firebirdsql.logging.LoggerFactory;
+import org.firebirdsql.util.ByteArrayHelper;
 import org.firebirdsql.util.IOUtils;
 
 import java.sql.SQLException;
@@ -492,6 +493,20 @@ public <T> T getBlobInfo(final byte[] requestItems, final int bufferLength, fina
         }
     }
 
+    /**
+     * The known blob info items for the connected server as a blob info request buffer.
+     *
+     * @return the known blob info items (possibly empty under implementation-specific circumstances)
+     * @since 7
+     */
+    protected byte[] getKnownBlobInfoItems() {
+        FbDatabase db = getDatabase();
+        if (db instanceof AbstractFbDatabase) {
+            return ((AbstractFbDatabase<?>) db).getServerVersionInformation().getBlobInfoRequestItems();
+        }
+        return ByteArrayHelper.emptyByteArray();
+    }
+
     @Override
     public long length() throws SQLException {
         try (LockCloseable ignored = withLock()) {
diff --git a/src/main/org/firebirdsql/gds/ng/ServerVersionInformation.java b/src/main/org/firebirdsql/gds/ng/ServerVersionInformation.java
@@ -25,11 +25,8 @@
 /**
  * Strategy for handling server version specific information needs that do not depend on the wire protocol (or client
  * library) version, but on the Firebird server version.
- * <p>
- * Currently only contains information items for statement info requests.
- * </p>
  *
- * @author <a href="mailto:mrotteveel@users.sourceforge.net">Mark Rotteveel</a>
+ * @author Mark Rotteveel
  * @since 3.0
  */
 enum ServerVersionInformation {
@@ -86,6 +83,14 @@ public byte[] getParameterDescriptionInfoRequestItems() {
      */
     public abstract byte[] getParameterDescriptionInfoRequestItems();
 
+    /**
+     * @return the known blob info request items
+     * @since 7
+     */
+    public byte[] getBlobInfoRequestItems() {
+        return Constants.V_1_0_BLOB_INFO.clone();
+    }
+
     /**
      * Convenience method to check if the majorVersion.minorVersion of this instance is equal to or smaller than the
      * specified version.
@@ -138,8 +143,8 @@ public static ServerVersionInformation getForVersion(GDSServerVersion serverVers
         return getForVersion(serverVersion.getMajorVersion(), serverVersion.getMinorVersion());
     }
 
-    private static class Constants {
-        public static final byte[] V1_0_STATEMENT_INFO = new byte[] {
+    private static final class Constants {
+        static final byte[] V1_0_STATEMENT_INFO = new byte[] {
                 isc_info_sql_stmt_type,
                 isc_info_sql_select,
                 isc_info_sql_describe_vars,
@@ -165,7 +170,7 @@ private static class Constants {
                 //isc_info_sql_owner,
                 isc_info_sql_describe_end
         };
-        public static final byte[] V_1_0_PARAMETER_INFO = new byte[] {
+        static final byte[] V_1_0_PARAMETER_INFO = new byte[] {
                 isc_info_sql_describe_vars,
                 isc_info_sql_sqlda_seq,
                 isc_info_sql_type, isc_info_sql_sub_type,
@@ -176,7 +181,15 @@ private static class Constants {
                 isc_info_sql_owner,
                 isc_info_sql_describe_end
         };
-        public static final byte[] V_2_0_STATEMENT_INFO = new byte[] {
+        static final byte[] V_1_0_BLOB_INFO = new byte[] {
+                isc_info_blob_num_segments,
+                isc_info_blob_max_segment,
+                isc_info_blob_total_length,
+                isc_info_blob_type,
+                isc_info_end
+        };
+
+        static final byte[] V_2_0_STATEMENT_INFO = new byte[] {
                 isc_info_sql_stmt_type,
                 isc_info_sql_select,
                 isc_info_sql_describe_vars,
@@ -203,7 +216,7 @@ private static class Constants {
                 //isc_info_sql_owner,
                 isc_info_sql_describe_end
         };
-        public static final byte[] V_2_0_PARAMETER_INFO = new byte[] {
+        static final byte[] V_2_0_PARAMETER_INFO = new byte[] {
                 isc_info_sql_describe_vars,
                 isc_info_sql_sqlda_seq,
                 isc_info_sql_type, isc_info_sql_sub_type,
@@ -215,5 +228,9 @@ private static class Constants {
                 isc_info_sql_owner,
                 isc_info_sql_describe_end
         };
+
+        private Constants() {
+            // no instances
+        }
     }
 }
diff --git a/src/main/org/firebirdsql/gds/ng/wire/version11/V11InputBlob.java b/src/main/org/firebirdsql/gds/ng/wire/version11/V11InputBlob.java
