From a85be673b47f4dd6c1f9f7e5ec400ba7b89775b9 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Mon, 23 Mar 2015 23:13:56 +0000
Subject: [PATCH] Rename WriteableStorage.create() to put() as agreed during the review of CR-6383.
---
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/VLVIndex.java | 6 +++---
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ID2Entry.java | 2 +-
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/JECompressedSchema.java | 2 +-
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/spi/WriteableStorage.java | 9 +++++----
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/State.java | 2 +-
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/Importer.java | 2 +-
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/Index.java | 4 ++--
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DN2ID.java | 2 +-
opendj-server-legacy/src/main/java/org/opends/server/backends/persistit/PersistItStorage.java | 2 +-
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/TracedStorage.java | 4 ++--
10 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/persistit/PersistItStorage.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/persistit/PersistItStorage.java
index 001aa36..d736649 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/persistit/PersistItStorage.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/persistit/PersistItStorage.java
@@ -274,7 +274,7 @@
private final Map<TreeName, Exchange> exchanges = new HashMap<TreeName, Exchange>();
@Override
- public void create(final TreeName treeName, final ByteSequence key,
+ public void put(final TreeName treeName, final ByteSequence key,
final ByteSequence value)
{
try
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DN2ID.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DN2ID.java
index 46bd605..e59cdd4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DN2ID.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DN2ID.java
@@ -70,7 +70,7 @@
{
ByteString key = dnToDNKey(dn, prefixRDNComponents);
ByteString value = id.toByteString();
- txn.create(getName(), key, value);
+ txn.put(getName(), key, value);
}
/**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ID2Entry.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ID2Entry.java
index e07dc08..006fdf6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ID2Entry.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ID2Entry.java
@@ -327,7 +327,7 @@
try
{
ByteString value = codec.encodeInternal(entry, dataConfig);
- txn.create(getName(), key, value);
+ txn.put(getName(), key, value);
}
finally
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/Importer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/Importer.java
index 5cea395..2a4d630 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/Importer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/Importer.java
@@ -2313,7 +2313,7 @@
public void writeToDN2ID(ImportIDSet idSet) throws DirectoryException
{
- txn.create(dn2id, idSet.getKey(), entryID.toByteString());
+ txn.put(dn2id, idSet.getKey(), entryID.toByteString());
indexMgr.addTotDNCount(1);
if (parentDN != null)
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/Index.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/Index.java
index 34875b5..31850d8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/Index.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/Index.java
@@ -163,7 +163,7 @@
else
{
value = importIDSet.valueToByteString();
- txn.create(getName(), key, value);
+ txn.put(getName(), key, value);
}
} else {
// Should never happen -- the keys should always be there.
@@ -194,7 +194,7 @@
}
value = importIdSet.valueToByteString();
}
- txn.create(getName(), key, value);
+ txn.put(getName(), key, value);
}
void updateKey(WriteableStorage txn, ByteString key, EntryIDSet deletedIDs, EntryIDSet addedIDs)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/JECompressedSchema.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/JECompressedSchema.java
index 23ac7ef..dcc99ce 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/JECompressedSchema.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/JECompressedSchema.java
@@ -238,7 +238,7 @@
@Override
public void run(WriteableStorage txn) throws Exception
{
- txn.create(treeName, keyEntry, value);
+ txn.put(treeName, keyEntry, value);
}
});
return true;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/State.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/State.java
index 2f61bd7..34e952e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/State.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/State.java
@@ -108,7 +108,7 @@
{
ByteString key = keyForIndex(index);
- txn.create(getName(), key, trusted ? trueBytes : falseBytes);
+ txn.put(getName(), key, trusted ? trueBytes : falseBytes);
}
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/TracedStorage.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/TracedStorage.java
index 5fa54ba..c31b52c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/TracedStorage.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/TracedStorage.java
@@ -154,9 +154,9 @@
}
@Override
- public void create(final TreeName name, final ByteSequence key, final ByteSequence value)
+ public void put(final TreeName name, final ByteSequence key, final ByteSequence value)
{
- txn.create(name, key, value);
+ txn.put(name, key, value);
logger.trace("Storage@%s.WriteableStorage@%s.create(%s, %s, %s, %s)",
storageId(), id(), backendId, name, hex(key), hex(value));
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/VLVIndex.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/VLVIndex.java
index 497e679..1b2b257 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/VLVIndex.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/VLVIndex.java
@@ -591,8 +591,8 @@
* the key.
*/
SortValuesSet splitSortValuesSet = sortValuesSet.split(newSize / 2);
- txn.create(getName(), splitSortValuesSet.getKeyBytes(), splitSortValuesSet.toByteString()); // splitAfter
- txn.create(getName(), sortValuesSet.getKeyBytes(), sortValuesSet.toByteString()); // after
+ txn.put(getName(), splitSortValuesSet.getKeyBytes(), splitSortValuesSet.toByteString()); // splitAfter
+ txn.put(getName(), sortValuesSet.getKeyBytes(), sortValuesSet.toByteString()); // after
if(logger.isTraceEnabled())
{
@@ -610,7 +610,7 @@
else
{
ByteString after = sortValuesSet.toByteString();
- txn.create(getName(), key, after);
+ txn.put(getName(), key, after);
}
count.getAndAdd(newSize - oldSize);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/spi/WriteableStorage.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/spi/WriteableStorage.java
index 8da03c9..7f9098d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/spi/WriteableStorage.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/spi/WriteableStorage.java
@@ -59,8 +59,8 @@
void deleteTree(TreeName name);
/**
- * Creates a new record with the provided key and value, in the tree whose name is provided.
- * If a previous record is associated to the provided key, then it will be replaced by the new record.
+ * Adds a record with the provided key and value, replacing any existing record having the same
+ * key.
*
* @param treeName
* the tree name
@@ -69,10 +69,11 @@
* @param value
* the value of the new record
*/
- void create(TreeName treeName, ByteSequence key, ByteSequence value);
+ void put(TreeName treeName, ByteSequence key, ByteSequence value);
/**
- * Updates a record with the provided key according to the new value computed by the update function.
+ * Atomically adds, deletes, or replaces a record with the provided key according to the new value
+ * computed by the update function.
*
* @param treeName
* the tree name
--
Gitblit v1.10.0