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 2019/07/10 04:58:09 UTC

svn commit: r1862847 - in /jackrabbit/oak/branches/1.6/oak-core: ./ src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java

Author: reschke
Date: Wed Jul 10 04:58:09 2019
New Revision: 1862847

URL: http://svn.apache.org/viewvc?rev=1862847&view=rev
Log:
OAK-7181: RDBDocumentStore: use try-with-resources for ChangesTracker (merged r1821663 into 1.6)

Modified:
    jackrabbit/oak/branches/1.6/oak-core/   (props changed)
    jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java

Propchange: jackrabbit/oak/branches/1.6/oak-core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 10 04:58:09 2019
@@ -3,5 +3,5 @@
 /jackrabbit/oak/trunk:1834823
 /jackrabbit/oak/trunk/oak-blob-plugins:1819950
 /jackrabbit/oak/trunk/oak-core:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782476,1782770,1782945,1782966,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783731,1783733,1783738,1783742,1783773,1783855,1783891,1784023,1784034,1784130,1784162,1784251,1784401,1784551,1784574,1784689,1785095,1785108,1785283,1785652,1785838,1785917,1785919,1785946,1786122,1787074,1787145,1787151,1787217,1787425,1788056,1788378,1788387-1788389,1788463,1788476,1788850,1789056,1789441,1789534,1789925,1789940,1789987,1790006,1790013,1790069,1790077,1790079,1790382,1792049,1792463,1792742,1792746,1793013,1793088,1793618,1793627,1793644,1794393,1794417,1794683,1795138,1795314,1795330,1795475,1795488,1795491,1795502,1795594,1795613,1795618,1796144,1796230,1796239,1796274,1796278,1796988,1797378,1798035,1798832,1798834,1799219,1799389,1799393,1799861,1799924,1800269,1800606,1800613,1800974,1801011,1801013,1801118-1801119,1801675,1802260,180226
 2,1802286,1802548,1802905,1802934,1802938,1802973,1803026,1803247-1803249,1803951,1803953-1803955,1804437,1805851-1805852,1806668,1807308,1807688,1808125,1808128,1808142,1808240,1808246,1809024,1809026,1809131,1809163,1809178-1809179,1809253,1809255-1809256,1810084,1811380,1811952,1811963,1811986,1814332,1818645,1821325,1821358,1821516,1830160,1840226,1846057,1846162
-/jackrabbit/oak/trunk/oak-store-document:1809866,1811575,1811702,1811709,1811823,1811835,1811931,1812739,1812750,1812753,1814407,1814499,1814579,1815450,1815466,1815940,1816436,1817379,1817772,1818301,1818303,1818903,1818906,1819421,1820199,1820661,1821130,1821477,1821487,1821617,1823163,1823169,1824962,1825065,1825442,1825470,1826833,1828349,1828868,1830048,1830209,1834610,1834823,1838076,1840455,1842089,1848073,1852451,1852492-1852493,1854455,1854701,1854827,1854930,1860202
+/jackrabbit/oak/trunk/oak-store-document:1809866,1811575,1811702,1811709,1811823,1811835,1811931,1812739,1812750,1812753,1814407,1814499,1814579,1815450,1815466,1815940,1816436,1817379,1817772,1818301,1818303,1818903,1818906,1819421,1820199,1820661,1821130,1821477,1821487,1821617,1821663,1823163,1823169,1824962,1825065,1825442,1825470,1826833,1828349,1828868,1830048,1830209,1834610,1834823,1838076,1840455,1842089,1848073,1852451,1852492-1852493,1854455,1854701,1854827,1854930,1860202
 /jackrabbit/trunk/oak-core:1345480

Modified: jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java?rev=1862847&r1=1862846&r2=1862847&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java (original)
+++ jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java Wed Jul 10 04:58:09 2019
@@ -453,6 +453,24 @@ public class RDBDocumentStore implements
         return result;
     }
 
+    @CheckForNull
+    private <T extends Document> CacheChangesTracker obtainTracker(Collection<T> collection, Set<String> keys) {
+        if (collection == Collection.NODES) {
+            return this.nodesCache.registerTracker(keys);
+        } else {
+            return null;
+        }
+    }
+
+    @CheckForNull
+    private <T extends Document> CacheChangesTracker obtainTracker(Collection<T> collection, String fromKey, String toKey) {
+        if (collection == Collection.NODES) {
+            return this.nodesCache.registerTracker(fromKey, toKey);
+        } else {
+            return null;
+        }
+    }
+
     private <T extends Document> Map<UpdateOp, T> bulkUpdate(Collection<T> collection, List<UpdateOp> updates, Map<String, T> oldDocs, boolean upsert) {
         Set<String> missingDocs = new HashSet<String>();
         for (UpdateOp op : updates) {
@@ -462,12 +480,7 @@ public class RDBDocumentStore implements
         }
         oldDocs.putAll(readDocumentsUncached(collection, missingDocs));
 
-        CacheChangesTracker tracker = null;
-        if (collection == Collection.NODES) {
-            tracker = nodesCache.registerTracker(Sets.union(oldDocs.keySet(), missingDocs));
-        }
-
-        try {
+        try (CacheChangesTracker tracker = obtainTracker(collection, Sets.union(oldDocs.keySet(), missingDocs) )) {
             List<T> docsToUpdate = new ArrayList<T>(updates.size());
             Set<String> keysToUpdate = new HashSet<String>();
             for (UpdateOp update : updates) {
@@ -514,10 +527,6 @@ public class RDBDocumentStore implements
             } finally {
                 this.ch.closeConnection(connection);
             }
-        } finally {
-            if (tracker != null) {
-                tracker.close();
-            }
         }
     }
 
@@ -1390,11 +1399,8 @@ public class RDBDocumentStore implements
 
         final Stopwatch watch = startWatch();
         int resultSize = 0;
-        CacheChangesTracker tracker = null;
-        try {
-            if (collection == Collection.NODES) {
-                tracker = nodesCache.registerTracker(fromKey, toKey);
-            }
+
+        try (CacheChangesTracker tracker = obtainTracker(collection, fromKey, toKey)) {
             long now = System.currentTimeMillis();
             connection = this.ch.getROConnection();
             String from = collection == Collection.NODES && NodeDocument.MIN_ID_VALUE.equals(fromKey) ? null : fromKey;
@@ -1456,9 +1462,6 @@ public class RDBDocumentStore implements
             LOG.error("SQL exception on query", ex);
             throw new DocumentStoreException(ex);
         } finally {
-            if (tracker != null) {
-                tracker.close();
-            }
             this.ch.closeConnection(connection);
             stats.doneQuery(watch.elapsed(TimeUnit.NANOSECONDS), collection, fromKey, toKey,
                     !conditions.isEmpty(), resultSize, -1, false);