Author: reschke
Date: Thu Feb 12 16:36:45 2015
New Revision: 1659309
URL: http://svn.apache.org/r1659309
Log:
OAK-1913 - fix BDATA type for MySQL to longblob; improve test diagnostics
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BasicDocumentStoreTest.java
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=1659309&r1=1659308&r2=1659309&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 Feb 12 16:36:45 2015
@@ -380,7 +380,7 @@ public class RDBDocumentStore implements
@Override
public String getTableCreationStatement(String tableName) {
// see https://issues.apache.org/jira/browse/OAK-1913
- return ("create table " + tableName + " (ID varbinary(512) not
null primary key, MODIFIED bigint, HASBINARY smallint, DELETEDONCE smallint,
MODCOUNT bigint, CMODCOUNT bigint, DSIZE bigint, DATA varchar(16000), BDATA
mediumblob)");
+ return ("create table " + tableName + " (ID varbinary(512) not
null primary key, MODIFIED bigint, HASBINARY smallint, DELETEDONCE smallint,
MODCOUNT bigint, CMODCOUNT bigint, DSIZE bigint, DATA varchar(16000), BDATA
longblob)");
}
@Override
@@ -490,7 +490,8 @@ public class RDBDocumentStore implements
public String getTableCreationStatement(String tableName) {
return "create table "
+ tableName
- + " (ID varchar(512) not null primary key, MODIFIED
bigint, HASBINARY smallint, DELETEDONCE smallint, MODCOUNT bigint, CMODCOUNT
bigint, DSIZE bigint, DATA varchar(16384), BDATA blob)";
+ + " (ID varchar(512) not null primary key, MODIFIED
bigint, HASBINARY smallint, DELETEDONCE smallint, MODCOUNT bigint, CMODCOUNT
bigint, DSIZE bigint, DATA varchar(16384), BDATA blob("
+ + 1024 * 1024 * 1024 + "))";
}
private String description;
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BasicDocumentStoreTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BasicDocumentStoreTest.java?rev=1659309&r1=1659308&r2=1659309&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BasicDocumentStoreTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BasicDocumentStoreTest.java
Thu Feb 12 16:36:45 2015
@@ -117,8 +117,9 @@ public class BasicDocumentStoreTest exte
@Test
public void testMaxProperty() {
int min = 0;
- int max = 1024 * 1024 * 4; // 32M
+ int max = 1024 * 1024 * 8;
int test = 0;
+ int last = 0;
while (max - min >= 256) {
test = (max + min) / 2;
@@ -134,12 +135,13 @@ public class BasicDocumentStoreTest exte
assertNotNull("failed to retrieve previously stored document",
findme);
super.ds.remove(Collection.NODES, id);
min = test;
+ last = test;
} else {
max = test;
}
}
- LOG.info("max prop length for " + super.dsname + " was " + test);
+ LOG.info("max prop length for " + super.dsname + " was " + last);
}
@Test
