refactor(storage): move interface to core package
This commit is contained in:
@@ -4,9 +4,9 @@ import (
|
||||
"sync"
|
||||
"testing"
|
||||
|
||||
"github.com/appleboy/gorush/storage"
|
||||
|
||||
"github.com/appleboy/gorush/config"
|
||||
"github.com/appleboy/gorush/core"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
@@ -19,15 +19,15 @@ func TestBadgerEngine(t *testing.T) {
|
||||
err := badger.Init()
|
||||
assert.Nil(t, err)
|
||||
|
||||
badger.Add(storage.HuaweiSuccessKey, 10)
|
||||
val = badger.Get(storage.HuaweiSuccessKey)
|
||||
badger.Add(core.HuaweiSuccessKey, 10)
|
||||
val = badger.Get(core.HuaweiSuccessKey)
|
||||
assert.Equal(t, int64(10), val)
|
||||
badger.Add(storage.HuaweiSuccessKey, 10)
|
||||
val = badger.Get(storage.HuaweiSuccessKey)
|
||||
badger.Add(core.HuaweiSuccessKey, 10)
|
||||
val = badger.Get(core.HuaweiSuccessKey)
|
||||
assert.Equal(t, int64(20), val)
|
||||
|
||||
badger.Set(storage.HuaweiSuccessKey, 0)
|
||||
val = badger.Get(storage.HuaweiSuccessKey)
|
||||
badger.Set(core.HuaweiSuccessKey, 0)
|
||||
val = badger.Get(core.HuaweiSuccessKey)
|
||||
assert.Equal(t, int64(0), val)
|
||||
|
||||
// test concurrency issues
|
||||
@@ -35,12 +35,12 @@ func TestBadgerEngine(t *testing.T) {
|
||||
for i := 0; i < 10; i++ {
|
||||
wg.Add(1)
|
||||
go func() {
|
||||
badger.Add(storage.HuaweiSuccessKey, 1)
|
||||
badger.Add(core.HuaweiSuccessKey, 1)
|
||||
wg.Done()
|
||||
}()
|
||||
}
|
||||
wg.Wait()
|
||||
val = badger.Get(storage.HuaweiSuccessKey)
|
||||
val = badger.Get(core.HuaweiSuccessKey)
|
||||
assert.Equal(t, int64(10), val)
|
||||
|
||||
assert.NoError(t, badger.Close())
|
||||
|
||||
@@ -4,9 +4,9 @@ import (
|
||||
"sync"
|
||||
"testing"
|
||||
|
||||
"github.com/appleboy/gorush/storage"
|
||||
|
||||
"github.com/appleboy/gorush/config"
|
||||
"github.com/appleboy/gorush/core"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
@@ -19,15 +19,15 @@ func TestBoltDBEngine(t *testing.T) {
|
||||
err := boltDB.Init()
|
||||
assert.Nil(t, err)
|
||||
|
||||
boltDB.Add(storage.HuaweiSuccessKey, 10)
|
||||
val = boltDB.Get(storage.HuaweiSuccessKey)
|
||||
boltDB.Add(core.HuaweiSuccessKey, 10)
|
||||
val = boltDB.Get(core.HuaweiSuccessKey)
|
||||
assert.Equal(t, int64(10), val)
|
||||
boltDB.Add(storage.HuaweiSuccessKey, 10)
|
||||
val = boltDB.Get(storage.HuaweiSuccessKey)
|
||||
boltDB.Add(core.HuaweiSuccessKey, 10)
|
||||
val = boltDB.Get(core.HuaweiSuccessKey)
|
||||
assert.Equal(t, int64(20), val)
|
||||
|
||||
boltDB.Set(storage.HuaweiSuccessKey, 0)
|
||||
val = boltDB.Get(storage.HuaweiSuccessKey)
|
||||
boltDB.Set(core.HuaweiSuccessKey, 0)
|
||||
val = boltDB.Get(core.HuaweiSuccessKey)
|
||||
assert.Equal(t, int64(0), val)
|
||||
|
||||
// test concurrency issues
|
||||
@@ -35,12 +35,12 @@ func TestBoltDBEngine(t *testing.T) {
|
||||
for i := 0; i < 10; i++ {
|
||||
wg.Add(1)
|
||||
go func() {
|
||||
boltDB.Add(storage.HuaweiSuccessKey, 1)
|
||||
boltDB.Add(core.HuaweiSuccessKey, 1)
|
||||
wg.Done()
|
||||
}()
|
||||
}
|
||||
wg.Wait()
|
||||
val = boltDB.Get(storage.HuaweiSuccessKey)
|
||||
val = boltDB.Get(core.HuaweiSuccessKey)
|
||||
assert.Equal(t, int64(10), val)
|
||||
|
||||
assert.NoError(t, boltDB.Close())
|
||||
|
||||
@@ -5,9 +5,9 @@ import (
|
||||
"sync"
|
||||
"testing"
|
||||
|
||||
"github.com/appleboy/gorush/storage"
|
||||
|
||||
"github.com/appleboy/gorush/config"
|
||||
"github.com/appleboy/gorush/core"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
@@ -25,15 +25,15 @@ func TestBuntDBEngine(t *testing.T) {
|
||||
err := buntDB.Init()
|
||||
assert.Nil(t, err)
|
||||
|
||||
buntDB.Add(storage.HuaweiSuccessKey, 10)
|
||||
val = buntDB.Get(storage.HuaweiSuccessKey)
|
||||
buntDB.Add(core.HuaweiSuccessKey, 10)
|
||||
val = buntDB.Get(core.HuaweiSuccessKey)
|
||||
assert.Equal(t, int64(10), val)
|
||||
buntDB.Add(storage.HuaweiSuccessKey, 10)
|
||||
val = buntDB.Get(storage.HuaweiSuccessKey)
|
||||
buntDB.Add(core.HuaweiSuccessKey, 10)
|
||||
val = buntDB.Get(core.HuaweiSuccessKey)
|
||||
assert.Equal(t, int64(20), val)
|
||||
|
||||
buntDB.Set(storage.HuaweiSuccessKey, 0)
|
||||
val = buntDB.Get(storage.HuaweiSuccessKey)
|
||||
buntDB.Set(core.HuaweiSuccessKey, 0)
|
||||
val = buntDB.Get(core.HuaweiSuccessKey)
|
||||
assert.Equal(t, int64(0), val)
|
||||
|
||||
// test concurrency issues
|
||||
@@ -41,12 +41,12 @@ func TestBuntDBEngine(t *testing.T) {
|
||||
for i := 0; i < 10; i++ {
|
||||
wg.Add(1)
|
||||
go func() {
|
||||
buntDB.Add(storage.HuaweiSuccessKey, 1)
|
||||
buntDB.Add(core.HuaweiSuccessKey, 1)
|
||||
wg.Done()
|
||||
}()
|
||||
}
|
||||
wg.Wait()
|
||||
val = buntDB.Get(storage.HuaweiSuccessKey)
|
||||
val = buntDB.Get(core.HuaweiSuccessKey)
|
||||
assert.Equal(t, int64(10), val)
|
||||
|
||||
assert.NoError(t, buntDB.Close())
|
||||
|
||||
@@ -5,9 +5,9 @@ import (
|
||||
"sync"
|
||||
"testing"
|
||||
|
||||
"github.com/appleboy/gorush/storage"
|
||||
|
||||
"github.com/appleboy/gorush/config"
|
||||
"github.com/appleboy/gorush/core"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
@@ -25,15 +25,15 @@ func TestLevelDBEngine(t *testing.T) {
|
||||
err := levelDB.Init()
|
||||
assert.Nil(t, err)
|
||||
|
||||
levelDB.Add(storage.HuaweiSuccessKey, 10)
|
||||
val = levelDB.Get(storage.HuaweiSuccessKey)
|
||||
levelDB.Add(core.HuaweiSuccessKey, 10)
|
||||
val = levelDB.Get(core.HuaweiSuccessKey)
|
||||
assert.Equal(t, int64(10), val)
|
||||
levelDB.Add(storage.HuaweiSuccessKey, 10)
|
||||
val = levelDB.Get(storage.HuaweiSuccessKey)
|
||||
levelDB.Add(core.HuaweiSuccessKey, 10)
|
||||
val = levelDB.Get(core.HuaweiSuccessKey)
|
||||
assert.Equal(t, int64(20), val)
|
||||
|
||||
levelDB.Set(storage.HuaweiSuccessKey, 0)
|
||||
val = levelDB.Get(storage.HuaweiSuccessKey)
|
||||
levelDB.Set(core.HuaweiSuccessKey, 0)
|
||||
val = levelDB.Get(core.HuaweiSuccessKey)
|
||||
assert.Equal(t, int64(0), val)
|
||||
|
||||
// test concurrency issues
|
||||
@@ -41,12 +41,12 @@ func TestLevelDBEngine(t *testing.T) {
|
||||
for i := 0; i < 10; i++ {
|
||||
wg.Add(1)
|
||||
go func() {
|
||||
levelDB.Add(storage.HuaweiSuccessKey, 1)
|
||||
levelDB.Add(core.HuaweiSuccessKey, 1)
|
||||
wg.Done()
|
||||
}()
|
||||
}
|
||||
wg.Wait()
|
||||
val = levelDB.Get(storage.HuaweiSuccessKey)
|
||||
val = levelDB.Get(core.HuaweiSuccessKey)
|
||||
assert.Equal(t, int64(10), val)
|
||||
|
||||
assert.NoError(t, levelDB.Close())
|
||||
|
||||
@@ -4,7 +4,7 @@ import (
|
||||
"sync"
|
||||
"testing"
|
||||
|
||||
"github.com/appleboy/gorush/storage"
|
||||
"github.com/appleboy/gorush/core"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
@@ -16,15 +16,15 @@ func TestMemoryEngine(t *testing.T) {
|
||||
err := memory.Init()
|
||||
assert.Nil(t, err)
|
||||
|
||||
memory.Add(storage.HuaweiSuccessKey, 10)
|
||||
val = memory.Get(storage.HuaweiSuccessKey)
|
||||
memory.Add(core.HuaweiSuccessKey, 10)
|
||||
val = memory.Get(core.HuaweiSuccessKey)
|
||||
assert.Equal(t, int64(10), val)
|
||||
memory.Add(storage.HuaweiSuccessKey, 10)
|
||||
val = memory.Get(storage.HuaweiSuccessKey)
|
||||
memory.Add(core.HuaweiSuccessKey, 10)
|
||||
val = memory.Get(core.HuaweiSuccessKey)
|
||||
assert.Equal(t, int64(20), val)
|
||||
|
||||
memory.Set(storage.HuaweiSuccessKey, 0)
|
||||
val = memory.Get(storage.HuaweiSuccessKey)
|
||||
memory.Set(core.HuaweiSuccessKey, 0)
|
||||
val = memory.Get(core.HuaweiSuccessKey)
|
||||
assert.Equal(t, int64(0), val)
|
||||
|
||||
// test concurrency issues
|
||||
@@ -32,12 +32,12 @@ func TestMemoryEngine(t *testing.T) {
|
||||
for i := 0; i < 10; i++ {
|
||||
wg.Add(1)
|
||||
go func() {
|
||||
memory.Add(storage.HuaweiSuccessKey, 1)
|
||||
memory.Add(core.HuaweiSuccessKey, 1)
|
||||
wg.Done()
|
||||
}()
|
||||
}
|
||||
wg.Wait()
|
||||
val = memory.Get(storage.HuaweiSuccessKey)
|
||||
val = memory.Get(core.HuaweiSuccessKey)
|
||||
assert.Equal(t, int64(10), val)
|
||||
|
||||
assert.NoError(t, memory.Close())
|
||||
|
||||
@@ -4,9 +4,9 @@ import (
|
||||
"sync"
|
||||
"testing"
|
||||
|
||||
"github.com/appleboy/gorush/storage"
|
||||
|
||||
"github.com/appleboy/gorush/config"
|
||||
"github.com/appleboy/gorush/core"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
@@ -30,15 +30,15 @@ func TestRedisEngine(t *testing.T) {
|
||||
err := redis.Init()
|
||||
assert.Nil(t, err)
|
||||
|
||||
redis.Add(storage.HuaweiSuccessKey, 10)
|
||||
val = redis.Get(storage.HuaweiSuccessKey)
|
||||
redis.Add(core.HuaweiSuccessKey, 10)
|
||||
val = redis.Get(core.HuaweiSuccessKey)
|
||||
assert.Equal(t, int64(10), val)
|
||||
redis.Add(storage.HuaweiSuccessKey, 10)
|
||||
val = redis.Get(storage.HuaweiSuccessKey)
|
||||
redis.Add(core.HuaweiSuccessKey, 10)
|
||||
val = redis.Get(core.HuaweiSuccessKey)
|
||||
assert.Equal(t, int64(20), val)
|
||||
|
||||
redis.Set(storage.HuaweiSuccessKey, 0)
|
||||
val = redis.Get(storage.HuaweiSuccessKey)
|
||||
redis.Set(core.HuaweiSuccessKey, 0)
|
||||
val = redis.Get(core.HuaweiSuccessKey)
|
||||
assert.Equal(t, int64(0), val)
|
||||
|
||||
// test concurrency issues
|
||||
@@ -46,12 +46,12 @@ func TestRedisEngine(t *testing.T) {
|
||||
for i := 0; i < 10; i++ {
|
||||
wg.Add(1)
|
||||
go func() {
|
||||
redis.Add(storage.HuaweiSuccessKey, 1)
|
||||
redis.Add(core.HuaweiSuccessKey, 1)
|
||||
wg.Done()
|
||||
}()
|
||||
}
|
||||
wg.Wait()
|
||||
val = redis.Get(storage.HuaweiSuccessKey)
|
||||
val = redis.Get(core.HuaweiSuccessKey)
|
||||
assert.Equal(t, int64(10), val)
|
||||
|
||||
assert.NoError(t, redis.Close())
|
||||
|
||||
@@ -1,33 +1 @@
|
||||
package storage
|
||||
|
||||
const (
|
||||
// TotalCountKey is key name for total count of storage
|
||||
TotalCountKey = "gorush-total-count"
|
||||
|
||||
// IosSuccessKey is key name or ios success count of storage
|
||||
IosSuccessKey = "gorush-ios-success-count"
|
||||
|
||||
// IosErrorKey is key name or ios success error of storage
|
||||
IosErrorKey = "gorush-ios-error-count"
|
||||
|
||||
// AndroidSuccessKey is key name for android success count of storage
|
||||
AndroidSuccessKey = "gorush-android-success-count"
|
||||
|
||||
// AndroidErrorKey is key name for android error count of storage
|
||||
AndroidErrorKey = "gorush-android-error-count"
|
||||
|
||||
// HuaweiSuccessKey is key name for huawei success count of storage
|
||||
HuaweiSuccessKey = "gorush-huawei-success-count"
|
||||
|
||||
// HuaweiErrorKey is key name for huawei error count of storage
|
||||
HuaweiErrorKey = "gorush-huawei-error-count"
|
||||
)
|
||||
|
||||
// Storage interface
|
||||
type Storage interface {
|
||||
Init() error
|
||||
Add(key string, count int64)
|
||||
Set(key string, count int64)
|
||||
Get(key string) int64
|
||||
Close() error
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user