You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2025/08/04 23:37:58 UTC

(shardingsphere) branch master updated: Fix wrong buffer length and some sonar issues in Firebird proxy modules (#36017)

This is an automated email from the ASF dual-hosted git repository.

zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git


The following commit(s) were added to refs/heads/master by this push:
     new 16520a39006 Fix wrong buffer length and some sonar issues in Firebird proxy modules (#36017)
16520a39006 is described below

commit 16520a3900635f40421bbd7e15c6ee40ccf6e43b
Author: Timofey Sakharovsky <te...@yandex.ru>
AuthorDate: Tue Aug 5 02:37:53 2025 +0300

    Fix wrong buffer length and some sonar issues in Firebird proxy modules (#36017)
    
    * RS-242326. fix for deadlock while transaction execution
    
    * RS-242327. remove unused payload field
    
    * RS-242327. move records processing to separate function
    
    * RS-242327. refactor FirebirdSQLInfoReturnValue
    
    * RS-242327. remove unused payload in getLength
    
    * RS-242327. remove readParameters
    
    * RS-242327. remove unused getSelectedTableNames method
    
    * RS-242327. refactor Optional<IdentifierValue> to IdentifierValue
    
    * RS-242327. replace FirebirdCommandPacket with CommandPacket
    
    * RS-242327. rename salt variable
    
    * RS-242327. fix test for buffer length
    
    * refactor FirebirdCommandPacketFactory.isValidLength function
    
    * fix incorrect index in fetch response packet
    
    * add null check in writeString function
    
    * fix for incorrect buffer allocations
    
    * revert changes in FirebirdPacketCodecEngine
---
 .../firebird/codec/FirebirdPacketCodecEngine.java  |  4 +-
 .../command/FirebirdCommandPacketFactory.java      | 54 ++++++++++++----------
 .../command/query/info/FirebirdInfoPacket.java     |  3 --
 .../info/type/sql/FirebirdSQLInfoReturnPacket.java | 37 ++++++++-------
 .../info/type/sql/FirebirdSQLInfoReturnValue.java  | 51 ++++++--------------
 .../statement/FirebirdAllocateStatementPacket.java |  3 +-
 .../statement/FirebirdFreeStatementPacket.java     |  3 +-
 .../execute/FirebirdExecuteStatementPacket.java    | 19 --------
 .../prepare/FirebirdPrepareStatementPacket.java    |  3 --
 .../FirebirdPrepareStatementReturnPacket.java      |  2 +-
 .../FirebirdCommitTransactionPacket.java           |  3 +-
 .../FirebirdRollbackTransactionPacket.java         |  3 +-
 .../generic/FirebirdFetchResponsePacket.java       |  6 ++-
 .../generic/FirebirdGenericResponsePacket.java     |  2 +-
 .../firebird/payload/FirebirdPacketPayload.java    |  2 +-
 .../payload/FirebirdPacketPayloadTest.java         |  2 +-
 .../admin/FirebirdAdminExecutorCreator.java        | 27 -----------
 .../impl/FirebirdLegacyAuthenticator.java          |  6 +--
 .../command/FirebirdCommandExecuteEngine.java      |  2 +-
 .../command/FirebirdCommandExecutorFactory.java    |  4 +-
 .../FirebirdExecuteStatementCommandExecutor.java   |  2 +-
 .../FirebirdPrepareStatementCommandExecutor.java   | 51 ++++++++++----------
 .../FirebirdCommandExecutorFactoryTest.java        | 12 ++---
 23 files changed, 114 insertions(+), 187 deletions(-)

diff --git a/db-protocol/firebird/src/main/java/org/apache/shardingsphere/db/protocol/firebird/codec/FirebirdPacketCodecEngine.java b/db-protocol/firebird/src/main/java/org/apache/shardingsphere/db/protocol/firebird/codec/FirebirdPacketCodecEngine.java
index dbf7b42143a..87ef0ab0856 100644
--- a/db-protocol/firebird/src/main/java/org/apache/shardingsphere/db/protocol/firebird/codec/FirebirdPacketCodecEngine.java
+++ b/db-protocol/firebird/src/main/java/org/apache/shardingsphere/db/protocol/firebird/codec/FirebirdPacketCodecEngine.java
@@ -79,14 +79,12 @@ public final class FirebirdPacketCodecEngine implements DatabasePacketCodecEngin
         if (in.writerIndex() == in.capacity()) {
             ByteBuf bufferPart = in.readRetainedSlice(in.readableBytes());
             CompositeByteBuf result = context.alloc().compositeBuffer(pendingMessages.size() + 1);
-            result.addComponents(true, pendingMessages).addComponent(true, bufferPart.retainedSlice());
+            result.addComponents(true, pendingMessages).addComponent(true, bufferPart);
             FirebirdPacketPayload payload = new FirebirdPacketPayload(result, context.channel().attr(CommonConstants.CHARSET_ATTRIBUTE_KEY).get());
             if (FirebirdCommandPacketFactory.isValidLength(pendingPacketType, payload, result.readableBytes(), context.channel().attr(FirebirdConstant.CONNECTION_PROTOCOL_VERSION).get())) {
                 out.add(result);
-                bufferPart.release();
                 pendingMessages.clear();
             } else {
-                result.release();
                 pendingMessages.add(bufferPart);
             }
         } else {
diff --git a/db-protocol/firebird/src/main/java/org/apache/shardingsphere/db/protocol/firebird/packet/command/FirebirdCommandPacketFactory.java b/db-protocol/firebird/src/main/java/org/apache/shardingsphere/db/protocol/firebird/packet/command/FirebirdCommandPacketFactory.java
index a497403467e..023e1000a64 100644
--- a/db-protocol/firebird/src/main/java/org/apache/shardingsphere/db/protocol/firebird/packet/command/FirebirdCommandPacketFactory.java
+++ b/db-protocol/firebird/src/main/java/org/apache/shardingsphere/db/protocol/firebird/packet/command/FirebirdCommandPacketFactory.java
@@ -87,32 +87,38 @@ public final class FirebirdCommandPacketFactory {
      */
     public static boolean isValidLength(final FirebirdCommandPacketType commandPacketType, final FirebirdPacketPayload payload, final int capacity, final FirebirdProtocolVersion protocolVersion) {
         try {
-            switch (commandPacketType) {
-                case INFO_DATABASE:
-                case INFO_SQL:
-                    return FirebirdInfoPacket.getLength(payload) <= capacity;
-                case TRANSACTION:
-                    return FirebirdStartTransactionPacket.getLength(payload) <= capacity;
-                case ALLOCATE_STATEMENT:
-                    return FirebirdAllocateStatementPacket.getLength(payload) <= capacity;
-                case PREPARE_STATEMENT:
-                    return FirebirdPrepareStatementPacket.getLength(payload) <= capacity;
-                case EXECUTE:
-                case EXECUTE2:
-                    return FirebirdExecuteStatementPacket.getLength(payload, protocolVersion) <= capacity;
-                case FETCH:
-                    return FirebirdFetchStatementPacket.getLength(payload) <= capacity;
-                case COMMIT:
-                    return FirebirdCommitTransactionPacket.getLength(payload) <= capacity;
-                case ROLLBACK:
-                    return FirebirdRollbackTransactionPacket.getLength(payload) <= capacity;
-                case FREE_STATEMENT:
-                    return FirebirdFreeStatementPacket.getLength(payload) <= capacity;
-                default:
-                    return true;
-            }
+            return getLength(commandPacketType, payload, protocolVersion) <= capacity;
         } catch (final IndexOutOfBoundsException ignored) {
+            payload.getByteBuf().resetReaderIndex();
             return false;
         }
     }
+    
+    private static int getLength(final FirebirdCommandPacketType commandPacketType, final FirebirdPacketPayload payload,
+                                 final FirebirdProtocolVersion protocolVersion) throws IndexOutOfBoundsException {
+        switch (commandPacketType) {
+            case INFO_DATABASE:
+            case INFO_SQL:
+                return FirebirdInfoPacket.getLength(payload);
+            case TRANSACTION:
+                return FirebirdStartTransactionPacket.getLength(payload);
+            case ALLOCATE_STATEMENT:
+                return FirebirdAllocateStatementPacket.getLength();
+            case PREPARE_STATEMENT:
+                return FirebirdPrepareStatementPacket.getLength(payload);
+            case EXECUTE:
+            case EXECUTE2:
+                return FirebirdExecuteStatementPacket.getLength(payload, protocolVersion);
+            case FETCH:
+                return FirebirdFetchStatementPacket.getLength(payload);
+            case COMMIT:
+                return FirebirdCommitTransactionPacket.getLength();
+            case ROLLBACK:
+                return FirebirdRollbackTransactionPacket.getLength();
+            case FREE_STATEMENT:
+                return FirebirdFreeStatementPacket.getLength();
+            default:
+                return 0;
+        }
+    }
 }
diff --git a/db-protocol/firebird/src/main/java/org/apache/shardingsphere/db/protocol/firebird/packet/command/query/info/FirebirdInfoPacket.java b/db-protocol/firebird/src/main/java/org/apache/shardingsphere/db/protocol/firebird/packet/command/query/info/FirebirdInfoPacket.java
index 0b94a562de4..10f586efc8d 100644
--- a/db-protocol/firebird/src/main/java/org/apache/shardingsphere/db/protocol/firebird/packet/command/query/info/FirebirdInfoPacket.java
+++ b/db-protocol/firebird/src/main/java/org/apache/shardingsphere/db/protocol/firebird/packet/command/query/info/FirebirdInfoPacket.java
@@ -43,15 +43,12 @@ public final class FirebirdInfoPacket extends FirebirdCommandPacket {
     
     private final int maxLength;
     
-    private final FirebirdPacketPayload payload;
-    
     public FirebirdInfoPacket(final FirebirdPacketPayload payload, final IntFunction<FirebirdInfoPacketType> valueOf) {
         payload.skipReserved(4);
         handle = payload.readInt4();
         incarnation = payload.readInt4();
         parseInfo(payload.readBuffer(), valueOf);
         maxLength = payload.readInt4();
-        this.payload = payload;
     }
     
     private void parseInfo(final ByteBuf buffer, final IntFunction<FirebirdInfoPacketType> valueOf) {
diff --git a/db-protocol/firebird/src/main/java/org/apache/shardingsphere/db/protocol/firebird/packet/command/query/info/type/sql/FirebirdSQLInfoReturnPacket.java b/db-protocol/firebird/src/main/java/org/apache/shardingsphere/db/protocol/firebird/packet/command/query/info/type/sql/FirebirdSQLInfoReturnPacket.java
index 1b571c4b5c5..62365a5609e 100644
--- a/db-protocol/firebird/src/main/java/org/apache/shardingsphere/db/protocol/firebird/packet/command/query/info/type/sql/FirebirdSQLInfoReturnPacket.java
+++ b/db-protocol/firebird/src/main/java/org/apache/shardingsphere/db/protocol/firebird/packet/command/query/info/type/sql/FirebirdSQLInfoReturnPacket.java
@@ -47,28 +47,33 @@ public final class FirebirdSQLInfoReturnPacket extends FirebirdPacket {
         }
     }
     
-    private void parseSQLInfo(final FirebirdPacketPayload data, final FirebirdSQLInfoPacketType type) {
+    private void parseSQLInfo(final FirebirdPacketPayload payload, final FirebirdSQLInfoPacketType type) {
         // TODO implement other request types handle
         switch (type) {
             case RECORDS:
                 // TODO handle actual update count
-                data.writeInt1(FirebirdSQLInfoPacketType.RECORDS.getCode());
-                data.writeInt2LE(0);
-                data.writeInt1(FirebirdSQLInfoReturnValue.SELECT.getCode());
-                data.writeInt2LE(4);
-                data.writeInt4LE(0);
-                data.writeInt1(FirebirdSQLInfoReturnValue.INSERT.getCode());
-                data.writeInt2LE(4);
-                data.writeInt4LE(0);
-                data.writeInt1(FirebirdSQLInfoReturnValue.UPDATE.getCode());
-                data.writeInt2LE(4);
-                data.writeInt4LE(0);
-                data.writeInt1(FirebirdSQLInfoReturnValue.DELETE.getCode());
-                data.writeInt2LE(4);
-                data.writeInt4LE(0);
-                break;
+                processRecords(payload);
+                return;
             default:
                 throw new FirebirdProtocolException("Unknown database information request type %d", type.getCode());
         }
     }
+    
+    private void processRecords(final FirebirdPacketPayload payload) {
+        // TODO handle actual update count
+        payload.writeInt1(FirebirdSQLInfoPacketType.RECORDS.getCode());
+        payload.writeInt2LE(0);
+        payload.writeInt1(FirebirdSQLInfoReturnValue.SELECT.getCode());
+        payload.writeInt2LE(4);
+        payload.writeInt4LE(0);
+        payload.writeInt1(FirebirdSQLInfoReturnValue.INSERT.getCode());
+        payload.writeInt2LE(4);
+        payload.writeInt4LE(0);
+        payload.writeInt1(FirebirdSQLInfoReturnValue.UPDATE.getCode());
+        payload.writeInt2LE(4);
+        payload.writeInt4LE(0);
+        payload.writeInt1(FirebirdSQLInfoReturnValue.DELETE.getCode());
+        payload.writeInt2LE(4);
+        payload.writeInt4LE(0);
+    }
 }
diff --git a/db-protocol/firebird/src/main/java/org/apache/shardingsphere/db/protocol/firebird/packet/command/query/info/type/sql/FirebirdSQLInfoReturnValue.java b/db-protocol/firebird/src/main/java/org/apache/shardingsphere/db/protocol/firebird/packet/command/query/info/type/sql/FirebirdSQLInfoReturnValue.java
index b5d9b0ed06f..23094dfe626 100644
--- a/db-protocol/firebird/src/main/java/org/apache/shardingsphere/db/protocol/firebird/packet/command/query/info/type/sql/FirebirdSQLInfoReturnValue.java
+++ b/db-protocol/firebird/src/main/java/org/apache/shardingsphere/db/protocol/firebird/packet/command/query/info/type/sql/FirebirdSQLInfoReturnValue.java
@@ -20,9 +20,7 @@ package org.apache.shardingsphere.db.protocol.firebird.packet.command.query.info
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -32,14 +30,14 @@ import java.util.Map;
 @Getter
 public enum FirebirdSQLInfoReturnValue {
     
-    SELECT(1),
-    INSERT(2),
-    UPDATE(3),
-    DELETE(4),
+    SELECT(1, true, true),
+    INSERT(2, false, true),
+    UPDATE(3, false, true),
+    DELETE(4, false, true),
     DDL(5),
     GET_SEGMENT(6),
     PUT_SEGMENT(7),
-    EXEC_PROCEDURE(8),
+    EXEC_PROCEDURE(8, true, true),
     START_TRANS(9),
     COMMIT(10),
     ROLLBACK(11),
@@ -49,23 +47,22 @@ public enum FirebirdSQLInfoReturnValue {
     
     private static final Map<Integer, FirebirdSQLInfoReturnValue> FIREBIRD_DATABASE_INFO_RETURN_VALUES_CACHE = new HashMap<>();
     
-    private static final List<FirebirdSQLInfoReturnValue> FIREBIRD_DESCRIBE_SELECT_OPERATIONS = new ArrayList<>();
+    private final int code;
     
-    private static final List<FirebirdSQLInfoReturnValue> FIREBIRD_DESCRIBE_BIND_OPERATIONS = new ArrayList<>();
+    private final boolean selectDescribable;
     
-    private final int code;
+    private final boolean bindDescribable;
     
     static {
         for (FirebirdSQLInfoReturnValue each : values()) {
             FIREBIRD_DATABASE_INFO_RETURN_VALUES_CACHE.put(each.code, each);
         }
-        FIREBIRD_DESCRIBE_SELECT_OPERATIONS.add(EXEC_PROCEDURE);
-        FIREBIRD_DESCRIBE_SELECT_OPERATIONS.add(SELECT);
-        FIREBIRD_DESCRIBE_BIND_OPERATIONS.add(EXEC_PROCEDURE);
-        FIREBIRD_DESCRIBE_BIND_OPERATIONS.add(SELECT);
-        FIREBIRD_DESCRIBE_BIND_OPERATIONS.add(INSERT);
-        FIREBIRD_DESCRIBE_BIND_OPERATIONS.add(UPDATE);
-        FIREBIRD_DESCRIBE_BIND_OPERATIONS.add(DELETE);
+    }
+    
+    FirebirdSQLInfoReturnValue(final int code) {
+        this.code = code;
+        selectDescribable = false;
+        bindDescribable = false;
     }
     
     /**
@@ -77,24 +74,4 @@ public enum FirebirdSQLInfoReturnValue {
     public static FirebirdSQLInfoReturnValue valueOf(final int code) {
         return FIREBIRD_DATABASE_INFO_RETURN_VALUES_CACHE.get(code);
     }
-    
-    /**
-     * Return true if code is select describable.
-     *
-     * @param code arch type code
-     * @return Is select describable
-     */
-    public static boolean isSelectDescribable(final int code) {
-        return FIREBIRD_DESCRIBE_SELECT_OPERATIONS.contains(valueOf(code));
-    }
-    
-    /**
-     * Return true if code is bind describable.
-     *
-     * @param code arch type code
-     * @return Is bind describable
-     */
-    public static boolean isBindDescribable(final int code) {
-        return FIREBIRD_DESCRIBE_BIND_OPERATIONS.contains(valueOf(code));
-    }
 }
diff --git a/db-protocol/firebird/src/main/java/org/apache/shardingsphere/db/protocol/firebird/packet/command/query/statement/FirebirdAllocateStatementPacket.java b/db-protocol/firebird/src/main/java/org/apache/shardingsphere/db/protocol/firebird/packet/command/query/statement/FirebirdAllocateStatementPacket.java
index 56acf720ba0..76c9614069a 100644
--- a/db-protocol/firebird/src/main/java/org/apache/shardingsphere/db/protocol/firebird/packet/command/query/statement/FirebirdAllocateStatementPacket.java
+++ b/db-protocol/firebird/src/main/java/org/apache/shardingsphere/db/protocol/firebird/packet/command/query/statement/FirebirdAllocateStatementPacket.java
@@ -37,10 +37,9 @@ public final class FirebirdAllocateStatementPacket extends FirebirdCommandPacket
     /**
      * Get length of packet.
      *
-     * @param payload Firebird packet payload
      * @return Length of packet
      */
-    public static int getLength(final FirebirdPacketPayload payload) {
+    public static int getLength() {
         return 8;
     }
     
diff --git a/db-protocol/firebird/src/main/java/org/apache/shardingsphere/db/protocol/firebird/packet/command/query/statement/FirebirdFreeStatementPacket.java b/db-protocol/firebird/src/main/java/org/apache/shardingsphere/db/protocol/firebird/packet/command/query/statement/FirebirdFreeStatementPacket.java
index 6f7f33aea34..e61a00d3099 100644
--- a/db-protocol/firebird/src/main/java/org/apache/shardingsphere/db/protocol/firebird/packet/command/query/statement/FirebirdFreeStatementPacket.java
+++ b/db-protocol/firebird/src/main/java/org/apache/shardingsphere/db/protocol/firebird/packet/command/query/statement/FirebirdFreeStatementPacket.java
@@ -46,10 +46,9 @@ public final class FirebirdFreeStatementPacket extends FirebirdCommandPacket {
     /**
      * Get length of packet.
      *
-     * @param payload Firebird packet payload
      * @return Length of packet
      */
-    public static int getLength(final FirebirdPacketPayload payload) {
+    public static int getLength() {
         return 12;
     }
     
diff --git a/db-protocol/firebird/src/main/java/org/apache/shardingsphere/db/protocol/firebird/packet/command/query/statement/execute/FirebirdExecuteStatementPacket.java b/db-protocol/firebird/src/main/java/org/apache/shardingsphere/db/protocol/firebird/packet/command/query/statement/execute/FirebirdExecuteStatementPacket.java
index f49ae76cb12..34faec02f76 100644
--- a/db-protocol/firebird/src/main/java/org/apache/shardingsphere/db/protocol/firebird/packet/command/query/statement/execute/FirebirdExecuteStatementPacket.java
+++ b/db-protocol/firebird/src/main/java/org/apache/shardingsphere/db/protocol/firebird/packet/command/query/statement/execute/FirebirdExecuteStatementPacket.java
@@ -28,10 +28,8 @@ import org.apache.shardingsphere.db.protocol.firebird.packet.command.query.state
 import org.apache.shardingsphere.db.protocol.firebird.payload.FirebirdPacketPayload;
 import org.firebirdsql.gds.BlrConstants;
 
-import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Set;
 
 /**
  * Firebird execute statement packet.
@@ -61,8 +59,6 @@ public final class FirebirdExecuteStatementPacket extends FirebirdCommandPacket
     
     private long maxBlobSize;
     
-    private final FirebirdPacketPayload payload;
-    
     public FirebirdExecuteStatementPacket(final FirebirdPacketPayload payload, final FirebirdProtocolVersion protocolVersion) {
         type = FirebirdCommandPacketType.valueOf(payload.readInt4());
         statementId = payload.readInt4();
@@ -106,9 +102,6 @@ public final class FirebirdExecuteStatementPacket extends FirebirdCommandPacket
         if (protocolVersion.getCode() >= FirebirdProtocolVersion.PROTOCOL_VERSION19.getCode()) {
             maxBlobSize = payload.readInt4Unsigned();
         }
-        
-        this.payload = payload;
-        
     }
     
     private List<FirebirdBinaryColumnType> parseBLR(final ByteBuf blrBuffer) {
@@ -151,18 +144,6 @@ public final class FirebirdExecuteStatementPacket extends FirebirdCommandPacket
         }
     }
     
-    /**
-     * Read parameter values from packet.
-     *
-     * @param paramTypes parameter type of values
-     * @param longDataIndexes indexes of long data
-     * @return parameter values
-     * @throws SQLException SQL exception
-     */
-    public List<Object> readParameters(final List<FirebirdBinaryColumnType> paramTypes, final Set<Integer> longDataIndexes) throws SQLException {
-        return parameterValues;
-    }
-    
     /**
      * Returns true if, and only if, operation is a stored procedure.
      *
diff --git a/db-protocol/firebird/src/main/java/org/apache/shardingsphere/db/protocol/firebird/packet/command/query/statement/prepare/FirebirdPrepareStatementPacket.java b/db-protocol/firebird/src/main/java/org/apache/shardingsphere/db/protocol/firebird/packet/command/query/statement/prepare/FirebirdPrepareStatementPacket.java
index 40bafc28489..49db8a6b50e 100644
--- a/db-protocol/firebird/src/main/java/org/apache/shardingsphere/db/protocol/firebird/packet/command/query/statement/prepare/FirebirdPrepareStatementPacket.java
+++ b/db-protocol/firebird/src/main/java/org/apache/shardingsphere/db/protocol/firebird/packet/command/query/statement/prepare/FirebirdPrepareStatementPacket.java
@@ -51,8 +51,6 @@ public final class FirebirdPrepareStatementPacket extends FirebirdCommandPacket
     
     private final int maxLength;
     
-    private final FirebirdPacketPayload payload;
-    
     public FirebirdPrepareStatementPacket(final FirebirdPacketPayload payload) {
         payload.skipReserved(4);
         transactionId = payload.readInt4();
@@ -63,7 +61,6 @@ public final class FirebirdPrepareStatementPacket extends FirebirdCommandPacket
         sql = SQLHintUtils.removeHint(originSQL);
         parseInfo(payload.readBuffer());
         maxLength = payload.readInt4();
-        this.payload = payload;
     }
     
     private void parseInfo(final ByteBuf buffer) {
diff --git a/db-protocol/firebird/src/main/java/org/apache/shardingsphere/db/protocol/firebird/packet/command/query/statement/prepare/FirebirdPrepareStatementReturnPacket.java b/db-protocol/firebird/src/main/java/org/apache/shardingsphere/db/protocol/firebird/packet/command/query/statement/prepare/FirebirdPrepareStatementReturnPacket.java
index 845dec37215..504101e90b3 100644
--- a/db-protocol/firebird/src/main/java/org/apache/shardingsphere/db/protocol/firebird/packet/command/query/statement/prepare/FirebirdPrepareStatementReturnPacket.java
+++ b/db-protocol/firebird/src/main/java/org/apache/shardingsphere/db/protocol/firebird/packet/command/query/statement/prepare/FirebirdPrepareStatementReturnPacket.java
@@ -72,7 +72,7 @@ public final class FirebirdPrepareStatementReturnPacket extends FirebirdPacket {
     
     static void writeString(final FirebirdInfoPacketType code, final String value, final FirebirdPacketPayload payload) {
         payload.writeInt1(code.getCode());
-        byte[] valueBytes = value.getBytes(payload.getCharset());
+        byte[] valueBytes = null != value ? value.getBytes(payload.getCharset()) : new byte[0];
         payload.writeInt2LE(valueBytes.length);
         payload.writeBytes(valueBytes);
     }
diff --git a/db-protocol/firebird/src/main/java/org/apache/shardingsphere/db/protocol/firebird/packet/command/query/transaction/FirebirdCommitTransactionPacket.java b/db-protocol/firebird/src/main/java/org/apache/shardingsphere/db/protocol/firebird/packet/command/query/transaction/FirebirdCommitTransactionPacket.java
index 316032e61d4..f098d03d0f7 100644
--- a/db-protocol/firebird/src/main/java/org/apache/shardingsphere/db/protocol/firebird/packet/command/query/transaction/FirebirdCommitTransactionPacket.java
+++ b/db-protocol/firebird/src/main/java/org/apache/shardingsphere/db/protocol/firebird/packet/command/query/transaction/FirebirdCommitTransactionPacket.java
@@ -42,10 +42,9 @@ public final class FirebirdCommitTransactionPacket extends FirebirdCommandPacket
     /**
      * Get length of packet.
      *
-     * @param payload Firebird packet payload
      * @return Length of packet
      */
-    public static int getLength(final FirebirdPacketPayload payload) {
+    public static int getLength() {
         return 8;
     }
 }
diff --git a/db-protocol/firebird/src/main/java/org/apache/shardingsphere/db/protocol/firebird/packet/command/query/transaction/FirebirdRollbackTransactionPacket.java b/db-protocol/firebird/src/main/java/org/apache/shardingsphere/db/protocol/firebird/packet/command/query/transaction/FirebirdRollbackTransactionPacket.java
index f101115c2fc..fd3f000b926 100644
--- a/db-protocol/firebird/src/main/java/org/apache/shardingsphere/db/protocol/firebird/packet/command/query/transaction/FirebirdRollbackTransactionPacket.java
+++ b/db-protocol/firebird/src/main/java/org/apache/shardingsphere/db/protocol/firebird/packet/command/query/transaction/FirebirdRollbackTransactionPacket.java
@@ -42,10 +42,9 @@ public final class FirebirdRollbackTransactionPacket extends FirebirdCommandPack
     /**
      * Get length of packet.
      *
-     * @param payload Firebird packet payload
      * @return Length of packet
      */
-    public static int getLength(final FirebirdPacketPayload payload) {
+    public static int getLength() {
         return 8;
     }
 }
diff --git a/db-protocol/firebird/src/main/java/org/apache/shardingsphere/db/protocol/firebird/packet/generic/FirebirdFetchResponsePacket.java b/db-protocol/firebird/src/main/java/org/apache/shardingsphere/db/protocol/firebird/packet/generic/FirebirdFetchResponsePacket.java
index 3918ab34382..4e8aeb45f48 100644
--- a/db-protocol/firebird/src/main/java/org/apache/shardingsphere/db/protocol/firebird/packet/generic/FirebirdFetchResponsePacket.java
+++ b/db-protocol/firebird/src/main/java/org/apache/shardingsphere/db/protocol/firebird/packet/generic/FirebirdFetchResponsePacket.java
@@ -63,6 +63,7 @@ public final class FirebirdFetchResponsePacket extends FirebirdPacket {
         if (data == null) {
             return;
         }
+        int nullBitsStartIndex = payload.getByteBuf().writerIndex();
         int nullBits = (data.getCells().size() + 7) / 8;
         nullBits += (4 - nullBits) & 3;
         payload.getByteBuf().writeZero(nullBits);
@@ -72,8 +73,9 @@ public final class FirebirdFetchResponsePacket extends FirebirdPacket {
                 FirebirdBinaryProtocolValue type = FirebirdBinaryProtocolValueFactory.getBinaryProtocolValue(cell.getColumnType());
                 type.write(payload, cell.getData());
             } else {
-                byte nullBitsByte = payload.getByteBuf().getByte(i / 8);
-                payload.getByteBuf().setByte(i / 8, nullBitsByte | (1 << i % 8));
+                int nullBitsIndex = nullBitsStartIndex + i / 8;
+                byte nullBitsByte = payload.getByteBuf().getByte(nullBitsIndex);
+                payload.getByteBuf().setByte(nullBitsIndex, nullBitsByte | (1 << i % 8));
             }
             i++;
         }
diff --git a/db-protocol/firebird/src/main/java/org/apache/shardingsphere/db/protocol/firebird/packet/generic/FirebirdGenericResponsePacket.java b/db-protocol/firebird/src/main/java/org/apache/shardingsphere/db/protocol/firebird/packet/generic/FirebirdGenericResponsePacket.java
index ab9ed75822b..af6afdd98fa 100644
--- a/db-protocol/firebird/src/main/java/org/apache/shardingsphere/db/protocol/firebird/packet/generic/FirebirdGenericResponsePacket.java
+++ b/db-protocol/firebird/src/main/java/org/apache/shardingsphere/db/protocol/firebird/packet/generic/FirebirdGenericResponsePacket.java
@@ -123,7 +123,7 @@ public final class FirebirdGenericResponsePacket extends FirebirdPacket {
             payload.getByteBuf().setInt(index - 4, length);
             payload.getByteBuf().writeBytes(new byte[(4 - length) & 3]);
         } else {
-            payload.writeBuffer(new byte[0]);
+            payload.writeInt4(0);
         }
         if (null != statusVector) {
             statusVector.write(payload);
diff --git a/db-protocol/firebird/src/main/java/org/apache/shardingsphere/db/protocol/firebird/payload/FirebirdPacketPayload.java b/db-protocol/firebird/src/main/java/org/apache/shardingsphere/db/protocol/firebird/payload/FirebirdPacketPayload.java
index 9ae95542a26..47532f57899 100644
--- a/db-protocol/firebird/src/main/java/org/apache/shardingsphere/db/protocol/firebird/payload/FirebirdPacketPayload.java
+++ b/db-protocol/firebird/src/main/java/org/apache/shardingsphere/db/protocol/firebird/payload/FirebirdPacketPayload.java
@@ -260,7 +260,7 @@ public final class FirebirdPacketPayload implements PacketPayload {
      * @return buffer length with padding added
      */
     public int getBufferLength(final int index) {
-        int length = byteBuf.getInt(index);
+        int length = byteBuf.getInt(index) + 4;
         return length + getPadding(length);
     }
 }
diff --git a/db-protocol/firebird/src/test/java/org/apache/shardingsphere/db/protocol/firebird/payload/FirebirdPacketPayloadTest.java b/db-protocol/firebird/src/test/java/org/apache/shardingsphere/db/protocol/firebird/payload/FirebirdPacketPayloadTest.java
index 0aa724928f0..594c837a9b9 100644
--- a/db-protocol/firebird/src/test/java/org/apache/shardingsphere/db/protocol/firebird/payload/FirebirdPacketPayloadTest.java
+++ b/db-protocol/firebird/src/test/java/org/apache/shardingsphere/db/protocol/firebird/payload/FirebirdPacketPayloadTest.java
@@ -176,6 +176,6 @@ class FirebirdPacketPayloadTest {
     @Test
     void assertGetBufferLength() {
         when(byteBuf.getInt(0)).thenReturn(5);
-        assertThat(new FirebirdPacketPayload(byteBuf, StandardCharsets.UTF_8).getBufferLength(0), is(8));
+        assertThat(new FirebirdPacketPayload(byteBuf, StandardCharsets.UTF_8).getBufferLength(0), is(12));
     }
 }
diff --git a/proxy/backend/type/firebird/src/main/java/org/apache/shardingsphere/proxy/backend/firebird/handler/admin/FirebirdAdminExecutorCreator.java b/proxy/backend/type/firebird/src/main/java/org/apache/shardingsphere/proxy/backend/firebird/handler/admin/FirebirdAdminExecutorCreator.java
index 3025900f4c1..9b30ba5db05 100644
--- a/proxy/backend/type/firebird/src/main/java/org/apache/shardingsphere/proxy/backend/firebird/handler/admin/FirebirdAdminExecutorCreator.java
+++ b/proxy/backend/type/firebird/src/main/java/org/apache/shardingsphere/proxy/backend/firebird/handler/admin/FirebirdAdminExecutorCreator.java
@@ -22,18 +22,11 @@ import org.apache.shardingsphere.proxy.backend.firebird.handler.admin.executor.F
 import org.apache.shardingsphere.proxy.backend.firebird.handler.admin.executor.FirebirdShowVariableExecutor;
 import org.apache.shardingsphere.proxy.backend.handler.admin.executor.DatabaseAdminExecutor;
 import org.apache.shardingsphere.proxy.backend.handler.admin.executor.DatabaseAdminExecutorCreator;
-import org.apache.shardingsphere.sql.parser.statement.core.extractor.TableExtractor;
-import org.apache.shardingsphere.sql.parser.statement.core.segment.generic.table.SimpleTableSegment;
-import org.apache.shardingsphere.sql.parser.statement.core.segment.generic.table.SubqueryTableSegment;
-import org.apache.shardingsphere.sql.parser.statement.core.segment.generic.table.TableSegment;
 import org.apache.shardingsphere.sql.parser.statement.core.statement.SQLStatement;
 import org.apache.shardingsphere.sql.parser.statement.core.statement.type.dal.SetStatement;
 import org.apache.shardingsphere.sql.parser.statement.core.statement.type.dal.ShowStatement;
 import org.apache.shardingsphere.sql.parser.statement.core.statement.type.dml.SelectStatement;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Optional;
 
@@ -64,26 +57,6 @@ public final class FirebirdAdminExecutorCreator implements DatabaseAdminExecutor
         return Optional.empty();
     }
     
-    private Collection<String> getSelectedTableNames(final SelectStatement sqlStatement) {
-        TableExtractor extractor = new TableExtractor();
-        extractor.extractTablesFromSelect(sqlStatement);
-        List<TableSegment> extracted = new LinkedList<>(extractor.getTableContext());
-        for (TableSegment each : extractor.getTableContext()) {
-            if (each instanceof SubqueryTableSegment) {
-                TableExtractor subExtractor = new TableExtractor();
-                subExtractor.extractTablesFromSelect(((SubqueryTableSegment) each).getSubquery().getSelect());
-                extracted.addAll(subExtractor.getTableContext());
-            }
-        }
-        List<String> result = new ArrayList<>(extracted.size());
-        for (TableSegment each : extracted) {
-            if (each instanceof SimpleTableSegment) {
-                result.add(((SimpleTableSegment) each).getTableName().getIdentifier().getValue());
-            }
-        }
-        return result;
-    }
-    
     @Override
     public String getDatabaseType() {
         return "Firebird";
diff --git a/proxy/frontend/type/firebird/src/main/java/org/apache/shardingsphere/proxy/frontend/firebird/authentication/authenticator/impl/FirebirdLegacyAuthenticator.java b/proxy/frontend/type/firebird/src/main/java/org/apache/shardingsphere/proxy/frontend/firebird/authentication/authenticator/impl/FirebirdLegacyAuthenticator.java
index b560d0b6e6a..bc5f77ed489 100644
--- a/proxy/frontend/type/firebird/src/main/java/org/apache/shardingsphere/proxy/frontend/firebird/authentication/authenticator/impl/FirebirdLegacyAuthenticator.java
+++ b/proxy/frontend/type/firebird/src/main/java/org/apache/shardingsphere/proxy/frontend/firebird/authentication/authenticator/impl/FirebirdLegacyAuthenticator.java
@@ -24,18 +24,18 @@ import org.firebirdsql.gds.ng.wire.auth.legacy.UnixCrypt;
 
 /**
  * Legacy authenticator for Firebird.
- * 
+ *
  * @see <a href=https://github.com/FirebirdSQL/jaybird/blob/Branch_5_0/src/main/org/firebirdsql/gds/ng/wire/auth/legacy/LegacyAuthenticationPlugin.java>Jaybird implementation</a>
  */
 public final class FirebirdLegacyAuthenticator implements FirebirdAuthenticator {
     
-    private static final String LEGACY_PASSWORD_SALT = "9z";
+    private static final String SALT = "9z";
     
     @Override
     public boolean authenticate(final ShardingSphereUser user, final Object[] authInfo) {
         // TODO update when version 6 of jaybird comes out
         String password = (String) authInfo[0];
-        String expectedPassword = UnixCrypt.crypt(user.getPassword(), LEGACY_PASSWORD_SALT).substring(2, 13);
+        String expectedPassword = UnixCrypt.crypt(user.getPassword(), SALT).substring(2, 13);
         return expectedPassword.equals(password);
     }
     
diff --git a/proxy/frontend/type/firebird/src/main/java/org/apache/shardingsphere/proxy/frontend/firebird/command/FirebirdCommandExecuteEngine.java b/proxy/frontend/type/firebird/src/main/java/org/apache/shardingsphere/proxy/frontend/firebird/command/FirebirdCommandExecuteEngine.java
index 5c023ef1ff3..1920e447de2 100644
--- a/proxy/frontend/type/firebird/src/main/java/org/apache/shardingsphere/proxy/frontend/firebird/command/FirebirdCommandExecuteEngine.java
+++ b/proxy/frontend/type/firebird/src/main/java/org/apache/shardingsphere/proxy/frontend/firebird/command/FirebirdCommandExecuteEngine.java
@@ -59,7 +59,7 @@ public final class FirebirdCommandExecuteEngine implements CommandExecuteEngine
     
     @Override
     public CommandExecutor getCommandExecutor(final CommandPacketType type, final CommandPacket packet, final ConnectionSession connectionSession) throws SQLException {
-        return FirebirdCommandExecutorFactory.newInstance((FirebirdCommandPacketType) type, (FirebirdCommandPacket) packet, connectionSession);
+        return FirebirdCommandExecutorFactory.newInstance((FirebirdCommandPacketType) type, packet, connectionSession);
     }
     
     @Override
diff --git a/proxy/frontend/type/firebird/src/main/java/org/apache/shardingsphere/proxy/frontend/firebird/command/FirebirdCommandExecutorFactory.java b/proxy/frontend/type/firebird/src/main/java/org/apache/shardingsphere/proxy/frontend/firebird/command/FirebirdCommandExecutorFactory.java
index 54708092e6f..5725a0a5d65 100644
--- a/proxy/frontend/type/firebird/src/main/java/org/apache/shardingsphere/proxy/frontend/firebird/command/FirebirdCommandExecutorFactory.java
+++ b/proxy/frontend/type/firebird/src/main/java/org/apache/shardingsphere/proxy/frontend/firebird/command/FirebirdCommandExecutorFactory.java
@@ -20,7 +20,6 @@ package org.apache.shardingsphere.proxy.frontend.firebird.command;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.shardingsphere.db.protocol.firebird.packet.command.FirebirdCommandPacket;
 import org.apache.shardingsphere.db.protocol.firebird.packet.command.FirebirdCommandPacketType;
 import org.apache.shardingsphere.db.protocol.firebird.packet.command.query.info.FirebirdInfoPacket;
 import org.apache.shardingsphere.db.protocol.firebird.packet.command.query.statement.FirebirdAllocateStatementPacket;
@@ -31,6 +30,7 @@ import org.apache.shardingsphere.db.protocol.firebird.packet.command.query.state
 import org.apache.shardingsphere.db.protocol.firebird.packet.command.query.transaction.FirebirdCommitTransactionPacket;
 import org.apache.shardingsphere.db.protocol.firebird.packet.command.query.transaction.FirebirdRollbackTransactionPacket;
 import org.apache.shardingsphere.db.protocol.firebird.packet.command.query.transaction.FirebirdStartTransactionPacket;
+import org.apache.shardingsphere.db.protocol.packet.command.CommandPacket;
 import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
 import org.apache.shardingsphere.proxy.frontend.command.executor.CommandExecutor;
 import org.apache.shardingsphere.proxy.frontend.firebird.command.admin.FirebirdUnsupportedCommandExecutor;
@@ -63,7 +63,7 @@ public final class FirebirdCommandExecutorFactory {
      * @return created instance
      * @throws SQLException SQL exception
      */
-    public static CommandExecutor newInstance(final FirebirdCommandPacketType commandPacketType, final FirebirdCommandPacket commandPacket,
+    public static CommandExecutor newInstance(final FirebirdCommandPacketType commandPacketType, final CommandPacket commandPacket,
                                               final ConnectionSession connectionSession) throws SQLException {
         switch (commandPacketType) {
             case INFO_DATABASE:
diff --git a/proxy/frontend/type/firebird/src/main/java/org/apache/shardingsphere/proxy/frontend/firebird/command/query/statement/execute/FirebirdExecuteStatementCommandExecutor.java b/proxy/frontend/type/firebird/src/main/java/org/apache/shardingsphere/proxy/frontend/firebird/command/query/statement/execute/FirebirdExecuteStatementCommandExecutor.java
index b193a47590d..5c3e88ee3c6 100644
--- a/proxy/frontend/type/firebird/src/main/java/org/apache/shardingsphere/proxy/frontend/firebird/command/query/statement/execute/FirebirdExecuteStatementCommandExecutor.java
+++ b/proxy/frontend/type/firebird/src/main/java/org/apache/shardingsphere/proxy/frontend/firebird/command/query/statement/execute/FirebirdExecuteStatementCommandExecutor.java
@@ -69,7 +69,7 @@ public final class FirebirdExecuteStatementCommandExecutor implements QueryComma
     @Override
     public Collection<DatabasePacket> execute() throws SQLException {
         FirebirdServerPreparedStatement preparedStatement = updateAndGetPreparedStatement();
-        List<Object> params = packet.readParameters(preparedStatement.getParameterTypes(), preparedStatement.getLongData().keySet());
+        List<Object> params = packet.getParameterValues();
         preparedStatement.getLongData().forEach(params::set);
         SQLStatementContext sqlStatementContext = preparedStatement.getSqlStatementContext();
         if (sqlStatementContext instanceof ParameterAware) {
diff --git a/proxy/frontend/type/firebird/src/main/java/org/apache/shardingsphere/proxy/frontend/firebird/command/query/statement/prepare/FirebirdPrepareStatementCommandExecutor.java b/proxy/frontend/type/firebird/src/main/java/org/apache/shardingsphere/proxy/frontend/firebird/command/query/statement/prepare/FirebirdPrepareStatementCommandExecutor.java
index b8d3db78b5b..08489ad1d27 100644
--- a/proxy/frontend/type/firebird/src/main/java/org/apache/shardingsphere/proxy/frontend/firebird/command/query/statement/prepare/FirebirdPrepareStatementCommandExecutor.java
+++ b/proxy/frontend/type/firebird/src/main/java/org/apache/shardingsphere/proxy/frontend/firebird/command/query/statement/prepare/FirebirdPrepareStatementCommandExecutor.java
@@ -88,7 +88,6 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.Map;
-import java.util.Optional;
 
 /**
  * Firebird prepare transaction command executor.
@@ -128,14 +127,14 @@ public final class FirebirdPrepareStatementCommandExecutor implements CommandExe
                     returnPacket.setType(statementType);
                     break;
                 case SELECT:
-                    if (FirebirdSQLInfoReturnValue.isSelectDescribable(statementType.getCode())) {
+                    if (statementType.isSelectDescribable()) {
                         processDescribe(sqlStatementContext, metaDataContexts, returnPacket.getDescribeSelect(), true);
                     } else {
                         skipDescribe();
                     }
                     break;
                 case BIND:
-                    if (FirebirdSQLInfoReturnValue.isBindDescribable(statementType.getCode())) {
+                    if (statementType.isBindDescribable()) {
                         processDescribe(sqlStatementContext, metaDataContexts, returnPacket.getDescribeBind(), false);
                     } else {
                         skipDescribe();
@@ -215,8 +214,8 @@ public final class FirebirdPrepareStatementCommandExecutor implements CommandExe
         }
     }
     
-    private int processReturnValues(final SQLStatementContext sqlStatementContext, final MetaDataContexts metaDataContexts, final Collection<FirebirdReturnColumnPacket> describeColumns,
-                                    final Collection<FirebirdSQLInfoPacketType> requestedItems) {
+    private void processReturnValues(final SQLStatementContext sqlStatementContext, final MetaDataContexts metaDataContexts, final Collection<FirebirdReturnColumnPacket> describeColumns,
+                                     final Collection<FirebirdSQLInfoPacketType> requestedItems) {
         String databaseName = connectionSession.getCurrentDatabaseName();
         String schemaName = new DatabaseTypeRegistry(sqlStatementContext.getSqlStatement().getDatabaseType()).getDefaultSchemaName(databaseName);
         ShardingSphereSchema schema = metaDataContexts.getMetaData().getDatabase(databaseName).getSchema(schemaName);
@@ -227,18 +226,17 @@ public final class FirebirdPrepareStatementCommandExecutor implements CommandExe
                 String tableName = ((ColumnProjection) each).getOriginalTable().getValue();
                 ShardingSphereTable table = schema.getTable(tableName.isEmpty() ? getTableNames(sqlStatementContext).iterator().next() : tableName);
                 ShardingSphereColumn column = table.getColumn(((ColumnProjection) each).getOriginalColumn().getValue());
-                processColumn(describeColumns, requestedItems, table, column, ((ColumnProjection) each).getOwner(), each.getAlias(), ++columnCount);
+                processColumn(describeColumns, requestedItems, table, column, ((ColumnProjection) each).getOwner().orElse(null), each.getAlias().orElse(null), ++columnCount);
             } else if (each instanceof ExpressionProjection) {
                 processExpressionProjection((ExpressionProjection) each, describeColumns, requestedItems, ++columnCount);
             } else if (each instanceof AggregationProjection) {
                 String functionName = ((AggregationProjection) each).getType().name();
-                processCustomColumn(null, functionName, each.getAlias(), getFunctionType(functionName), describeColumns, requestedItems, ++columnCount);
+                processCustomColumn(null, functionName, each.getAlias().orElse(null), getFunctionType(functionName), describeColumns, requestedItems, ++columnCount);
             } else if (each instanceof SubqueryProjection) {
                 SubqueryProjection subquery = (SubqueryProjection) each;
-                processCustomColumn(null, subquery.getColumnName(), subquery.getAlias(), Types.INTEGER, describeColumns, requestedItems, ++columnCount);
+                processCustomColumn(null, subquery.getColumnName(), subquery.getAlias().orElse(null), Types.INTEGER, describeColumns, requestedItems, ++columnCount);
             }
         }
-        return columnCount;
     }
     
     private Collection<Projection> getProjections(final SQLStatementContext sqlStatementContext, final ShardingSphereSchema schema) {
@@ -295,10 +293,11 @@ public final class FirebirdPrepareStatementCommandExecutor implements CommandExe
         return result;
     }
     
-    private int processParameters(final SQLStatementContext sqlStatementContext, final MetaDataContexts metaDataContexts, final Collection<FirebirdReturnColumnPacket> describeColumns,
-                                  final Collection<FirebirdSQLInfoPacketType> requestedItems) {
+    private void processParameters(final SQLStatementContext sqlStatementContext, final MetaDataContexts metaDataContexts, final Collection<FirebirdReturnColumnPacket> describeColumns,
+                                   final Collection<FirebirdSQLInfoPacketType> requestedItems) {
         if (sqlStatementContext instanceof InsertStatementContext) {
-            return processInsertStatement((InsertStatementContext) sqlStatementContext, metaDataContexts, describeColumns, requestedItems);
+            processInsertStatement((InsertStatementContext) sqlStatementContext, metaDataContexts, describeColumns, requestedItems);
+            return;
         }
         Collection<ColumnSegment> affectedColumns = findAffectedColumns(sqlStatementContext);
         int parametersCount = sqlStatementContext.getSqlStatement().getParameterMarkers().size();
@@ -308,16 +307,15 @@ public final class FirebirdPrepareStatementCommandExecutor implements CommandExe
         for (ColumnSegment columnSegment : affectedColumns) {
             ShardingSphereTable table = metaDataContexts.getMetaData().getDatabase(databaseName).getSchema(schemaName).getTable(columnSegment.getColumnBoundInfo().getOriginalTable().getValue());
             ShardingSphereColumn column = table.getColumn(columnSegment.getColumnBoundInfo().getOriginalColumn().getValue());
-            processColumn(describeColumns, requestedItems, table, column, columnSegment.getOwner().map(OwnerSegment::getIdentifier), Optional.ofNullable(columnSegment.getIdentifier()), ++columnCount);
+            processColumn(describeColumns, requestedItems, table, column, columnSegment.getOwner().map(OwnerSegment::getIdentifier).orElse(null), columnSegment.getIdentifier(), ++columnCount);
         }
         for (int i = 0; i < parametersCount - affectedColumns.size(); i++) {
-            processCustomColumn(null, null, Optional.empty(), 12, describeColumns, requestedItems, ++columnCount);
+            processCustomColumn(null, null, null, 12, describeColumns, requestedItems, ++columnCount);
         }
-        return columnCount;
     }
     
-    private int processInsertStatement(final InsertStatementContext sqlStatementContext, final MetaDataContexts metaDataContexts, final Collection<FirebirdReturnColumnPacket> describeColumns,
-                                       final Collection<FirebirdSQLInfoPacketType> requestedItems) {
+    private void processInsertStatement(final InsertStatementContext sqlStatementContext, final MetaDataContexts metaDataContexts, final Collection<FirebirdReturnColumnPacket> describeColumns,
+                                        final Collection<FirebirdSQLInfoPacketType> requestedItems) {
         Collection<String> tableNames = getTableNames(sqlStatementContext);
         Collection<String> affectedColumns = new LinkedList<>();
         for (InsertValueContext context : sqlStatementContext.getInsertValueContexts()) {
@@ -330,10 +328,9 @@ public final class FirebirdPrepareStatementCommandExecutor implements CommandExe
             ShardingSphereTable table = metaDataContexts.getMetaData().getDatabase(databaseName).getSchema(schemaName).getTable(tableName);
             for (String columnName : affectedColumns) {
                 ShardingSphereColumn column = table.getColumn(columnName);
-                processColumn(describeColumns, requestedItems, table, column, Optional.empty(), Optional.empty(), ++columnCount);
+                processColumn(describeColumns, requestedItems, table, column, null, null, ++columnCount);
             }
         }
-        return columnCount;
     }
     
     private Collection<String> processInsertValueContext(final InsertStatementContext context, final InsertValueContext valueContext) {
@@ -388,11 +385,11 @@ public final class FirebirdPrepareStatementCommandExecutor implements CommandExe
         final ExpressionSegment exprSegment = expr.getExpressionSegment().getExpr();
         if (exprSegment instanceof FunctionSegment) {
             String functionName = ((FunctionSegment) exprSegment).getFunctionName();
-            processCustomColumn(null, functionName, expr.getAlias(), getFunctionType(functionName), describeColumns, requestedItems, columnCount);
+            processCustomColumn(null, functionName, expr.getAlias().orElse(null), getFunctionType(functionName), describeColumns, requestedItems, columnCount);
         } else if (exprSegment instanceof BinaryOperationExpression) {
             String operationName = getOperationName(((BinaryOperationExpression) exprSegment).getOperator());
             int operationType = getOperationType(((BinaryOperationExpression) exprSegment).getOperator());
-            processCustomColumn(null, operationName, expr.getAlias(), operationType, describeColumns, requestedItems, columnCount);
+            processCustomColumn(null, operationName, expr.getAlias().orElse(null), operationType, describeColumns, requestedItems, columnCount);
         } else if (exprSegment instanceof LiteralExpressionSegment) {
             Object value = ((LiteralExpressionSegment) exprSegment).getLiterals();
             int type = Types.NULL;
@@ -405,7 +402,7 @@ public final class FirebirdPrepareStatementCommandExecutor implements CommandExe
             } else if (value instanceof Number) {
                 type = Types.NUMERIC;
             }
-            processCustomColumn(null, null, expr.getAlias(), type, describeColumns, requestedItems, columnCount);
+            processCustomColumn(null, null, expr.getAlias().orElse(null), type, describeColumns, requestedItems, columnCount);
         }
     }
     
@@ -444,17 +441,17 @@ public final class FirebirdPrepareStatementCommandExecutor implements CommandExe
         }
     }
     
-    private void processCustomColumn(final String tableName, final String columnName, final Optional<IdentifierValue> columnAlias, final int dataType,
+    private void processCustomColumn(final String tableName, final String columnName, final IdentifierValue columnAlias, final int dataType,
                                      final Collection<FirebirdReturnColumnPacket> describeColumns, final Collection<FirebirdSQLInfoPacketType> requestedItems, final int columnCount) {
         ShardingSphereTable table = new ShardingSphereTable(tableName, Collections.emptyList(), Collections.emptyList(), Collections.emptyList());
         ShardingSphereColumn column = new ShardingSphereColumn(columnName, dataType, false, false, true, true, false, false);
-        processColumn(describeColumns, requestedItems, table, column, Optional.empty(), columnAlias, columnCount);
+        processColumn(describeColumns, requestedItems, table, column, null, columnAlias, columnCount);
     }
     
     private void processColumn(final Collection<FirebirdReturnColumnPacket> describeColumns, final Collection<FirebirdSQLInfoPacketType> requestedItems, final ShardingSphereTable table,
-                               final ShardingSphereColumn column, final Optional<IdentifierValue> tableAlias, final Optional<IdentifierValue> columnAlias, final int idx) {
-        String tableAliasString = tableAlias.map(IdentifierValue::getValue).orElse(table.getName());
-        String columnAliasString = columnAlias.map(IdentifierValue::getValue).orElse(column.getName());
+                               final ShardingSphereColumn column, final IdentifierValue tableAlias, final IdentifierValue columnAlias, final int idx) {
+        String tableAliasString = null == tableAlias ? table.getName() : tableAlias.getValue();
+        String columnAliasString = null == columnAlias ? column.getName() : columnAlias.getValue();
         String owner = connectionSession.getConnectionContext().getGrantee().getUsername();
         describeColumns.add(new FirebirdReturnColumnPacket(requestedItems, idx, table, column, tableAliasString, columnAliasString, owner));
     }
diff --git a/proxy/frontend/type/firebird/src/test/java/org/apache/shardingsphere/proxy/frontend/firebird/command/FirebirdCommandExecutorFactoryTest.java b/proxy/frontend/type/firebird/src/test/java/org/apache/shardingsphere/proxy/frontend/firebird/command/FirebirdCommandExecutorFactoryTest.java
index ad319c41d60..1e549ff1de3 100644
--- a/proxy/frontend/type/firebird/src/test/java/org/apache/shardingsphere/proxy/frontend/firebird/command/FirebirdCommandExecutorFactoryTest.java
+++ b/proxy/frontend/type/firebird/src/test/java/org/apache/shardingsphere/proxy/frontend/firebird/command/FirebirdCommandExecutorFactoryTest.java
@@ -18,7 +18,6 @@
 package org.apache.shardingsphere.proxy.frontend.firebird.command;
 
 import org.apache.shardingsphere.db.protocol.firebird.packet.command.FirebirdCommandPacketType;
-import org.apache.shardingsphere.db.protocol.firebird.packet.command.FirebirdCommandPacket;
 import org.apache.shardingsphere.db.protocol.firebird.packet.command.query.info.FirebirdInfoPacket;
 import org.apache.shardingsphere.db.protocol.firebird.packet.command.query.statement.FirebirdAllocateStatementPacket;
 import org.apache.shardingsphere.db.protocol.firebird.packet.command.query.statement.FirebirdFetchStatementPacket;
@@ -28,6 +27,7 @@ import org.apache.shardingsphere.db.protocol.firebird.packet.command.query.state
 import org.apache.shardingsphere.db.protocol.firebird.packet.command.query.transaction.FirebirdCommitTransactionPacket;
 import org.apache.shardingsphere.db.protocol.firebird.packet.command.query.transaction.FirebirdRollbackTransactionPacket;
 import org.apache.shardingsphere.db.protocol.firebird.packet.command.query.transaction.FirebirdStartTransactionPacket;
+import org.apache.shardingsphere.db.protocol.packet.command.CommandPacket;
 import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
 import org.apache.shardingsphere.proxy.frontend.firebird.command.admin.FirebirdUnsupportedCommandExecutor;
 import org.apache.shardingsphere.proxy.frontend.firebird.command.query.info.FirebirdDatabaseInfoExecutor;
@@ -41,16 +41,18 @@ import org.apache.shardingsphere.proxy.frontend.firebird.command.query.transacti
 import org.apache.shardingsphere.proxy.frontend.firebird.command.query.transaction.FirebirdRollbackTransactionCommandExecutor;
 import org.apache.shardingsphere.proxy.frontend.firebird.command.query.transaction.FirebirdStartTransactionCommandExecutor;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Answers;
 import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 import java.sql.SQLException;
 
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
 
+@ExtendWith(MockitoExtension.class)
 class FirebirdCommandExecutorFactoryTest {
     
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -118,10 +120,6 @@ class FirebirdCommandExecutorFactoryTest {
     
     @Test
     void assertNewInstanceWithUnsupportedCommand() throws SQLException {
-        FirebirdCommandPacketType unsupported = mock(FirebirdCommandPacketType.class);
-        when(unsupported.name()).thenReturn("UNSUPPORTED");
-        FirebirdCommandPacket unknownPacket = mock(FirebirdCommandPacket.class);
-        assertThat(FirebirdCommandExecutorFactory.newInstance(unsupported, unknownPacket, connectionSession),
-                instanceOf(FirebirdUnsupportedCommandExecutor.class));
+        assertThat(FirebirdCommandExecutorFactory.newInstance(FirebirdCommandPacketType.VOID, mock(CommandPacket.class), connectionSession), instanceOf(FirebirdUnsupportedCommandExecutor.class));
     }
 }