File storage usage default 0 (#20454)
* check for test fail in CI * use 0 if there are no fileinfo table entries * fix usage
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
1876d69210
Коммит
90c737a57a
@@ -739,7 +739,7 @@ func (fs SqlFileInfoStore) GetFilesBatchForIndexing(startTime int64, startFileID
|
|||||||
|
|
||||||
func (fs SqlFileInfoStore) GetStorageUsage(allowFromCache, includeDeleted bool) (int64, error) {
|
func (fs SqlFileInfoStore) GetStorageUsage(allowFromCache, includeDeleted bool) (int64, error) {
|
||||||
query := fs.getQueryBuilder().
|
query := fs.getQueryBuilder().
|
||||||
Select("SUM(Size)").
|
Select("COALESCE(SUM(Size), 0)").
|
||||||
From("FileInfo")
|
From("FileInfo")
|
||||||
|
|
||||||
if !includeDeleted {
|
if !includeDeleted {
|
||||||
|
|||||||
@@ -730,6 +730,11 @@ func testFileInfoStoreCountAll(t *testing.T, ss store.Store) {
|
|||||||
func testFileInfoGetStorageUsage(t *testing.T, ss store.Store) {
|
func testFileInfoGetStorageUsage(t *testing.T, ss store.Store) {
|
||||||
_, err := ss.FileInfo().PermanentDeleteBatch(model.GetMillis(), 100000)
|
_, err := ss.FileInfo().PermanentDeleteBatch(model.GetMillis(), 100000)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
usage, err := ss.FileInfo().GetStorageUsage(false, false)
|
||||||
|
require.NoError(t, err)
|
||||||
|
require.Equal(t, int64(0), usage)
|
||||||
|
|
||||||
f1, err := ss.FileInfo().Save(&model.FileInfo{
|
f1, err := ss.FileInfo().Save(&model.FileInfo{
|
||||||
PostId: model.NewId(),
|
PostId: model.NewId(),
|
||||||
CreatorId: model.NewId(),
|
CreatorId: model.NewId(),
|
||||||
@@ -753,7 +758,7 @@ func testFileInfoGetStorageUsage(t *testing.T, ss store.Store) {
|
|||||||
})
|
})
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
usage, err := ss.FileInfo().GetStorageUsage(false, false)
|
usage, err = ss.FileInfo().GetStorageUsage(false, false)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
require.Equal(t, int64(30), usage)
|
require.Equal(t, int64(30), usage)
|
||||||
|
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user