[Geotools-commits] svn - r38520 - branches/2.7.x/modules/library/jdbc/src/main/java/org/geotools/jdbc

[<svn...@os...>]

Author: aaime
Date: 2012-01-23 09:34:51 -0800 (Mon, 23 Jan 2012)
New Revision: 38520

Modified:
   branches/2.7.x/modules/library/jdbc/src/main/java/org/geotools/jdbc/JDBCDataStore.java
   branches/2.7.x/modules/library/jdbc/src/main/java/org/geotools/jdbc/JDBCFeatureSource.java
Log:
[GEOT-4025] Use fetch size for metadata gathering as well

Modified: branches/2.7.x/modules/library/jdbc/src/main/java/org/geotools/jdbc/JDBCDataStore.java
===================================================================
--- branches/2.7.x/modules/library/jdbc/src/main/java/org/geotools/jdbc/JDBCDataStore.java	2012-01-23 17:34:38 UTC (rev 38519)
+++ branches/2.7.x/modules/library/jdbc/src/main/java/org/geotools/jdbc/JDBCDataStore.java	2012-01-23 17:34:51 UTC (rev 38520)
@@ -841,6 +841,9 @@
             DatabaseMetaData metaData = cx.getMetaData();
             ResultSet tables = metaData.getTables(null, databaseSchema, "%",
                     new String[] { "TABLE", "VIEW" });
+            if(fetchSize > 1) {
+                tables.setFetchSize(fetchSize);
+            }
 
             try {
                 while (tables.next()) {

Modified: branches/2.7.x/modules/library/jdbc/src/main/java/org/geotools/jdbc/JDBCFeatureSource.java
===================================================================
--- branches/2.7.x/modules/library/jdbc/src/main/java/org/geotools/jdbc/JDBCFeatureSource.java	2012-01-23 17:34:38 UTC (rev 38519)
+++ branches/2.7.x/modules/library/jdbc/src/main/java/org/geotools/jdbc/JDBCFeatureSource.java	2012-01-23 17:34:51 UTC (rev 38520)
@@ -640,6 +640,9 @@
          * </UL>
          */
         ResultSet columns = metaData.getColumns(null, databaseSchema, tableName, "%");
+        if(getDataStore().getFetchSize() > 0) {
+            columns.setFetchSize(getDataStore().getFetchSize());
+        }
 
         try {
             while (columns.next()) {