svn commit: r1793088 - in /jackrabbit/oak/trunk: oak-core/src/test/java/org/apache/jackrabbit/oak/fixture/ oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ oak-run/

[reschke]

Author: reschke
Date: Fri Apr 28 13:33:18 2017
New Revision: 1793088

URL: http://svn.apache.org/viewvc?rev=1793088&view=rev
Log:
OAK-6143: RDB*store fixtures: shorten table name prefixes for Oracle

Modified:
    
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/fixture/DocumentRdbFixture.java
    
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractRDBConnectionTest.java
    
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakDocumentRDBRepositoryStub.java
    jackrabbit/oak/trunk/oak-run/pom.xml

Modified: 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/fixture/DocumentRdbFixture.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/fixture/DocumentRdbFixture.java?rev=1793088&r1=1793087&r2=1793088&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/fixture/DocumentRdbFixture.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/fixture/DocumentRdbFixture.java
 Fri Apr 28 13:33:18 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/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractRDBConnectionTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractRDBConnectionTest.java?rev=1793088&r1=1793087&r2=1793088&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractRDBConnectionTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractRDBConnectionTest.java
 Fri Apr 28 13:33:18 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/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakDocumentRDBRepositoryStub.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakDocumentRDBRepositoryStub.java?rev=1793088&r1=1793087&r2=1793088&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakDocumentRDBRepositoryStub.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakDocumentRDBRepositoryStub.java
 Fri Apr 28 13:33:18 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;
 import javax.jcr.Session;
@@ -61,7 +61,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).

Modified: jackrabbit/oak/trunk/oak-run/pom.xml
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/pom.xml?rev=1793088&r1=1793087&r2=1793088&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-run/pom.xml Fri Apr 28 13:33:18 2017
@@ -156,7 +156,7 @@
             <configuration>
               <rules>
                 <requireFilesSize>
-                  <maxsize>38000000</maxsize>
+                  <maxsize>380000000</maxsize>
                   <!--
                     Size History:
                     + 38 MB. Initial value. Current 35MB plus a 10%