Author: mreutegg
Date: Thu Sep 21 13:20:37 2017
New Revision: 1809161
URL: http://svn.apache.org/viewvc?rev=1809161&view=rev
Log:
OAK-6697: Use OakVersion in oak-commons
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStore.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBExport.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/Utils.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java?rev=1809161&r1=1809160&r2=1809161&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java
Thu Sep 21 13:20:37 2017
@@ -18,6 +18,7 @@ package org.apache.jackrabbit.oak.plugin
import static com.google.common.base.Preconditions.checkNotNull;
import static
org.apache.jackrabbit.oak.plugins.document.ClusterNodeInfo.ClusterNodeState.ACTIVE;
+import static
org.apache.jackrabbit.oak.plugins.document.util.Utils.getModuleVersion;
import java.lang.management.ManagementFactory;
import java.net.NetworkInterface;
@@ -35,7 +36,6 @@ import com.google.common.base.Stopwatch;
import org.apache.jackrabbit.oak.commons.StringUtils;
import org.apache.jackrabbit.oak.stats.Clock;
-import org.apache.jackrabbit.oak.OakVersion;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -210,7 +210,7 @@ public class ClusterNodeInfo {
/**
* The Oak version.
*/
- private static final String OAK_VERSION = OakVersion.getVersion();
+ private static final String OAK_VERSION = getModuleVersion();
/**
* The number of milliseconds for a lease (2 minute by default, and
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java?rev=1809161&r1=1809160&r2=1809161&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
Thu Sep 21 13:20:37 2017
@@ -39,6 +39,7 @@ import static org.apache.jackrabbit.oak.
import static org.apache.jackrabbit.oak.plugins.document.UpdateOp.Operation;
import static
org.apache.jackrabbit.oak.plugins.document.util.Utils.alignWithExternalRevisions;
import static
org.apache.jackrabbit.oak.plugins.document.util.Utils.getIdFromPath;
+import static
org.apache.jackrabbit.oak.plugins.document.util.Utils.getModuleVersion;
import static org.apache.jackrabbit.oak.plugins.document.util.Utils.pathToId;
import static
org.apache.jackrabbit.oak.plugins.observation.ChangeCollectorProvider.COMMIT_CONTEXT_OBSERVATION_CHANGESET;
@@ -123,7 +124,6 @@ import org.apache.jackrabbit.oak.spi.sta
import org.apache.jackrabbit.oak.spi.state.NodeStateDiff;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
import org.apache.jackrabbit.oak.stats.Clock;
-import org.apache.jackrabbit.oak.OakVersion;
import org.apache.jackrabbit.oak.commons.benchmark.PerfLogger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -2532,7 +2532,7 @@ public final class DocumentNodeStore
"in read-write mode. Existing data in DocumentStore " +
"was written with older version. Store version: " +
storeVersion + ", this version: " + VERSION + ". Use "
+
- "the oak-run-" + OakVersion.getVersion() + ".jar tool
" +
+ "the oak-run-" + getModuleVersion() + ".jar tool " +
"with the unlockUpgrade command first.");
}
}
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStore.java?rev=1809161&r1=1809160&r2=1809161&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStore.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStore.java
Thu Sep 21 13:20:37 2017
@@ -18,6 +18,7 @@ package org.apache.jackrabbit.oak.plugin
import static
org.apache.jackrabbit.oak.plugins.document.rdb.RDBJDBCTools.closeResultSet;
import static
org.apache.jackrabbit.oak.plugins.document.rdb.RDBJDBCTools.closeStatement;
+import static
org.apache.jackrabbit.oak.plugins.document.util.Utils.getModuleVersion;
import java.io.Closeable;
import java.io.IOException;
@@ -45,7 +46,6 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.document.DocumentStoreException;
import
org.apache.jackrabbit.oak.plugins.document.rdb.RDBJDBCTools.PreparedStatementComponent;
import org.apache.jackrabbit.oak.spi.blob.AbstractBlobStore;
-import org.apache.jackrabbit.oak.OakVersion;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -108,7 +108,7 @@ public class RDBBlobStore extends Cachin
} catch (IOException ex) {
LOG.error("closing connection handler", ex);
}
- LOG.info("RDBBlobStore (" + OakVersion.getVersion() + ") closed"
+ LOG.info("RDBBlobStore (" + getModuleVersion() + ") closed"
+ (dropped.isEmpty() ? "" : " (tables dropped: " + dropped +
")"));
}
@@ -220,7 +220,7 @@ public class RDBBlobStore extends Cachin
tablesToBeDropped.addAll(tablesCreated);
}
- LOG.info("RDBBlobStore (" + OakVersion.getVersion() + ")
instantiated for database " + dbDesc + ", using driver: "
+ LOG.info("RDBBlobStore (" + getModuleVersion() + ") instantiated
for database " + dbDesc + ", using driver: "
+ driverDesc + ", connecting to: " + dbUrl + ",
transaction isolation level: " + isolationDiags);
if (!tablesPresent.isEmpty()) {
LOG.info("Tables present upon startup: " + tablesPresent);
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=1809161&r1=1809160&r2=1809161&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 Sep 21 13:20:37 2017
@@ -23,6 +23,7 @@ import static org.apache.jackrabbit.oak.
import static
org.apache.jackrabbit.oak.plugins.document.rdb.RDBJDBCTools.closeResultSet;
import static
org.apache.jackrabbit.oak.plugins.document.rdb.RDBJDBCTools.closeStatement;
import static
org.apache.jackrabbit.oak.plugins.document.rdb.RDBJDBCTools.createTableName;
+import static
org.apache.jackrabbit.oak.plugins.document.util.Utils.getModuleVersion;
import java.io.ByteArrayOutputStream;
import java.io.Closeable;
@@ -83,7 +84,6 @@ import org.apache.jackrabbit.oak.plugins
import
org.apache.jackrabbit.oak.plugins.document.locks.StripedNodeDocumentLocks;
import org.apache.jackrabbit.oak.plugins.document.mongo.MongoDocumentStore;
import org.apache.jackrabbit.oak.plugins.document.util.CloseableIterator;
-import org.apache.jackrabbit.oak.OakVersion;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -706,7 +706,7 @@ public class RDBDocumentStore implements
} catch (IOException ex) {
LOG.warn("Error occurred while closing nodes cache", ex);
}
- LOG.info("RDBDocumentStore (" + OakVersion.getVersion() + ") disposed"
+ getCnStats()
+ LOG.info("RDBDocumentStore (" + getModuleVersion() + ") disposed" +
getCnStats()
+ (this.droppedTables.isEmpty() ? "" : " (tables dropped: " +
this.droppedTables + ")"));
}
@@ -893,7 +893,7 @@ public class RDBDocumentStore implements
String diag = dbInfo.getAdditionalDiagnostics(this.ch,
this.tableMeta.get(Collection.NODES).getName());
- LOG.info("RDBDocumentStore (" + OakVersion.getVersion() + ")
instantiated for database " + dbDesc + ", using driver: "
+ LOG.info("RDBDocumentStore (" + getModuleVersion() + ") instantiated
for database " + dbDesc + ", using driver: "
+ driverDesc + ", connecting to: " + dbUrl + (diag.isEmpty() ?
"" : (", properties: " + diag))
+ ", transaction isolation level: " + isolationDiags +
tableDiags);
if (!tablesPresent.isEmpty()) {
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBExport.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBExport.java?rev=1809161&r1=1809160&r2=1809161&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBExport.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBExport.java
Thu Sep 21 13:20:37 2017
@@ -52,7 +52,8 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.document.DocumentStoreException;
import org.apache.jackrabbit.oak.plugins.document.NodeDocument;
import org.apache.jackrabbit.oak.plugins.document.memory.MemoryDocumentStore;
-import org.apache.jackrabbit.oak.OakVersion;
+
+import static
org.apache.jackrabbit.oak.plugins.document.util.Utils.getModuleVersion;
/**
* Utility for dumping contents from {@link RDBDocumentStore}'s tables.
@@ -109,7 +110,7 @@ public class RDBExport {
String fields = args[++i];
fieldList = Arrays.asList(fields.split(","));
} else if ("--version".equals(param)) {
- System.out.println(RDBExport.class.getName() + " version "
+ OakVersion.getVersion());
+ System.out.println(RDBExport.class.getName() + " version "
+ getModuleVersion());
System.exit(0);
} else if ("--help".equals(param)) {
printHelp();
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/Utils.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/Utils.java?rev=1809161&r1=1809160&r2=1809161&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/Utils.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/Utils.java
Thu Sep 21 13:20:37 2017
@@ -40,6 +40,7 @@ import com.google.common.base.Predicate;
import com.google.common.collect.AbstractIterator;
import org.apache.commons.codec.binary.Hex;
+import org.apache.jackrabbit.oak.commons.OakVersion;
import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.oak.commons.StringUtils;
import org.apache.jackrabbit.oak.plugins.document.Collection;
@@ -62,6 +63,8 @@ import static org.apache.jackrabbit.oak.
public class Utils {
private static final Logger LOG = LoggerFactory.getLogger(Utils.class);
+ private static String MODULE_VERSION = null;
+
/**
* Approximate length of a Revision string.
*/
@@ -878,4 +881,18 @@ public class Utils {
}
}
}
+
+ /**
+ * Returns the version of the module that contains the DocumentNodeStore.
+ *
+ * @return the module version or "SNAPSHOT" if unknown.
+ */
+ public static String getModuleVersion() {
+ String v = MODULE_VERSION;
+ if (v == null) {
+ v = OakVersion.getVersion("oak-core", Utils.class);
+ MODULE_VERSION = v;
+ }
+ return v;
+ }
}
