You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2015/12/29 16:15:46 UTC
svn commit: r1722147 - in /jackrabbit/oak/branches/1.2: ./
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/
oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/
oak-core/src/test/java/org/apache/jackrabbit/oak/p...
Author: reschke
Date: Tue Dec 29 15:15:45 2015
New Revision: 1722147
URL: http://svn.apache.org/viewvc?rev=1722147&view=rev
Log:
OAK-3807: Oracle DB doesn't support lists longer than 1000 (ported to 1.2)
Add generic generator for "in" clauses and use it throughout
Added:
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBToolsTest.java
- copied unchanged from r1722141, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBToolsTest.java
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/RDBBlobStore.java
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
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBJDBCTools.java
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/RDBBlobStoreTest.java
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStoreFriend.java
Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 29 15:15:45 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,1695571,1695
905,1696190,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,1707509,1708105,1708315,1708546,1708592,1708766,1709012,1709852,1709978,1710013,1710031,1710049,1710205,1710242,1710559,1710575,1710590,1710614,1710637,1710789,1710800,1710811,1710816,1710972,1
711248,1711282,1711296,1711498,1711654,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,1715346,1715767,1715771,1715888,1715898,1716178,1716426,1716576,1716596,1716616,1716703,1716712,1716815,1716823,1716830,1716883,1717277,1717462,1717632,1717784,1717988,1718626,1718646,1718801,1718895,1719111,1719288,1720335,1720500,1721160,1721172
+/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,1695571,1695
905,1696190,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,1707509,1708105,1708315,1708546,1708592,1708766,1709012,1709852,1709978,1710013,1710031,1710049,1710205,1710242,1710559,1710575,1710590,1710614,1710637,1710789,1710800,1710811,1710816,1710972,1
711248,1711282,1711296,1711498,1711654,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,1715346,1715767,1715771,1715888,1715898,1716178,1716426,1716576,1716596,1716616,1716703,1716712,1716815,1716823,1716830,1716883,1717277,1717462,1717632,1717784,1717988,1718626,1718646,1718801,1718895,1719111,1719288,1720335,1720500,1721160,1721172,1722141
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStore.java?rev=1722147&r1=1722146&r2=1722147&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStore.java (original)
+++ jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStore.java Tue Dec 29 15:15:45 2015
@@ -42,6 +42,7 @@ import javax.sql.DataSource;
import org.apache.jackrabbit.oak.commons.StringUtils;
import org.apache.jackrabbit.oak.plugins.blob.CachingBlobStore;
import org.apache.jackrabbit.oak.plugins.document.DocumentStoreException;
+import org.apache.jackrabbit.oak.plugins.document.rdb.RDBJDBCTools.PreparedStatementComponent;
import org.apache.jackrabbit.oak.spi.blob.AbstractBlobStore;
import org.apache.jackrabbit.oak.util.OakVersion;
import org.slf4j.Logger;
@@ -497,31 +498,28 @@ public class RDBBlobStore extends Cachin
PreparedStatement prepData = null;
try {
- StringBuilder inClause = new StringBuilder();
- int batch = chunkIds.size();
- for (int i = 0; i < batch; i++) {
- inClause.append('?');
- if (i != batch - 1) {
- inClause.append(',');
- }
- }
+ PreparedStatementComponent inClause = RDBJDBCTools.createInStatement("ID", chunkIds, false);
+
+ StringBuilder metaStatement = new StringBuilder("delete from " + this.tnMeta + " where ")
+ .append(inClause.getStatementComponent());
+ StringBuilder dataStatement = new StringBuilder("delete from " + this.tnData + " where ")
+ .append(inClause.getStatementComponent());
if (maxLastModifiedTime > 0) {
- prepMeta = con.prepareStatement("delete from " + this.tnMeta + " where ID in (" + inClause.toString()
- + ") and LASTMOD <= ?");
- prepMeta.setLong(batch + 1, maxLastModifiedTime);
-
- prepData = con.prepareStatement("delete from " + this.tnData + " where ID in (" + inClause.toString()
- + ") and not exists(select * from " + this.tnMeta + " m where ID = m.ID and m.LASTMOD <= ?)");
- prepData.setLong(batch + 1, maxLastModifiedTime);
- } else {
- prepMeta = con.prepareStatement("delete from " + this.tnMeta + " where ID in (" + inClause.toString() + ")");
- prepData = con.prepareStatement("delete from " + this.tnData + " where ID in (" + inClause.toString() + ")");
+ metaStatement.append(" and LASTMOD <= ?");
+ dataStatement.append(" and not exists(select * from " + this.tnMeta + " m where ID = m.ID and m.LASTMOD <= ?)");
}
- for (int idx = 0; idx < batch; idx++) {
- prepMeta.setString(idx + 1, chunkIds.get(idx));
- prepData.setString(idx + 1, chunkIds.get(idx));
+ prepMeta = con.prepareStatement(metaStatement.toString());
+ prepData = con.prepareStatement(dataStatement.toString());
+
+ int mindex = 1, dindex = 1;
+ mindex = inClause.setParameters(prepMeta, mindex);
+ dindex = inClause.setParameters(prepData, dindex);
+
+ if (maxLastModifiedTime > 0) {
+ prepMeta.setLong(mindex, maxLastModifiedTime);
+ prepData.setLong(dindex, maxLastModifiedTime);
}
count = prepMeta.executeUpdate();
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=1722147&r1=1722146&r2=1722147&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 Dec 29 15:15:45 2015
@@ -33,6 +33,7 @@ import java.util.Map;
import javax.annotation.Nonnull;
+import org.apache.jackrabbit.oak.plugins.document.rdb.RDBJDBCTools.PreparedStatementComponent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -369,29 +370,6 @@ 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
*/
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=1722147&r1=1722146&r2=1722147&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 Dec 29 15:15:45 2015
@@ -48,7 +48,7 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.document.rdb.RDBDocumentStore.QueryCondition;
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.apache.jackrabbit.oak.plugins.document.rdb.RDBJDBCTools.PreparedStatementComponent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -120,19 +120,13 @@ public class RDBDocumentStoreJDBC {
boolean setModifiedConditionally, String appendData) throws SQLException {
String appendDataWithComma = "," + appendData;
PreparedStatementComponent stringAppend = this.dbInfo.getConcatQuery(appendDataWithComma, tmd.getDataLimitInOctets());
+ PreparedStatementComponent inClause = RDBJDBCTools.createInStatement("ID", ids, tmd.isIdBinary());
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 = " + stringAppend.getStatementComponent() + " ");
- t.append("where ID in (");
- for (int i = 0; i < ids.size(); i++) {
- if (i != 0) {
- t.append(',');
- }
- t.append('?');
- }
- t.append(")");
+ t.append("where ").append(inClause.getStatementComponent());
PreparedStatement stmt = connection.prepareStatement(t.toString());
try {
int si = 1;
@@ -142,9 +136,7 @@ public class RDBDocumentStoreJDBC {
}
stmt.setObject(si++, appendDataWithComma.length(), Types.BIGINT);
si = stringAppend.setParameters(stmt, si);
- for (String id : ids) {
- setIdInStatement(tmd, stmt, si++, id);
- }
+ si = inClause.setParameters(stmt, si);
int result = stmt.executeUpdate();
if (result != ids.size()) {
LOG.debug("DB update failed: only " + result + " of " + ids.size() + " updated. Table: " + tmd.getName() + ", IDs:"
@@ -159,24 +151,12 @@ public class RDBDocumentStoreJDBC {
public int delete(Connection connection, RDBTableMetaData tmd, List<String> ids) throws SQLException {
PreparedStatement stmt;
int cnt = ids.size();
-
- if (cnt == 1) {
- stmt = connection.prepareStatement("delete from " + tmd.getName() + " where ID=?");
- } else {
- StringBuilder inClause = new StringBuilder();
- for (int i = 0; i < cnt; i++) {
- inClause.append('?');
- if (i != cnt - 1) {
- inClause.append(',');
- }
- }
- stmt = connection.prepareStatement("delete from " + tmd.getName() + " where ID in (" + inClause.toString() + ")");
- }
+ PreparedStatementComponent inClause = RDBJDBCTools.createInStatement("ID", ids, tmd.isIdBinary());
+ String sql = "delete from " + tmd.getName() + " where " + inClause.getStatementComponent();
+ stmt = connection.prepareStatement(sql);
try {
- for (int i = 0; i < cnt; i++) {
- setIdInStatement(tmd, stmt, i + 1, ids.get(i));
- }
+ inClause.setParameters(stmt, 1);
int result = stmt.executeUpdate();
if (result != cnt) {
LOG.debug("DB delete failed for " + tmd.getName() + "/" + ids);
Modified: jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBJDBCTools.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBJDBCTools.java?rev=1722147&r1=1722146&r2=1722147&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBJDBCTools.java (original)
+++ jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBJDBCTools.java Tue Dec 29 15:15:45 2015
@@ -16,8 +16,13 @@
*/
package org.apache.jackrabbit.oak.plugins.document.rdb;
+import static com.google.common.collect.Iterables.cycle;
+import static com.google.common.collect.Iterables.limit;
+
+import java.io.UnsupportedEncodingException;
import java.sql.Connection;
import java.sql.DatabaseMetaData;
+import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
import java.sql.SQLException;
@@ -32,8 +37,11 @@ import java.util.TreeMap;
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
+import org.apache.jackrabbit.oak.plugins.document.DocumentStoreException;
import org.slf4j.LoggerFactory;
+import com.google.common.base.Joiner;
+
/**
* Convenience methods dealing with JDBC specifics.
*/
@@ -240,4 +248,114 @@ public class RDBJDBCTools {
return null;
}
+
+ /**
+ * 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;
+ }
+
+ /**
+ * Appends following SQL condition to the builder: {@code ID in (?,?,?)}.
+ * The field name {@code ID} and the number of place holders is
+ * configurable. If the number of place holders is greater than
+ * {@code maxListLength}, then the condition will have following form:
+ * {@code (ID in (?,?,?) or ID in (?,?,?) or ID in (?,?))}
+ *
+ * @param builder
+ * the condition will be appended here
+ * @param field
+ * name of the field
+ * @param placeholdersCount
+ * how many ? should be included
+ * @param maxListLength
+ * what's the max number of ? in one list
+ */
+ protected static void appendInCondition(StringBuilder builder, String field, int placeholdersCount, int maxListLength) {
+ if (placeholdersCount == 1) {
+ builder.append(field).append(" = ?");
+ } else if (placeholdersCount > 0) {
+
+ if (placeholdersCount > maxListLength) {
+ builder.append('(');
+ }
+
+ int i;
+ for (i = 0; i < placeholdersCount / maxListLength; i++) {
+ if (i > 0) {
+ builder.append(" or ");
+ }
+ appendInCondition(builder, field, maxListLength);
+ }
+
+ if (placeholdersCount % maxListLength > 0) {
+ if (i > 0) {
+ builder.append(" or ");
+ }
+ appendInCondition(builder, field, placeholdersCount % maxListLength);
+ }
+
+ if (placeholdersCount > maxListLength) {
+ builder.append(')');
+ }
+ }
+ }
+
+ private static void appendInCondition(StringBuilder builder, String field, int placeholdersCount) {
+ builder.append(field).append(" in (");
+ Joiner.on(',').appendTo(builder, limit(cycle('?'), placeholdersCount));
+ builder.append(')');
+ }
+
+ public static PreparedStatementComponent createInStatement(final String fieldName, final List<String> values,
+ final boolean binary) {
+ return new PreparedStatementComponent() {
+
+ @Override
+ public String getStatementComponent() {
+ StringBuilder sb = new StringBuilder(values.size() * 3);
+ // maximum "in" statement in Oracle takes 1000 values
+ appendInCondition(sb, fieldName, values.size(), 1000);
+ return sb.toString();
+ }
+
+ @Override
+ public int setParameters(PreparedStatement stmt, int startIndex) throws SQLException {
+ for (String value : values) {
+ if (binary) {
+ try {
+ stmt.setBytes(startIndex++, value.getBytes("UTF-8"));
+ } catch (UnsupportedEncodingException ex) {
+ LOG.error("UTF-8 not supported??", ex);
+ throw new DocumentStoreException(ex);
+ }
+ } else {
+ stmt.setString(startIndex++, value);
+ }
+ }
+ return startIndex;
+ }
+ };
+ }
}
Modified: jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/RDBBlobStoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/RDBBlobStoreTest.java?rev=1722147&r1=1722146&r2=1722147&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/RDBBlobStoreTest.java (original)
+++ jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/RDBBlobStoreTest.java Tue Dec 29 15:15:45 2015
@@ -28,6 +28,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Random;
+import org.apache.jackrabbit.oak.commons.StringUtils;
import org.apache.jackrabbit.oak.plugins.document.rdb.RDBBlobStore;
import org.apache.jackrabbit.oak.plugins.document.rdb.RDBBlobStoreFriend;
import org.apache.jackrabbit.oak.spi.blob.AbstractBlobStoreTest;
@@ -136,6 +137,29 @@ public class RDBBlobStoreTest extends Ab
}
@Test
+ public void testDeleteManyBlobs() throws Exception {
+ // see https://issues.apache.org/jira/browse/OAK-3807
+ int count = 2000;
+ List<String> toDelete = new ArrayList<String>();
+
+ for (int i = 0; i < count; i++) {
+ byte[] data = new byte[256];
+ Random r = new Random(0);
+ r.nextBytes(data);
+ byte[] digest = getDigest(data);
+ RDBBlobStoreFriend.storeBlock(blobStore, digest, 0, data);
+ byte[] data2 = RDBBlobStoreFriend.readBlockFromBackend(blobStore, digest);
+ if (!Arrays.equals(data, data2)) {
+ throw new Exception("data mismatch for length " + data.length);
+ }
+ String id = StringUtils.convertBytesToHex(digest);
+ toDelete.add(id);
+ }
+
+ RDBBlobStoreFriend.deleteChunks(blobStore, toDelete, System.currentTimeMillis() + 1000);
+ }
+
+ @Test
public void testResilienceMissingMetaEntry() throws Exception {
int test = 1024 * 1024;
byte[] data = new byte[test];
Modified: jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStoreFriend.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStoreFriend.java?rev=1722147&r1=1722146&r2=1722147&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStoreFriend.java (original)
+++ jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStoreFriend.java Tue Dec 29 15:15:45 2015
@@ -21,6 +21,7 @@ import static org.apache.jackrabbit.oak.
import java.io.IOException;
import java.sql.Connection;
import java.sql.PreparedStatement;
+import java.util.List;
import org.apache.jackrabbit.oak.commons.StringUtils;
@@ -48,4 +49,8 @@ public class RDBBlobStoreFriend {
ds.ch.closeConnection(con);
}
}
+
+ public static void deleteChunks(RDBBlobStore ds, List<String> chunkIds, long maxLastModifiedTime) throws Exception {
+ ds.deleteChunks(chunkIds, maxLastModifiedTime);
+ }
}