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

解决冲突,准备合并代码 #220

Merged
merged 7 commits into from
Sep 25, 2023
Merged

解决冲突,准备合并代码 #220

merged 7 commits into from
Sep 25, 2023

Conversation

flycash
Copy link
Contributor

@flycash flycash commented Sep 25, 2023

No description provided.

flycash and others added 6 commits September 28, 2022 23:48
* sqlx 加密列 key长度校验 (ecodeclub#102)

* sqlx 加密列 key长度校验

* sqlx 加密列 key长度校验 补单元测试

* 修改加密列key长度错误提示

* atomicx: 泛型封装 atomic.Value (ecodeclub#101)

* atomicx: 泛型封装 atomic.Value

* 添加 CHANGELOG

* syncx/atomicx: 增加 Swap 和 CAS 的泛型包装

* 添加 swap nil 的测试

* 添加更加多的 benchmark 测试,同时保证 NewValue 和 NewValueOf 的语义在 nil 上一致

* 优化单元测试

* queue: API 定义 (ecodeclub#109)

* queue: API 定义

* 补充 API 说明

* 实现优先级队列和并发安全优先级队列 (ecodeclub#110)

基于小顶堆和切片的实现

* queue: 延时队列 (ecodeclub#115)

* 延迟队列: 优化唤醒入队元素逻辑 (ecodeclub#117)

* 修改CHANGELOG链接;添加测试用例修复bug

Signed-off-by: longyue0521 <[email protected]>

* 修改cond的SignalCh为signalCh;理清注释

Signed-off-by: longyue0521 <[email protected]>

Signed-off-by: longyue0521 <[email protected]>

* value: AnyValue 设计 (ecodeclub#120) (ecodeclub#121)

* value: AnyValue 设计 (ecodeclub#120)

* 修复ci检测问题

* 1.fix cr问题
2.add changelog对该pr的引用
3.add license 头部

* 1.修改ChangeLog,加入新特性描述
2.挪出value包,放在根目录
3.统一error格式打印

* 断言方式.Name改为.String

Co-authored-by: vividwei <[email protected]>

* queue: 基于切片的并发阻塞队列和基于 CAS 的并发队列设计 (ecodeclub#119)

* queue:使用list包中的LinkedList实现并发阻塞链式队列 (ecodeclub#122)

* queue:增加链式并发阻塞队列

Co-authored-by: kangdan <[email protected]>
Co-authored-by: dan.kang <[email protected]>

* ConcurrentLinkBlockingQueue 改成ConcurrentLinkedBlockingQueue (ecodeclub#123)



* ConcurrentLinkBlockingQueue 改成ConcurrentLinkedBlockingQueue

* modify .CHANGELOG.md

* modify .CHANGELOG.md

Co-authored-by: kangdan <[email protected]>
Co-authored-by: dan.kang <[email protected]>

* queue: ConcurrentLinkedQueue增加超时控制逻辑 (ecodeclub#124)



Co-authored-by: kangdan <[email protected]>
Co-authored-by: dan.kang <[email protected]>

* queue: 添加例子

- 添加队列例子
- 去除 ConcurrentLinkedQueue 的超时机制

* queue: 添加例子 (ecodeclub#126)

Signed-off-by: longyue0521 <[email protected]>
Co-authored-by: hookokoko <[email protected]>
Co-authored-by: Gevin <[email protected]>
Co-authored-by: Longyue Li <[email protected]>
Co-authored-by: 韦佳栋 <[email protected]>
Co-authored-by: vividwei <[email protected]>
Co-authored-by: kangdan666 <[email protected]>
Co-authored-by: kangdan <[email protected]>
Co-authored-by: dan.kang <[email protected]>
@flycash flycash merged commit 1966061 into ecodeclub:dev Sep 25, 2023
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant