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:02:57 UTC
svn commit: r1722141 - in /jackrabbit/oak/trunk/oak-core/src:
main/java/org/apache/jackrabbit/oak/plugins/document/rdb/
test/java/org/apache/jackrabbit/oak/plugins/document/blob/
test/java/org/apache/jackrabbit/oak/plugins/document/rdb/
Author: reschke
Date: Tue Dec 29 15:02:57 2015
New Revision: 1722141
URL: http://svn.apache.org/viewvc?rev=1722141&view=rev
Log:
OAK-3807: Oracle DB doesn't support lists longer than 1000
Add generic generator for "in" clauses and use it throughout
Added:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBToolsTest.java (with props)
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStore.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBJDBCTools.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/RDBBlobStoreTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStoreFriend.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStore.java?rev=1722141&r1=1722140&r2=1722141&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStore.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStore.java Tue Dec 29 15:02:57 2015
@@ -43,6 +43,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;
@@ -500,31 +501,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/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java?rev=1722141&r1=1722140&r2=1722141&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java Tue Dec 29 15:02:57 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/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java?rev=1722141&r1=1722140&r2=1722141&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java Tue Dec 29 15:02:57 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/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBJDBCTools.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBJDBCTools.java?rev=1722141&r1=1722140&r2=1722141&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBJDBCTools.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBJDBCTools.java Tue Dec 29 15:02:57 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/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/RDBBlobStoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/RDBBlobStoreTest.java?rev=1722141&r1=1722140&r2=1722141&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/RDBBlobStoreTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/RDBBlobStoreTest.java Tue Dec 29 15:02:57 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;
@@ -141,6 +142,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/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStoreFriend.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStoreFriend.java?rev=1722141&r1=1722140&r2=1722141&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStoreFriend.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStoreFriend.java Tue Dec 29 15:02:57 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);
+ }
}
Added: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBToolsTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBToolsTest.java?rev=1722141&view=auto
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBToolsTest.java (added)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBToolsTest.java Tue Dec 29 15:02:57 2015
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.oak.plugins.document.rdb;
+
+import static org.junit.Assert.assertEquals;
+import org.junit.Test;
+
+public class RDBToolsTest {
+
+ @Test
+ public void testAppendInCondition() {
+ assertEquals("", appendInCondition("ID", 0, 1000));
+ assertEquals("ID = ?", appendInCondition("ID", 1, 1000));
+ assertEquals("ID in (?,?,?)", appendInCondition("ID", 3, 1000));
+ assertEquals("(ID in (?,?,?) or ID in (?,?,?) or ID in (?,?,?))", appendInCondition("ID", 9, 3));
+ assertEquals("(ID in (?,?,?) or ID in (?,?,?) or ID in (?,?,?) or ID in (?,?))", appendInCondition("ID", 11, 3));
+ }
+
+ private String appendInCondition(String field, int placeholdersCount, int maxListLength) {
+ StringBuilder builder = new StringBuilder();
+ RDBJDBCTools.appendInCondition(builder, field, placeholdersCount, maxListLength);
+ return builder.toString();
+ }
+}
Propchange: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBToolsTest.java
------------------------------------------------------------------------------
svn:eol-style = native