Merge branch 'master' of https://github.com/AlibabaTech/druid

2023-03-04 19:17:16 +00:00 · 2012-08-11 14:21:46 +08:00
parent 4986d228be b6895d84d6
commit 4a22e228ef
10 changed files with 317 additions and 78 deletions
@@ -3336,7 +3336,65 @@ public class FilterChainImpl implements FilterChain {
        if (this.pos < filterSize) {
            return nextFilter().callableStatement_getObject(this, statement, parameterIndex);
        }
-        return statement.getRawObject().getObject(parameterIndex);
+        
+        Object obj = statement.getRawObject().getObject(parameterIndex);
+        
+        if (obj instanceof ResultSet) {
+            return wrap(statement, (ResultSet) obj);
+        }
+        
+        return obj;
+    }
+    
+    @Override
+    public Object callableStatement_getObject(CallableStatementProxy statement, int parameterIndex,
+                                              java.util.Map<String, Class<?>> map) throws SQLException {
+        if (this.pos < filterSize) {
+            return nextFilter().callableStatement_getObject(this, statement, parameterIndex, map);
+        }
+        
+        
+        Object obj = statement.getRawObject().getObject(parameterIndex, map);
+        
+        if (obj instanceof ResultSet) {
+            return wrap(statement, (ResultSet) obj);
+        }
+        
+        return obj;
+    }
+    
+
+    @Override
+    public Object callableStatement_getObject(CallableStatementProxy statement, String parameterName)
+                                                                                                     throws SQLException {
+        if (this.pos < filterSize) {
+            return nextFilter().callableStatement_getObject(this, statement, parameterName);
+        }
+        
+        Object obj = statement.getRawObject().getObject(parameterName);
+        
+        if (obj instanceof ResultSet) {
+            return wrap(statement, (ResultSet) obj);
+        }
+        
+        return obj;
+    }
+    
+
+    @Override
+    public Object callableStatement_getObject(CallableStatementProxy statement, String parameterName,
+                                              java.util.Map<String, Class<?>> map) throws SQLException {
+        if (this.pos < filterSize) {
+            return nextFilter().callableStatement_getObject(this, statement, parameterName, map);
+        }
+        
+        Object obj = statement.getRawObject().getObject(parameterName, map);
+        
+        if (obj instanceof ResultSet) {
+            return wrap(statement, (ResultSet) obj);
+        }
+        
+        return obj;
    }

    @Override
@@ -3348,15 +3406,6 @@ public class FilterChainImpl implements FilterChain {
        return statement.getRawObject().getBigDecimal(parameterIndex);
    }

