Skip to content

fix(sql-execute): fail to execute statement on OceanBase 2.2.30 #1487

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yhilmare merged 3 commits into from
Jan 31, 2024
Merged

fix(sql-execute): fail to execute statement on OceanBase 2.2.30 #1487

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a31f8b6
get actual connection by Proxy#getInvocationHandler
LuckyPickleZZ Jan 30, 2024
d6c3516
use reflection to get private field
LuckyPickleZZ Jan 31, 2024
94ac4ee
update license
LuckyPickleZZ Jan 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion .../odc-core/src/main/java/com/oceanbase/odc/core/datasource/SingleConnectionDataSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ private Connection innerCreateConnection() throws SQLException {
* @since ODC_release_3.2.2
* @see java.lang.reflect.InvocationHandler
*/
private static class CloseIgnoreInvocationHandler implements InvocationHandler {
public static class CloseIgnoreInvocationHandler implements InvocationHandler {
private final Connection target;
private final Lock lock;

Expand Down Expand Up @@ -242,6 +242,11 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
throw ex.getTargetException();
}
}

public Connection getTarget() {
return target;
}

}

}
Expand Down
5 changes: 5 additions & 0 deletions ...cle/src/main/java/com/oceanbase/odc/plugin/connect/oboracle/OBOracleSessionExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*/
package com.oceanbase.odc.plugin.connect.oboracle;

import java.lang.reflect.Proxy;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.Objects;
Expand All @@ -24,6 +25,7 @@
import com.oceanbase.jdbc.OceanBaseConnection;
import com.oceanbase.odc.common.util.JdbcOperationsUtil;
import com.oceanbase.odc.common.util.StringUtils;
import com.oceanbase.odc.core.datasource.SingleConnectionDataSource.CloseIgnoreInvocationHandler;
import com.oceanbase.odc.plugin.connect.api.SessionExtensionPoint;

import lombok.extern.slf4j.Slf4j;
Expand Down Expand Up @@ -67,6 +69,9 @@ public String getConnectionId(Connection connection) {
} catch (Exception e) {
if (connection instanceof OceanBaseConnection) {
connectionId = ((OceanBaseConnection) connection).getServerThreadId() + "";
} else if (Proxy.isProxyClass(connection.getClass())) {
Comment thread
yhilmare marked this conversation as resolved.
Outdated
Connection actual = ((CloseIgnoreInvocationHandler) Proxy.getInvocationHandler(connection)).getTarget();
connectionId = ((OceanBaseConnection) actual).getServerThreadId() + "";
}
}
return connectionId;
Expand Down