CovenantSQL · laodouya · Jun 21, 2019 · Jun 18, 2019 · Jun 18, 2019 · Jun 18, 2019
diff --git a/.travis.yml b/.travis.yml
@@ -7,7 +7,7 @@ env:
     - REVIEWDOG_VERSION=0.9.11
 language: go
 go:
-  - '1.11.x'
+  - '1.12.x'
 
 os:
   - linux
@@ -30,14 +30,21 @@ before_script:
   - echo $TRAVIS_SECURE_ENV_VARS
   - ulimit -n 8192
 script:
+  - make release
+  - mkdir tmp && tar zxvf app-bin.tgz -C tmp
+  - ldd tmp/bin/cql* || true
+  - set -x
+  - mv -f tmp/bin/cql* bin/
+  - ./test/testnet_client/run.sh
   - >-
     golint ./... | grep -v 'vendor/' | grep -v 'server/' | grep -v 'utils/' | reviewdog -f=golint -reporter=github-pr-review || true
 
 before_deploy:
   - make clean
-  - make use_all_cores
-  - mkdir -p build
-  - tar czvf build/CovenantSQL-$TRAVIS_TAG.$TRAVIS_OS_NAME-amd64.tar.gz bin/cql bin/cql-fuse bin/cql-minerd bin/cql-mysql-adapter
+  - make release
+  - mkdir build && tar zxvf app-bin.tgz -C build
+  - ldd build/bin/cql* || true
+  - mv app-bin.tgz build/CovenantSQL-$TRAVIS_TAG.$TRAVIS_OS_NAME-amd64.tar.gz
 
 deploy:
   provider: releases

diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -60,6 +60,10 @@
   name = "github.com/CovenantSQL/xurls"
   branch = "master"
 
+[[override]]
+  name = "github.com/CovenantSQL/sqlparser"
+  branch = "master"
+
 [[override]]
   name = "github.com/zserge/metric"
   branch = "master"

diff --git a/Makefile b/Makefile
@@ -57,6 +57,9 @@ docker_clean: status
 	docker rmi -f $(BUILDER):$(VERSION)
 	docker rmi -f $(IMAGE):$(VERSION)
 
+alpine_release: builder
+	temp_container=$$(docker create $(BUILDER):$(VERSION)) ; \
+	docker cp $${temp_container}:/go/src/github.com/CovenantSQL/CovenantSQL/bin - | gzip > app-bin.tgz
 
 save: status
 ifeq ($(SHIP_VERSION),)
@@ -102,6 +105,10 @@ unamestr := $(shell uname)
 
 ifeq ($(unamestr),Linux)
 	platform := linux
+else
+  ifeq ($(unamestr),Darwin)
+	platform := darwin
+  endif
 endif
 
 ifdef CQLVERSION
@@ -111,16 +118,22 @@ else
 endif
 
 tags := $(platform) sqlite_omit_load_extension
-testtags := $(tags) testbinary
+miner_tags := $(tags) sqlite_vtable sqlite_fts5 sqlite_icu sqlite_json
+test_tags := $(tags) testbinary
+miner_test_tags := $(test_tags) sqlite_vtable sqlite_fts5 sqlite_icu sqlite_json
+
+static_flags := -linkmode external -extldflags '-static'
 test_flags := -coverpkg github.com/CovenantSQL/CovenantSQL/... -cover -race -c
 
-ldflags_role_bp := -X main.version=$(version) -X github.com/CovenantSQL/CovenantSQL/conf.RoleTag=B $$GOLDFLAGS
-ldflags_role_miner := -X main.version=$(version) -X github.com/CovenantSQL/CovenantSQL/conf.RoleTag=M $$GOLDFLAGS
-ldflags_role_client := -X main.version=$(version) -X github.com/CovenantSQL/CovenantSQL/conf.RoleTag=C $$GOLDFLAGS
+ldflags_role_bp := -X main.version=$(version) -X github.com/CovenantSQL/CovenantSQL/conf.RoleTag=B
+ldflags_role_miner := -X main.version=$(version) -X github.com/CovenantSQL/CovenantSQL/conf.RoleTag=M
+ldflags_role_client := -X main.version=$(version) -X github.com/CovenantSQL/CovenantSQL/conf.RoleTag=C
 ldflags_role_client_simple_log := $(ldflags_role_client) -X github.com/CovenantSQL/CovenantSQL/utils/log.SimpleLog=Y
 