-    @Override
-    public Object callableStatement_getObject(CallableStatementProxy statement, int parameterIndex,
-                                              java.util.Map<String, Class<?>> map) throws SQLException {
-        if (this.pos < filterSize) {
-            return nextFilter().callableStatement_getObject(this, statement, parameterIndex, map);
-        }
-        return statement.getRawObject().getObject(parameterIndex, map);
-    }
-
    @Override
    public Ref callableStatement_getRef(CallableStatementProxy statement, int parameterIndex) throws SQLException {
        if (this.pos < filterSize) {
@@ -3820,15 +3869,6 @@ public class FilterChainImpl implements FilterChain {
        return statement.getRawObject().getTimestamp(parameterName);
    }

-    @Override
-    public Object callableStatement_getObject(CallableStatementProxy statement, String parameterName)
-                                                                                                     throws SQLException {
-        if (this.pos < filterSize) {
-            return nextFilter().callableStatement_getObject(this, statement, parameterName);
-        }
-        return statement.getRawObject().getObject(parameterName);
-    }
-
    @Override
    public BigDecimal callableStatement_getBigDecimal(CallableStatementProxy statement, String parameterName)
                                                                                                             throws SQLException {
@@ -3838,15 +3878,6 @@ public class FilterChainImpl implements FilterChain {
        return statement.getRawObject().getBigDecimal(parameterName);
    }

-    @Override
-    public Object callableStatement_getObject(CallableStatementProxy statement, String parameterName,
-                                              java.util.Map<String, Class<?>> map) throws SQLException {
-        if (this.pos < filterSize) {
-            return nextFilter().callableStatement_getObject(this, statement, parameterName, map);
-        }
-        return statement.getRawObject().getObject(parameterName, map);
-    }
-
    @Override
    public Ref callableStatement_getRef(CallableStatementProxy statement, String parameterName) throws SQLException {
        if (this.pos < filterSize) {
@@ -33,7 +33,6 @@ import com.alibaba.druid.proxy.jdbc.ClobProxy;
 import com.alibaba.druid.proxy.jdbc.ConnectionProxy;
 import com.alibaba.druid.proxy.jdbc.PreparedStatementProxy;
 import com.alibaba.druid.proxy.jdbc.ResultSetProxy;
-import com.alibaba.druid.proxy.jdbc.ResultSetProxyImpl;
 import com.alibaba.druid.proxy.jdbc.StatementProxy;
 import com.alibaba.druid.util.IOUtils;

@@ -225,12 +224,6 @@ public class EncodingConvertFilter extends FilterAdapter {
            return new StringReader(decode(stmt.getConnectionProxy(), text));
        }

-        if (object instanceof ResultSet) {
-            long resultSetId = stmt.getConnectionProxy().getDirectDataSource().createResultSetId();
-            ResultSet resultSet = (ResultSet) object;
-            return new ResultSetProxyImpl(stmt, resultSet, resultSetId, stmt.getLastExecuteSql());
-        }
-
        return object;
    }

@@ -291,7 +291,7 @@ public abstract class LogFilter extends FilterEventAdapter implements LogFilterM
        super.connection_rollback(chain, connection);

        if (connectionRollbackAfterLogEnable && isConnectionLogEnabled()) {
-            connectionLog("connect rollback. id " + connection.getId());
+            connectionLog("{conn " + connection.getId() + "} rollback");
        }
    }

@@ -300,7 +300,7 @@ public abstract class LogFilter extends FilterEventAdapter implements LogFilterM
        super.connection_commit(chain, connection);

        if (connectionCommitAfterLogEnable && isConnectionLogEnabled()) {
-            connectionLog("connect committed. id " + connection.getId());
+            connectionLog("{conn-" + connection.getId() + "} commited");
        }
    }
    
@@ -308,7 +308,7 @@ public abstract class LogFilter extends FilterEventAdapter implements LogFilterM
    public void connection_setAutoCommit(FilterChain chain, ConnectionProxy connection, boolean autoCommit)
                                                                                                           throws SQLException {
        
-        connectionLog("connect setAutoCommit " + autoCommit + ". id " + connection.getId());
+        connectionLog("{conn-" + connection.getId() + "} setAutoCommit " + autoCommit);
        chain.connection_setAutoCommit(connection, autoCommit);
    }

@@ -392,6 +392,24 @@ public abstract class LogFilter extends FilterEventAdapter implements LogFilterM
                         + "} update executed. effort " + updateCount + ". " + sql);
        }
    }
+    
+    @Override
+    public void resultSet_close(FilterChain chain, ResultSetProxy resultSet) throws SQLException {
+        chain.resultSet_close(resultSet);
+        
+        StringBuffer buf = new StringBuffer();
+        buf.append("{conn-");
+        buf.append(resultSet.getStatementProxy().getConnectionProxy().getId());
+        buf.append(", ");
+        buf.append(stmtId(resultSet));
+        buf.append(", rs-");
+        buf.append(resultSet.getId());
+        buf.append("} closed");
+        
+        if (isResultSetCloseAfterLogEnabled()) {
+            resultSetLog(buf.toString());
+        }
+    }

    @Override
    public boolean resultSet_next(FilterChain chain, ResultSetProxy resultSet) throws SQLException {
@@ -446,6 +464,55 @@ public abstract class LogFilter extends FilterEventAdapter implements LogFilterM

        return moreRows;
    }
