You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2015/11/11 12:12:21 UTC
svn commit: r1713809 -
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
Author: reschke
Date: Wed Nov 11 11:12:21 2015
New Revision: 1713809
URL: http://svn.apache.org/viewvc?rev=1713809&view=rev
Log:
OAK-3605: RDBBlob/DocumentStore: reduce class complexity (WIP)
fix regression causing table metadata potentially to be incorrect for tables other than NODES
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.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=1713809&r1=1713808&r2=1713809&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 Wed Nov 11 11:12:21 2015
@@ -766,7 +766,8 @@ public class RDBDocumentStore implements
}
String tableName = tmd.getName();
- PreparedStatement checkStatement = null;
+ PreparedStatement checkStatement = null, checkStatement2 = null;
+
ResultSet checkResultSet = null;
Statement creatStatement = null;
try {
@@ -774,11 +775,11 @@ public class RDBDocumentStore implements
checkStatement.setString(1, "0:/");
checkResultSet = checkStatement.executeQuery();
- // try to discover size of DATA column
+ // try to discover size of DATA column and binary-ness of ID
ResultSetMetaData met = checkResultSet.getMetaData();
obtainFlagsFromResultSetMeta(met, tmd);
- if (col.equals(Collection.NODES)) {
+ if (col == Collection.NODES) {
String tableInfo = RDBJDBCTools.dumpResultSetMeta(met);
diagnostics.append(tableInfo);
String indexInfo = dumpIndexData(con.getMetaData(), met, tableName);
@@ -806,12 +807,14 @@ public class RDBDocumentStore implements
tablesCreated.add(tableName);
- if (col.equals(Collection.NODES)) {
- PreparedStatement pstmt = con.prepareStatement("select * from " + tableName + " where ID = ?");
- pstmt.setString(1, "0:/");
- ResultSet rs = pstmt.executeQuery();
- ResultSetMetaData met = rs.getMetaData();
- obtainFlagsFromResultSetMeta(met, tmd);
+ checkStatement2 = con.prepareStatement("select * from " + tableName + " where ID = ?");
+ checkStatement2.setString(1, "0:/");
+ ResultSet rs = checkStatement2.executeQuery();
+ // try to discover size of DATA column and binary-ness of ID
+ ResultSetMetaData met = rs.getMetaData();
+ obtainFlagsFromResultSetMeta(met, tmd);
+
+ if (col == Collection.NODES) {
String tableInfo = RDBJDBCTools.dumpResultSetMeta(met);
diagnostics.append(tableInfo);
String indexInfo = dumpIndexData(con.getMetaData(), met, tableName);
@@ -828,6 +831,7 @@ public class RDBDocumentStore implements
finally {
closeResultSet(checkResultSet);
closeStatement(checkStatement);
+ closeStatement(checkStatement2);
closeStatement(creatStatement);
}
}