* feature extend readthrough for cache module (#5116) * feature 增加readthrough * feature: add write though for cache mode (#5117) * feature: add writethough for cache mode * feature add singleflight cache (#5119) * build(deps): bump go.opentelemetry.io/otel/trace from 1.8.0 to 1.11.2 Bumps [go.opentelemetry.io/otel/trace](https://github.com/open-telemetry/opentelemetry-go) from 1.8.0 to 1.11.2. - [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-go/compare/v1.8.0...v1.11.2) --- updated-dependencies: - dependency-name: go.opentelemetry.io/otel/trace dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * fix 5129: must set formatter after init the logger * remove beego.vip * build(deps): bump actions/stale from 5 to 7 Bumps [actions/stale](https://github.com/actions/stale) from 5 to 7. - [Release notes](https://github.com/actions/stale/releases) - [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/stale/compare/v5...v7) --- updated-dependencies: - dependency-name: actions/stale dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * fix 5079: only log msg when the channel is not closed (#5132) * optimize test * upgrade otel dependencies to v1.11.2 * format code * Bloom filter cache (#5126) * feature: add bloom filter cache * feature upload remove all temp file * bugfix Controller SaveToFile remove all temp file * rft: motify BeeLogger signalChan (#5139) * add non-block write log in asynchronous mode (#5150) * add non-block write log in asynchronous mode --------- Co-authored-by: chenhaokun <chenhaokun@itiger.com> * fix the docsite URL (#5173) * Unified gopkg.in/yaml version to v2 (#5169) * Unified gopkg.in/yaml version to v2 and go mod tidy * update CHANGELOG * bugfix: protect field access with lock to avoid possible data race (#5211) * fix some comments (#5194) Signed-off-by: cui fliter <imcusg@gmail.com> * build(deps): bump github.com/prometheus/client_golang (#5213) Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.14.0 to 1.15.1. - [Release notes](https://github.com/prometheus/client_golang/releases) - [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md) - [Commits](https://github.com/prometheus/client_golang/compare/v1.14.0...v1.15.1) --- updated-dependencies: - dependency-name: github.com/prometheus/client_golang dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): bump go.etcd.io/etcd/client/v3 from 3.5.4 to 3.5.9 (#5209) Bumps [go.etcd.io/etcd/client/v3](https://github.com/etcd-io/etcd) from 3.5.4 to 3.5.9. - [Release notes](https://github.com/etcd-io/etcd/releases) - [Commits](https://github.com/etcd-io/etcd/compare/v3.5.4...v3.5.9) --- updated-dependencies: - dependency-name: go.etcd.io/etcd/client/v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * cache: fix typo and optimize the naming * Release 2.1.0 change log * bugfix: beegoAppConfig String and Strings function has bug * httplib: fix unstable test, do not use httplib.org * chore: pkg imported more than once * chore: fmt modify * chore: Use github.com/go-kit/log * chore: unnecessary use of fmt.Sprintf * fix: golangci-lint error * orm: refactor ORM introducing internal/models pkg * remove adapter package * build(deps): bump github.com/bits-and-blooms/bloom/v3 Bumps [github.com/bits-and-blooms/bloom/v3](https://github.com/bits-and-blooms/bloom) from 3.3.1 to 3.5.0. - [Release notes](https://github.com/bits-and-blooms/bloom/releases) - [Commits](https://github.com/bits-and-blooms/bloom/compare/v3.3.1...v3.5.0) --- updated-dependencies: - dependency-name: github.com/bits-and-blooms/bloom/v3 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * feat: add write-delete cache mode * fix: unnecessary assignment to the blank identifier * fix: add change into .CHANGELOG file * build(deps): bump golang.org/x/sync from 0.1.0 to 0.3.0 Bumps [golang.org/x/sync](https://github.com/golang/sync) from 0.1.0 to 0.3.0. - [Commits](https://github.com/golang/sync/compare/v0.1.0...v0.3.0) --- updated-dependencies: - dependency-name: golang.org/x/sync dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * build(deps): bump golang.org/x/crypto Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.0.0-20220315160706-3147a52a75dd to 0.10.0. - [Commits](https://github.com/golang/crypto/commits/v0.10.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * remove golang--lint-ci * Beego web.Run() runs the server twice * fix 5255: Check the rows.Err() if rows.Next() is false * closes 5254: %COL% should be a common placeholder * build(deps): bump github.com/prometheus/client_golang Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.15.1 to 1.16.0. - [Release notes](https://github.com/prometheus/client_golang/releases) - [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md) - [Commits](https://github.com/prometheus/client_golang/compare/v1.15.1...v1.16.0) --- updated-dependencies: - dependency-name: github.com/prometheus/client_golang dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * fix: use of ioutil package (#5261) * fix ioutil.NopCloser * fix ioutil.ReadAll * fix ioutil.ReadFile * fix ioutil.WriteFile * run goimports -w -format-only ./ * update CHANGELOG.md * feature: add write-double-delete cache mode (#5263) * cache/redis: support skipEmptyPrefix option (#5264) * fix: refactor InsertValue method (#5267) * fix: refactor insertValue method and add the test * fix: exec goimports and add Licence file header * fix: modify construct method of dbBase * fix: add modify record into CHANGELOG * fix: modify InsertOrUpdate method (#5269) * fix: modify InsertOrUpdate method, Remove the isMulti variable and its associated code * fix: Delete unnecessary judgment branches * fix: add modify record into CHANGELOG * cache/redis: use redisConfig to receive incoming JSON (previously using a map) (#5268) * refactor cache/redis: Use redisConfig to receive incoming JSON (previously using a map). * refactor cache/redis: Use the string type to receive JSON parameters. --------- Co-authored-by: Tan <tanqianheng@gmail.com> * fix: refactor Delete method (#5271) * fix: refactor Delete method and add test * fix: add modify record into CHANGELOG * fix: refactor update sql (#5274) * fix: refactor UpdateSQL method and add test * fix: add modify record into CHANGELOG * fix: modify url in the CHANGELOG * fix: modify pr url in the CHANGELOG * Fix setPK function for table without primary key (#5276) --------- Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: cui fliter <imcusg@gmail.com> Co-authored-by: Stone-afk <73482944+Stone-afk@users.noreply.github.com> Co-authored-by: hookokoko <hooko@tju.edu.cn> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: hookokoko <648646891@qq.com> Co-authored-by: Stone-afk <1711865140@qq.com> Co-authored-by: chenhaokun <chenhaokun@itiger.com> Co-authored-by: Xuing <admin@xuing.cn> Co-authored-by: cui fliter <imcusg@gmail.com> Co-authored-by: guoguangwu <guoguangwu@magic-shield.com> Co-authored-by: uzziah <uzziahlin@gmail.com> Co-authored-by: Hanjiang Yu <delacroix.yu@gmail.com> Co-authored-by: Kota <mdryzk64smsh@gmail.com> Co-authored-by: Uzziah <120019273+uzziahlin@users.noreply.github.com> Co-authored-by: Handkerchiefs-t <59816423+Handkerchiefs-t@users.noreply.github.com> Co-authored-by: Tan <tanqianheng@gmail.com> Co-authored-by: mlgd <mlgd17@gmail.com>
188 lines
4.0 KiB
Go
188 lines
4.0 KiB
Go
// Copyright 2014 beego Author. All Rights Reserved.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package config
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
"strings"
|
|
"testing"
|
|
)
|
|
|
|
func TestIni(t *testing.T) {
|
|
var (
|
|
inicontext = `
|
|
;comment one
|
|
#comment two
|
|
appname = beeapi
|
|
httpport = 8080
|
|
mysqlport = 3600
|
|
PI = 3.1415976
|
|
runmode = "dev"
|
|
autorender = false
|
|
copyrequestbody = true
|
|
session= on
|
|
cookieon= off
|
|
newreg = OFF
|
|
needlogin = ON
|
|
enableSession = Y
|
|
enableCookie = N
|
|
flag = 1
|
|
path1 = ${GOPATH}
|
|
path2 = ${GOPATH||/home/go}
|
|
[demo]
|
|
key1="asta"
|
|
key2 = "xie"
|
|
CaseInsensitive = true
|
|
peers = one;two;three
|
|
password = ${GOPATH}
|
|
`
|
|
|
|
keyValue = map[string]interface{}{
|
|
"appname": "beeapi",
|
|
"httpport": 8080,
|
|
"mysqlport": int64(3600),
|
|
"pi": 3.1415976,
|
|
"runmode": "dev",
|
|
"autorender": false,
|
|
"copyrequestbody": true,
|
|
"session": true,
|
|
"cookieon": false,
|
|
"newreg": false,
|
|
"needlogin": true,
|
|
"enableSession": true,
|
|
"enableCookie": false,
|
|
"flag": true,
|
|
"path1": os.Getenv("GOPATH"),
|
|
"path2": os.Getenv("GOPATH"),
|
|
"demo::key1": "asta",
|
|
"demo::key2": "xie",
|
|
"demo::CaseInsensitive": true,
|
|
"demo::peers": []string{"one", "two", "three"},
|
|
"demo::password": os.Getenv("GOPATH"),
|
|
"null": "",
|
|
"demo2::key1": "",
|
|
"error": "",
|
|
"emptystrings": []string{},
|
|
}
|
|
)
|
|
|
|
f, err := os.Create("testini.conf")
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
_, err = f.WriteString(inicontext)
|
|
if err != nil {
|
|
f.Close()
|
|
t.Fatal(err)
|
|
}
|
|
f.Close()
|
|
defer os.Remove("testini.conf")
|
|
iniconf, err := NewConfig("ini", "testini.conf")
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
for k, v := range keyValue {
|
|
var err error
|
|
var value interface{}
|
|
switch v.(type) {
|
|
case int:
|
|
value, err = iniconf.Int(k)
|
|
case int64:
|
|
value, err = iniconf.Int64(k)
|
|
case float64:
|
|
value, err = iniconf.Float(k)
|
|
case bool:
|
|
value, err = iniconf.Bool(k)
|
|
case []string:
|
|
value, err = iniconf.Strings(k)
|
|
case string:
|
|
value, err = iniconf.String(k)
|
|
default:
|
|
value, err = iniconf.DIY(k)
|
|
}
|
|
if err != nil {
|
|
t.Fatalf("get key %q value fail,err %s", k, err)
|
|
} else if fmt.Sprintf("%v", v) != fmt.Sprintf("%v", value) {
|
|
t.Fatalf("get key %q value, want %v got %v .", k, v, value)
|
|
}
|
|
|
|
}
|
|
if err = iniconf.Set("name", "astaxie"); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
res, _ := iniconf.String("name")
|
|
if res != "astaxie" {
|
|
t.Fatal("get name error")
|
|
}
|
|
}
|
|
|
|
func TestIniSave(t *testing.T) {
|
|
const (
|
|
inicontext = `
|
|
app = app
|
|
;comment one
|
|
#comment two
|
|
# comment three
|
|
appname = beeapi
|
|
httpport = 8080
|
|
# DB Info
|
|
# enable db
|
|
[dbinfo]
|
|
# db type name
|
|
# support mysql,sqlserver
|
|
name = mysql
|
|
`
|
|
|
|
saveResult = `
|
|
app=app
|
|
#comment one
|
|
#comment two
|
|
# comment three
|
|
appname=beeapi
|
|
httpport=8080
|
|
|
|
# DB Info
|
|
# enable db
|
|
[dbinfo]
|
|
# db type name
|
|
# support mysql,sqlserver
|
|
name=mysql
|
|
`
|
|
)
|
|
cfg, err := NewConfigData("ini", []byte(inicontext))
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
name := "newIniConfig.ini"
|
|
if err := cfg.SaveConfigFile(name); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
defer os.Remove(name)
|
|
|
|
if data, err := os.ReadFile(name); err != nil {
|
|
t.Fatal(err)
|
|
} else {
|
|
cfgData := string(data)
|
|
datas := strings.Split(saveResult, "\n")
|
|
for _, line := range datas {
|
|
if !strings.Contains(cfgData, line+"\n") {
|
|
t.Fatalf("different after save ini config file. need contains %q", line)
|
|
}
|
|
}
|
|
|
|
}
|
|
}
|