-GOTEST := CGO_ENABLED=1 go test $(test_flags) -tags "$(testtags)"
+GOTEST := CGO_ENABLED=1 go test $(test_flags) -tags "$(test_tags)"
+GOTEST_MINER := CGO_ENABLED=1 go test $(test_flags) -tags "$(miner_test_tags)"
 GOBUILD := CGO_ENABLED=1 go build -tags "$(tags)"
+GOBUILD_MINER := CGO_ENABLED=1 go build -tags "$(miner_tags)"
 
 bin/cqld.test:
 	$(GOTEST) \
@@ -134,49 +147,84 @@ bin/cqld:
 		-o bin/cqld \
 		github.com/CovenantSQL/CovenantSQL/cmd/cqld
 
+bin/cqld.static:
+	$(GOBUILD) \
+		-ldflags "$(ldflags_role_bp) $(static_flags)" \
+		-o bin/cqld \
+		github.com/CovenantSQL/CovenantSQL/cmd/cqld
+
 bin/cql-minerd.test:
-	$(GOTEST) \
+	$(GOTEST_MINER) \
 		-ldflags "$(ldflags_role_miner)" \
 		-o bin/cql-minerd.test \
 		github.com/CovenantSQL/CovenantSQL/cmd/cql-minerd
 
 bin/cql-minerd:
-	$(GOBUILD) \
+	$(GOBUILD_MINER) \
 		-ldflags "$(ldflags_role_miner)" \
 		-o bin/cql-minerd \
 		github.com/CovenantSQL/CovenantSQL/cmd/cql-minerd
 
-bin/cql:
-	$(GOBUILD) \
-		-ldflags "$(ldflags_role_client_simple_log)" \
-		-o bin/cql \
-		github.com/CovenantSQL/CovenantSQL/cmd/cql
+bin/cql-minerd.static:
+	$(GOBUILD_MINER) \
+		-ldflags "$(ldflags_role_miner) $(static_flags)" \
+		-o bin/cql-minerd \
+		github.com/CovenantSQL/CovenantSQL/cmd/cql-minerd
 
 bin/cql.test:
 	$(GOTEST) \
 		-ldflags "$(ldflags_role_client)" \
 		-o bin/cql.test \
 		github.com/CovenantSQL/CovenantSQL/cmd/cql
 
+bin/cql:
+	$(GOBUILD) \
+		-ldflags "$(ldflags_role_client_simple_log)" \
+		-o bin/cql \
+		github.com/CovenantSQL/CovenantSQL/cmd/cql
+
+bin/cql.static:
+	$(GOBUILD) \
+		-ldflags "$(ldflags_role_client_simple_log) $(static_flags)" \
+		-o bin/cql \
+		github.com/CovenantSQL/CovenantSQL/cmd/cql
 
 bin/cql-fuse:
 	$(GOBUILD) \
 		-ldflags "$(ldflags_role_client_simple_log)" \
 		-o bin/cql-fuse \
 		github.com/CovenantSQL/CovenantSQL/cmd/cql-fuse
 
+bin/cql-fuse.static:
+	$(GOBUILD) \
+		-ldflags "$(ldflags_role_client_simple_log) $(static_flags)" \
+		-o bin/cql-fuse \
+		github.com/CovenantSQL/CovenantSQL/cmd/cql-fuse
+
 bin/cql-mysql-adapter:
 	$(GOBUILD) \
 		-ldflags "$(ldflags_role_client)" \
 		-o bin/cql-mysql-adapter \
 		github.com/CovenantSQL/CovenantSQL/cmd/cql-mysql-adapter
 
+bin/cql-mysql-adapter.static:
+	$(GOBUILD) \
+		-ldflags "$(ldflags_role_client) $(static_flags)" \
+		-o bin/cql-mysql-adapter \
+		github.com/CovenantSQL/CovenantSQL/cmd/cql-mysql-adapter
+
 bin/cql-faucet:
 	$(GOBUILD) \
 		-ldflags "$(ldflags_role_client)" \
 		-o bin/cql-faucet \
 		github.com/CovenantSQL/CovenantSQL/cmd/cql-faucet
 
