Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

修正快照的接口问题 #8

Merged
merged 68 commits into from
Jan 13, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
06f9219
增加错误基类、简单的记录接口
kaaass Jan 1, 2021
e9fd13f
增加.gitignore
kaaass Jan 1, 2021
7e3e2b4
完成记录的mock
kaaass Jan 1, 2021
f6edd17
增加记录接口的简易单元测试
kaaass Jan 1, 2021
910fc57
Merge branch 'dev' into feature-mock
kaaass Jan 1, 2021
481bea3
引入Slf4j、log4j、jbbp外部库
kaaass Jan 1, 2021
eb3d19c
[+]add table mock and unit test
KveinAxel Jan 1, 2021
50a8ad6
Merge branch 'feature-mock' into feature-table
KveinAxel Jan 2, 2021
1776095
Merge pull request #2 from kaaass/feature-table
KveinAxel Jan 2, 2021
d8aa315
增加Travis配置
kaaass Jan 2, 2021
c89d9c0
Merge remote-tracking branch 'origin/feature-mock' into feature-mock
kaaass Jan 2, 2021
a2d5fa2
fix: transform java14 to java11
KveinAxel Jan 2, 2021
2491186
更新Gradle配置以允许Scan ToS
kaaass Jan 2, 2021
b1b8e33
删除冗余Travis配置
kaaass Jan 2, 2021
f843d2f
README增加Travis Badge
kaaass Jan 2, 2021
8211faf
增加UTF-8 gradle配置
kaaass Jan 8, 2021
2e50aba
对于数据项管理的mock和测试部分
xwinks Jan 8, 2021
0e6bddf
修改测试用例的文件名
KveinAxel Jan 8, 2021
9240fe7
index mock
DctorWei1314 Jan 8, 2021
845c7f9
增加事务的Mock
Criterionist Jan 8, 2021
37a86d8
Merge remote-tracking branch 'origin/feature-mock' into feature-mock
Criterionist Jan 8, 2021
642c52e
testPage
xiaoxuanNLP Jan 9, 2021
96fc8dd
Merge branch 'feature-mock' of https://github.com/kaaass/rumbase_java…
xiaoxuanNLP Jan 9, 2021
2797554
index mock plus test
DctorWei1314 Jan 9, 2021
3079b1f
Merge remote-tracking branch 'origin/feature-mock' into feature-mock
DctorWei1314 Jan 9, 2021
be73a7d
对于数据项管理的mock和测试部分的修改
xwinks Jan 9, 2021
aa6faa7
Merge remote-tracking branch 'origin/feature-mock' into feature-mock
xwinks Jan 9, 2021
35f6267
testPage1.01
xiaoxuanNLP Jan 9, 2021
015b1d1
Merge remote-tracking branch 'origin/feature-mock' into feature-mock
xiaoxuanNLP Jan 9, 2021
4d046cc
dataitem模块修改建议
kaaass Jan 9, 2021
934e336
Merge remote-tracking branch 'origin/feature-mock' into feature-mock
kaaass Jan 9, 2021
4f79206
dataitem模块修改建议
kaaass Jan 9, 2021
dd92f0e
Merge remote-tracking branch 'origin/feature-mock' into feature-mock
Criterionist Jan 9, 2021
2f0874e
修正编码风格
Criterionist Jan 9, 2021
2c4cbbb
对于数据项管理的mock和测试部分
xwinks Jan 9, 2021
0242ee6
对于数据项管理的mock和测试部分
xwinks Jan 9, 2021
fd25691
对于数据项管理的mock和测试部分
xwinks Jan 9, 2021
6029610
Index审计、修改建议
kaaass Jan 9, 2021
03f8b09
Merge remote-tracking branch 'origin/feature-mock' into feature-mock
kaaass Jan 9, 2021
019036d
增加JBBP的使用示例
kaaass Jan 9, 2021
5656c6f
page模块审计、修改建议
kaaass Jan 9, 2021
4c3e3c2
删除table模块,更改record模块
kaaass Jan 9, 2021
c381c2e
recovery模块审计
kaaass Jan 9, 2021
1fc4b5c
transaction模块审计
kaaass Jan 9, 2021
c2b5606
对于日志恢复的接口和测试
xwinks Jan 9, 2021
69845d0
完善事务模块接口
Criterionist Jan 9, 2021
4974a28
Merge remote-tracking branch 'origin/feature-mock' into feature-mock
Criterionist Jan 9, 2021
6511024
testPage1.02
xiaoxuanNLP Jan 9, 2021
e590bf2
Merge remote-tracking branch 'origin/feature-mock' into feature-mock
xiaoxuanNLP Jan 9, 2021
7e6ccd9
testPage1.03
xiaoxuanNLP Jan 10, 2021
e50c917
复审recovery,tx
kaaass Jan 10, 2021
795ecef
格式化代码
kaaass Jan 10, 2021
26f1626
更新README
kaaass Jan 10, 2021
8fefaa0
Merge branch 'dev' into feature-mock
kaaass Jan 10, 2021
ecbe27f
修改异常名称
xwinks Jan 11, 2021
7fe37c4
修正编译失败
kaaass Jan 11, 2021
f8c5bff
Merge branch 'dev' into feature-mock
kaaass Jan 12, 2021
3aa86e3
表创建、表头解析以及页头解析
xwinks Jan 13, 2021
1cebb4a
Merge branch 'feature-dataitem' into feature-mock
xwinks Jan 13, 2021
476e115
Merge remote-tracking branch 'origin/feature-mock' into feature-mock
xwinks Jan 13, 2021
78f7433
索引审计修改
DctorWei1314 Jan 13, 2021
39870f8
Merge remote-tracking branch 'origin/feature-mock' into feature-mock
DctorWei1314 Jan 13, 2021
5a84ca0
RumbaseException增加错误原因
kaaass Jan 13, 2021
f6a5fe0
Merge to dev
kaaass Jan 13, 2021
98da699
完善事务模块接口,增加事务模块测试用例
Criterionist Jan 13, 2021
668121e
修正事务接口
Criterionist Jan 13, 2021
a46b8c0
Merge remote-tracking branch 'origin/dev' into feature-mock
kaaass Jan 13, 2021
25930c7
修正事务接口
Criterionist Jan 13, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[+]add table mock and unit test
  • Loading branch information
