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/07/16 15:23:13 UTC
svn commit: r1691401 -
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
Author: reschke
Date: Thu Jul 16 13:23:13 2015
New Revision: 1691401
URL: http://svn.apache.org/r1691401
Log:
OAK-3114: RDBDocumentStore: add BDATA DDL information to startup diagnostics
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=1691401&r1=1691400&r2=1691401&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 Jul 16 13:23:13 2015
@@ -282,7 +282,6 @@ public class RDBDocumentStore implements
}
return null;
}
-
@Override
public CacheInvalidationStats invalidateCache(Iterable<String> keys) {
//TODO: optimize me
@@ -919,9 +918,11 @@ public class RDBDocumentStore implements
}
private static String dumpTableMeta(int idType, String idTypeName, int idPrecision, int dataType, String dataTypeName,
- int dataPrecision) {
- return String.format("type of ID: %d (%s) precision %d (-> %s), type of DATA: %d (%s) precision %d", idType, idTypeName,
- idPrecision, isBinaryType(idType) ? "binary" : "character", dataType, dataTypeName, dataPrecision);
+ int dataPrecision, int bdataType, String bdataTypeName, int bdataPrecision) {
+ return String
+ .format("type of ID: %d (%s) precision %d (-> %s), type of DATA: %d (%s) precision %d, type of BDATA: %d (%s) precision %d",
+ idType, idTypeName, idPrecision, isBinaryType(idType) ? "binary" : "character", dataType, dataTypeName,
+ dataPrecision, bdataType, bdataTypeName, bdataPrecision);
}
private void createTableFor(Connection con, Collection<? extends Document> col, List<String> tablesCreated,
@@ -936,7 +937,7 @@ public class RDBDocumentStore implements
ResultSet checkResultSet = null;
Statement creatStatement = null;
try {
- checkStatement = con.prepareStatement("select ID, DATA from " + tableName + " where ID = ?");
+ checkStatement = con.prepareStatement("select ID, DATA, BDATA from " + tableName + " where ID = ?");
checkStatement.setString(1, "0:/");
checkResultSet = checkStatement.executeQuery();
@@ -946,7 +947,8 @@ public class RDBDocumentStore implements
this.isIdBinary = isBinaryType(met.getColumnType(1));
this.dataLimitInOctets = met.getPrecision(2);
diagnostics.append(dumpTableMeta(met.getColumnType(1), met.getColumnTypeName(1), met.getPrecision(1),
- met.getColumnType(2), met.getColumnTypeName(2), met.getPrecision(2)));
+ met.getColumnType(2), met.getColumnTypeName(2), met.getPrecision(2), met.getColumnType(3),
+ met.getColumnTypeName(3), met.getPrecision(3)));
}
tablesPresent.add(tableName);
} catch (SQLException ex) {
@@ -969,14 +971,15 @@ public class RDBDocumentStore implements
tablesCreated.add(tableName);
if (col.equals(Collection.NODES)) {
- PreparedStatement pstmt = con.prepareStatement("select ID, DATA from " + tableName + " where ID = ?");
+ PreparedStatement pstmt = con.prepareStatement("select ID, DATA, BDATA from " + tableName + " where ID = ?");
pstmt.setString(1, "0:/");
ResultSet rs = pstmt.executeQuery();
ResultSetMetaData met = rs.getMetaData();
this.isIdBinary = isBinaryType(met.getColumnType(1));
this.dataLimitInOctets = met.getPrecision(2);
diagnostics.append(dumpTableMeta(met.getColumnType(1), met.getColumnTypeName(1), met.getPrecision(1),
- met.getColumnType(2), met.getColumnTypeName(2), met.getPrecision(2)));
+ met.getColumnType(2), met.getColumnTypeName(2), met.getPrecision(2), met.getColumnType(3),
+ met.getColumnTypeName(3), met.getPrecision(3)));
}
}
catch (SQLException ex2) {