+    
+    @Override
+    public Object callableStatement_getObject(FilterChain chain, CallableStatementProxy statement, int parameterIndex)
+                                                                                                                      throws SQLException {
+        Object obj = chain.callableStatement_getObject(statement, parameterIndex);
+        
+        if (obj instanceof ResultSetProxy) {
+            resultSetOpenAfter((ResultSetProxy) obj);
+        }
+        
+        return obj;
+    }
+
+    @Override
+    public Object callableStatement_getObject(FilterChain chain, CallableStatementProxy statement, int parameterIndex,
+                                              java.util.Map<String, Class<?>> map) throws SQLException {
+        Object obj =  chain.callableStatement_getObject(statement, parameterIndex, map);
+        
+        if (obj instanceof ResultSetProxy) {
+            resultSetOpenAfter((ResultSetProxy) obj);
+        }
+        
+        return obj;
+    }
+
+    @Override
+    public Object callableStatement_getObject(FilterChain chain, CallableStatementProxy statement, String parameterName)
+                                                                                                                        throws SQLException {
+        Object obj =  chain.callableStatement_getObject(statement, parameterName);
+        
+        if (obj instanceof ResultSetProxy) {
+            resultSetOpenAfter((ResultSetProxy) obj);
+        }
+        
+        return obj;
+    }
+
+    @Override
+    public Object callableStatement_getObject(FilterChain chain, CallableStatementProxy statement,
+                                              String parameterName, java.util.Map<String, Class<?>> map)
+                                                                                                        throws SQLException {
+        Object obj =  chain.callableStatement_getObject(statement, parameterName, map);
+        
+        if (obj instanceof ResultSetProxy) {
+            resultSetOpenAfter((ResultSetProxy) obj);
+        }
+        
+        return obj;
+    }

    @Override
    protected void resultSetOpenAfter(ResultSetProxy resultSet) {
@@ -270,7 +270,7 @@ public class MockDriver implements Driver, MockDriverMBean {
        }
    }

