Skip to content

Commit 988da9f

Browse files
author
laodouya
authored
Merge branch 'beta' into bugfix/beta_chain_db_key_prefix
2 parents 2e93401 + 66e2b91 commit 988da9f

543 files changed

Lines changed: 6085 additions & 54452 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.dockerignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
test/
22
bin/cql*
3+
conf/testnet*/*.keystore
34
*.cover.out

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ idminer
1010
coverage.txt
1111
analysisVendor.png
1212
vendor/**/.gitignore
13-
*.keystore
13+
*.keystore*
1414
node_*/
1515
kayak_test
1616
*.conf

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ before_deploy:
3737
- make clean
3838
- make use_all_cores
3939
- mkdir -p build
40-
- tar czvf build/CovenantSQL-$TRAVIS_TAG.$TRAVIS_OS_NAME-amd64.tar.gz $(ls bin/cql* | grep -v test)
40+
- tar czvf build/CovenantSQL-$TRAVIS_TAG.$TRAVIS_OS_NAME-amd64.tar.gz bin/cql bin/cql-fuse bin/cql-minerd bin/cql-mysql-adapter bin/cql-utils
4141

4242
deploy:
4343
provider: releases

‎Gopkg.lock‎

Lines changed: 11 additions & 47 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Gopkg.toml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,3 +89,7 @@
8989
[[constraint]]
9090
name = "github.com/rakyll/statik"
9191
version = "0.1.5"
92+
93+
[[constraint]]
94+
branch = "master"
95+
name = "github.com/CovenantSQL/beacon"

‎Makefile‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -140,12 +140,6 @@ bin/cql-minerd:
140140
-o bin/cql-minerd \
141141
github.com/CovenantSQL/CovenantSQL/cmd/cql-minerd
142142

143-
bin/cql-utils:
144-
$(GOBUILD) \
145-
-ldflags "$(ldflags_role_client_simple_log)" \
146-
-o bin/cql-utils \
147-
github.com/CovenantSQL/CovenantSQL/cmd/cql-utils
148-
149143
bin/cql:
150144
$(GOBUILD) \
151145
-ldflags "$(ldflags_role_client_simple_log)" \
@@ -181,7 +175,7 @@ bp: bin/cqld.test bin/cqld
181175

182176
miner: bin/cql-minerd.test bin/cql-minerd
183177

184-
client: bin/cql-utils bin/cql bin/cql.test bin/cql-fuse bin/cql-mysql-adapter bin/cql-faucet
178+
client: bin/cql bin/cql.test bin/cql-fuse bin/cql-mysql-adapter bin/cql-faucet
185179

186180
all: bp miner client
187181

@@ -191,5 +185,5 @@ clean:
191185
rm -f coverage.txt
192186

193187
.PHONY: status start stop logs push push_testnet clean \
194-
bin/cqld.test bin/cqld bin/cql-minerd.test bin/cql-minerd bin/cql-utils \
188+
bin/cqld.test bin/cqld bin/cql-minerd.test bin/cql-minerd \
195189
bin/cql bin/cql.test bin/cql-fuse bin/cql-mysql-adapter bin/cql-faucet

‎README.md‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,17 @@ sql.Open("CovenantSQL", dbURI)
5757
- Each Database has its own independent distributed engine.
5858
- Mainly responsible for: database storage & encryption, query processing & signature, efficient indexing.
5959

