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 2014/04/17 18:09:40 UTC

svn commit: r1588298 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java

Author: reschke
Date: Thu Apr 17 16:09:40 2014
New Revision: 1588298

URL: http://svn.apache.org/r1588298
Log:
OAK-1746 - disable "limit" support for now

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=1588298&r1=1588297&r2=1588298&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 Thu Apr 17 16:09:40 2014
@@ -753,9 +753,10 @@ public class RDBDocumentStore implements
             t += " and MODIFIED >= ?";
         }
         t += " order by ID";
-        if (limit != Integer.MAX_VALUE) {
-            t += " limit ?";
-        }
+        // TODO: OAK-1746
+        //        if (limit != Integer.MAX_VALUE) {
+        //            t += " limit ?";
+        //        }
         PreparedStatement stmt = connection.prepareStatement(t);
         List<String> result = new ArrayList<String>();
         try {
@@ -765,11 +766,12 @@ public class RDBDocumentStore implements
             if (indexedProperty != null) {
                 stmt.setLong(si++, startValue);
             }
-            if (limit != Integer.MAX_VALUE) {
-                stmt.setInt(si++, limit);
-            }
+            // TODO: OAK-1746
+            //            if (limit != Integer.MAX_VALUE) {
+            //                stmt.setInt(si++, limit);
+            //            }
             ResultSet rs = stmt.executeQuery();
-            while (rs.next()) {
+            while (rs.next() && result.size() < limit) {
                 String data = getData(rs, 1, 2);
                 result.add(data);
             }