复审recovery,tx

kaaass · kaaass · Jan 13, 2021 · Jan 1, 2021 · Jan 1, 2021 · Jan 1, 2021
commit e50c9179fd4fdb760a801162d18b0ddbbd64dd78
diff --git a/src/main/java/net/kaaass/rumbase/index/Index.java b/src/main/java/net/kaaass/rumbase/index/Index.java
@@ -66,7 +66,7 @@ static Index createEmptyIndex(String indexFileName) throws IndexAlreadyExistExce
      * 向索引中加入键值对“数据Hash-UUID”
      *
      * @param dataHash 数据Hash
-     * @param uuid 对应记录UUID
+     * @param uuid     对应记录UUID
      */
     void insert(long dataHash, long uuid);
 
@@ -115,6 +115,7 @@ static Index createEmptyIndex(String indexFileName) throws IndexAlreadyExistExce
 
     /**
      * 返回遍历索引的迭代器
+     *
      * @return 第一个键值对的迭代器
      */
     @Override

diff --git a/src/main/java/net/kaaass/rumbase/recovery/IRecoveryStorage.java b/src/main/java/net/kaaass/rumbase/recovery/IRecoveryStorage.java
@@ -4,6 +4,7 @@
 
 /**
  * 日志管理的接口，用来进行日志的写入和恢复
+ *
  * @author kaito
  */
 public interface IRecoveryStorage {

diff --git a/src/main/java/net/kaaass/rumbase/recovery/RecoveryManager.java b/src/main/java/net/kaaass/rumbase/recovery/RecoveryManager.java
@@ -4,6 +4,7 @@
 
 /**
  * 日志恢复的管理器，用来对每个数据库文件进行恢复
+ *
  * @author kaito
  */
 public class RecoveryManager {

diff --git a/src/main/java/net/kaaass/rumbase/recovery/mock/MockRecoveryStorage.java b/src/main/java/net/kaaass/rumbase/recovery/mock/MockRecoveryStorage.java
@@ -12,16 +12,17 @@ public class MockRecoveryStorage implements IRecoveryStorage {
     public MockRecoveryStorage() {
         bytes = new ArrayList<>();
     }
+
     /**
      * 模拟日志记录
      */
     public List<byte[]> bytes;
 
     @Override
     public void begin(int xid, List<Integer> snapshots) {
-        String beginStr = "begin "+ xid;
+        String beginStr = "begin " + xid;
         bytes.add(beginStr.getBytes());
-        String snapStr = "snap "+snapshots.toString();
+        String snapStr = "snap " + snapshots.toString();
         bytes.add(snapStr.getBytes());
     }
 
@@ -33,33 +34,33 @@ public void rollback(int xid) {
 
     @Override
     public void commit(int xid) {
-        String commitStr = "commit " +xid;
+        String commitStr = "commit " + xid;
         bytes.add(commitStr.getBytes());
     }
 
     @Override
     public void insert(int xid, long uuid, byte[] item) {
-        String insertStr = "insert "+xid + " " + uuid+" ";
+        String insertStr = "insert " + xid + " " + uuid + " ";
         // 对控制语句、数据两部分进行合并得到最终日志记录
         byte[] first = insertStr.getBytes();
-        byte[] result = Arrays.copyOf(first,first.length + item.length);
-        System.arraycopy(item,0,result,first.length,item.length);
+        byte[] result = Arrays.copyOf(first, first.length + item.length);
+        System.arraycopy(item, 0, result, first.length, item.length);
         bytes.add(result);
     }
 
     @Override
     public void update(int xid, long uuid, byte[] item) {
-        String updateStr = "update "+xid + " " + uuid+" ";
+        String updateStr = "update " + xid + " " + uuid + " ";
         // 对控制语句、数据两部分进行合并得到最终日志记录
         byte[] first = updateStr.getBytes();
-        byte[] result = Arrays.copyOf(first,first.length + item.length);
-        System.arraycopy(item,0,result,first.length,item.length);
+        byte[] result = Arrays.copyOf(first, first.length + item.length);
+        System.arraycopy(item, 0, result, first.length, item.length);
         bytes.add(result);
     }
 
     @Override
     public void updateMeta(int xid, long metaUUID) {
-        String updateMetaStr = "meta " + xid +" " + metaUUID;
+        String updateMetaStr = "meta " + xid + " " + metaUUID;
         bytes.add(updateMetaStr.getBytes());
     }
 

diff --git a/src/main/java/net/kaaass/rumbase/transaction/LockTable.java b/src/main/java/net/kaaass/rumbase/transaction/LockTable.java
@@ -11,17 +11,17 @@ public interface LockTable {
     /**
      * 添加共享锁
      *
-     * @param xid  事务id
-     * @param uuid 记录id
+     * @param xid       事务id
+     * @param uuid      记录id
      * @param tableName 表名
      */
     void addSharedLock(int xid, long uuid, String tableName);
 
     /**
      * 添加排他锁
      *
-     * @param xid  事务id
-     * @param uuid 记录id
+     * @param xid       事务id
+     * @param uuid      记录id
      * @param tableName 表名
      */
     void addExclusiveLock(int xid, long uuid, String tableName);

diff --git a/src/main/java/net/kaaass/rumbase/transaction/TransactionContext.java b/src/main/java/net/kaaass/rumbase/transaction/TransactionContext.java
@@ -4,10 +4,8 @@
 
 /**
  * 事务上下文
- *
  * <p>
  * 存储事务状态，对事务进行操作
- * </p>
  *
  * @author criki
  */

diff --git a/src/main/java/net/kaaass/rumbase/transaction/exception/DeadlockException.java b/src/main/java/net/kaaass/rumbase/transaction/exception/DeadlockException.java
@@ -10,7 +10,6 @@
  * E6001 死锁异常
  * <p>
  * E6001-1 发生死锁
- * </p>
  *
  * @author criki
  */

diff --git a/src/test/java/net/kaaass/rumbase/recovery/IRecoveryTest.java b/src/test/java/net/kaaass/rumbase/recovery/IRecoveryTest.java
@@ -6,6 +6,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import static org.junit.Assert.assertArrayEquals;
+
 /**
  * TODO 文档
  */
@@ -26,6 +28,8 @@ public void testBegin() {
         List<byte[]> result = new ArrayList<>();
         result.add(beginStr.getBytes());
         result.add(snapStr.getBytes());
-        assertEquals(result, content);
+        assertEquals(result.size(), content.size());
+        assertArrayEquals(result.get(0), content.get(0));
+        assertArrayEquals(result.get(1), content.get(1));
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ @@
     /**
      * 日志管理的接口，用来进行日志的写入和恢复
+     *
      * @author kaito
      */
     public interface IRecoveryStorage {
@@ Expand Down @@