KveinAxel committed Jan 1, 2021
commit eb3d19c928d751f8a8da4d1ba642e743560f9b59
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ Java构建的高性能SQL关系型数据库。
| **模块** | **内容** | **负责人** | **包** |
| ----------------------- | -------------------- | ---------- | ------------ |
| Query Parse Module | SQL 语句解析 | @KAAAsS | parse |
| Query Execution Module | 查询执行、优化 | | query |
| Table Management Module | 系统内数据库、表管理 | | table |
| Query Execution Module | 查询执行、优化 | @KveinAxel | query |
| Table Management Module | 系统内数据库、表管理 | @KveinAxel | table |
| Indexing Module | 索引结构,使用 B+ 树 | | index |
| Record Module | 记录管理,实现 MVCC | @KAAAsS | record |
| Transaction Module | 实现事务的管理与 2PL | | transaction |
Expand Down
13 changes: 13 additions & 0 deletions src/main/java/net/kaaass/rumbase/table/Entry.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package net.kaaass.rumbase.table;

import java.util.*;

/**
* 一行记录数据
* <p>
* 代表表中的一行数据
*
* @author @KveinAxel
*/
public class Entry extends HashMap<String, FieldValue> {
}
13 changes: 13 additions & 0 deletions src/main/java/net/kaaass/rumbase/table/FieldType.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package net.kaaass.rumbase.table;

public enum FieldType {
INT,
FLOAT;

public int getSize() {
return switch (this) {
case INT -> 4;
case FLOAT -> 4;
};
}
}
57 changes: 57 additions & 0 deletions src/main/java/net/kaaass/rumbase/table/FieldValue.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
package net.kaaass.rumbase.table;

public class FieldValue<T> implements Comparable {
private T value;
private FieldType type;

public T getValue() {
return value;
}

public void setValue(T value) {
this.value = value;
}

public FieldType getType() {
return type;
}

public void setType(FieldType type) {
this.type = type;
}

public FieldValue(FieldType type) {
this.type = type;
}

public FieldValue(T value, FieldType type) {
this.value = value;
this.type = type;
}


@Override
public int compareTo(Object o) {
if (o instanceof FieldValue) {
var another = (FieldValue) o;
if (this.type != another.type) {
return 0;
} else {
return switch (this.type) {
case INT -> (int) this.getValue() - (int) another.getValue();
case FLOAT -> {
var res = (float) this.getValue() - (float) another.getValue();
if (res < 0)
yield -1;
else if (res == 0)
yield 0;
else
yield 1;
}
};
}
} else {
return 0;
}
}
}
100 changes: 100 additions & 0 deletions src/main/java/net/kaaass/rumbase/table/IField.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
package net.kaaass.rumbase.table;

import java.util.List;
import java.util.Optional;
import java.util.UUID;