+bin/cql-faucet.static:
+	$(GOBUILD) \
+		-ldflags "$(ldflags_role_client) $(static_flags)" \
+		-o bin/cql-faucet \
+		github.com/CovenantSQL/CovenantSQL/cmd/cql-faucet
+
 bp: bin/cqld.test bin/cqld
 
 miner: bin/cql-minerd.test bin/cql-minerd
@@ -187,8 +235,21 @@ all: bp miner client
 
 build-release: bin/cqld bin/cql-minerd bin/cql bin/cql-fuse bin/cql-mysql-adapter bin/cql-faucet
 
+# This should only called in alpine docker builder
+build-release-static: bin/cqld.static bin/cql-minerd.static bin/cql.static \
+	bin/cql-fuse.static bin/cql-mysql-adapter.static bin/cql-faucet.static
+
 release:
+ifeq ($(unamestr),Linux)
+	if [ -f /.dockerenv ]; then \
+		make -j$(JOBS) build-release-static; \
+	else \
+		make alpine_release; \
+	fi
+else
 	make -j$(JOBS) build-release
+	tar czvf app-bin.tgz bin/cqld bin/cql-minerd bin/cql bin/cql-fuse bin/cql-mysql-adapter bin/cql-faucet
+endif
 
 android-release: status
 	docker build \

diff --git a/api/models/pagination.go b/api/models/pagination.go
@@ -77,14 +77,14 @@ func (p *Pagination) SetTotal(total int) {
 }
 
 // Limit returns the page size.
-// Attened to be used in SQL statements.
+// Intend to be used in SQL statements.
 func (p *Pagination) Limit() int {
 	p.normalize()
 	return p.Size
 }
 
 // Offset returns the size of skipped items of current page.
