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/06/02 14:49:14 UTC
svn commit: r1683089 -
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
Author: reschke
Date: Tue Jun 2 12:49:14 2015
New Revision: 1683089
URL: http://svn.apache.org/r1683089
Log:
OAK-2949 - RDBDocumentStore: no custom SQL needed for GREATEST function
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java?rev=1683089&r1=1683088&r2=1683089&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java Tue Jun 2 12:49:14 2015
@@ -599,11 +599,6 @@ public class RDBDocumentStore implements
}
@Override
- public String getGreatestQueryString(String column) {
- return "(select MAX(mod) from (VALUES (" + column + "), (?)) AS ALLMOD(mod))";
- }
-
- @Override
public String getAdditionalDiagnostics(RDBConnectionHandler ch, String tableName) {
Connection con = null;
Map<String, String> result = new HashMap<String, String>();
@@ -674,16 +669,6 @@ public class RDBDocumentStore implements
}
/**
- * Returns the GREATEST function or its equivalent function or sub-query
- * supported.
- *
- * @return the greatest query string
- */
- public String getGreatestQueryString(String column) {
- return "GREATEST(" + column + ", ?)";
- }
-
- /**
* Query for any required initialization of the DB.
*
* @return the DB initialization SQL string
@@ -1697,8 +1682,8 @@ public class RDBDocumentStore implements
private boolean dbAppendingUpdate(Connection connection, String tableName, String id, Long modified, Boolean hasBinary,
Boolean deletedOnce, Long modcount, Long cmodcount, Long oldmodcount, String appendData) throws SQLException {
StringBuilder t = new StringBuilder();
- t.append("update " + tableName + " set MODIFIED = " + this.db.getGreatestQueryString("MODIFIED")
- + ", HASBINARY = ?, DELETEDONCE = ?, MODCOUNT = ?, CMODCOUNT = ?, DSIZE = DSIZE + ?, ");
+ t.append("update " + tableName + " set MODIFIED = case when ? > MODIFIED then ? else MODIFIED end, "
+ + "HASBINARY = ?, DELETEDONCE = ?, MODCOUNT = ?, CMODCOUNT = ?, DSIZE = DSIZE + ?, ");
t.append("DATA = " + this.db.getConcatQueryString(this.dataLimitInOctets, appendData.length()) + " ");
t.append("where ID = ?");
if (oldmodcount != null) {
@@ -1708,6 +1693,7 @@ public class RDBDocumentStore implements
try {
int si = 1;
stmt.setObject(si++, modified, Types.BIGINT);
+ stmt.setObject(si++, modified, Types.BIGINT);
stmt.setObject(si++, hasBinary ? 1 : 0, Types.SMALLINT);
stmt.setObject(si++, deletedOnce ? 1 : 0, Types.SMALLINT);
stmt.setObject(si++, modcount, Types.BIGINT);
@@ -1732,8 +1718,7 @@ public class RDBDocumentStore implements
private boolean dbBatchedAppendingUpdate(Connection connection, String tableName, List<String> ids, Long modified,
String appendData) throws SQLException {
StringBuilder t = new StringBuilder();
- t.append("update " + tableName + " set MODIFIED = " + this.db.getGreatestQueryString("MODIFIED")
- + ", MODCOUNT = MODCOUNT + 1, DSIZE = DSIZE + ?, ");
+ t.append("update " + tableName + " set MODIFIED = case when ? > MODIFIED then ? else MODIFIED end, MODCOUNT = MODCOUNT + 1, DSIZE = DSIZE + ?, ");
t.append("DATA = " + this.db.getConcatQueryString(this.dataLimitInOctets, appendData.length()) + " ");
t.append("where ID in (");
for (int i = 0; i < ids.size(); i++) {
@@ -1747,6 +1732,7 @@ public class RDBDocumentStore implements
try {
int si = 1;
stmt.setObject(si++, modified, Types.BIGINT);
+ stmt.setObject(si++, modified, Types.BIGINT);
stmt.setObject(si++, 1 + appendData.length(), Types.BIGINT);
stmt.setString(si++, "," + appendData);
for (String id : ids) {