Author: reschke
Date: Tue Nov 24 15:56:20 2015
New Revision: 1716186
URL: http://svn.apache.org/viewvc?rev=1716186&view=rev
Log:
OAK-3676: RDBDocumentStore on SQLServer: append logic creates many different
PreparedStatements (ported to 1.2)
Modified:
jackrabbit/oak/branches/1.2/ (props changed)
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java
Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 24 15:56:20 2015
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673713,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674228,1674780,1674880,1675054-1675055,1675319,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678023,1678095-1678096,1678124,1678171,1678173,1678211,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679503,1679958,1679961,1680170,1680172,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1681921,1681955,1682042,1682218,1682235,1682437,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174-1684175,1684186,1684376,1684442,1684561,1684570,1684601,1684618
,1684820,1684868,1685023,1685075,1685370,1685552,1685589-1685590,1685840,1685964,1685977,1685989,1685999,1686023,1686032,1686097,1686162,1686229,1686234,1686253,1686414,1686780,1686854,1686857,1686971,1687053-1687055,1687175,1687196,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688089-1688090,1688172,1688179,1688349,1688421,1688436,1688453,1688616,1688622,1688634,1688636,1688817,1689003-1689004,1689008,1689577,1689581,1689623,1689810,1689828,1689831,1689833,1689903,1690017,1690043,1690047,1690057,1690247,1690249,1690634-1690637,1690650,1690669,1690674,1690885,1690941,1691139,1691151,1691159,1691167,1691183,1691188,1691210,1691280,1691307,1691331-1691333,1691345,1691384-1691385,1691401,1691509,1692133-1692134,1692156,1692250,1692274,1692363,1692382,1692478,1692955,1693002,1693030,1693050,1693209,1693421,1693525-1693526,1694007,1694393-1694394,1694651,1694653-1694654,1695032,1695050,1695122,1695280,1695299,1695420,1695457,1695482,1695492,1695507,1695521,1695540,1695905,1696
190,1696194,1696242,1696285,1696375,1696522,1696578,1696759,1696916,1697363,1697373,1697410,1697582,1697589,1697616,1697672,1700191,1700231,1700397,1700403,1700506,1700571,1700718,1700727,1700749,1700769,1700775,1701065,1701619,1701733,1701743,1701750,1701768,1701806,1701810,1701814,1701948,1701955,1701959,1701965,1701986,1702014,1702022,1702045,1702051,1702241,1702272,1702387,1702405,1702423,1702860,1702942,1702960,1703212,1703382,1703395,1703411,1703428,1703430,1703568,1703592,1703758,1703858,1703878,1704256,1704282,1704285,1704457,1704479,1704490,1704614,1704629,1704636,1704655,1704670,1704886,1705005,1705027,1705043,1705055,1705250,1705268,1705273,1705323,1705677,1705701,1705871,1705992,1705998,1706009,1706037,1706059,1706212,1706218,1706270,1706764,1706772,1707049,1707191,1707435,1708105,1708315,1708546,1708592,1708766,1709012,1709852,1709978,1710013,1710031,1710049,1710205,1710242,1710559,1710575,1710590,1710614,1710637,1710789,1710811,1710816,1710972,1711248,1711282,1711296,1
711498,1712018,1712042,1712319,1712490,1712531,1712730,1712785,1712963,1713008,1713439,1713461,1713580,1713586,1713599-1713600,1713626,1713698,1713803,1713809,1714034,1714061,1714084,1714170,1714213,1714229,1714238,1714519-1714520,1714543-1714544,1714730,1714739,1714779,1714956,1714961,1715010,1715191,1715767,1715771,1715888,1715898
+/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673713,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674228,1674780,1674880,1675054-1675055,1675319,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678023,1678095-1678096,1678124,1678171,1678173,1678211,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679503,1679958,1679961,1680170,1680172,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1681921,1681955,1682042,1682218,1682235,1682437,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174-1684175,1684186,1684376,1684442,1684561,1684570,1684601,1684618
,1684820,1684868,1685023,1685075,1685370,1685552,1685589-1685590,1685840,1685964,1685977,1685989,1685999,1686023,1686032,1686097,1686162,1686229,1686234,1686253,1686414,1686780,1686854,1686857,1686971,1687053-1687055,1687175,1687196,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688089-1688090,1688172,1688179,1688349,1688421,1688436,1688453,1688616,1688622,1688634,1688636,1688817,1689003-1689004,1689008,1689577,1689581,1689623,1689810,1689828,1689831,1689833,1689903,1690017,1690043,1690047,1690057,1690247,1690249,1690634-1690637,1690650,1690669,1690674,1690885,1690941,1691139,1691151,1691159,1691167,1691183,1691188,1691210,1691280,1691307,1691331-1691333,1691345,1691384-1691385,1691401,1691509,1692133-1692134,1692156,1692250,1692274,1692363,1692382,1692478,1692955,1693002,1693030,1693050,1693209,1693421,1693525-1693526,1694007,1694393-1694394,1694651,1694653-1694654,1695032,1695050,1695122,1695280,1695299,1695420,1695457,1695482,1695492,1695507,1695521,1695540,1695905,1696
190,1696194,1696242,1696285,1696375,1696522,1696578,1696759,1696916,1697363,1697373,1697410,1697582,1697589,1697616,1697672,1700191,1700231,1700397,1700403,1700506,1700571,1700718,1700727,1700749,1700769,1700775,1701065,1701619,1701733,1701743,1701750,1701768,1701806,1701810,1701814,1701948,1701955,1701959,1701965,1701986,1702014,1702022,1702045,1702051,1702241,1702272,1702387,1702405,1702423,1702860,1702942,1702960,1703212,1703382,1703395,1703411,1703428,1703430,1703568,1703592,1703758,1703858,1703878,1704256,1704282,1704285,1704457,1704479,1704490,1704614,1704629,1704636,1704655,1704670,1704886,1705005,1705027,1705043,1705055,1705250,1705268,1705273,1705323,1705677,1705701,1705871,1705992,1705998,1706009,1706037,1706059,1706212,1706218,1706270,1706764,1706772,1707049,1707191,1707435,1708105,1708315,1708546,1708592,1708766,1709012,1709852,1709978,1710013,1710031,1710049,1710205,1710242,1710559,1710575,1710590,1710614,1710637,1710789,1710811,1710816,1710972,1711248,1711282,1711296,1
711498,1712018,1712042,1712319,1712490,1712531,1712730,1712785,1712963,1713008,1713439,1713461,1713580,1713586,1713599-1713600,1713626,1713698,1713803,1713809,1714034,1714061,1714084,1714170,1714213,1714229,1714238,1714519-1714520,1714543-1714544,1714730,1714739,1714779,1714956,1714961,1715010,1715191,1715767,1715771,1715888,1715898,1716178
/jackrabbit/trunk:1345480
Modified:
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java?rev=1716186&r1=1716185&r2=1716186&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java
Tue Nov 24 15:56:20 2015
@@ -40,6 +40,7 @@ import org.slf4j.LoggerFactory;
* Defines variation in the capabilities of different RDBs.
*/
public enum RDBDocumentStoreDB {
+
DEFAULT("default") {
},
@@ -237,9 +238,22 @@ public enum RDBDocumentStoreDB {
}
@Override
- public String getConcatQueryString(int dataOctetLimit, int dataLength)
{
- return "CONCAT(DATA, ?)";
+ public PreparedStatementComponent getConcatQuery(final String
appendData, final int dataOctetLimit) {
+ return new PreparedStatementComponent() {
+
+ @Override
+ public String getStatementComponent() {
+ return "CONCAT(DATA, ?)";
+ }
+
+ @Override
+ public int setParameters(PreparedStatement stmt, int
startIndex) throws SQLException {
+ stmt.setString(startIndex++, appendData);
+ return startIndex;
+ }
+ };
}
+
@Override
public String getAdditionalDiagnostics(RDBConnectionHandler ch, String
tableName) {
Connection con = null;
@@ -293,14 +307,23 @@ public enum RDBDocumentStoreDB {
}
@Override
- public String getConcatQueryString(int dataOctetLimit, int dataLength)
{
- /*
- * To avoid truncation when concatenating force an error when limit
- * is above the octet limit
- */
- return "CASE WHEN LEN(DATA) < " + (dataOctetLimit - dataLength) +
" THEN (DATA + CAST(? AS nvarchar(" + dataOctetLimit
- + "))) ELSE (DATA + CAST(DATA AS nvarchar(max))) END";
+ public PreparedStatementComponent getConcatQuery(final String
appendData, final int dataOctetLimit) {
+ return new PreparedStatementComponent() {
+
+ @Override
+ // this statement ensures that SQL server will generate an
exception on overflow
+ public String getStatementComponent() {
+ return "CASE WHEN LEN(DATA) < ? THEN (DATA + CAST(? AS
nvarchar(" + dataOctetLimit
+ + "))) ELSE (DATA + CAST(DATA AS nvarchar(max)))
END";
+ }
+ @Override
+ public int setParameters(PreparedStatement stmt, int
startIndex) throws SQLException {
+ stmt.setInt(startIndex++, dataOctetLimit -
appendData.length());
+ stmt.setString(startIndex++, appendData);
+ return startIndex;
+ }
+ };
}
@Override
@@ -346,6 +369,29 @@ public enum RDBDocumentStoreDB {
FETCHFIRST, LIMIT, TOP
};
+
+ /**
+ * Provides a component for a {@link PreparedStatement} and a method for
setting the
+ * parameters within this component
+ */
+ public interface PreparedStatementComponent {
+
+ /**
+ * @return a string suitable for inclusion into a {@link
PreparedStatement}
+ */
+ @Nonnull
+ public String getStatementComponent();
+
+ /**
+ * Set the parameters need by the statement component returned by
{@link #getStatementComponent()}
+ * @param stmt the statement
+ * @param index of first parameter to set
+ * @return index of next parameter to set
+ * @throws SQLException
+ */
+ public int setParameters(PreparedStatement stmt, int startIndex)
throws SQLException;
+ }
+
/**
* Check the database brand and version
*/
@@ -378,15 +424,26 @@ public enum RDBDocumentStoreDB {
* Returns the CONCAT function or its equivalent function or sub-query.
Note
* that the function MUST NOT cause a truncated value to be written!
*
+ * @param appendData
+ * string to be inserted
* @param dataOctetLimit
* expected capacity of data column
- * @param dataLength
- * length of string to be inserted
- *
- * @return the concat query string
*/
- public String getConcatQueryString(int dataOctetLimit, int dataLength) {
- return "DATA || CAST(? AS varchar(" + dataOctetLimit + "))";
+ public PreparedStatementComponent getConcatQuery(final String appendData,
final int dataOctetLimit) {
+
+ return new PreparedStatementComponent() {
+
+ @Override
+ public String getStatementComponent() {
+ return "DATA || CAST(? AS varchar(" + dataOctetLimit + "))";
+ }
+
+ @Override
+ public int setParameters(PreparedStatement stmt, int startIndex)
throws SQLException {
+ stmt.setString(startIndex++, appendData);
+ return startIndex;
+ }
+ };
}
/**
Modified:
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java?rev=1716186&r1=1716185&r2=1716186&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java
Tue Nov 24 15:56:20 2015
@@ -43,6 +43,7 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.document.UpdateOp.Key;
import
org.apache.jackrabbit.oak.plugins.document.rdb.RDBDocumentStore.RDBTableMetaData;
import
org.apache.jackrabbit.oak.plugins.document.rdb.RDBDocumentStoreDB.FETCHFIRSTSYNTAX;
+import
org.apache.jackrabbit.oak.plugins.document.rdb.RDBDocumentStoreDB.PreparedStatementComponent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -71,11 +72,13 @@ public class RDBDocumentStoreJDBC {
public boolean appendingUpdate(Connection connection, RDBTableMetaData
tmd, String id, Long modified,
boolean setModifiedConditionally, Boolean hasBinary, Boolean
deletedOnce, Long modcount, Long cmodcount,
Long oldmodcount, String appendData) throws SQLException {
+ String appendDataWithComma = "," + appendData;
+ PreparedStatementComponent stringAppend =
this.dbInfo.getConcatQuery(appendDataWithComma, tmd.getDataLimitInOctets());
StringBuilder t = new StringBuilder();
t.append("update " + tmd.getName() + " set ");
t.append(setModifiedConditionally ? "MODIFIED = case when ? > MODIFIED
then ? else MODIFIED end, " : "MODIFIED = ?, ");
t.append("HASBINARY = ?, DELETEDONCE = ?, MODCOUNT = ?, CMODCOUNT = ?,
DSIZE = DSIZE + ?, ");
- t.append("DATA = " +
this.dbInfo.getConcatQueryString(tmd.getDataLimitInOctets(),
appendData.length()) + " ");
+ t.append("DATA = " + stringAppend.getStatementComponent() + " ");
t.append("where ID = ?");
if (oldmodcount != null) {
t.append(" and MODCOUNT = ?");
@@ -91,8 +94,8 @@ public class RDBDocumentStoreJDBC {
stmt.setObject(si++, deletedOnce ? 1 : 0, Types.SMALLINT);
stmt.setObject(si++, modcount, Types.BIGINT);
stmt.setObject(si++, cmodcount == null ? Long.valueOf(0) :
cmodcount, Types.BIGINT);
- stmt.setObject(si++, 1 + appendData.length(), Types.BIGINT);
- stmt.setString(si++, "," + appendData);
+ stmt.setObject(si++, appendDataWithComma.length(), Types.BIGINT);
+ si = stringAppend.setParameters(stmt, si);
setIdInStatement(tmd, stmt, si++, id);
if (oldmodcount != null) {
@@ -110,11 +113,13 @@ public class RDBDocumentStoreJDBC {
public boolean batchedAppendingUpdate(Connection connection,
RDBTableMetaData tmd, List<String> ids, Long modified,
boolean setModifiedConditionally, String appendData) throws
SQLException {
+ String appendDataWithComma = "," + appendData;
+ PreparedStatementComponent stringAppend =
this.dbInfo.getConcatQuery(appendDataWithComma, tmd.getDataLimitInOctets());
StringBuilder t = new StringBuilder();
t.append("update " + tmd.getName() + " set ");
t.append(setModifiedConditionally ? "MODIFIED = case when ? > MODIFIED
then ? else MODIFIED end, " : "MODIFIED = ?, ");
t.append("MODCOUNT = MODCOUNT + 1, DSIZE = DSIZE + ?, ");
- t.append("DATA = " +
this.dbInfo.getConcatQueryString(tmd.getDataLimitInOctets(),
appendData.length() + 1) + " ");
+ t.append("DATA = " + stringAppend.getStatementComponent() + " ");
t.append("where ID in (");
for (int i = 0; i < ids.size(); i++) {
if (i != 0) {
@@ -130,8 +135,8 @@ public class RDBDocumentStoreJDBC {
if (setModifiedConditionally) {
stmt.setObject(si++, modified, Types.BIGINT);
}
- stmt.setObject(si++, 1 + appendData.length(), Types.BIGINT);
- stmt.setString(si++, "," + appendData);
+ stmt.setObject(si++, appendDataWithComma.length(), Types.BIGINT);
+ si = stringAppend.setParameters(stmt, si);
for (String id : ids) {
setIdInStatement(tmd, stmt, si++, id);
}
