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
index mock
  • Loading branch information
DctorWei1314 committed Jan 8, 2021
commit 9240fe73f07a676c7c6d79fe6693708710630bf3
92 changes: 92 additions & 0 deletions src/main/java/net/kaaass/rumbase/index/Index.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
package net.kaaass.rumbase.index;

import net.kaaass.rumbase.index.exception.IndexNotFoundException;
import net.kaaass.rumbase.index.mock.MockBtreeIndex;
import net.kaaass.rumbase.record.exception.RecordNotFoundException;

import java.nio.file.LinkOption;
import java.security.KeyPair;
import java.util.*;

/**
* 索引
*
* @author DoctorWei1314
*/

public interface Index {
/**
* 通过文件名拿到索引,如果不存在,则抛出异常
*
* @param indexFileName
* @return
*/
static Index getIndex(String indexFileName) throws IndexNotFoundException {
if (MockBtreeIndex.MOCK_BTREE_INDEX_MAP.get(indexFileName) == null){
MockBtreeIndex.MOCK_BTREE_INDEX_MAP.put(indexFileName,new MockBtreeIndex());
}
return MockBtreeIndex.MOCK_BTREE_INDEX_MAP.get(indexFileName);
}

/**
* 查看索引文件是否存在
*
* @param indexFileName
* @return
*/
static boolean exists(String indexFileName) {
return true;
}

/**
* 创建一个空的索引
*
* @param indexFileName
* @return
*/
static Index createEmptyIndex(String indexFileName) {
return new MockBtreeIndex();
}

/**
*替换uuid
*
* @param uuidMap
*/
void replace(Map<Long, Long> uuidMap);

/**
* 插入
*
* @param dataHash
* @param uuid
*/
void insert(long dataHash, long uuid);

/**
* 返回对应key的uuid,如果不存在,则list为空
* @param keyHash
* @return
*/
List<Long> query(long keyHash);

/**
* 返回包括keyHash在内的迭代器 eg: keyHash = 4, 33^^^445577
* @param keyHash
* @return
*/
Iterator<Pair> queryWith(long keyHash);

/**
* 返回不包括keyHash在内的迭代器 eg: keyHash = 4, 3344^^^5577
* @param keyHask
* @return
*/
Iterator<Pair> queryWithout(long keyHask);

/**
* 返回第一个版本的迭代器
* @return
*/
Iterator<Pair> getFirst();
}
19 changes: 19 additions & 0 deletions src/main/java/net/kaaass/rumbase/index/Pair.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package net.kaaass.rumbase.index;

public class Pair {
private long key;
private long uuid;

public Pair(long key, long uuid) {
this.key = key;
this.uuid = uuid;
}

public long getKey() {
return key;
}

public long getUuid() {
return uuid;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
package net.kaaass.rumbase.index.exception;

import net.kaaass.rumbase.exception.RumbaseException;

import java.util.HashMap;
import java.util.Map;
public class IndexNotFoundException extends RumbaseException {
/**
* 构造Rumbase异常
*
* @param mainId 主错误号
* @param subId 子错误号
* @param reason 错误原因
*/
public IndexNotFoundException(int mainId, int subId, String reason) {
super(mainId, subId, reason);
}

public static final Map<Integer, String> REASONS = new HashMap<>(){{
put(1, "索引不存在");
}};

/**
* 索引不存在
*
* @param subId 子错误号
*/
public IndexNotFoundException(int subId) {
super(9001, subId, REASONS.get(subId));
}
}
58 changes: 58 additions & 0 deletions src/main/java/net/kaaass/rumbase/index/mock/MockBtreeIndex.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
package net.kaaass.rumbase.index.mock;

import lombok.Getter;
import lombok.RequiredArgsConstructor;
import net.kaaass.rumbase.index.Index;
import net.kaaass.rumbase.index.Pair;
import net.kaaass.rumbase.record.mock.MockRecordStorage;

import java.util.*;

@RequiredArgsConstructor
public class MockBtreeIndex implements Index {
/**
* 内存中创建的MockBtreeIndex
*/
public static final Map<String, MockBtreeIndex> MOCK_BTREE_INDEX_MAP = new HashMap<>();

@Getter
private HashMap<Long, List<Long>> hashMap = new HashMap<>();

@Override
public void replace(Map<Long, Long> uuidMap) {
var values = hashMap.values();
for (List<Long> value : values){
for (Long old : value){
if (uuidMap.containsKey(old)) {
value.remove(old);
value.add(uuidMap.get(old));
}
}
}
}

@Override
public void insert(long dataHash, long uuid) {
hashMap.computeIfAbsent(dataHash,k -> new ArrayList<>()).add(uuid);
}

@Override
public List<Long> query(long keyHash) {
return hashMap.get(keyHash) == null ? new LinkedList<>() : hashMap.get(keyHash);
}

@Override
public Iterator<Pair> queryWith(long keyHash) {
return new MockIterator(this, keyHash, true);
}

@Override
public Iterator<Pair> queryWithout(long keyHash) {
return new MockIterator(this, keyHash, false);
}

@Override
public Iterator<Pair> getFirst() {
return new MockIterator(this);
}
}
66 changes: 66 additions & 0 deletions src/main/java/net/kaaass/rumbase/index/mock/MockIterator.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
package net.kaaass.rumbase.index.mock;

import net.kaaass.rumbase.index.Pair;

import java.util.Iterator;
import java.util.LinkedList;

public class MockIterator implements Iterator {
private MockBtreeIndex mockBtreeIndex;
private Iterator tempIterator;
private long tempKey;
private boolean state = true;

public MockIterator(MockBtreeIndex mockBtreeIndex) {
this.mockBtreeIndex = mockBtreeIndex;
var v = mockBtreeIndex.getHashMap().entrySet().iterator().next();
tempIterator = v.getValue().iterator();
tempKey = v.getKey();
}

public MockIterator(MockBtreeIndex mockBtreeIndex,long keyHash,boolean isWith) {
this.mockBtreeIndex = mockBtreeIndex;
if (isWith == true){
do {
var v = mockBtreeIndex.getHashMap().entrySet().iterator().next();
if (v == null) {
state = false;
break;
}
tempIterator = v.getValue().iterator();
tempKey = v.getKey();
} while (tempKey < keyHash);
}
else
{
do {
var v = mockBtreeIndex.getHashMap().entrySet().iterator().next();
if (v == null) {
state = false;
break;
}
tempIterator = v.getValue().iterator();
tempKey = v.getKey();
} while (tempKey <= keyHash);
}
}

@Override
public boolean hasNext() {
return mockBtreeIndex.getHashMap().entrySet().iterator().hasNext();
}


@Override
public Object next() {
if (state == false) return null;
Pair res = new Pair(tempKey, (Long) tempIterator.next());
if (!tempIterator.hasNext()) {
var v = mockBtreeIndex.getHashMap().entrySet().iterator().next();
if (v == null) return null;
tempIterator = v.getValue().iterator();
tempKey = v.getKey();
}
return res;
}
}