add helper functions for debuging

fanap-infra · Aug 7, 2021 · 97cf835 · 97cf835
1 parent 18f3304
commit 97cf835
Show file tree

Hide file tree

Showing 23 changed files with 51 additions and 14 deletions.
diff --git a/crud.go b/crud.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/fanap-infra/fsEngine/internal/constants"
 
-	"github.com/fanap-infra/fsEngine/internal/blockAllocationMap"
+	"github.com/fanap-infra/fsEngine/pkg/blockAllocationMap"
 	"github.com/fanap-infra/fsEngine/pkg/virtualFile"
 )
 

diff --git a/helper.go b/helper.go
@@ -0,0 +1,23 @@
+package fsEngine
+
+import (
+	"github.com/fanap-infra/fsEngine/pkg/blockAllocationMap"
+	"github.com/fanap-infra/fsEngine/pkg/fileIndex"
+)
+
+func (fse *FSEngine) GetFileList() []*fileIndex.File {
+	return fse.header.GetFilesList()
+}
+
+func (fse *FSEngine) GetFileBLM(id uint32) (*blockAllocationMap.BlockAllocationMap, error) {
+	fileInfo, err := fse.header.GetFileData(id)
+	if err != nil {
+		return nil, err
+	}
+	blm, err := blockAllocationMap.Open(fse.log, fse, fse.maxNumberOfBlocks, fileInfo.GetLastBlock(),
+		fileInfo.GetRMapBlocks())
+	if err != nil {
+		return nil, err
+	}
+	return blm, nil
+}
diff --git a/internal/Header/blm.go b/internal/Header/blm.go
@@ -3,7 +3,7 @@ package Header_
 import (
 	"fmt"
 
-	"github.com/fanap-infra/fsEngine/internal/blockAllocationMap"
+	"github.com/fanap-infra/fsEngine/pkg/blockAllocationMap"
 )
 
 func (hfs *HFileSystem) updateBLM() error {

diff --git a/internal/Header/crud.go b/internal/Header/crud.go
@@ -1,6 +1,6 @@
 package Header_
 
-import "github.com/fanap-infra/fsEngine/internal/fileIndex"
+import "github.com/fanap-infra/fsEngine/pkg/fileIndex"
 
 func (hfs *HFileSystem) CheckIDExist(id uint32) bool {
 	return hfs.fileIndex.CheckFileExistWithLock(id)

diff --git a/internal/Header/fileIndex.go b/internal/Header/fileIndex.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"hash/crc32"
 
-	"github.com/fanap-infra/fsEngine/internal/fileIndex"
+	"github.com/fanap-infra/fsEngine/pkg/fileIndex"
 )
 
 func (hfs *HFileSystem) generateFileIndex() ([]byte, error) {
@@ -127,6 +127,10 @@ func (hfs *HFileSystem) UpdateFileOptionalData(fileId uint32, info []byte) error
 	return hfs.fileIndex.UpdateFileOptionalData(fileId, info)
 }
 
+func (hfs *HFileSystem) GetFilesList() []*fileIndex.File {
+	return hfs.fileIndex.GetFilesList()
+}
+
 //func (hfs *HFileSystem) GetFileOptionalData(fileId uint32) ([]byte, error) {
 //	return hfs.fileIndex.
 //}
diff --git a/internal/Header/fs.go b/internal/Header/fs.go
@@ -4,8 +4,8 @@ import (
 	"os"
 	"time"
 
-	"github.com/fanap-infra/fsEngine/internal/blockAllocationMap"
-	"github.com/fanap-infra/fsEngine/internal/fileIndex"
+	"github.com/fanap-infra/fsEngine/pkg/blockAllocationMap"
+	"github.com/fanap-infra/fsEngine/pkg/fileIndex"
 
 	"github.com/fanap-infra/log"
 )

diff --git a/internal/Header/provider.go b/internal/Header/provider.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/fanap-infra/fsEngine/internal/constants"
 
-	"github.com/fanap-infra/fsEngine/internal/blockAllocationMap"
-	"github.com/fanap-infra/fsEngine/internal/fileIndex"
+	"github.com/fanap-infra/fsEngine/pkg/blockAllocationMap"
+	"github.com/fanap-infra/fsEngine/pkg/fileIndex"
 	"github.com/fanap-infra/fsEngine/pkg/utils"
 
 	"github.com/fanap-infra/log"

diff --git a/.../blockAllocationMap/blockAllocationMap.go → pkg/blockAllocationMap/blockAllocationMap.go b/.../blockAllocationMap/blockAllocationMap.go → pkg/blockAllocationMap/blockAllocationMap.go
diff --git a/...kAllocationMap/blockAllocationMap_test.go → ...kAllocationMap/blockAllocationMap_test.go b/...kAllocationMap/blockAllocationMap_test.go → ...kAllocationMap/blockAllocationMap_test.go
diff --git a/internal/blockAllocationMap/event.go → pkg/blockAllocationMap/event.go b/internal/blockAllocationMap/event.go → pkg/blockAllocationMap/event.go
diff --git a/internal/blockAllocationMap/provider.go → pkg/blockAllocationMap/provider.go b/internal/blockAllocationMap/provider.go → pkg/blockAllocationMap/provider.go
diff --git a/internal/fileIndex/fileIndex.go → pkg/fileIndex/fileIndex.go b/internal/fileIndex/fileIndex.go → pkg/fileIndex/fileIndex.go
@@ -148,6 +148,16 @@ func (i *FileIndex) UpdateFileOptionalData(fileId uint32, info []byte) error {
 	return nil
 }
 
+func (i *FileIndex) GetFilesList() []*File {
+	i.rwMux.Lock()
+	defer i.rwMux.Unlock()
+	var files []*File
+	for _, f := range i.table.Files {
+		files = append(files, f)
+	}
+	return files
+}
+
 //func (i *FileIndex) GetFileOptionalData(fileId uint32) ([]byte, error) {
 //	i.rwMux.Lock()
 //	defer i.rwMux.Unlock()

diff --git a/internal/fileIndex/fileIndex.pb.go → pkg/fileIndex/fileIndex.pb.go b/internal/fileIndex/fileIndex.pb.go → pkg/fileIndex/fileIndex.pb.go
diff --git a/internal/fileIndex/fileIndex.proto → pkg/fileIndex/fileIndex.proto b/internal/fileIndex/fileIndex.proto → pkg/fileIndex/fileIndex.proto
diff --git a/internal/fileIndex/fileIndex_test.go → pkg/fileIndex/fileIndex_test.go b/internal/fileIndex/fileIndex_test.go → pkg/fileIndex/fileIndex_test.go
diff --git a/internal/fileIndex/hashtable.go → pkg/fileIndex/hashtable.go b/internal/fileIndex/hashtable.go → pkg/fileIndex/hashtable.go
diff --git a/internal/fileIndex/provider.go → pkg/fileIndex/provider.go b/internal/fileIndex/provider.go → pkg/fileIndex/provider.go
diff --git a/internal/fileIndex/provider_test.go → pkg/fileIndex/provider_test.go b/internal/fileIndex/provider_test.go → pkg/fileIndex/provider_test.go
diff --git a/pkg/virtualFile/IO.go b/pkg/virtualFile/IO.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/fanap-infra/fsEngine/internal/blockAllocationMap"
+	"github.com/fanap-infra/fsEngine/pkg/blockAllocationMap"
 	errPackage "github.com/fanap-infra/fsEngine/pkg/errstring"
 )
 

