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:56:28 UTC
svn commit: r1683094 - in /jackrabbit/oak/branches/1.2: ./
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
Author: reschke
Date: Tue Jun 2 12:56:28 2015
New Revision: 1683094
URL: http://svn.apache.org/r1683094
Log:
OAK-2949 - RDBDocumentStore: no custom SQL needed for GREATEST function (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/RDBDocumentStore.java
Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 2 12:56:28 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,1673436,1673644,1673662-1673664,1673669,1673695,1674046,1674065,1674075,1674107,1674228,1674880,1675054-1675055,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677939,1677991,1678173,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679235,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680805-1680806,1680903,1681282,1681767,1681918,1682218,1682235,1682437,1682494,1682855,1682904
+/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414,1673436,1673644,1673662-1673664,1673669,1673695,1674046,1674065,1674075,1674107,1674228,1674880,1675054-1675055,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677939,1677991,1678173,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679235,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680805-1680806,1680903,1681282,1681767,1681918,1682218,1682235,1682437,1682494,1682855,1682904,1683089
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java?rev=1683094&r1=1683093&r2=1683094&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java (original)
+++ jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java Tue Jun 2 12:56:28 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) {