date:20171122

svn commit: r1816015 - in /jackrabbit/oak/trunk/oak-upgrade/src: main/java/org/apache/jackrabbit/oak/upgrade/ main/java/org/apache/jackrabbit/oak/upgrade/cli/ main/java/org/apache/jackrabbit/oak/upgra

2017-11-22 Thread tomekr

Author: tomekr
Date: Wed Nov 22 09:10:11 2017
New Revision: 1816015

URL: http://svn.apache.org/viewvc?rev=1816015=rev
Log:
OAK-6971: Remove composite node store-related features from the oak-upgrade

Removed:

jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/IndexCopier.java

jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/IncludeIndexTest.java
Modified:

jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java

jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java

jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/MigrationFactory.java

jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/MigrationOptions.java

jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/OptionParserFactory.java

jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/IncludeExcludeSidegradeTest.java

jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/IncludeExcludeUpgradeTest.java

Modified: 
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java?rev=1816015=1816014=1816015=diff
==
--- 
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java
 Wed Nov 22 09:10:11 2017
@@ -71,9 +71,7 @@ import static org.apache.jackrabbit.JcrC
 import static 
org.apache.jackrabbit.oak.plugins.migration.NodeStateCopier.copyProperties;
 import static 
org.apache.jackrabbit.oak.spi.security.authorization.permission.PermissionConstants.NT_REP_PERMISSION_STORE;
 import static 
org.apache.jackrabbit.oak.spi.security.authorization.permission.PermissionConstants.REP_PERMISSION_STORE;
-import static 
org.apache.jackrabbit.oak.upgrade.RepositoryUpgrade.DEFAULT_EXCLUDE_FRAGMENTS;
 import static 
org.apache.jackrabbit.oak.upgrade.RepositoryUpgrade.DEFAULT_EXCLUDE_PATHS;
-import static 
org.apache.jackrabbit.oak.upgrade.RepositoryUpgrade.DEFAULT_FRAGMENT_PATHS;
 import static 
org.apache.jackrabbit.oak.upgrade.RepositoryUpgrade.DEFAULT_INCLUDE_PATHS;
 import static 
org.apache.jackrabbit.oak.upgrade.RepositoryUpgrade.DEFAULT_MERGE_PATHS;
 import static 