diff --git a/pkg/virtualFile/IO_test.go b/pkg/virtualFile/IO_test.go
@@ -5,7 +5,7 @@ import (
 	"math/rand"
 	"testing"
 
-	"github.com/fanap-infra/fsEngine/internal/blockAllocationMap"
+	"github.com/fanap-infra/fsEngine/pkg/blockAllocationMap"
 	"github.com/fanap-infra/log"
 	"github.com/stretchr/testify/assert"
 )

diff --git a/pkg/virtualFile/provider.go b/pkg/virtualFile/provider.go
@@ -1,8 +1,8 @@
 package virtualFile
 
 import (
-	"github.com/fanap-infra/fsEngine/internal/blockAllocationMap"
-	"github.com/fanap-infra/fsEngine/internal/fileIndex"
+	"github.com/fanap-infra/fsEngine/pkg/blockAllocationMap"
+	"github.com/fanap-infra/fsEngine/pkg/fileIndex"
 
 	"github.com/fanap-infra/log"
 )

diff --git a/pkg/virtualFile/virtualFile.go b/pkg/virtualFile/virtualFile.go
@@ -1,7 +1,7 @@
 package virtualFile
 
 import (
-	"github.com/fanap-infra/fsEngine/internal/blockAllocationMap"
+	"github.com/fanap-infra/fsEngine/pkg/blockAllocationMap"
 
 	"github.com/fanap-infra/log"
 )

diff --git a/vfInfo.go b/vfInfo.go
@@ -1,7 +1,7 @@
 package fsEngine
 
 import (
-	"github.com/fanap-infra/fsEngine/internal/blockAllocationMap"
+	"github.com/fanap-infra/fsEngine/pkg/blockAllocationMap"
 	"github.com/fanap-infra/fsEngine/pkg/virtualFile"
 )