-    protected ResultSet createResultSet(MockPreparedStatement stmt) {
+    public ResultSet createResultSet(MockPreparedStatement stmt) {
        MockResultSet rs = new MockResultSet(stmt);

        String sql = stmt.getSql();
@@ -24,6 +24,7 @@ import java.sql.CallableStatement;
 import java.sql.Clob;
 import java.sql.NClob;
 import java.sql.Ref;
+import java.sql.ResultSet;
 import java.sql.RowId;
 import java.sql.SQLException;
 import java.sql.SQLFeatureNotSupportedException;
@@ -196,12 +197,26 @@ public class DruidPooledCallableStatement extends DruidPooledPreparedStatement i
    @Override
    public Object getObject(int parameterIndex) throws SQLException {
        try {
-            return stmt.getObject(parameterIndex);
+            Object obj = stmt.getObject(parameterIndex);
+            return wrapObject(obj);
        } catch (Throwable t) {
            throw checkException(t);
        }
    }

+    private Object wrapObject(Object obj) {
+        if (obj instanceof ResultSet) {
+            ResultSet rs = (ResultSet) obj;
+            
+            DruidPooledResultSet poolableResultSet = new DruidPooledResultSet(this, rs);
+            resultSetTrace.add(poolableResultSet);
+            
+            obj = poolableResultSet;
+        }
+        
+        return obj;
+    }
+
    @Override
    public BigDecimal getBigDecimal(int parameterIndex) throws SQLException {
        try {
@@ -214,7 +229,8 @@ public class DruidPooledCallableStatement extends DruidPooledPreparedStatement i
    @Override
    public Object getObject(int parameterIndex, java.util.Map<String, Class<?>> map) throws SQLException {
        try {
-            return stmt.getObject(parameterIndex, map);
+            Object obj = stmt.getObject(parameterIndex, map);
+            return wrapObject(obj);
        } catch (Throwable t) {
            throw checkException(t);
        }
@@ -664,7 +680,8 @@ public class DruidPooledCallableStatement extends DruidPooledPreparedStatement i
    @Override
    public Object getObject(String parameterName) throws SQLException {
        try {
-            return stmt.getObject(parameterName);
+            Object obj = stmt.getObject(parameterName);
+            return wrapObject(obj);
        } catch (Throwable t) {
            throw checkException(t);
        }
@@ -682,7 +699,8 @@ public class DruidPooledCallableStatement extends DruidPooledPreparedStatement i
    @Override
    public Object getObject(String parameterName, java.util.Map<String, Class<?>> map) throws SQLException {
        try {
-            return stmt.getObject(parameterName, map);
+            Object obj = stmt.getObject(parameterName, map);
+            return wrapObject(obj);
        } catch (Throwable t) {
            throw checkException(t);
        }
@@ -19,7 +19,6 @@ import java.util.ArrayList;
 import java.util.List;

 import com.alibaba.druid.sql.ast.SQLExpr;
-import com.alibaba.druid.sql.ast.SQLObjectImpl;
 import com.alibaba.druid.sql.dialect.oracle.ast.OracleSQLObjectImpl;
 import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor;

@@ -73,16 +72,4 @@ public class OracleSelectForUpdate extends OracleSQLObjectImpl {
    public List<SQLExpr> getOf() {
        return this.of;
    }
-
-    public static class SkipLock {
-    }
-
-    public static abstract class Type extends SQLObjectImpl {
-
-        private static final long serialVersionUID = 1L;
-
-        public Type(){
-
-        }
-    }
 }
@@ -26,7 +26,7 @@ public class PGSelectParser extends SQLSelectParser {
    public PGSelectParser(String sql) throws ParserException{
        this(new PGExprParser(sql));
    }
-    
+
    protected SQLExprParser createExprParser() {
        return new PGExprParser(lexer);
    }
@@ -133,8 +133,8 @@ public class PGSelectParser extends SQLSelectParser {
            if (lexer.token() == Token.ROW || lexer.token() == Token.ROWS) {
                lexer.nextToken();
            } else {
-            	//TODO
-                //throw new ParserException("expect 'ROW' or 'ROWS'");
+                // TODO
+                // throw new ParserException("expect 'ROW' or 'ROWS'");
            }
        }

@@ -175,22 +175,24 @@ public class PGSelectParser extends SQLSelectParser {

            if (lexer.token() == Token.UPDATE) {
                forClause.setOption(PGSelectQueryBlock.ForClause.Option.UPDATE);
+                lexer.nextToken();
            } else if (lexer.token() == Token.SHARE) {
                forClause.setOption(PGSelectQueryBlock.ForClause.Option.SHARE);
+                lexer.nextToken();
            } else {
                throw new ParserException("expect 'FIRST' or 'NEXT'");
            }

-            accept(Token.OF);
-
-            for (;;) {
-                SQLExpr expr = this.createExprParser().expr();
-                forClause.getOf().add(expr);
-                if (lexer.token() == Token.COMMA) {
-                    lexer.nextToken();
-                    continue;
-                } else {
-                    break;
+            if (lexer.token() == Token.OF) {
+                for (;;) {
+                    SQLExpr expr = this.createExprParser().expr();
+                    forClause.getOf().add(expr);
+                    if (lexer.token() == Token.COMMA) {
+                        lexer.nextToken();
+                        continue;
+                    } else {
+                        break;
+                    }
                }
            }

@@ -208,31 +210,31 @@ public class PGSelectParser extends SQLSelectParser {
    protected SQLTableSource parseTableSourceRest(SQLTableSource tableSource) throws ParserException {
        if (lexer.token() == Token.AS && tableSource instanceof SQLExprTableSource) {
            String alias = this.as();
-            
+
            if (lexer.token() == Token.LPAREN) {
                SQLExprTableSource exprTableSource = (SQLExprTableSource) tableSource;
-                
+
                PGFunctionTableSource functionTableSource = new PGFunctionTableSource(exprTableSource.getExpr());
                functionTableSource.setAlias(alias);
-                
+
                lexer.nextToken();
                parserParameters(functionTableSource.getParameters());
                accept(Token.RPAREN);
-                
+
                return super.parseTableSourceRest(functionTableSource);
            }
        }
-        
+
        return super.parseTableSourceRest(tableSource);
    }
-    
+
    private void parserParameters(List<PGParameter> parameters) {
        for (;;) {
            PGParameter parameter = new PGParameter();

            parameter.setName(this.exprParser.name());
            parameter.setDataType(this.exprParser.parseDataType());
-            
+
            parameters.add(parameter);
            if (lexer.token() == Token.COMMA || lexer.token() == Token.SEMI) {
                lexer.nextToken();
@@ -245,4 +247,4 @@ public class PGSelectParser extends SQLSelectParser {
            break;
        }
    }
-}
+}