-// Attened to be used in SQL statements.
+// Intend to be used in SQL statements.
 func (p *Pagination) Offset() int {
 	p.normalize()
 	return (p.Page - 1) * p.Size

diff --git a/bin/completion/_cql b/bin/completion/_cql
@@ -193,7 +193,7 @@ _cql() {
 	"adapter:start a SQLChain adapter"
 	"idminer:calculate nonce and node id for config.yaml file"
 	"rpc:make a rpc request"
-	"version:show build version infomation"
+	"version:show build version information"
 	"help:show help for sub command"
   )
 

diff --git a/client/driver.go b/client/driver.go
@@ -272,7 +272,6 @@ func WaitBPDatabaseCreation(
 		select {
 		case <-ticker.C:
 			count++
-			fmt.Printf("\rWaiting for miner confirmation %vs", count*int(period.Seconds()))
 
 			if err = rpc.RequestBP(
 				route.MCCQuerySQLChainProfile.String(), req, nil,
@@ -291,6 +290,7 @@ func WaitBPDatabaseCreation(
 					return
 				}
 			}
+			fmt.Printf("\rQuerying SQLChain Profile %vs", count*int(period.Seconds()))
 		case <-ctx.Done():
 			err = ctx.Err()
 			return

diff --git a/cmd/cql-minerd/main.go b/cmd/cql-minerd/main.go
@@ -255,6 +255,9 @@ func main() {
 	if dbms, err = startDBMS(server, direct, func() {
 		sendProvideService(reg)
 	}); err != nil {
+		// FIXME(auxten): if restart all miners with the same db,
+		// miners will fail to start
+		time.Sleep(10 * time.Second)
 		log.WithError(err).Fatal("start dbms failed")
 	}
 

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -16,7 +16,7 @@ ENV VERSION=${VERSION}
 ENV COVENANT_ROLE=miner
 ENV COVENANT_CONF=config.yaml
 
-RUN apk --no-cache add ca-certificates
+RUN apk --no-cache add ca-certificates icu-libs musl
 
 WORKDIR /app
 COPY --from=covenantsql/covenantsql-builder /go/src/github.com/CovenantSQL/CovenantSQL/bin/* /app/

diff --git a/docker/builder.Dockerfile b/docker/builder.Dockerfile
@@ -1,11 +1,10 @@
 # Stage: builder
-FROM golang:1.11-alpine3.9 as builder
+FROM covenantsql/release-builder as builder
 
 ARG BUILD_ARG
 
 WORKDIR /go/src/github.com/CovenantSQL/CovenantSQL
 COPY . .
-RUN apk --no-cache add build-base make git
 RUN make clean
-RUN GOOS=linux GOLDFLAGS="-linkmode external -extldflags -static" make ${BUILD_ARG}
+RUN GOOS=linux make ${BUILD_ARG}
 
diff --git a/docker/builder/Dockerfile b/docker/builder/Dockerfile
@@ -0,0 +1,10 @@
+FROM golang:alpine3.9
+MAINTAINER auxten
+
+RUN apk add build-base
+RUN apk add make
+RUN apk add git
+RUN apk add icu-dev
+RUN apk add icu-static
+
+WORKDIR $GOPATH
diff --git a/docker/builder/build.sh b/docker/builder/build.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+docker build -t covenantsql/release-builder:latest . && \
+docker push covenantsql/release-builder
diff --git a/docker/ci-builder/Dockerfile b/docker/ci-builder/Dockerfile
@@ -0,0 +1,14 @@
+FROM golang:1.12
+MAINTAINER auxten
+
+RUN apt-get update && apt-get install -y --no-install-recommends \
+		libicu-dev \
+	&& rm -rf /var/lib/apt/lists/*
+
+
+RUN go get github.com/mattn/goveralls
+RUN go get github.com/haya14busa/goverage
+RUN go get golang.org/x/lint/golint
+RUN go get github.com/haya14busa/reviewdog/cmd/reviewdog
+
+WORKDIR $GOPATH
diff --git a/docker/ci-builder/build.sh b/docker/ci-builder/build.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+docker build -t covenantsql/build:latest . && \
+docker push covenantsql/build
diff --git a/metric/cpu_linux.go b/metric/cpu_linux.go
@@ -81,10 +81,7 @@ func (c *cpuCollector) Update(ch chan<- prometheus.Metric) error {
 	if err := c.updateStat(ch); err != nil {
 		return err
 	}
-	if err := c.updateCPUfreq(ch); err != nil {
-		return err
-	}
-	return nil
+	return c.updateCPUfreq(ch)
 }
 
 // updateCPUfreq reads /sys/devices/system/cpu/cpu* and expose cpu frequency statistics.

diff --git a/storage/storage_test.go b/storage/storage_test.go
@@ -197,9 +197,9 @@ func TestStorage(t *testing.T) {
 		t.Fatalf("error result count: %v, should be 3", len(data))
 	} else {
 		// compare rows
-		should1 := []interface{}{[]byte("k0"), nil}
-		should2 := []interface{}{[]byte("k1"), []byte("v1")}
-		should3 := []interface{}{[]byte("k3"), []byte("v3-2")}
+		should1 := []interface{}{"k0", nil}
+		should2 := []interface{}{"k1", "v1"}
+		should3 := []interface{}{"k3", "v3-2"}
 		t.Logf("Rows: %v", data)
 		if !reflect.DeepEqual(data[0], should1) {
 			t.Fatalf("error result row: %v, should: %v", data[0], should1)
@@ -229,9 +229,9 @@ func TestStorage(t *testing.T) {
 		t.Fatalf("error result count: %v, should be 3", len(data))
 	} else {
 		// compare rows
-		should1 := []interface{}{[]byte("k0")}
-		should2 := []interface{}{[]byte("k1")}
-		should3 := []interface{}{[]byte("k3")}
+		should1 := []interface{}{"k0"}
+		should2 := []interface{}{"k1"}
+		should3 := []interface{}{"k3"}
 		t.Logf("Rows: %v", data)
 		if !reflect.DeepEqual(data[0], should1) {
 			t.Fatalf("error result row: %v, should: %v", data[0], should1)
@@ -261,8 +261,8 @@ func TestStorage(t *testing.T) {
 		t.Fatalf("error result count: %v, should be 3", len(data))
 	} else {
 		// compare rows
-		should1 := []interface{}{[]byte("k1")}
-		should2 := []interface{}{[]byte("k3")}
+		should1 := []interface{}{"k1"}
+		should2 := []interface{}{"k3"}
 		t.Logf("Rows: %v", data)
 		if !reflect.DeepEqual(data[0], should1) {
 			t.Fatalf("error result row: %v, should: %v", data[0], should1)