/**
* 字段结构
* <p>
* 提供字段解析服务
* <p>
* 提供字段的索引处理
*
* @author @KveinAxel
*/
public interface IField {

/**
* 从配置信息的字节数组获取字段的属性
*
* @param raw 配置信息
*/
void parseSelf(byte[] raw);

/**
* 将自身的配置信息持久化成字节数组
*
* @return 配置信息
*/
byte[] persistSelf();

/**
* 是否已经被建立引用
* @return true则已经建立引用,反之没建立
*/
Boolean isIndexed();

/**
* 获取字段的类型
*
* @return 字段类型
*/
FieldType getType();

/**
* 字段所占用的字节数
*
* @return 字节数
*/
int getSize();

/**
* 在该字段的索引上进行范围搜索
*
* @param left 查询左端点
* @param right 查询右端点
* @return 查询到的uuid
*/
List<UUID> searchRange(FieldValue left, FieldValue right);

/**
* 在该字段的索引上进行单点搜索
*
* @param value 字段的值
* @return 字段的uuid的Optional
*/
Optional<UUID> search(FieldValue value);

/**
* 将字符串转换成字段值
*
* @param valStr 字符串
* @return 字段值的Optional
*/
Optional<FieldValue> strToValue(String valStr);

/**
* 将字段值转成字节数组
*
* @param value 字段值
* @return 字节数组
*/
Optional<byte[]> valueToRaw(FieldValue value);

/**
* 将字节数组转成字段值
*
* @param raw 字节数组
* @return 字段值
*/
Optional<FieldValue> rawToValue(byte[] raw) ;

/**
* 获取字段名
*
* @return 字段名
*/
String getFieldName();

}
115 changes: 115 additions & 0 deletions src/main/java/net/kaaass/rumbase/table/ITable.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
package net.kaaass.rumbase.table;

import net.kaaass.rumbase.record.IRecordStorage;
import net.kaaass.rumbase.table.exception.TableNotFoundException;
import net.kaaass.rumbase.table.exception.TypeIncompatibleException;
import net.kaaass.rumbase.transaction.TransactionContext;

import java.util.List;
import java.util.Optional;
import java.util.UUID;

/**
* 表结构
* <p>
* 验证数据是否满足表约束
* <p>
* 提供行数据解析服务
*
* @author @KveinAxel
*/
public interface ITable {

/**
* 根据配置信息解析获取表属性
* @param raw 配置信息
*/
void parseSelf(byte[] raw);

/**
* 将自己持久化成字节数组
*/
byte[] persistSelf();

/**
* 删除元组
*
* @param context 事务context
* @param fieldName 字段名
* @param uuid 元组的uuid
* @param recordStorage record层访问接口
* @return 被删除的元组数
*/
int delete(TransactionContext context, String fieldName, UUID uuid, IRecordStorage recordStorage);

/**
* 更新元组
*
* @param context 事务context
* @param fieldName 字段名
* @param uuid 元组的uuid
* @param newEntry 新的元组
* @return 被更新的元组数
*/
int update(TransactionContext context, String fieldName, UUID uuid, Entry newEntry);

/**
* 获取元组内容
*
* @param context 事务context
* @param fieldName 字段名
* @param uuids 元组的uuid列表
* @param recordStorage record层访问接口
* @return 元组entry列表
* @throws TableNotFoundException 要查询的表不存在
*/
List<Entry> read(TransactionContext context, String fieldName, List<UUID> uuids, IRecordStorage recordStorage) throws TableNotFoundException;

/**
* 向表插入元组
*
* @param context 事务context
* @param fieldName 字段名
* @param newEntry 新的元组
* @param recordStorage record层访问接口
* @throws TableNotFoundException 要查询的表不存在
* @throws TypeIncompatibleException 插入的元组不满足表约束
*/
void insert(TransactionContext context, String fieldName, Entry newEntry, IRecordStorage recordStorage) throws TableNotFoundException, TypeIncompatibleException;

/**
*
*
* @param fieldName 字段名
* @param left 查询区间左端点
* @param right 查询区间右端点
* @return 查询到的uuid列表
* @throws TableNotFoundException 要查询的表不存在
*/
List<UUID> search(String fieldName, FieldValue left, FieldValue right) throws TableNotFoundException;

/**
* 将字符串列表转换成一个元组
*
* @param values 字符串列表
* @return 元组的Optional
*/
Optional<Entry> strToEntry(List<String> values);

/**
* 将entry转换成字节数组
*
* @param entry 元组
* @return 字节数组
*/
Optional<byte[]> entryToRaw(Entry entry);

/**
* 将字节数组转换成entry
*
* @param raw 字节数组
* @return 元组
*/
Optional<Entry> parseEntry(byte[] raw);

}
Loading