60+
## How it works
61+
[How CovenantSQL works(video)](https://youtu.be/2Mz5POxxaQM?t=106)
62+
63+
## Demos
64+
65+
- [CovenantForum](https://demo.covenantsql.io/forum/)
66+
- [Twitter Bot @iBlockPin](https://twitter.com/iblockpin)
67+
- [Weibo Bot @BlockPin](https://weibo.com/BlockPin)
68+
- [Markdown Editor with CovenantSQL sync](https://github.com/CovenantSQL/stackedit)
69+
- [Web Admin for CovenantSQL](https://github.com/CovenantSQL/adminer)
70+
6071
## Papers
6172
Our team members published:
6273

@@ -114,10 +125,8 @@ Watch us or [![follow on Twitter](https://img.shields.io/twitter/url/https/twitt
114125

115126
## Contact
116127

128+
- [Blog](https://medium.com/@covenant_labs)
129+
- [YouTube](https://www.youtube.com/channel/UCe9P_TMiexSHW2GGV5qBmZw)
117130
- [Mail](mailto:[email protected])
118131
- [Forum](https://demo.covenantsql.io/forum/)
119-
- <a href="https://twitter.com/intent/follow?screen_name=CovenantLabs">
120-
<img src="https://img.shields.io/twitter/url/https/twitter.com/fold_left.svg?style=social&label=Follow%20%40CovenantLabs"
121-
alt="follow on Twitter"></a>
122-
123-
- [![Join the chat at https://gitter.im/CovenantSQL/CovenantSQL](https://badges.gitter.im/CovenantSQL/CovenantSQL.svg)](https://gitter.im/CovenantSQL/CovenantSQL?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
132+
- <a href="https://twitter.com/intent/follow?screen_name=CovenantLabs"><img src="https://img.shields.io/twitter/url/https/twitter.com/fold_left.svg?style=social&label=Follow%20%40CovenantLabs" alt="follow on Twitter"></a>

‎alltest.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ main() {
1515
# some benchmarks
1616
go test -tags "${UNITTESTTAGS:-}" -bench=^BenchmarkPersistentCaller_Call$ -run ^$ ./rpc/
1717
bash cleanupDB.sh || true
18-
go test -tags "${UNITTESTTAGS:-}" -bench=^BenchmarkMinerTwo$ -benchtime=5s -run ^$ ./cmd/cql-minerd/
18+
go test -tags "${UNITTESTTAGS:-}" -bench=^BenchmarkMiner$ -benchtime=5s -run ^$ ./cmd/cql-minerd/ -bench-miner-count=2
1919
bash cleanupDB.sh || true
2020
}
2121

‎bin/docker-entry.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22

3-
echo nameserver 114.114.114.114 > /etc/resolv.conf
3+
# echo nameserver 114.114.114.114 > /etc/resolv.conf
44

55
[ -s "${COVENANT_ALERT}" ] && [ -x "${COVENANT_ALERT}" ] && (eval "${COVENANT_ALERT}")
66

@@ -12,16 +12,16 @@ blockproducer)
1212
exec /app/cqld -config "${COVENANT_CONF}" -metric-web "${METRIC_WEB_ADDR}" "${@}"
1313
;;
1414
observer)
15-
exec /app/cql -config "${COVENANT_CONF}" -web "${COVENANTSQL_OBSERVER_ADDR}" "${@}"
15+
exec /app/cql web -config "${COVENANT_CONF}" -no-password "${COVENANTSQL_OBSERVER_ADDR}" "${@}"
1616
;;
1717
adapter)
18-
exec /app/cql -config "${COVENANT_CONF}" -adapter "${COVENANTSQL_ADAPTER_ADDR}" "${@}"
18+
exec /app/cql adapter -config "${COVENANT_CONF}" -no-password "${COVENANTSQL_ADAPTER_ADDR}" "${@}"
1919
;;
2020
mysql-adapter)
2121
exec /app/cql-mysql-adapter -config "${COVENANT_CONF}" "${@}"
2222
;;
2323
cli)
24-
exec /app/cql -config ${COVENANT_CONF} "${@}"
24+
exec /app/cql console -config ${COVENANT_CONF} -no-password "${@}"
2525
;;
2626
faucet)
2727
exec /app/cql-faucet -config ${COVENANT_CONF} "${@}"

‎blockproducer/metastate.go‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -810,13 +810,6 @@ func (s *metaState) updatePermission(tx *types.UpdatePermission) (err error) {
810810
}).WithError(ErrDatabaseNotFound).Error("unexpected error in updatePermission")
811811
return ErrDatabaseNotFound
812812
}
813-
if !tx.Permission.IsValid() {
814-
log.WithFields(log.Fields{
815-
"permission": tx.Permission,
816-
"dbID": tx.TargetSQLChain.DatabaseID(),
817-
}).WithError(ErrInvalidPermission).Error("unexpected error in updatePermission")
818-
return ErrInvalidPermission
819-
}
820813

821814
// check whether sender has super privilege and find targetUser
822815
numOfSuperUsers := 0

0 commit comments

Comments
 (0)