testPage1.03

kaaass · kaaass · Jan 13, 2021 · Jan 1, 2021 · Jan 1, 2021 · Jan 1, 2021
commit 7e6ccd9ee5dae704a2cb99107d7636e5442e4ce3
diff --git a/src/main/java/net/kaaass/rumbase/page/Page.java b/src/main/java/net/kaaass/rumbase/page/Page.java
@@ -66,7 +66,7 @@ default InputStream getData() {
      * 将字节数据写入页
      *
      * @param data 待写入字节数据
-     * @throws PageException TODO
+     * @throws PageException 若写入的数据超出页的范围则抛出异常
      */
     default void writeData(byte[] data) throws PageException {
         patchData(0, data);
@@ -77,7 +77,7 @@ default void writeData(byte[] data) throws PageException {
      *
      * @param offset 页内偏移值，以字节为单位
      * @param data   待写入数据
-     * @throws PageException TODO
+     * @throws PageException 若写入的数据超出页的范围则抛出异常
      */
     void patchData(int offset, byte[] data) throws PageException;
 

diff --git a/src/main/java/net/kaaass/rumbase/page/PageCache.java b/src/main/java/net/kaaass/rumbase/page/PageCache.java
diff --git a/src/main/java/net/kaaass/rumbase/page/PageManager.java b/src/main/java/net/kaaass/rumbase/page/PageManager.java
@@ -13,11 +13,11 @@ public class PageManager {
     public static int BYTE_BUFFER_SIZE = 1024 * 4 * PAGE_NUM;
 
     /**
-     * TODO 文档
+     * 取数据库文件生成文件管理的对象
      *
-     * @param filepath
+     * @param filepath 每个表文件路径
      * @return
-     * @throws FileException
+     * @throws FileException 若文件不存在则创建，创建过程中出现错误会抛出错误
      */
     public static PageStorage fromFile(String filepath) throws FileException {
         return new MockPageStorage(filepath);

diff --git a/src/main/java/net/kaaass/rumbase/page/PageStorage.java b/src/main/java/net/kaaass/rumbase/page/PageStorage.java
@@ -13,9 +13,8 @@ public interface PageStorage {
      * 获取该页存储中的某一页
      * @param pageId 页号
      * @return 该页页对象
-     * @throws FileException TODO 为什么要抛出FileException？此步骤应该隐藏文件接口的任何细节
      */
-    Page get(long pageId) throws FileException;
+    Page get(long pageId);
 
     /**
      * 将页存储中的所有脏页写回文件

diff --git a/src/main/java/net/kaaass/rumbase/page/exception/PageException.java b/src/main/java/net/kaaass/rumbase/page/exception/PageException.java
@@ -8,7 +8,7 @@
 /**
  * E9002 文件异常
  * <p>
- * E9002-1  创建文件失败 TODO 不一致
+ * E9002-1  回写数据偏移与大小之和超过规定
  *
  * @author XuanLaoYee
  */

diff --git a/src/main/java/net/kaaass/rumbase/page/mock/MockPage.java b/src/main/java/net/kaaass/rumbase/page/mock/MockPage.java
@@ -16,20 +16,17 @@ public class MockPage implements Page {
     boolean dirty;
     int pinned = 0;
     String filepath;
-    private final ReentrantLock lock;
 
     MockPage(byte[] data, long pageId, String filepath) {
         this.data = data;
         this.pageId = pageId;
-        this.lock = new ReentrantLock();
         this.dirty = false;
         this.filepath = filepath;
     }
 
     @Override
     public byte[] getDataBytes() {
         synchronized (this) {
-            pin(); // TODO 错误使用
             return data;
         }
     }
@@ -43,25 +40,7 @@ public void patchData(int offset, byte[] data) throws PageException {
     }
 
     @Override
-    public void flush() throws FileException {
-        File file = new File(this.filepath);
-        try {
-            RandomAccessFile out = new RandomAccessFile(file, "rw");
-            try {
-                out.seek((PageManager.FILE_HEAD_SIZE + this.pageId) * PageManager.PAGE_SIZE);
-            }catch(Exception e){
-                throw new FileExeception(4);
-            }
-            try {
-                out.write(data);
-            } catch (Exception e) {
-                throw new FileException(2);
-            }
-            out.close();
-        } catch (Exception e) {
-            throw new FileException(3);
-        }
-    }
+    public void flush() throws FileException { }
 
     @Override
     public void pin() {

diff --git a/src/main/java/net/kaaass/rumbase/page/mock/MockPageStorage.java b/src/main/java/net/kaaass/rumbase/page/mock/MockPageStorage.java
@@ -21,61 +21,40 @@ public class MockPageStorage implements PageStorage {
 
     public MockPageStorage(String filepath) throws FileException {
         this.filepath = filepath;
-        File file = new File(filepath);
         pageMap = new HashMap<>();
-        if (!file.exists()) {
-            try {
-                file.createNewFile();
-                OutputStream os = null;
-                try {
-                    os = new FileOutputStream(file, true);
-                    byte[] data = new byte[PageManager.PAGE_SIZE];
-                    for (int i = 0; i < 10; i++) {
-                        os.write(data, 0, data.length);
-                        os.flush();
-                    }
-                } catch (Exception e) {
-                    throw new FileException(2);
-                }
-            } catch (Exception e) {
-                throw new FileException(1);
+        this.fakeFile = new byte[1024 * 4 * 20];
+        for (int i = 0; i < 20; i++) {
+            for (int j = 0; j < 1024 * 4; j++) {
+                this.fakeFile[1024 * 4 * i + j] = (byte)i;
             }
         }
     }
 
     @Override
-    public Page get(long pageId) throws FileException {
-        File file = new File(filepath);
+    public Page get(long pageId) {
         //文件会预留5页作为文件头
         try {
-            FileInputStream in = new FileInputStream(file);
             byte[] data = new byte[PageManager.PAGE_SIZE];
-            try {
-                in.skip((pageId + PageManager.FILE_HEAD_SIZE) * PageManager.PAGE_SIZE);
-                int readNumber = in.read(data);
-                if (readNumber < PageManager.PAGE_SIZE) {
-                    throw new FileException(4);
-                }
-            } catch (Exception e) {
-                throw new FileException(4);
-            }
+            System.arraycopy(fakeFile, (int) (pageId + PageManager.FILE_HEAD_SIZE)*PageManager.PAGE_SIZE, data, 0, data.length);
             Integer tmpId = (int) pageId;
-            if(pageMap.containsKey(tmpId)){
+            if (pageMap.containsKey(tmpId)) {
                 return pageMap.get(tmpId);
             }
             Page page = new MockPage(data, pageId, this.filepath);
             pageMap.put(tmpId, page);
             return page;
         } catch (Exception e) {
-            throw new FileException(3);
+            e.printStackTrace();
         }
+        return null;
     }
 
     @Override
     public void flush() {
-        //TODO
     }
-    private Map<Integer,Page> pageMap;
+
+    private Map<Integer, Page> pageMap;
 
     private String filepath;
+    private byte[] fakeFile;
 }
diff --git a/src/test/java/net/kaaass/rumbase/page/PageStorageTest.java b/src/test/java/net/kaaass/rumbase/page/PageStorageTest.java
@@ -8,31 +8,32 @@
 import static org.junit.Assert.assertArrayEquals;
 
 /**
- * TODO 文档
- * TODO Mock的测试不应该和文件有关，本测试仅仅测试接口对上层的意义。而物理文件对上层不可见
+ * 文件管理测试
+ *
+ * @author XuanLaoYee
+ * @see net.kaaass.rumbase.page.PageStorage
  */
 public class PageStorageTest extends TestCase {
     public void testGet() {
         try {
             PageStorage pc = PageManager.fromFile("testFile");
             Page p0 = pc.get(0);
-            p0 = pc.get(0);
             Page p3 = pc.get(3);
-
-            File file = new File("testFile");
-            FileInputStream in = new FileInputStream(file);
-            in.skip((PageManager.FILE_HEAD_SIZE) * PageManager.PAGE_SIZE);
-            byte[] data0 = new byte[PageManager.PAGE_SIZE];
-            in.read(data0);
-            in.close();
-            assertArrayEquals(data0, p0.getDataBytes());
-            in = new FileInputStream(file);
-            in.skip((3 + PageManager.FILE_HEAD_SIZE) * PageManager.PAGE_SIZE);
-            byte[] data3 = new byte[PageManager.PAGE_SIZE];
-            in.skip((PageManager.FILE_HEAD_SIZE) * PageManager.PAGE_SIZE);
-            in.read(data3);
-            assertArrayEquals(data3, p3.getDataBytes());
-
+            byte[] data0 = new byte[1024 * 4];
+            byte[] data3 = new byte[1024 * 4];
+            p0.getData().read(data0);
+            p3.getData().read(data3);
+
+            byte[] testData0 = new byte[1024 * 4];
+            for (int j = 0; j < 1024 * 4; j++) {
+                testData0[j] = (byte)5;
+            }
+            byte[] testData3 = new byte[1024 * 4];
+            for (int j = 0; j < 1024 * 4; j++) {
+                testData3[j] = (byte)8;
+            }
+            assertArrayEquals(testData0,data0);
+            assertArrayEquals(testData3,data3);
 
         } catch (Exception e) {
             e.printStackTrace();

diff --git a/src/test/java/net/kaaass/rumbase/page/PageTest.java b/src/test/java/net/kaaass/rumbase/page/PageTest.java
@@ -15,28 +15,26 @@
  */
 public class PageTest extends TestCase {
 
-    // TODO Mock的测试不应该和文件有关，本测试仅仅测试接口对上层的意义。而物理文件对上层不可见
     public void testGetData() {
         try {
             PageStorage pc = PageManager.fromFile("testFile");
             Page p0 = pc.get(0);
             Page p3 = pc.get(3);
+            byte[] data0 = new byte[1024 * 4];
+            byte[] data3 = new byte[1024 * 4];
+            p0.getData().read(data0);
+            p3.getData().read(data3);
+            byte[] testData0 = new byte[1024 * 4];
+            for (int j = 0; j < 1024 * 4; j++) {
+                testData0[j] = (byte)5;
+            }
+            byte[] testData3 = new byte[1024 * 4];
+            for (int j = 0; j < 1024 * 4; j++) {
+                testData3[j] = (byte)8;
+            }
+            assertArrayEquals(testData0,data0);
+            assertArrayEquals(testData3,data3);
 
-            File file = new File("testFile");
-            FileInputStream in0 = new FileInputStream(file);
-            in0.skip((PageManager.FILE_HEAD_SIZE) * PageManager.PAGE_SIZE);
-            byte[] data0 = new byte[PageManager.PAGE_SIZE];
-            int readNumber1 = in0.read(data0);
-            in0.close();
-            assertArrayEquals(data0, p0.getDataBytes());
-            assertEquals(PageManager.PAGE_SIZE, readNumber1);
-            FileInputStream in3 = new FileInputStream(file);
-            in3.skip((3 + PageManager.FILE_HEAD_SIZE) * PageManager.PAGE_SIZE);
-            byte[] data3 = new byte[PageManager.PAGE_SIZE];
-            int readNumber3 = in3.read(data3);
-            assertArrayEquals(data3, p3.getDataBytes());
-            assertEquals(PageManager.PAGE_SIZE, readNumber3);
-            in3.close();
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -82,22 +80,4 @@ public void testPatchData() {
             e.printStackTrace();
         }
     }
-
-    public void testFlush() {
-        byte[] data = new byte[PageManager.PAGE_SIZE];
-        for (int i = 0; i < data.length; i++) {
-            data[i] = (byte) (i % 120);
-        }
-
-        try {
-            PageStorage pc = PageManager.fromFile("testFile");
-            Page p0 = pc.get(0);
-            p0.writeData(data);
-            p0.flush();
-            p0 = pc.get(0);
-            assertArrayEquals(data, p0.getDataBytes());
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
 }