You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2011/11/15 14:50:14 UTC
svn commit: r1202191 - in /jackrabbit/branches/2.2: ./
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/pool/
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/db/
Author: jukka
Date: Tue Nov 15 13:50:14 2011
New Revision: 1202191
URL: http://svn.apache.org/viewvc?rev=1202191&view=rev
Log:
2.2: Merged revision 1182667 (JCR-2892)
Added:
jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/db/PostgreSQLConnectionHelper.java
- copied unchanged from r1182667, jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/db/PostgreSQLConnectionHelper.java
Modified:
jackrabbit/branches/2.2/ (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/pool/PostgreSQLPersistenceManager.java
jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/db/ConnectionHelper.java
Propchange: jackrabbit/branches/2.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 15 13:50:14 2011
@@ -3,4 +3,4 @@
/jackrabbit/sandbox/JCR-1456:774917-886178
/jackrabbit/sandbox/JCR-2170:812417-816332
/jackrabbit/sandbox/tripod-JCR-2209:795441-795863
-/jackrabbit/trunk:1038201,1038203,1038205,1038657,1039064,1039347,1039408,1039422-1039423,1039888,1039946,1040033,1040090,1040459,1040601,1040606,1040661,1040958,1041379,1041439,1041761,1042643,1042647,1042978-1042982,1043084-1043086,1043088,1043343,1043357-1043358,1043430,1043554,1043616,1043618,1043637,1043656,1043893,1043897,1044239,1044312,1044451,1044613,1049473,1049491,1049514,1049518,1049520,1049859,1049870,1049874,1049878,1049880,1049883,1049889,1049891,1049894-1049895,1049899-1049901,1049909-1049911,1049915-1049916,1049919,1049923,1049925,1049931,1049936,1049939,1050212,1050298,1050346,1050551,1055068,1055070-1055071,1055116-1055117,1055127,1055134,1055164,1055498,1060431,1060434,1060753,1063756,1064670,1065599,1065622,1066059,1066071,1069831,1071562,1071573,1071680,1074140,1079314,1079317,1080186,1080540,1087304,1088991,1089032,1089053,1089436,1092106,1092117,1092683,1097363,1097513-1097514,1098963-1098964,1099033,1099172,1100242,1100286,1101046,1102601,1104027,112
8175,1130192,1130228,1132993,1136353,1136360,1138511,1141141,1141717,1143396,1143738,1144332,1144338,1144695,1152258,1155431,1157175,1165609,1173196,1174822,1174887,1175988,1176423,1176465,1176515,1176546,1177249,1177340,1178251,1178892,1179548,1180922,1181712,1183409,1185691,1186285,1186802,1187344,1188590,1198827
+/jackrabbit/trunk:1038201,1038203,1038205,1038657,1039064,1039347,1039408,1039422-1039423,1039888,1039946,1040033,1040090,1040459,1040601,1040606,1040661,1040958,1041379,1041439,1041761,1042643,1042647,1042978-1042982,1043084-1043086,1043088,1043343,1043357-1043358,1043430,1043554,1043616,1043618,1043637,1043656,1043893,1043897,1044239,1044312,1044451,1044613,1049473,1049491,1049514,1049518,1049520,1049859,1049870,1049874,1049878,1049880,1049883,1049889,1049891,1049894-1049895,1049899-1049901,1049909-1049911,1049915-1049916,1049919,1049923,1049925,1049931,1049936,1049939,1050212,1050298,1050346,1050551,1055068,1055070-1055071,1055116-1055117,1055127,1055134,1055164,1055498,1060431,1060434,1060753,1063756,1064670,1065599,1065622,1066059,1066071,1069831,1071562,1071573,1071680,1074140,1079314,1079317,1080186,1080540,1087304,1088991,1089032,1089053,1089436,1092106,1092117,1092683,1097363,1097513-1097514,1098963-1098964,1099033,1099172,1100242,1100286,1101046,1102601,1104027,112
8175,1130192,1130228,1132993,1136353,1136360,1138511,1141141,1141717,1143396,1143738,1144332,1144338,1144695,1152258,1155431,1157175,1165609,1173196,1174822,1174887,1175988,1176423,1176465,1176515,1176546,1177249,1177340,1178251,1178892,1179548,1180922,1181712,1182667,1183409,1185691,1186285,1186802,1187344,1188590,1198827
Modified: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/pool/PostgreSQLPersistenceManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/pool/PostgreSQLPersistenceManager.java?rev=1202191&r1=1202190&r2=1202191&view=diff
==============================================================================
--- jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/pool/PostgreSQLPersistenceManager.java (original)
+++ jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/pool/PostgreSQLPersistenceManager.java Tue Nov 15 13:50:14 2011
@@ -18,7 +18,11 @@ package org.apache.jackrabbit.core.persi
import java.sql.SQLException;
+import javax.sql.DataSource;
+
import org.apache.jackrabbit.core.persistence.PMContext;
+import org.apache.jackrabbit.core.util.db.ConnectionHelper;
+import org.apache.jackrabbit.core.util.db.PostgreSQLConnectionHelper;
/**
* Extends the {@link BundleDbPersistenceManager} by PostgreSQL specific code.
@@ -63,6 +67,14 @@ public class PostgreSQLPersistenceManage
}
/**
+ * {@inheritDoc}
+ */
+ @Override
+ protected ConnectionHelper createConnectionHelper(DataSource dataSrc) throws Exception {
+ return new PostgreSQLConnectionHelper(dataSrc, blockOnConnectionLoss);
+ }
+
+ /**
* returns the storage model
* @return the storage model
*/
Modified: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/db/ConnectionHelper.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/db/ConnectionHelper.java?rev=1202191&r1=1202190&r2=1202191&view=diff
==============================================================================
--- jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/db/ConnectionHelper.java (original)
+++ jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/db/ConnectionHelper.java Tue Nov 15 13:50:14 2011
@@ -77,6 +77,11 @@ public class ConnectionHelper {
protected final DataSource dataSource;
private ThreadLocal<Connection> batchConnectionTl = new ThreadLocal<Connection>();
+
+ /**
+ * The default fetchSize is '0'. This means the fetchSize Hint will be ignored
+ */
+ private int fetchSize = 0;
/**
* @param dataSrc the {@link DataSource} on which this instance acts
@@ -101,6 +106,19 @@ public class ConnectionHelper {
}
/**
+ * @param dataSrc the {@link DataSource} on which this instance acts
+ * @param checkWithUserName whether the username is to be used for the {@link #tableExists(String)} method
+ * @param block whether the helper should transparently block on DB connection loss (otherwise it throws exceptions)
+ * @param fetchSize the fetchSize that will be used per default
+ */
+ protected ConnectionHelper(DataSource dataSrc, boolean checkWithUserName, boolean block, int fetchSize) {
+ dataSource = dataSrc;
+ checkTablesWithUserName = checkWithUserName;
+ blockOnConnectionLoss = block;
+ this.fetchSize = fetchSize;
+ }
+
+ /**
* A utility method that makes sure that <code>identifier</code> does only consist of characters that are
* allowed in names on the target database. Illegal characters will be escaped as necessary.
*
@@ -355,11 +373,11 @@ public class ConnectionHelper {
stmt = con.prepareStatement(sql);
}
stmt.setMaxRows(maxRows);
- int fetchSize = 10000;
- if (0 < maxRows && maxRows < fetchSize) {
- fetchSize = maxRows; // JCR-3090
+ int currentFetchSize = this.fetchSize;
+ if (0 < maxRows && maxRows < currentFetchSize) {
+ currentFetchSize = maxRows; // JCR-3090
}
- stmt.setFetchSize(fetchSize);
+ stmt.setFetchSize(currentFetchSize);
execute(stmt, params);
if (returnGeneratedKeys) {
rs = stmt.getGeneratedKeys();
@@ -381,7 +399,7 @@ public class ConnectionHelper {
}
}
- /**
+ /**
* Gets a connection based on the {@code batchMode} state of this helper. The connection should be closed
* by a call to {@link #closeResources(Connection, Statement, ResultSet)} which also takes the {@code
* batchMode} state into account.