Author: reschke
Date: Fri Apr 28 14:32:48 2017
New Revision: 1793099
URL: http://svn.apache.org/viewvc?rev=1793099&view=rev
Log:
OAK-6143: RDB*store fixtures: shorten table name prefixes for Oracle (ported to
1.6)
Modified:
jackrabbit/oak/branches/1.6/ (props changed)
jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/fixture/DocumentRdbFixture.java
jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractRDBConnectionTest.java
jackrabbit/oak/branches/1.6/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakDocumentRDBRepositoryStub.java
Propchange: jackrabbit/oak/branches/1.6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 28 14:32:48 2017
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782476,1782770,1782945,1782966,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783619,1783720,1783731,1783733,1783738,1783742,1783773,1783855,1783891,1784023,1784130,1784162,1784251,1784401,1784551,1784574,1785095,1785108,1785283,1785838,1785919,1787074,1787217,1788378,1790382,1792463,1792742
+/jackrabbit/oak/trunk:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782476,1782770,1782945,1782966,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783619,1783720,1783731,1783733,1783738,1783742,1783773,1783855,1783891,1784023,1784130,1784162,1784251,1784401,1784551,1784574,1785095,1785108,1785283,1785838,1785919,1787074,1787217,1788378,1790382,1792463,1792742,1793088
/jackrabbit/trunk:1345480
Modified:
jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/fixture/DocumentRdbFixture.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/fixture/DocumentRdbFixture.java?rev=1793099&r1=1793098&r2=1793099&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/fixture/DocumentRdbFixture.java
(original)
+++
jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/fixture/DocumentRdbFixture.java
Fri Apr 28 14:32:48 2017
@@ -23,7 +23,6 @@ import java.io.Closeable;
import java.io.File;
import java.io.IOException;
import java.util.Map;
-import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
import javax.sql.DataSource;
@@ -51,7 +50,7 @@ public class DocumentRdbFixture extends
@Override
public NodeStore createNodeStore() {
- String prefix = "T" + UUID.randomUUID().toString().replace("-", "");
+ String prefix = "T" + Long.toHexString(System.currentTimeMillis());
RDBOptions options = new
RDBOptions().tablePrefix(prefix).dropTablesOnClose(true);
this.jdbcUrl = pUrl.replace("{fname}", fname);
DataSource ds = RDBDataSourceFactory.forJdbcUrl(jdbcUrl, pUser,
pPasswd);
Modified:
jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractRDBConnectionTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractRDBConnectionTest.java?rev=1793099&r1=1793098&r2=1793099&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractRDBConnectionTest.java
(original)
+++
jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractRDBConnectionTest.java
Fri Apr 28 14:32:48 2017
@@ -18,7 +18,6 @@ package org.apache.jackrabbit.oak.plugin
import java.io.Closeable;
import java.io.File;
-import java.util.UUID;
import javax.sql.DataSource;
@@ -57,7 +56,8 @@ public class AbstractRDBConnectionTest e
}
protected DocumentMK.Builder newBuilder(DataSource db) throws Exception {
- RDBOptions opt = new RDBOptions().tablePrefix("T" +
UUID.randomUUID().toString().replace("-", "")).dropTablesOnClose(true);
+ String prefix = "T" + Long.toHexString(System.currentTimeMillis());
+ RDBOptions opt = new
RDBOptions().tablePrefix(prefix).dropTablesOnClose(true);
return new
DocumentMK.Builder().clock(getTestClock()).setRDBConnection(dataSource, opt);
}
Modified:
jackrabbit/oak/branches/1.6/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakDocumentRDBRepositoryStub.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakDocumentRDBRepositoryStub.java?rev=1793099&r1=1793098&r2=1793099&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.6/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakDocumentRDBRepositoryStub.java
(original)
+++
jackrabbit/oak/branches/1.6/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakDocumentRDBRepositoryStub.java
Fri Apr 28 14:32:48 2017
@@ -21,7 +21,7 @@ import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.SQLException;
import java.util.Properties;
-import java.util.UUID;
+
import javax.jcr.Repository;
import javax.jcr.RepositoryException;
@@ -63,7 +63,7 @@ public class OakDocumentRDBRepositoryStu
Session session = null;
final DocumentNodeStore m;
try {
- String prefix = "T" + UUID.randomUUID().toString().replace("-",
"");
+ String prefix = "T" + Long.toHexString(System.currentTimeMillis());
RDBOptions options = new
RDBOptions().tablePrefix(prefix).dropTablesOnClose(true);
m = new DocumentMK.Builder().
memoryCacheSize(64 * 1024 * 1024).
