Merge pull request #505 from kazuki43zoo/issues/503_improve-defaultStatementTimeout

Improve handling of defaultStatementTimeout #503

Author: emacarron

src/main/java/org/apache/ibatis/builder/MapperBuilderAssistant.java

@@ -282,6 +282,7 @@ public MappedStatement addMappedStatement(
     MappedStatement.Builder statementBuilder = new MappedStatement.Builder(configuration, id, sqlSource, sqlCommandType);
     statementBuilder.resource(resource);
     statementBuilder.fetchSize(fetchSize);
+    statementBuilder.timeout(timeout);
     statementBuilder.statementType(statementType);
     statementBuilder.keyGenerator(keyGenerator);
     statementBuilder.keyProperty(keyProperty);
@@ -290,7 +291,6 @@ public MappedStatement addMappedStatement(
     statementBuilder.lang(lang);
     statementBuilder.resultOrdered(resultOrdered);
     statementBuilder.resulSets(resultSets);
-    setStatementTimeout(timeout, statementBuilder);
 
     setStatementParameterMap(parameterMap, parameterType, statementBuilder);
     setStatementResultMap(resultMap, resultType, resultSetType, statementBuilder);
@@ -372,13 +372,6 @@ private void setStatementResultMap(
     statementBuilder.resultSetType(resultSetType);
   }
 
-  private void setStatementTimeout(Integer timeout, MappedStatement.Builder statementBuilder) {
-    if (timeout == null) {
-      timeout = configuration.getDefaultStatementTimeout();
-    }
-    statementBuilder.timeout(timeout);
-  }
-
   public ResultMapping buildResultMapping(
       Class<?> resultType,
       String property,

src/main/java/org/apache/ibatis/executor/statement/BaseStatementHandler.java

@@ -102,10 +102,12 @@ public Statement prepare(Connection connection) throws SQLException {
 
   protected void setStatementTimeout(Statement stmt) throws SQLException {
     Integer timeout = mappedStatement.getTimeout();
-    Integer defaultTimeout = configuration.getDefaultStatementTimeout();
     if (timeout != null) {
       stmt.setQueryTimeout(timeout);
-    } else if (defaultTimeout != null) {
+      return;
+    }
+    Integer defaultTimeout = configuration.getDefaultStatementTimeout();
+    if (defaultTimeout != null) {
       stmt.setQueryTimeout(defaultTimeout);
     }
   }

src/main/java/org/apache/ibatis/mapping/MappedStatement.java

@@ -71,7 +71,6 @@ public Builder(Configuration configuration, String id, SqlSource sqlSource, SqlC
       mappedStatement.statementType = StatementType.PREPARED;
       mappedStatement.parameterMap = new ParameterMap.Builder(configuration, "defaultParameterMap", null, new ArrayList<ParameterMapping>()).build();
       mappedStatement.resultMaps = new ArrayList<ResultMap>();
-      mappedStatement.timeout = configuration.getDefaultStatementTimeout();
       mappedStatement.sqlCommandType = sqlCommandType;
       mappedStatement.keyGenerator = configuration.isUseGeneratedKeys() && SqlCommandType.INSERT.equals(sqlCommandType) ? new Jdbc3KeyGenerator() : new NoKeyGenerator();
       String logId = id;

src/test/java/org/apache/ibatis/executor/ExecutorTestHelper.java

@@ -197,7 +197,7 @@ public static MappedStatement prepareSelectAllAuthorsAutoMappedStatement(final C
               }
             }).build());
           }
-        }).fetchSize(1000).build();
+        }).fetchSize(1000).timeout(2000).build();
   }
 
   public static MappedStatement prepareSelectOneAuthorMappedStatementWithConstructorResults(final Configuration config) {