You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2009/07/10 18:23:17 UTC
svn commit: r793013 - in
/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle:
BundleDbPersistenceManager.java BundleFsPersistenceManager.java
Oracle9PersistenceManager.java PostgreSQLPersistenceManager.java
Author: jukka
Date: Fri Jul 10 16:23:17 2009
New Revision: 793013
URL: http://svn.apache.org/viewvc?rev=793013&view=rev
Log:
#0000 - JCR-1232: Merge UUID to NodeId
Replace UUID references with NodeId alternatives from o.a.j.core.persistence.bundle.
Modified:
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/BundleDbPersistenceManager.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/BundleFsPersistenceManager.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/Oracle9PersistenceManager.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/PostgreSQLPersistenceManager.java
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/BundleDbPersistenceManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/BundleDbPersistenceManager.java?rev=793013&r1=793012&r2=793013&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/BundleDbPersistenceManager.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/BundleDbPersistenceManager.java Fri Jul 10 16:23:17 2009
@@ -818,7 +818,7 @@
ResultSet bRs = null;
byte[] data = null;
try {
- Statement bSmt = connectionManager.executeStmt(bundleSelectSQL, getKey(id.getUUID()));
+ Statement bSmt = connectionManager.executeStmt(bundleSelectSQL, getKey(id));
bRs = bSmt.getResultSet();
if (!bRs.next()) {
throw new SQLException("bundle cannot be retrieved?");
@@ -865,26 +865,25 @@
// b) check bundle, store any bundle-to-be-modified in collection
// c) if recursive, add child uuids to list of uuids
- List<UUID> uuidList = new ArrayList<UUID>(uuids.length);
+ List<NodeId> idList = new ArrayList<NodeId>(uuids.length);
// convert uuid string array to list of UUID objects
for (int i = 0; i < uuids.length; i++) {
try {
- uuidList.add(new UUID(uuids[i]));
+ idList.add(new NodeId(uuids[i]));
} catch (IllegalArgumentException e) {
log.error("Invalid uuid for consistency check, skipping: '" + uuids[i] + "': " + e);
}
}
// iterate over UUIDs (including ones that are newly added inside the loop!)
- for (int i = 0; i < uuidList.size(); i++) {
- final UUID uuid = (UUID) uuidList.get(i);
+ for (int i = 0; i < idList.size(); i++) {
+ NodeId id = idList.get(i);
try {
// load the node from the database
- NodeId id = new NodeId(uuid);
NodePropBundle bundle = loadBundle(id, true);
if (bundle == null) {
- log.error("No bundle found for uuid '" + uuid + "'");
+ log.error("No bundle found for uuid '" + id + "'");
continue;
}
@@ -892,20 +891,20 @@
if (recursive) {
for (NodePropBundle.ChildNodeEntry entry : bundle.getChildNodeEntries()) {
- uuidList.add(entry.getId().getUUID());
+ idList.add(entry.getId());
}
}
count++;
if (count % 1000 == 0) {
- log.info(name + ": checked " + count + "/" + uuidList.size() + " bundles...");
+ log.info(name + ": checked " + count + "/" + idList.size() + " bundles...");
}
} catch (ItemStateException e) {
// problem already logged (loadBundle called with logDetailedErrors=true)
}
}
- total = uuidList.size();
+ total = idList.size();
}
// repair collected broken bundles
@@ -1000,38 +999,38 @@
/**
* Constructs a parameter list for a PreparedStatement
- * for the given UUID.
+ * for the given node identifier.
*
- * @param uuid the uuid
+ * @param id the node id
* @return a list of Objects
*/
- protected Object[] getKey(UUID uuid) {
+ protected Object[] getKey(NodeId id) {
if (getStorageModel() == SM_BINARY_KEYS) {
- return new Object[]{uuid.getRawBytes()};
+ return new Object[] { id.getRawBytes() };
} else {
- return new Object[]{new Long(uuid.getMostSignificantBits()),
- new Long(uuid.getLeastSignificantBits())};
+ return new Object[] {
+ id.getMostSignificantBits(), id.getLeastSignificantBits() };
}
}
/**
* Creates a parameter array for an SQL statement that needs
- * (i) a UUID, and (2) another parameter.
+ * (i) a node identifier, and (2) another parameter.
*
- * @param uuid the UUID
+ * @param id the node id
* @param p the other parameter
* @param before whether the other parameter should be before the uuid parameter
* @return an Object array that represents the parameters
*/
- protected Object[] createParams(UUID uuid, Object p, boolean before) {
+ protected Object[] createParams(NodeId id, Object p, boolean before) {
// Create the key
List<Object> key = new ArrayList<Object>();
if (getStorageModel() == SM_BINARY_KEYS) {
- key.add(uuid.getRawBytes());
+ key.add(id.getRawBytes());
} else {
- key.add(new Long(uuid.getMostSignificantBits()));
- key.add(new Long(uuid.getLeastSignificantBits()));
+ key.add(id.getMostSignificantBits());
+ key.add(id.getLeastSignificantBits());
}
// Create the parameters
@@ -1054,17 +1053,13 @@
throws ItemStateException, RepositoryException {
ResultSet rs = null;
try {
- UUID lowUuid;
- Object[] keys;
- String sql;
- if (bigger == null) {
- sql = bundleSelectAllIdsSQL;
- lowUuid = null;
- keys = new Object[0];
- } else {
+ String sql = bundleSelectAllIdsSQL;
+ NodeId lowId = null;
+ Object[] keys = new Object[0];
+ if (bigger != null) {
sql = bundleSelectAllIdsFromSQL;
- lowUuid = bigger.getUUID();
- keys = getKey(lowUuid);
+ lowId = bigger;
+ keys = getKey(bigger);
}
if (maxCount > 0) {
// get some more rows, in case the first row is smaller
@@ -1077,21 +1072,21 @@
rs = stmt.getResultSet();
ArrayList<NodeId> result = new ArrayList<NodeId>();
while ((maxCount == 0 || result.size() < maxCount) && rs.next()) {
- UUID current;
+ NodeId current;
if (getStorageModel() == SM_BINARY_KEYS) {
- current = new UUID(rs.getBytes(1));
+ current = new NodeId(rs.getBytes(1));
} else {
long high = rs.getLong(1);
long low = rs.getLong(2);
- current = new UUID(high, low);
+ current = new NodeId(high, low);
}
- if (lowUuid != null) {
+ if (lowId != null) {
// skip the keys that are smaller or equal (see above, maxCount += 10)
- if (current.compareTo(lowUuid) <= 0) {
+ if (current.compareTo(lowId) <= 0) {
continue;
}
}
- result.add(new NodeId(current));
+ result.add(current);
}
return result;
} catch (SQLException e) {
@@ -1150,7 +1145,7 @@
throws ItemStateException {
ResultSet rs = null;
try {
- Statement stmt = connectionManager.executeStmt(bundleSelectSQL, getKey(id.getUUID()));
+ Statement stmt = connectionManager.executeStmt(bundleSelectSQL, getKey(id));
rs = stmt.getResultSet();
if (!rs.next()) {
return null;
@@ -1187,7 +1182,7 @@
protected synchronized boolean existsBundle(NodeId id) throws ItemStateException {
ResultSet rs = null;
try {
- Statement stmt = connectionManager.executeStmt(bundleSelectSQL, getKey(id.getUUID()));
+ Statement stmt = connectionManager.executeStmt(bundleSelectSQL, getKey(id));
rs = stmt.getResultSet();
// a bundle exists, if the result has at least one entry
return rs.next();
@@ -1211,7 +1206,7 @@
dout.close();
String sql = bundle.isNew() ? bundleInsertSQL : bundleUpdateSQL;
- Object[] params = createParams(bundle.getId().getUUID(), out.toByteArray(), true);
+ Object[] params = createParams(bundle.getId(), out.toByteArray(), true);
connectionManager.executeStmt(sql, params);
} catch (Exception e) {
String msg = "failed to write bundle: " + bundle.getId();
@@ -1225,7 +1220,7 @@
*/
protected synchronized void destroyBundle(NodePropBundle bundle) throws ItemStateException {
try {
- connectionManager.executeStmt(bundleDeleteSQL, getKey(bundle.getId().getUUID()));
+ connectionManager.executeStmt(bundleDeleteSQL, getKey(bundle.getId()));
} catch (Exception e) {
if (e instanceof NoSuchItemStateException) {
throw (NoSuchItemStateException) e;
@@ -1249,7 +1244,7 @@
InputStream in = null;
try {
Statement stmt = connectionManager.executeStmt(
- nodeReferenceSelectSQL, getKey(targetId.getTargetId().getUUID()));
+ nodeReferenceSelectSQL, getKey(targetId.getTargetId()));
rs = stmt.getResultSet();
if (!rs.next()) {
throw new NoSuchItemStateException(targetId.toString());
@@ -1297,7 +1292,7 @@
// serialize references
Serializer.serialize(refs, out);
- Object[] params = createParams(refs.getTargetId().getUUID(), out.toByteArray(), true);
+ Object[] params = createParams(refs.getTargetId(), out.toByteArray(), true);
connectionManager.executeStmt(sql, params);
// there's no need to close a ByteArrayOutputStream
@@ -1319,7 +1314,7 @@
try {
connectionManager.executeStmt(nodeReferenceDeleteSQL,
- getKey(refs.getTargetId().getUUID()));
+ getKey(refs.getTargetId()));
} catch (Exception e) {
if (e instanceof NoSuchItemStateException) {
throw (NoSuchItemStateException) e;
@@ -1341,7 +1336,7 @@
ResultSet rs = null;
try {
Statement stmt = connectionManager.executeStmt(nodeReferenceSelectSQL,
- getKey(targetId.getTargetId().getUUID()));
+ getKey(targetId.getTargetId()));
rs = stmt.getResultSet();
// a reference exists if the result has at least one entry
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/BundleFsPersistenceManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/BundleFsPersistenceManager.java?rev=793013&r1=793012&r2=793013&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/BundleFsPersistenceManager.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/BundleFsPersistenceManager.java Fri Jul 10 16:23:17 2009
@@ -37,7 +37,6 @@
import org.apache.jackrabbit.core.id.NodeReferencesId;
import org.apache.jackrabbit.core.state.NoSuchItemStateException;
import org.apache.jackrabbit.core.state.NodeReferences;
-import org.apache.jackrabbit.uuid.UUID;
import java.io.DataInputStream;
import java.io.DataOutputStream;
@@ -506,7 +505,7 @@
throws ItemStateException {
ArrayList<NodeId> list = new ArrayList<NodeId>();
try {
- getListRecursive(list, "", bigger == null ? null : bigger.getUUID(), maxCount);
+ getListRecursive(list, "", bigger == null ? null : bigger, maxCount);
return list;
} catch (FileSystemException e) {
String msg = "failed to read node list: " + bigger + ": " + e;
@@ -518,7 +517,7 @@
/**
* {@inheritDoc}
*/
- protected UUID getUUIDFromFileName(String fileName) {
+ protected NodeId getIdFromFileName(String fileName) {
StringBuffer buff = new StringBuffer(35);
if (!fileName.endsWith("." + NODEFILENAME)) {
return null;
@@ -536,12 +535,12 @@
}
}
}
- String u = buff.toString();
- return new UUID(u);
+ return new NodeId(buff.toString());
}
- private void getListRecursive(ArrayList<NodeId> list, String path, UUID bigger,
- int maxCount) throws FileSystemException {
+ private void getListRecursive(
+ ArrayList<NodeId> list, String path, NodeId bigger, int maxCount)
+ throws FileSystemException {
if (maxCount > 0 && list.size() >= maxCount) {
return;
}
@@ -549,14 +548,13 @@
Arrays.sort(files);
for (int i = 0; i < files.length; i++) {
String f = files[i];
- UUID u = getUUIDFromFileName(path + FileSystem.SEPARATOR + f);
- if (u == null) {
+ NodeId n = getIdFromFileName(path + FileSystem.SEPARATOR + f);
+ if (n == null) {
continue;
}
- if (bigger != null && bigger.toString().compareTo(u.toString()) >= 0) {
+ if (bigger != null && bigger.toString().compareTo(n.toString()) >= 0) {
continue;
}
- NodeId n = new NodeId(u);
list.add(n);
if (maxCount > 0 && list.size() >= maxCount) {
return;
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/Oracle9PersistenceManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/Oracle9PersistenceManager.java?rev=793013&r1=793012&r2=793013&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/Oracle9PersistenceManager.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/Oracle9PersistenceManager.java Fri Jul 10 16:23:17 2009
@@ -116,7 +116,7 @@
String sql = bundle.isNew() ? bundleInsertSQL : bundleUpdateSQL;
blob = createTemporaryBlob(new ByteArrayInputStream(out.toByteArray()));
- Object[] params = createParams(bundle.getId().getUUID(), blob, true);
+ Object[] params = createParams(bundle.getId(), blob, true);
connectionManager.executeStmt(sql, params);
} catch (Exception e) {
String msg = "failed to write bundle: " + bundle.getId();
@@ -155,7 +155,7 @@
// not have to additionally synchronize on the preparedStatement
blob = createTemporaryBlob(new ByteArrayInputStream(out.toByteArray()));
- Object[] params = createParams(refs.getTargetId().getUUID(), blob, true);
+ Object[] params = createParams(refs.getTargetId(), blob, true);
connectionManager.executeStmt(sql, params);
// there's no need to close a ByteArrayOutputStream
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/PostgreSQLPersistenceManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/PostgreSQLPersistenceManager.java?rev=793013&r1=793012&r2=793013&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/PostgreSQLPersistenceManager.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/PostgreSQLPersistenceManager.java Fri Jul 10 16:23:17 2009
@@ -91,7 +91,7 @@
protected synchronized NodePropBundle loadBundle(NodeId id)
throws ItemStateException {
try {
- Statement stmt = connectionManager.executeStmt(bundleSelectSQL, getKey(id.getUUID()));
+ Statement stmt = connectionManager.executeStmt(bundleSelectSQL, getKey(id));
ResultSet rs = stmt.getResultSet();
try {
if (rs.next()) {