org.apache.jackrabbit.oak.upgrade.RepositoryUpgrade.calculateEffectiveIncludePaths;
@@ -110,16 +108,6 @@ public class RepositorySidegrade {
 private Set excludePaths = DEFAULT_EXCLUDE_PATHS;
 
 /**
- * Paths supporting fragments during the copy process. Empty by default.
- */
-private Set fragmentPaths = DEFAULT_FRAGMENT_PATHS;
-
-/**
- * Fragments to exclude during the copy process. Empty by default.
- */
-private Set excludeFragments = DEFAULT_EXCLUDE_FRAGMENTS;
-
-/**
  * Paths to merge during the copy process. Empty by default.
  */
 private Set mergePaths = DEFAULT_MERGE_PATHS;
@@ -128,8 +116,6 @@ public class RepositorySidegrade {
 
 private boolean forceCheckpoints = false;
 
-private boolean includeIndex = false;
-
 private boolean filterLongNames = true;
 
 private boolean verify = false;
@@ -237,29 +223,6 @@ public class RepositorySidegrade {
 }
 
 /**
- * Sets the paths that should support the fragments.
- *
- * @param fragmentPaths Paths that should support fragments.
- */
-public void setFragmentPaths(@Nonnull String... fragmentPaths) {
-this.fragmentPaths = copyOf(checkNotNull(fragmentPaths));
-}
-
-/**
- * Sets the name fragments that should be excluded when the source 
repository
- * is copied to the target repository.
- *
- * @param excludes Name fragments to be excluded from the copy.
- */
-public void setExcludeFragments(@Nonnull String... excludes) {
-this.excludeFragments = copyOf(checkNotNull(excludes));
-}
-
-public void setIncludeIndex(boolean includeIndex) {
-this.includeIndex = includeIndex;
-}
-
-/**
  * Sets the paths that should be merged when the source repository
  * is copied to the target repository.
  *
@@ -453,9 +416,6 @@ public class RepositorySidegrade {
 NodeBuilder targetRoot = target.getRoot().builder();
 copyWorkspace(sourceRoot, targetRoot);
 removeCheckpointReferences(targetRoot);
-if (includeIndex) {
-IndexCopier.copy(sourceRoot, targetRoot, includePaths);
-}
 if (!versionCopyConfiguration.isCopyAll()) {
 NodeBuilder

svn commit: r1816027 - in /jackrabbit/oak/branches/1.0/oak-upgrade/src: main/java/org/apache/jackrabbit/oak/upgrade/ main/java/org/apache/jackrabbit/oak/upgrade/cli/ main/java/org/apache/jackrabbit/oa

2017-11-22 Thread tomekr

Author: tomekr
Date: Wed Nov 22 10:17:32 2017
New Revision: 1816027

URL: http://svn.apache.org/viewvc?rev=1816027=rev
Log:
OAK-6971: Remove composite node store-related features from the oak-upgrade

Removed:

jackrabbit/oak/branches/1.0/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/IndexCopier.java

jackrabbit/oak/branches/1.0/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/IncludeIndexTest.java
Modified:

jackrabbit/oak/branches/1.0/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java

jackrabbit/oak/branches/1.0/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java

jackrabbit/oak/branches/1.0/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/MigrationFactory.java

jackrabbit/oak/branches/1.0/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/MigrationOptions.java

jackrabbit/oak/branches/1.0/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/OptionParserFactory.java

jackrabbit/oak/branches/1.0/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/IncludeExcludeSidegradeTest.java

jackrabbit/oak/branches/1.0/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/IncludeExcludeUpgradeTest.java

Modified: 
jackrabbit/oak/branches/1.0/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java?rev=1816027=1816026=1816027=diff
==
--- 
jackrabbit/oak/branches/1.0/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java
 (original)
+++ 
jackrabbit/oak/branches/1.0/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java
 Wed Nov 22 10:17:32 2017
@@ -70,9 +70,7 @@ import static org.apache.jackrabbit.JcrC
 import static org.apache.jackrabbit.JcrConstants.JCR_SYSTEM;
 import static 
org.apache.jackrabbit.oak.spi.security.authorization.permission.PermissionConstants.NT_REP_PERMISSION_STORE;
 import static 
org.apache.jackrabbit.oak.spi.security.authorization.permission.PermissionConstants.REP_PERMISSION_STORE;
-import static 
org.apache.jackrabbit.oak.upgrade.RepositoryUpgrade.DEFAULT_EXCLUDE_FRAGMENTS;
 import static 
org.apache.jackrabbit.oak.upgrade.RepositoryUpgrade.DEFAULT_EXCLUDE_PATHS;
-import static 
org.apache.jackrabbit.oak.upgrade.RepositoryUpgrade.DEFAULT_FRAGMENT_PATHS;
 import static 
org.apache.jackrabbit.oak.upgrade.RepositoryUpgrade.DEFAULT_INCLUDE_PATHS;
 import static 
org.apache.jackrabbit.oak.upgrade.RepositoryUpgrade.DEFAULT_MERGE_PATHS;
 import static 
org.apache.jackrabbit.oak.upgrade.RepositoryUpgrade.calculateEffectiveIncludePaths;
@@ -110,16 +108,6 @@ public class RepositorySidegrade {
 private Set excludePaths = DEFAULT_EXCLUDE_PATHS;
 
 /**
- * Paths supporting fragments during the copy process. Empty by default.
- */
-private Set fragmentPaths = DEFAULT_FRAGMENT_PATHS;
-
-/**
- * Fragments to exclude during the copy process. Empty by default.
- */
-private Set excludeFragments = DEFAULT_EXCLUDE_FRAGMENTS;
-
-/**
  * Paths to merge during the copy process. Empty by default.
  */
 private Set mergePaths = DEFAULT_MERGE_PATHS;
@@ -128,8 +116,6 @@ public class RepositorySidegrade {
 
 private boolean forceCheckpoints = false;
 
-private boolean includeIndex = false;
-
 private boolean filterLongNames = true;
 
 private boolean verify = false;
@@ -235,29 +221,6 @@ public class RepositorySidegrade {
 }
 
 /**
- * Sets the paths that should support the fragments.
- *
- * @param fragmentPaths Paths that should support fragments.
- */
-public void setFragmentPaths(@Nonnull String... fragmentPaths) {
-this.fragmentPaths = copyOf(checkNotNull(fragmentPaths));
-}
-
-/**
- * Sets the name fragments that should be excluded when the source 
repository
- * is copied to the target repository.
- *
- * @param excludes Name fragments to be excluded from the copy.
- */
-public void setExcludeFragments(@Nonnull String... excludes) {
-this.excludeFragments = copyOf(checkNotNull(excludes));
-}
-
-public void setIncludeIndex(boolean includeIndex) {
-this.includeIndex = includeIndex;
-}
-
-/**
  * Sets the paths that should be merged when the source repository
  * is copied to the target repository.
  *
@@ -457,9 +420,6 @@ public class RepositorySidegrade {
 NodeBuilder targetRoot = target.getRoot().builder();
 copyWorkspace(sourceRoot, targetRoot);
 removeCheckpointReferences(targetRoot);
-if (includeIndex) {
-IndexCopier.copy(sourceRoot, targetRoot, includePaths);
-}
 if

svn commit: r1816012 - in /jackrabbit/oak/branches/1.2/oak-core: ./ src/main/java/org/apache/jackrabbit/oak/plugins/document/ src/test/java/org/apache/jackrabbit/oak/plugins/document/

2017-11-22 Thread mreutegg

Author: mreutegg
Date: Wed Nov 22 08:40:50 2017
New Revision: 1816012

URL: http://svn.apache.org/viewvc?rev=1816012=rev
Log:
OAK-6953: CacheLIRS cannot be disabled

Merged revision 1815450,1815466 from trunk

Added:

jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DisableCacheTest.java
  - copied, changed from r1815450, 
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DisableCacheTest.java
Modified:
jackrabbit/oak/branches/1.2/oak-core/   (props changed)

jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java

jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java

Propchange: jackrabbit/oak/branches/1.2/oak-core/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 22 08:40:50 2017
@@ -1,5 +1,5 @@
 /jackrabbit/oak/branches/1.0/oak-core:1665962
 
/jackrabbit/oak/branches/1.4/oak-core:1745750,1747354,1750078,1750512,1790375,1803776,1805392,1805400,1805402
 
/jackrabbit/oak/trunk/oak-core:1672350,1672468-1672469,1672537,1672603,1672611,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673713,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674228,1674780,1674880,1675054-1675055,1675089,1675319,1675332,1675354,1675357,1675382,167,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,164,1677788,1677797,1677804,1677806,1677939,1677991,1678023,1678095-1678096,1678124,1678171,1678173,1678202,1678211,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679503,1679958,1679961,1680170,1680172,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1681921,1681955,1682042,1682218,1682235,1682437,1682488,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174-1684175,168418
 
6,1684376,1684442,1684561,1684570,1684601,1684618,1684669,1684820,1684868,1684894,1685023,1685075,1685370,1685541,1685552,1685589-1685590,1685834,1685839-1685840,1685964,1685977,1685989,1685999,1686003,1686023,1686032,1686097,1686162,1686229,1686234,1686253,1686414,1686772,1686780,1686790,1686854,1686857,1686971,1687053-1687055,1687175,1687196,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688089-1688090,1688172,1688179,1688349,1688421,1688436,1688453,1688616,1688622,1688634,1688636,1688817,1689003-1689004,1689008,1689577,1689581,1689623,1689810,1689828,1689831,1689833,1689903,1690017,1690043,1690047,1690057,1690247,1690249,1690634-1690637,1690650,1690657,1690669,1690672,1690674,1690885,1690941,1691139,1691151,1691159,1691167,1691183,1691188,1691201,1691210,1691217-1691218,1691280,1691307,1691331-1691333,1691345,1691384-1691385,1691394,1691401,1691498,1691509,1692133-1692134,1692156,1692250,1692272,1692274,1692363,1692382,1692393,1692478,1692955,1693002,1693030,1693050,169
 
3209,1693401,1693421,1693525-1693526,1694007,1694049,1694393-1694394,1694651,1694653-1694654,1695032,1695050,1695122,1695223,1695280,1695299,1695420,1695457,1695482,1695492,1695507,1695521,1695540,1695571,1695829-1695830,1695905,1696190,1696194,1696242,1696285,1696375,1696522,1696578,1696759,1696916,1697363,1697373,1697383,1697410,1697579,1697582,1697589,1697616,1697672,1697896,1698096,1698144,1700191,1700231,1700397,1700403,1700506,1700571,1700709,1700718,1700720,1700727,1700749,1700769,1700775,1701065,1701613,1701619,1701733,1701743,1701750,1701768,1701806,1701810,1701814,1701907,1701948,1701955,1701959,1701965,1701986,1702014,1702022,1702045,1702051,1702241,1702272,1702371,1702387,1702405,1702423,1702426,1702428,1702860,1702866,1702942,1702960,1703212,1703382,1703395,1703411,1703428,1703430,1703568,1703592,1703758,1703858,1703878,1704256,1704282,1704285,1704457,1704479,1704490,1704614,1704629,1704636,1704655,1704670,1704886,1705005,1705027,1705043,1705055,1705250,1705268,1705273,

svn commit: r1816026 - in /jackrabbit/oak/branches/1.2/oak-upgrade/src: main/java/org/apache/jackrabbit/oak/upgrade/ main/java/org/apache/jackrabbit/oak/upgrade/cli/ main/java/org/apache/jackrabbit/oa

2017-11-22 Thread tomekr

Author: tomekr
Date: Wed Nov 22 10:11:19 2017
New Revision: 1816026

URL: http://svn.apache.org/viewvc?rev=1816026=rev
Log:
OAK-6971: Remove composite node store-related features from the oak-upgrade

Removed:

jackrabbit/oak/branches/1.2/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/IndexCopier.java

jackrabbit/oak/branches/1.2/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/IncludeIndexTest.java
Modified:

jackrabbit/oak/branches/1.2/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java

jackrabbit/oak/branches/1.2/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java

jackrabbit/oak/branches/1.2/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/MigrationFactory.java

jackrabbit/oak/branches/1.2/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/MigrationOptions.java

jackrabbit/oak/branches/1.2/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/OptionParserFactory.java

jackrabbit/oak/branches/1.2/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/IncludeExcludeSidegradeTest.java

jackrabbit/oak/branches/1.2/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/IncludeExcludeUpgradeTest.java

Modified: 
jackrabbit/oak/branches/1.2/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java?rev=1816026=1816025=1816026=diff
==
--- 
jackrabbit/oak/branches/1.2/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java
 (original)
+++ 
jackrabbit/oak/branches/1.2/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java
 Wed Nov 22 10:11:19 2017
@@ -69,9 +69,7 @@ import static org.apache.jackrabbit.JcrC
 import static org.apache.jackrabbit.JcrConstants.JCR_SYSTEM;
 import static 
org.apache.jackrabbit.oak.spi.security.authorization.permission.PermissionConstants.NT_REP_PERMISSION_STORE;
 import static 
org.apache.jackrabbit.oak.spi.security.authorization.permission.PermissionConstants.REP_PERMISSION_STORE;
-import static 
org.apache.jackrabbit.oak.upgrade.RepositoryUpgrade.DEFAULT_EXCLUDE_FRAGMENTS;
 import static 
org.apache.jackrabbit.oak.upgrade.RepositoryUpgrade.DEFAULT_EXCLUDE_PATHS;
-import static 
org.apache.jackrabbit.oak.upgrade.RepositoryUpgrade.DEFAULT_FRAGMENT_PATHS;
 import static 
org.apache.jackrabbit.oak.upgrade.RepositoryUpgrade.DEFAULT_INCLUDE_PATHS;
 import static 
org.apache.jackrabbit.oak.upgrade.RepositoryUpgrade.DEFAULT_MERGE_PATHS;
 import static 
org.apache.jackrabbit.oak.upgrade.RepositoryUpgrade.calculateEffectiveIncludePaths;
@@ -109,16 +107,6 @@ public class RepositorySidegrade {
 private Set excludePaths = DEFAULT_EXCLUDE_PATHS;
 
 /**
- * Paths supporting fragments during the copy process. Empty by default.
- */
-private Set fragmentPaths = DEFAULT_FRAGMENT_PATHS;
-
-/**
- * Fragments to exclude during the copy process. Empty by default.
- */
-private Set excludeFragments = DEFAULT_EXCLUDE_FRAGMENTS;
-
-/**
  * Paths to merge during the copy process. Empty by default.
  */
 private Set mergePaths = DEFAULT_MERGE_PATHS;
@@ -127,8 +115,6 @@ public class RepositorySidegrade {
 
 private boolean forceCheckpoints = false;
 
-private boolean includeIndex = false;
-
 private boolean filterLongNames = true;
 
 private boolean verify = false;
@@ -234,29 +220,6 @@ public class RepositorySidegrade {
 }
 
 /**
- * Sets the paths that should support the fragments.
- *
- * @param fragmentPaths Paths that should support fragments.
- */
-public void setFragmentPaths(@Nonnull String... fragmentPaths) {
-this.fragmentPaths = copyOf(checkNotNull(fragmentPaths));
-}
-
-/**
- * Sets the name fragments that should be excluded when the source 
repository
- * is copied to the target repository.
- *
- * @param excludes Name fragments to be excluded from the copy.
- */
-public void setExcludeFragments(@Nonnull String... excludes) {
-this.excludeFragments = copyOf(checkNotNull(excludes));
-}
-
-public void setIncludeIndex(boolean includeIndex) {
-this.includeIndex = includeIndex;
-}
-
-/**
  * Sets the paths that should be merged when the source repository
  * is copied to the target repository.
  *
@@ -446,9 +409,6 @@ public class RepositorySidegrade {
 NodeBuilder targetRoot = target.getRoot().builder();
 copyWorkspace(sourceRoot, targetRoot);
 removeCheckpointReferences(targetRoot);
-if (includeIndex) {
-IndexCopier.copy(sourceRoot, targetRoot, includePaths);
-}
 if

svn commit: r1816019 - in /jackrabbit/oak/trunk/oak-lucene/src: main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/ main/java/org/apache/jackrabbit/oak/plugins/index/lucene/reader/ tes

2017-11-22 Thread chetanm

Author: chetanm
Date: Wed Nov 22 09:48:31 2017
New Revision: 1816019

URL: http://svn.apache.org/viewvc?rev=1816019=rev
Log:
OAK-6972 - DefaultIndexReader closes suggest directory multiple times

Added:

jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/CopyOnReadDirectoryTest.java
   (with props)
Modified:

jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/CopyOnReadDirectory.java

jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/reader/DefaultIndexReader.java

Modified: 
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/CopyOnReadDirectory.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/CopyOnReadDirectory.java?rev=1816019=1816018=1816019=diff
==
--- 
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/CopyOnReadDirectory.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/CopyOnReadDirectory.java
 Wed Nov 22 09:48:31 2017
@@ -27,6 +27,7 @@ import java.util.List;
 import java.util.Set;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.Executor;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
@@ -56,6 +57,7 @@ public class CopyOnReadDirectory extends
 private final Directory local;
 private final String indexPath;
 private final Executor executor;
+private final AtomicBoolean closed = new AtomicBoolean();
 
 private final ConcurrentMap files = 
newConcurrentMap();
 /**
@@ -267,6 +269,9 @@ public class CopyOnReadDirectory extends
  */
 @Override
 public void close() throws IOException {
+if (!closed.compareAndSet(false, true)){
+return;
+}
 //Always remove old index file on close as it ensures that
 //no other IndexSearcher are opened with previous revision of Index 
due to
 //way IndexTracker closes IndexNode. At max there would be only two 
IndexNode

Modified: 
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/reader/DefaultIndexReader.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/reader/DefaultIndexReader.java?rev=1816019=1816018=1816019=diff
==
--- 
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/reader/DefaultIndexReader.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/reader/DefaultIndexReader.java
 Wed Nov 22 09:48:31 2017
@@ -49,7 +49,7 @@ public class DefaultIndexReader implemen
 closer.register(this.reader);
 this.suggestDirectory = suggestDirectory;
 if (suggestDirectory != null) {
-closer.register(this.suggestDirectory);
+//Directory is closed by AnalyzingInfixSuggester close call
 this.lookup = SuggestHelper.getLookup(suggestDirectory, analyzer);
 closer.register(this.lookup);
 } else {

Added: 
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/CopyOnReadDirectoryTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/CopyOnReadDirectoryTest.java?rev=1816019=auto
==
--- 
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/CopyOnReadDirectoryTest.java
 (added)
+++ 
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/CopyOnReadDirectoryTest.java
 Wed Nov 22 09:48:31 2017
@@ -0,0 +1,52 @@
+/*
+ * 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,

svn commit: r1816016 - in /jackrabbit/oak/branches/1.6/oak-upgrade/src: main/java/org/apache/jackrabbit/oak/upgrade/ main/java/org/apache/jackrabbit/oak/upgrade/cli/ main/java/org/apache/jackrabbit/oa

2017-11-22 Thread tomekr

Author: tomekr
Date: Wed Nov 22 09:14:51 2017
New Revision: 1816016

URL: http://svn.apache.org/viewvc?rev=1816016=rev
Log:
OAK-6971: Remove composite node store-related features from the oak-upgrade

Removed:

jackrabbit/oak/branches/1.6/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/IndexCopier.java

jackrabbit/oak/branches/1.6/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/IncludeIndexTest.java
Modified:

jackrabbit/oak/branches/1.6/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java

jackrabbit/oak/branches/1.6/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java

jackrabbit/oak/branches/1.6/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/MigrationFactory.java

jackrabbit/oak/branches/1.6/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/MigrationOptions.java

jackrabbit/oak/branches/1.6/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/OptionParserFactory.java

jackrabbit/oak/branches/1.6/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/IncludeExcludeSidegradeTest.java

jackrabbit/oak/branches/1.6/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/IncludeExcludeUpgradeTest.java

Modified: 
jackrabbit/oak/branches/1.6/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java?rev=1816016=1816015=1816016=diff
==
--- 
jackrabbit/oak/branches/1.6/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java
 (original)
+++ 
jackrabbit/oak/branches/1.6/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java
 Wed Nov 22 09:14:51 2017
@@ -69,9 +69,7 @@ import static org.apache.jackrabbit.JcrC
 import static org.apache.jackrabbit.JcrConstants.JCR_SYSTEM;
 import static 
org.apache.jackrabbit.oak.spi.security.authorization.permission.PermissionConstants.NT_REP_PERMISSION_STORE;
 import static 
org.apache.jackrabbit.oak.spi.security.authorization.permission.PermissionConstants.REP_PERMISSION_STORE;
-import static 
org.apache.jackrabbit.oak.upgrade.RepositoryUpgrade.DEFAULT_EXCLUDE_FRAGMENTS;
 import static 
org.apache.jackrabbit.oak.upgrade.RepositoryUpgrade.DEFAULT_EXCLUDE_PATHS;
-import static 
org.apache.jackrabbit.oak.upgrade.RepositoryUpgrade.DEFAULT_FRAGMENT_PATHS;
 import static 
org.apache.jackrabbit.oak.upgrade.RepositoryUpgrade.DEFAULT_INCLUDE_PATHS;
 import static 
org.apache.jackrabbit.oak.upgrade.RepositoryUpgrade.DEFAULT_MERGE_PATHS;
 import static 
org.apache.jackrabbit.oak.upgrade.RepositoryUpgrade.calculateEffectiveIncludePaths;
@@ -109,16 +107,6 @@ public class RepositorySidegrade {
 private Set excludePaths = DEFAULT_EXCLUDE_PATHS;
 
 /**
- * Paths supporting fragments during the copy process. Empty by default.
- */
-private Set fragmentPaths = DEFAULT_FRAGMENT_PATHS;
-
-/**
- * Fragments to exclude during the copy process. Empty by default.
- */
-private Set excludeFragments = DEFAULT_EXCLUDE_FRAGMENTS;
-
-/**
  * Paths to merge during the copy process. Empty by default.
  */
 private Set mergePaths = DEFAULT_MERGE_PATHS;
@@ -127,8 +115,6 @@ public class RepositorySidegrade {
 
 private boolean forceCheckpoints = false;
 
-private boolean includeIndex = false;
-
 private boolean filterLongNames = true;
 
 private boolean verify = false;
@@ -234,29 +220,6 @@ public class RepositorySidegrade {
 }
 
 /**
- * Sets the paths that should support the fragments.
- *
- * @param fragmentPaths Paths that should support fragments.
- */
-public void setFragmentPaths(@Nonnull String... fragmentPaths) {
-this.fragmentPaths = copyOf(checkNotNull(fragmentPaths));
-}
-
-/**
- * Sets the name fragments that should be excluded when the source 
repository
- * is copied to the target repository.
- *
- * @param excludes Name fragments to be excluded from the copy.
- */
-public void setExcludeFragments(@Nonnull String... excludes) {
-this.excludeFragments = copyOf(checkNotNull(excludes));
-}
-
-public void setIncludeIndex(boolean includeIndex) {
-this.includeIndex = includeIndex;
-}
-
-/**
  * Sets the paths that should be merged when the source repository
  * is copied to the target repository.
  *
@@ -446,9 +409,6 @@ public class RepositorySidegrade {
 NodeBuilder targetRoot = target.getRoot().builder();
 copyWorkspace(sourceRoot, targetRoot);
 removeCheckpointReferences(targetRoot);
-if (includeIndex) {
-IndexCopier.copy(sourceRoot, targetRoot, includePaths);
-}
 if

svn commit: r1816028 - in /jackrabbit/oak/trunk: oak-run-commons/ oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/ oak-run-commons/src/test/ oak-run-commons/src/test/java/ oak-run-comm

2017-11-22 Thread chetanm

Author: chetanm
Date: Wed Nov 22 10:36:44 2017
New Revision: 1816028

URL: http://svn.apache.org/viewvc?rev=1816028=rev
Log:
OAK-6257 - Move the NodeStoreFixtureProvider support to oak-run-commons

Added:

jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/

jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/BlobStoreFixture.java
   (contents, props changed)
  - copied, changed from r1816019, 
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/cli/BlobStoreFixture.java

jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/BlobStoreFixtureProvider.java
   (contents, props changed)
  - copied, changed from r1816019, 
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/cli/BlobStoreFixtureProvider.java

jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/BlobStoreOptions.java
   (contents, props changed)
  - copied, changed from r1816019, 
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/cli/BlobStoreOptions.java

jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/CommonOptions.java
   (contents, props changed)
  - copied, changed from r1816019, 
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/cli/CommonOptions.java

jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/DocumentBuilderCustomizer.java
   (contents, props changed)
  - copied, changed from r1816019, 
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/cli/DocumentBuilderCustomizer.java

jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/DocumentFixtureProvider.java
   (contents, props changed)
  - copied, changed from r1816019, 
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/cli/DocumentFixtureProvider.java

jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/DocumentNodeStoreOptions.java
   (contents, props changed)
  - copied, changed from r1816019, 
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/cli/DocumentNodeStoreOptions.java

jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/DummyDataStore.java
   (contents, props changed)
  - copied, changed from r1816019, 
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/cli/DummyDataStore.java

jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/FileStoreBuilderCustomizer.java
   (contents, props changed)
  - copied, changed from r1816019, 
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/cli/FileStoreBuilderCustomizer.java

jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/FileStoreTarBuilderCustomizer.java
   (contents, props changed)
  - copied, changed from r1816019, 
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/cli/FileStoreTarBuilderCustomizer.java

jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/NodeStoreFixture.java
   (contents, props changed)
  - copied, changed from r1816019, 
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/cli/NodeStoreFixture.java

jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/NodeStoreFixtureProvider.java
   (contents, props changed)
  - copied, changed from r1816019, 
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/cli/NodeStoreFixtureProvider.java

jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/OakHelpFormatter.java
   (contents, props changed)
  - copied, changed from r1816019, 
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/cli/OakHelpFormatter.java

jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/OptionBeans.java
   (contents, props changed)
  - copied, changed from r1816019, 
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/cli/OptionBeans.java

jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/Options.java
   (contents, props changed)
  - copied, changed from r1816019, 
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/cli/Options.java

jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/OptionsBean.java
   (contents, props changed)
  - copied, changed from r1816019, 
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/cli/OptionsBean.java

jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/OptionsBeanFactory.java
   (contents, props changed)

svn commit: r1816021 - in /jackrabbit/oak/branches/1.4/oak-upgrade/src: main/java/org/apache/jackrabbit/oak/upgrade/ main/java/org/apache/jackrabbit/oak/upgrade/cli/ main/java/org/apache/jackrabbit/oa

2017-11-22 Thread tomekr

Author: tomekr
Date: Wed Nov 22 10:05:39 2017
New Revision: 1816021

URL: http://svn.apache.org/viewvc?rev=1816021=rev
Log:
OAK-6971: Remove composite node store-related features from the oak-upgrade

Removed:

jackrabbit/oak/branches/1.4/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/IndexCopier.java

jackrabbit/oak/branches/1.4/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/IncludeIndexTest.java
Modified:

jackrabbit/oak/branches/1.4/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java

jackrabbit/oak/branches/1.4/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java

jackrabbit/oak/branches/1.4/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/MigrationFactory.java

jackrabbit/oak/branches/1.4/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/MigrationOptions.java

jackrabbit/oak/branches/1.4/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/OptionParserFactory.java

jackrabbit/oak/branches/1.4/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/IncludeExcludeSidegradeTest.java

jackrabbit/oak/branches/1.4/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/IncludeExcludeUpgradeTest.java

Modified: 
jackrabbit/oak/branches/1.4/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java?rev=1816021=1816020=1816021=diff
==
--- 
jackrabbit/oak/branches/1.4/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java
 (original)
+++ 
jackrabbit/oak/branches/1.4/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java
 Wed Nov 22 10:05:39 2017
@@ -69,9 +69,7 @@ import static org.apache.jackrabbit.JcrC
 import static org.apache.jackrabbit.JcrConstants.JCR_SYSTEM;
 import static 
org.apache.jackrabbit.oak.spi.security.authorization.permission.PermissionConstants.NT_REP_PERMISSION_STORE;
 import static 
org.apache.jackrabbit.oak.spi.security.authorization.permission.PermissionConstants.REP_PERMISSION_STORE;
-import static 
org.apache.jackrabbit.oak.upgrade.RepositoryUpgrade.DEFAULT_EXCLUDE_FRAGMENTS;
 import static 
org.apache.jackrabbit.oak.upgrade.RepositoryUpgrade.DEFAULT_EXCLUDE_PATHS;
-import static 
org.apache.jackrabbit.oak.upgrade.RepositoryUpgrade.DEFAULT_FRAGMENT_PATHS;
 import static 
org.apache.jackrabbit.oak.upgrade.RepositoryUpgrade.DEFAULT_INCLUDE_PATHS;
 import static 
org.apache.jackrabbit.oak.upgrade.RepositoryUpgrade.DEFAULT_MERGE_PATHS;
 import static 
org.apache.jackrabbit.oak.upgrade.RepositoryUpgrade.calculateEffectiveIncludePaths;
@@ -109,16 +107,6 @@ public class RepositorySidegrade {
 private Set excludePaths = DEFAULT_EXCLUDE_PATHS;
 
 /**
- * Paths supporting fragments during the copy process. Empty by default.
- */
-private Set fragmentPaths = DEFAULT_FRAGMENT_PATHS;
-
-/**
- * Fragments to exclude during the copy process. Empty by default.
- */
-private Set excludeFragments = DEFAULT_EXCLUDE_FRAGMENTS;
-
-/**
  * Paths to merge during the copy process. Empty by default.
  */
 private Set mergePaths = DEFAULT_MERGE_PATHS;
@@ -127,8 +115,6 @@ public class RepositorySidegrade {
 
 private boolean forceCheckpoints = false;
 
-private boolean includeIndex = false;
-
 private boolean filterLongNames = true;
 
 private boolean verify = false;
@@ -234,29 +220,6 @@ public class RepositorySidegrade {
 }
 
 /**
- * Sets the paths that should support the fragments.
- *
- * @param fragmentPaths Paths that should support fragments.
- */
-public void setFragmentPaths(@Nonnull String... fragmentPaths) {
-this.fragmentPaths = copyOf(checkNotNull(fragmentPaths));
-}
-
-/**
- * Sets the name fragments that should be excluded when the source 
repository
- * is copied to the target repository.
- *
- * @param excludes Name fragments to be excluded from the copy.
- */
-public void setExcludeFragments(@Nonnull String... excludes) {
-this.excludeFragments = copyOf(checkNotNull(excludes));
-}
-
-public void setIncludeIndex(boolean includeIndex) {
-this.includeIndex = includeIndex;
-}
-
-/**
  * Sets the paths that should be merged when the source repository
  * is copied to the target repository.
  *
@@ -446,9 +409,6 @@ public class RepositorySidegrade {
 NodeBuilder targetRoot = target.getRoot().builder();
 copyWorkspace(sourceRoot, targetRoot);
 removeCheckpointReferences(targetRoot);
-if (includeIndex) {
-IndexCopier.copy(sourceRoot, targetRoot, includePaths);
-}
 if

svn commit: r1816047 - in /jackrabbit/oak/branches/1.0/oak-core: ./ src/main/java/org/apache/jackrabbit/oak/plugins/document/ src/test/java/org/apache/jackrabbit/oak/plugins/document/

2017-11-22 Thread mreutegg

Author: mreutegg
Date: Wed Nov 22 12:28:32 2017
New Revision: 1816047

URL: http://svn.apache.org/viewvc?rev=1816047=rev
Log:
OAK-6953: CacheLIRS cannot be disabled

Merged revision 1815450,1815466 from trunk

Added:

jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DisableCacheTest.java
  - copied, changed from r1815450, 
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DisableCacheTest.java
Modified:
jackrabbit/oak/branches/1.0/oak-core/   (props changed)

jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java

jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java

Propchange: jackrabbit/oak/branches/1.0/oak-core/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 22 12:28:32 2017
@@ -1,5 +1,5 @@
 
/jackrabbit/oak/branches/1.2/oak-core:1695500,1700753,1709440,1714095,1725270,1742959,1743356,1745019,1745589,1749700,1750645,1751766,1751768,1782746,1805405-1805406,1805409
 
/jackrabbit/oak/branches/1.4/oak-core:1745750,1747354,1750078,1750512,1805392,1805400,1805402
 
/jackrabbit/oak/trunk/oak-core:1584578,1584602,1584614,1584616,1584709,1584781,1584937,1585297,1585304-1585305,1585420,1585424,1585427,1585448,1585465,1585468,1585486,1585497,1585509,1585647,1585655-1585656,1585661,1585665-1585666,1585669-1585670,1585673,1585680,1585719,1585763,1585770,1585896,1585904,1585907,1585940,1585949,1585951,1585956,1585962-1585963,1586287,1586320,1586364,1586372,1586655,1586836,1587130,1587224,1587399,1587408,1587472,1587485,1587488,1587538,1587580,1587807,1588033,1588042,1588046,1588066,1588201,1589025,1589101,1589137,1589141,1589263,1589440,1589442,1589484,1589488,1589661,1589664,1589682,1589708,1589741,1589748,1589789,1589794,1589850,1589864,1590628,1590660,1590684,1590697,1590701,1590980,1590988,1591101,1591226,1591229,1591293,1591314,1591317,1591362,1591374,1591381,1591438,1591467,1591552,1591704,1591713,1591715,1591723,1591874,1592487,1592512,1592658,1592665,1592677,1592742,1592744,1592787,1592809,1592955,1593036,1593048,1593061,1593133,1593210-159321
 
1,1593231,1593245,1593250,1593294,1593304,1593317,1593342,1593554,1594158-1594164,1594166-1594167,1594169,1594237,1594800,1594808,1594835,1594888,1594987,1595147,1595186,1595457,1595856,1596241,1596474,1596534,1596844,1596889,1597569,1597795,1597854,1597860,1598292,1598302,1598352,1598369,1598595,1598631,1598696,1598732,1598797-1598798,1599160,1599299,1599332,1599416,1599434,1599671,1600088,1600935,1601309,1601388,1601578,1601649,1601676,1601757,1601768,1601814,1601833,1601838,1601853,1601878,1601888,1601922,1602156,1602170,1602174,1602179,1602183,1602201,1602207,1602227,1602256,1602261,1602342,1602796-1602797,1602800,1602809,1602853,1602872,1602914,1603155,1603307,1603401,1603441,1603748,1604166,1605030,1605036,1605038,1605292,1605447,1605526,1605670,1605725,1605831,1605852,1606077,1606079,1606087,1606638,1606641,1606644,1606708,1606711,1607031-1607032,1607077,1607127,1607141,1607152,1607185,1607196,1607331,1607362,1607366,1607392,1607526,1607557,1607664,1607737,1608463,1608560,160
 
8731,1608783,1609064,1609081,1609165,1609214,1609488,1610489,1610592,1610603,1610634,1610658,1610664,1611021,1611041,1611270,1611275,1611277,1611313,1611332,1611584,1612560,1612825,1612848,1612892,1612899,1612993,1613018,1613041,1614032,1614265,1614272,1614344-1614345,1614384-1614385,1614397,1614405-1614406,1614574,1614591,1614593,1614596,1614604,1614689,1614807,1614835,1614891,1615417-1615418,1616182,1616236,1616463,1616719,1617417,1617451,1617463,1617711,1618158,1618613,1618624,1618709,1619222,1619411,1619695,1619800,1619808,1619815,1619823-1619824,1620512,1620581,1620585,1620634,1620898,1620905,1621115,1621123-1621124,1621168,1621192,1621201,1621706,1621962,1622197,1622201,1622207,1622250,1622479,1623364,1623766,1623827,1623949,1623969,1623973,1624216,1624317,1624551,1624559,1624973,1624993-1624994,1625025,1625036,1625158,1625224,1625237,1625299,1625348,1625620,1625916,1625962-1625963,1626021,1626053,1626163,1626168,1626175,1626191,1626265,1626770,1627047,1627052,1627228,1627346,

svn commit: r1816056 - in /jackrabbit/oak/trunk: oak-run/src/main/java/org/apache/jackrabbit/oak/run/ oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/ oak-segment-tar/src/test/jav

2017-11-22 Thread frm

Author: frm
Date: Wed Nov 22 13:38:22 2017
New Revision: 1816056

URL: http://svn.apache.org/viewvc?rev=1816056=rev
Log:
OAK-6969 - Move the offline compaction logic in the tool backend

Modified:

jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/CompactCommand.java

jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/SegmentTarUtils.java

jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Compact.java

jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/upgrade/UpgradeIT.java

Modified: 
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/CompactCommand.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/CompactCommand.java?rev=1816056=1816055=1816056=diff
==
--- 
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/CompactCommand.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/CompactCommand.java
 Wed Nov 22 13:38:22 2017
@@ -17,63 +17,19 @@
 
 package org.apache.jackrabbit.oak.run;
 
-import static com.google.common.collect.Sets.difference;
-import static com.google.common.collect.Sets.newHashSet;
-
 import java.io.File;
-import java.util.Date;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
 
 import com.google.common.base.StandardSystemProperty;
-import com.google.common.base.Stopwatch;
 import joptsimple.OptionParser;
 import joptsimple.OptionSet;
 import joptsimple.OptionSpec;
-import org.apache.commons.io.FileUtils;
-import org.apache.jackrabbit.oak.commons.IOUtils;
 import org.apache.jackrabbit.oak.run.commons.Command;
+import org.apache.jackrabbit.oak.segment.tool.Compact;
 
 class CompactCommand implements Command {
 
-private enum FileAccessMode {
-
-ARCH_DEPENDENT(null, "default access mode"),
-MEMORY_MAPPED(true, "memory mapped access mode"),
-REGULAR(false, "regular access mode"),
-REGULAR_ENFORCED(false, "enforced regular access mode");
-
-private final Boolean memoryMapped;
-
-private final String description;
-
-FileAccessMode(Boolean memoryMapped, String description) {
-this.memoryMapped = memoryMapped;
-this.description = description;
-}
-
-Boolean getMemoryMapped() {
-return memoryMapped;
-}
-
-@Override
-public String toString() {
-return description;
-}
-
-}
-
-private static FileAccessMode getFileAccessMode(Boolean arg, String os) {
-if (os != null && os.toLowerCase().contains("windows")) {
-return FileAccessMode.REGULAR_ENFORCED;
-}
-if (arg == null) {
-return FileAccessMode.ARCH_DEPENDENT;
-}
-if (arg) {
-return FileAccessMode.MEMORY_MAPPED;
-}
-return FileAccessMode.REGULAR;
+private static boolean isTrue(Boolean value) {
+return value != null && value;
 }
 
 @Override
@@ -95,79 +51,27 @@ class CompactCommand implements Command
 "which is incompatible with older versions of Oak.")
 .withOptionalArg()
 .ofType(Boolean.class);
-
 OptionSet options = parser.parse(args);
 
 String path = directoryArg.value(options);
+
 if (path == null) {
 System.err.println("Compact a file store. Usage: compact [path] 
");
 parser.printHelpOn(System.err);
 System.exit(-1);
 }
 
-File directory = new File(path);
-
-boolean success = false;
-Set beforeLs = newHashSet();
-Set afterLs = newHashSet();
-Stopwatch watch = Stopwatch.createStarted();
-
-FileAccessMode fileAccessMode = getFileAccessMode(
-mmapArg.value(options),
-StandardSystemProperty.OS_NAME.value()
-);
-
-System.out.println("Compacting " + directory + " with " + 
fileAccessMode);
-
-boolean force = isTrue(forceArg.value(options));
-
-System.out.println("before ");
-beforeLs.addAll(list(directory));
-long sizeBefore = FileUtils.sizeOfDirectory(directory);
-System.out.println("size "
-+ IOUtils.humanReadableByteCount(sizeBefore) + " (" + 
sizeBefore
-+ " bytes)");
-System.out.println("-> compacting");
-
-try {
-SegmentTarUtils.compact(directory, 
fileAccessMode.getMemoryMapped(), force);
-success = true;
-} catch (Exception e) {
-e.printStackTrace(System.err);
-} finally {
-watch.stop();
-if (success) {
-System.out.println("after ");
-afterLs.addAll(list(directory));
-long

svn commit: r1816064 - in /jackrabbit/oak/trunk: oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/ oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/ oak-c

2017-11-22 Thread stillalex

Author: stillalex
Date: Wed Nov 22 16:00:40 2017
New Revision: 1816064

URL: http://svn.apache.org/viewvc?rev=1816064=rev
Log:
OAK-6818 TokenAuthentication/TokenProviderImpl: cleanup expired tokens


Added:

jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/LoginWithTokensTest.java
   (with props)

jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/TokenCleanupTest.java
   (with props)
Modified:

jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/AbstractLoginTest.java

jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java

jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenConfigurationImpl.java

jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenProviderImpl.java

jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/authentication/token/default.md

Modified: 
jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/AbstractLoginTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/AbstractLoginTest.java?rev=1816064=1816063=1816064=diff
==
--- 
jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/AbstractLoginTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/AbstractLoginTest.java
 Wed Nov 22 16:00:40 2017
@@ -108,16 +108,32 @@ abstract class AbstractLoginTest extends
 }
 }
 
+protected boolean customConfigurationParameters() {
+return noIterations != -1 || expiration > 0;
+}
+
+protected ConfigurationParameters prepare(ConfigurationParameters conf) {
+return conf;
+}
+
 @Override
 protected Repository[] createRepository(RepositoryFixture fixture) throws 
Exception {
-if (noIterations != -1 || expiration > 0) {
+if (customConfigurationParameters()) {
 if (fixture instanceof OakRepositoryFixture) {
 return ((OakRepositoryFixture) fixture).setUpCluster(1, new 
JcrCreator() {
 @Override
 public Jcr customize(Oak oak) {
 ConfigurationParameters conf;
-ConfigurationParameters iterations = 
ConfigurationParameters.of(UserConstants.PARAM_PASSWORD_HASH_ITERATIONS, 
noIterations);
-ConfigurationParameters cache = 
ConfigurationParameters.of("cacheExpiration", expiration);
+ConfigurationParameters iterations = 
ConfigurationParameters.EMPTY;
+if (noIterations != DEFAULT_ITERATIONS) {
+iterations = 
ConfigurationParameters.of(UserConstants.PARAM_PASSWORD_HASH_ITERATIONS,
+noIterations);
+}
+ConfigurationParameters cache = 
ConfigurationParameters.EMPTY;
+if (expiration > 0) {
+cache = 
ConfigurationParameters.of("cacheExpiration", expiration);
+}
+
 if (runWithToken) {
 conf = ConfigurationParameters.of(
 TokenConfiguration.NAME, iterations,
@@ -126,6 +142,7 @@ abstract class AbstractLoginTest extends
 conf = ConfigurationParameters.of(
 UserConfiguration.NAME, 
ConfigurationParameters.of(iterations, cache));
 }
+conf = prepare(conf);
 SecurityProvider sp = new SecurityProviderImpl(conf);
 return new Jcr(oak).with(sp);
 }

Modified: 
jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java?rev=1816064=1816063=1816064=diff
==
--- 
jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java
 Wed Nov 22 16:00:40 2017
@@ -250,6 +250,7 @@ public class BenchmarkRunner {
 runAsUser.value(options),
 runWithToken.value(options),
 noIterations.value(options)),
+new LoginWithTokensTest(numberOfUsers.value(options)),
 new

svn commit: r1816067 - in /jackrabbit/oak/branches/1.4: ./ oak-core/ oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/documen

2017-11-22 Thread mreutegg

Author: mreutegg
Date: Wed Nov 22 16:33:50 2017
New Revision: 1816067

URL: http://svn.apache.org/viewvc?rev=1816067=rev
Log:
OAK-4518: ConcurrentAddReferenceTest fails occasionally

Merged revisions 1750656,1753481 from trunk

Added:

jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ConcurrentReadAndAddTest.java
  - copied, changed from r1750656, 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ConcurrentReadAndAddTest.java
Modified:
jackrabbit/oak/branches/1.4/   (props changed)
jackrabbit/oak/branches/1.4/oak-core/   (props changed)

jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java

jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java

jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java

jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollector.java

jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractJournalTest.java

jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCDeletionTest.java

jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/JournalIT.java

Propchange: jackrabbit/oak/branches/1.4/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 22 16:33:50 2017
@@ -1,4 +1,4 @@
 /jackrabbit/oak/branches/1.0:1665962
 /jackrabbit/oak/branches/1.6:1802566
-/jackrabbit/oak/trunk:1733615,1733875,1733913,1733929,1734230,1734254,1734279,1734941,1735052,1735081,1735109,1735141,1735267,1735405,1735484,1735549,1735564,1735588,1735622,1735638,1735919,1735983,1736176,1737309-1737310,1737334,1737349,1737998,1738004,1738136,1738138,1738207,1738234,1738252,1738775,1738795,1738833,1738950,1738957,1738963,1739712,1739760,1739867,1739894,1739959-1739960,1740114,1740116,1740250,1740333,1740349,1740360,1740625-1740626,1740774,1740837,1740879,1740971,1741016,1741032,1741339,1741343,1742077,1742117,1742125,1742363,1742520,1742888,1742916,1743097,1743172,1743343,1743674,1744265,1744292,1744589,1744670,1744672,1744959,1745038,1745127,1745197,1745336,1745368,1746086,1746117,1746342,1746345,1746408,1746634,1746696,1746981,1747198,1747200,1747341-1747342,1747380,1747387,1747406,1747492,1747512,1747654,1748505,1748553,1748722,1748870,1749275,1749350,1749424,1749443,1749464,1749475,1749645,1749662,1749815,1749872,1749875,1749899,1750052,1750076-1750077,1750287
 
,1750457,1750462,1750465,1750495,1750626,1750809,1750886-1750887,1751396,1751410,1751419,1751445-1751446,1751478,1751748,1751753,1751755,1751871,1752198,1752202,1752259,1752273-1752274,1752283,1752292,1752438,1752447-1752448,1752508,1752596,1752616,1752659,1752672,1753262,1753331-1753332,1753335-1753336,1753355,1753444,1754117,1754239,1755157,1755191,1756505-1756506,1756520,1756580,1757119,1757166,1758213,1758713,1759433,1759754,1759795,1759826,1760326,1760340,1760373,1760387,1760486,1760492,1760494,1760661-1760662,1760677,1760701,1760709,1760946,1761412,1761444,1761571,1761762,1761787,1761866,1761876,1762453,1762463,1762612,1762632,1762635,1762825,1763347,1763355-1763356,1763378,1763465,1763735,1764475,1764678,1764705,1764814,1764898,1765817,1765983,1766071,1766390,1766423,1766496,1766519,1766554,1766644,1767025,1767265,1767502,1767704,1768446,1768637,1769078,1769939-1769940,1770694,1770982,1771022,1771093,1771098,1771739,1771852,1771870,1771902,1772155,1772162,1772228,1772593,1772
 
768,1772906,1773190,1774141,1774256,1774497,1774787,1775474,1775622,1775628,1775757,1778112,1778423,1778968,1779137,1779478,1780388,1780424,1780538,1780543,1781068,1781075,1781386,1781846,1781907,1782476,1782966,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783738,1783773,1783855,1783891,1784023,1784034,1784130,1784251,1784551,1784574,1784689,1785283,1785838,1785946,1787074,1787217,1787425,1789056,1792463,1792742,1793013,1793088,1793644,1795314,1795330,1795475,1795488,1795491,1795613,1795618,1796144,1798035,1798834,1799219,1799389,1799924,1800974,1801011,1801013,1802548,1802973,1803026,1807308,1808125,1808128,1808142,1808240,1808246,1809024,1809026,1809163,1811380,1811655,1811952,1811963,1811986,1814189,1814332,1814397

svn commit: r1816015 - in /jackrabbit/oak/trunk/oak-upgrade/src: main/java/org/apache/jackrabbit/oak/upgrade/ main/java/org/apache/jackrabbit/oak/upgrade/cli/ main/java/org/apache/jackrabbit/oak/upgra

svn commit: r1816027 - in /jackrabbit/oak/branches/1.0/oak-upgrade/src: main/java/org/apache/jackrabbit/oak/upgrade/ main/java/org/apache/jackrabbit/oak/upgrade/cli/ main/java/org/apache/jackrabbit/oa

svn commit: r1816012 - in /jackrabbit/oak/branches/1.2/oak-core: ./ src/main/java/org/apache/jackrabbit/oak/plugins/document/ src/test/java/org/apache/jackrabbit/oak/plugins/document/

svn commit: r1816026 - in /jackrabbit/oak/branches/1.2/oak-upgrade/src: main/java/org/apache/jackrabbit/oak/upgrade/ main/java/org/apache/jackrabbit/oak/upgrade/cli/ main/java/org/apache/jackrabbit/oa

svn commit: r1816019 - in /jackrabbit/oak/trunk/oak-lucene/src: main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/ main/java/org/apache/jackrabbit/oak/plugins/index/lucene/reader/ tes

svn commit: r1816016 - in /jackrabbit/oak/branches/1.6/oak-upgrade/src: main/java/org/apache/jackrabbit/oak/upgrade/ main/java/org/apache/jackrabbit/oak/upgrade/cli/ main/java/org/apache/jackrabbit/oa

svn commit: r1816028 - in /jackrabbit/oak/trunk: oak-run-commons/ oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/ oak-run-commons/src/test/ oak-run-commons/src/test/java/ oak-run-comm

svn commit: r1816021 - in /jackrabbit/oak/branches/1.4/oak-upgrade/src: main/java/org/apache/jackrabbit/oak/upgrade/ main/java/org/apache/jackrabbit/oak/upgrade/cli/ main/java/org/apache/jackrabbit/oa

svn commit: r1816047 - in /jackrabbit/oak/branches/1.0/oak-core: ./ src/main/java/org/apache/jackrabbit/oak/plugins/document/ src/test/java/org/apache/jackrabbit/oak/plugins/document/

svn commit: r1816056 - in /jackrabbit/oak/trunk: oak-run/src/main/java/org/apache/jackrabbit/oak/run/ oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/ oak-segment-tar/src/test/jav

svn commit: r1816064 - in /jackrabbit/oak/trunk: oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/ oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/ oak-c

svn commit: r1816067 - in /jackrabbit/oak/branches/1.4: ./ oak-core/ oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/documen

12 matches

Site Navigation

Mail list logo

Footer information