Changeset 4657

Timestamp:

2011-02-08 12:40:25 (2 years ago)

Author:

evert

Message:

Repository.create() throws a RecordExistsException? if the record already exists. (#198)

Location:

trunk/cr/repository/impl/src

Files:

• main/java/org/lilyproject/repository/impl/HBaseRepository.java (modified) (1 diff)
• main/java/org/lilyproject/repository/impl/lock/RowLocker.java (modified) (2 diffs)
• test/java/org/lilyproject/repository/impl/test/AbstractRepositoryTest.java (modified) (2 diffs)

trunk/cr/repository/impl/src/main/java/org/lilyproject/repository/impl/HBaseRepository.java

@@ -192 +192 @@
                 // The version numbering continues from where it has been deleted.
                 Get get = new Get(rowId);
+                get.addColumn(systemColumnFamily, RecordColumn.DELETED.bytes);
                 get.addColumn(systemColumnFamily, RecordColumn.VERSION.bytes);
                 Result result = recordTable.get(get);
                 if (!result.isEmpty()) {
+                    // If the record existed it should have been deleted
+                    byte[] recordDeleted = result.getValue(systemColumnFamily, RecordColumn.DELETED.bytes);
+                    if (recordDeleted != null && !Bytes.toBoolean(recordDeleted)) {
+                        throw new RecordExistsException(recordId);
+                    }
                     byte[] oldVersion = result.getValue(systemColumnFamily, RecordColumn.VERSION.bytes);
                     if (oldVersion != null) {

trunk/cr/repository/impl/src/main/java/org/lilyproject/repository/impl/lock/RowLocker.java

@@ -39 +39 @@
     
     public RowLock lockRow(byte[] rowKey) throws IOException {
-        return lockRow(rowKey, null);
-    }
-    
-    public RowLock lockRow(byte[] rowKey, org.apache.hadoop.hbase.client.RowLock hbaseRowLock) throws IOException {
         long now = System.currentTimeMillis();
         Get get = new Get(rowKey);
@@ -58 +54 @@
         }
         if ((previousTimestamp == -1) || (previousTimestamp + timeout  < now)) {
-            Put put = new Put(rowKey, hbaseRowLock);
+            Put put = new Put(rowKey);
             RowLock rowLock = RowLock.createRowLock(rowKey);
             put.add(family, qualifier, 1L, rowLock.getPermit());

trunk/cr/repository/impl/src/test/java/org/lilyproject/repository/impl/test/AbstractRepositoryTest.java

@@ -33 +33 @@
 import org.junit.Before;
 import org.junit.Test;
-import org.lilyproject.repository.api.FieldNotFoundException;
-import org.lilyproject.repository.api.FieldType;
-import org.lilyproject.repository.api.IdGenerator;
-import org.lilyproject.repository.api.IdRecord;
-import org.lilyproject.repository.api.InvalidRecordException;
-import org.lilyproject.repository.api.QName;
-import org.lilyproject.repository.api.Record;
-import org.lilyproject.repository.api.RecordId;
-import org.lilyproject.repository.api.RecordNotFoundException;
-import org.lilyproject.repository.api.RecordType;
-import org.lilyproject.repository.api.RecordTypeNotFoundException;
-import org.lilyproject.repository.api.Repository;
-import org.lilyproject.repository.api.ResponseStatus;
-import org.lilyproject.repository.api.Scope;
-import org.lilyproject.repository.api.TypeManager;
-import org.lilyproject.repository.api.VersionNotFoundException;
+import org.lilyproject.repository.api.*;
 import org.lilyproject.util.repo.VersionTag;
 
@@ -183 +168 @@
 
         assertEquals(createdRecord, repository.read(createdRecord.getId()));
+        control.verify();
+    }
+    
+    @Test
+    public void testCreateTwice() throws Exception {
+        IMocksControl control = createControl();
+        control.replay();
+        Record createdRecord = createDefaultRecord();
+
+        Record record = repository.newRecord(createdRecord.getId());
+        record.setRecordType(recordType1.getName(), recordType1.getVersion());
+        record.setField(fieldType1.getName(), "value1");
+        record.setField(fieldType2.getName(), 123);
+        record.setField(fieldType3.getName(), true);
+        try {
+            repository.create(record);
+            fail();
+        } catch (RecordExistsException expected) {
+        }
+        
         control.verify();
     }