From ffd6060d0cb624c896d5dfecdc5c726c3de987ce Mon Sep 17 00:00:00 2001
From: wangboo <5417808+wangboa@user.noreply.gitee.com>
Date: Wed, 7 Dec 2022 21:23:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0roadmap=20=E5=92=8C=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=20git=E8=A7=84=E8=8C=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md        | 22 +++++++++++++++-
 doc/CodeStyle.md |  6 ++---
 doc/TODOList.md  | 68 ++++++++++++++++++++++++------------------------
 3 files changed, 58 insertions(+), 38 deletions(-)

diff --git a/README.md b/README.md
index 2c55689..84ebc1b 100644
--- a/README.md
+++ b/README.md
@@ -31,4 +31,24 @@ LevelDB for rust
 [TODO和分工](doc/TODOList.md)
 
 ## 编码和git规范
-[编码和git规范](doc/CodeStyle.md)
\ No newline at end of file
+[编码和git规范](doc/CodeStyle.md)
+
+## RoadMap
+1. 1.0.0 版本, 完成 util 相关的内容
+
+
+| 功能模块                          | 完成人          |
+|-------------------------------|--------------|
+| Arena (Memory Management)     | wangboo      |
+| Slice                         | wangboo      |
+| BloomFilter                   | colagy       |
+| Cache                         | colagy       |
+| Coding (Primitive Type SerDe) | colagy       |
+| Comparator                    | fengyang     |
+| Status                        | fengyang     |
+| Random                        | fengyang     |
+| CRC                           | lxd5866      |
+| Env                           | lxd5866      |
+| Hash                          | lxd5866      |
+| MutexLock                     | kazeseiriou  |
+| Histgram                      | kazeseiriou  |
\ No newline at end of file
diff --git a/doc/CodeStyle.md b/doc/CodeStyle.md
index cc05186..0ad9419 100644
--- a/doc/CodeStyle.md
+++ b/doc/CodeStyle.md
@@ -9,7 +9,7 @@
 8. cargo不允许引用第三方库
 
 # 2. 分支管理规范
-1. master作为主分支
-2. feat/xx 作为开发分支
-3. 其它人从主分支checkout分支
+1. master作为release分支, 该分支是受保护的,任何人没有权限提交
+2. dev作为开发分支, 新功能从该分支拉取代码并合并到该分支
+3. feat/1.0.0_util_xx 作为开发分支
 4. 开发分支提交到git, 然后发起 merge_request, merge 必须超过2个人同意
\ No newline at end of file
diff --git a/doc/TODOList.md b/doc/TODOList.md
index 2e90c57..87c3a04 100644
--- a/doc/TODOList.md
+++ b/doc/TODOList.md
@@ -1,35 +1,35 @@
-# DB
-## Build / Compaction
-## DB implements
-## Log - WAL canghai
-## Memtable - wangxu
-## SkipList - wangxu
-## Snapshot / VersionSet - yuanyang, zhangtao, canghai
-## WriteBatch
-## TableCache
-# Table
-## Block
-## FilterBlock
-## Format (encode/decode)
-## Table Level Iterator (Empty / MergingIterator / TwoLevelIterator)
-## Table Build
-## Recovery
-## SStable - canghai
+## DB
+1. Build / Compaction
+2. DB implements
+3. Log - WAL canghai
+4. Memtable - wangxu
+5. SkipList - wangxu
+6. Snapshot / VersionSet - yuanyang, zhangtao, canghai
+7. WriteBatch
+8. TableCache
+
+## Table
+1.  Block
+2.  FilterBlock
+3. Format (encode/decode)
+4. Table Level Iterator (Empty / MergingIterator / TwoLevelIterator)
+5. Table Build
+6. Recovery
+7. SStable - canghai
 # Util
-## Arena (Memory Management) - wangboo
-## BloomFilter - yuanyang
-## Cache - wangxu
-## Coding (Primitive Type SerDe) - wangxu
-## Comparator - yuanyang
-## CRC - canghai
-## Env - canghai
-## Hash - canghai
-## Histgram - zhengcheng
-## Logging - zhoujian
-## MutexLock - zhengcheng
-## Status - yuanyang
-## Random - yuanyang
-## Slice - wangboo
-# Traits
-## public trait defined in leveldb include dir
-# 
\ No newline at end of file
+1. Arena (Memory Management) - wangboo
+2. BloomFilter - yuanyang
+3. Cache - wangxu
+4. Coding (Primitive Type SerDe) - wangxu
+5. Comparator - yuanyang
+6. CRC - canghai
+7. Env - canghai
+8. Hash - canghai
+9. Histgram - zhengcheng
+10. Logging - zhoujian
+11. MutexLock - zhengcheng
+12. Status - yuanyang
+13. Random - yuanyang
+14. Slice - wangboo
+## Traits
+1. public trait defined in leveldb include dir
\ No newline at end of file
-- 
Gitee