mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

Matthew Swift
17.39.2014 9f2b0e32f4fd3962e71358bdbef5d5af9b5e8379
Rename transaction methods to create/read/update/delete
7 files modified
28 ■■■■ changed files
opendj3-server-dev/src/server/org/opends/server/backends/persistit/PersistItStorage.java 8 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/backends/pluggable/ConfigurableEnvironment.java 4 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/backends/pluggable/DatabaseContainer.java 6 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/backends/pluggable/State.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/backends/pluggable/VLVIndex.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/backends/pluggable/spi/ReadableStorage.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/backends/pluggable/spi/WriteableStorage.java 4 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/backends/persistit/PersistItStorage.java
@@ -121,7 +121,7 @@
        }
        @Override
        public ByteString get(TreeName treeName, ByteSequence key) {
        public ByteString read(TreeName treeName, ByteSequence key) {
            try {
                final Exchange ex = getExchange(treeName);
                ex.getKey().clear().append(key.toByteArray());
@@ -138,11 +138,11 @@
        @Override
        public ByteString getRMW(TreeName treeName, ByteSequence key) {
            return get(treeName, key);
            return read(treeName, key);
        }
        @Override
        public void put(TreeName treeName, ByteSequence key, ByteSequence value) {
        public void create(TreeName treeName, ByteSequence key, ByteSequence value) {
            try {
                final Exchange ex = getExchange(treeName);
                ex.getKey().clear().append(key.toByteArray());
@@ -173,7 +173,7 @@
        }
        @Override
        public boolean remove(TreeName treeName, ByteSequence key) {
        public boolean delete(TreeName treeName, ByteSequence key) {
            try {
                final Exchange ex = getExchange(treeName);
                ex.getKey().clear().append(key.toByteArray());
opendj3-server-dev/src/server/org/opends/server/backends/pluggable/ConfigurableEnvironment.java
@@ -463,12 +463,12 @@
    {
      if (MemoryBudget.getRuntimeMaxMemory() < cfg.getDBCacheSize()) {
        throw new ConfigException(
            ERR_CONFIG_JEB_CACHE_SIZE_GREATER_THAN_JVM_HEAP.get(
            ERR_CONFIG_JEB_CACHE_SIZE_GREATER_THAN_JVM_HEAP.read(
                cfg.getDBCacheSize(), MemoryBudget.getRuntimeMaxMemory()));
      }
      if (cfg.getDBCacheSize() < MemoryBudget.MIN_MAX_MEMORY_SIZE) {
        throw new ConfigException(
            ERR_CONFIG_JEB_CACHE_SIZE_TOO_SMALL.get(
            ERR_CONFIG_JEB_CACHE_SIZE_TOO_SMALL.read(
                cfg.getDBCacheSize(), MemoryBudget.MIN_MAX_MEMORY_SIZE));
      }
    }
opendj3-server-dev/src/server/org/opends/server/backends/pluggable/DatabaseContainer.java
@@ -129,7 +129,7 @@
  protected void put(WriteableStorage txn, ByteSequence key, ByteSequence value)
      throws StorageRuntimeException
  {
    txn.put(treeName, key, value);
    txn.create(treeName, key, value);
    if (logger.isTraceEnabled())
    {
      logger.trace(messageToLog(true, treeName, txn, key, value));
@@ -146,7 +146,7 @@
   */
  protected ByteString read(ReadableStorage txn, ByteSequence key, boolean isRMW) throws StorageRuntimeException
  {
    ByteString value = isRMW ? txn.get(treeName, key) : txn.getRMW(treeName, key);
    ByteString value = isRMW ? txn.read(treeName, key) : txn.getRMW(treeName, key);
    if (logger.isTraceEnabled())
    {
      logger.trace(messageToLog(value != null, treeName, txn, key, value));
@@ -183,7 +183,7 @@
   */
  protected boolean delete(WriteableStorage txn, ByteSequence key) throws StorageRuntimeException
  {
    boolean result = txn.remove(treeName, key);
    boolean result = txn.delete(treeName, key);
    if (logger.isTraceEnabled())
    {
      logger.trace(messageToLog(result, treeName, txn, key, null));
opendj3-server-dev/src/server/org/opends/server/backends/pluggable/State.java
@@ -116,7 +116,7 @@
  {
    ByteString key = keyForIndex(index);
    txn.put(treeName, key, trusted ? trueBytes : falseBytes);
    txn.create(treeName, key, trusted ? trueBytes : falseBytes);
  }
}
opendj3-server-dev/src/server/org/opends/server/backends/pluggable/VLVIndex.java
@@ -424,7 +424,7 @@
  private SortValuesSet getSortValuesSet(ReadableStorage txn, ByteString key, boolean isRMW)
  {
    ByteString value = isRMW ? txn.getRMW(treeName, key) : txn.get(treeName, key);
    ByteString value = isRMW ? txn.getRMW(treeName, key) : txn.read(treeName, key);
    if (value == null)
    {
      // There are no records in the database
opendj3-server-dev/src/server/org/opends/server/backends/pluggable/spi/ReadableStorage.java
@@ -31,7 +31,7 @@
public interface ReadableStorage
{
  ByteString get(TreeName name, ByteSequence key);
  ByteString read(TreeName name, ByteSequence key);
  ByteString getRMW(TreeName name, ByteSequence key);
opendj3-server-dev/src/server/org/opends/server/backends/pluggable/spi/WriteableStorage.java
@@ -32,9 +32,9 @@
{
  void openTree(TreeName name);
  void put(TreeName name, ByteSequence key, ByteSequence value);
  void create(TreeName name, ByteSequence key, ByteSequence value);
  boolean putIfAbsent(TreeName treeName, ByteSequence key, ByteSequence value);
  boolean remove(TreeName name, ByteSequence key);
  boolean delete(TreeName name, ByteSequence key);
}