From f937933b3dff354a62316a84e484e1cfd8237c42 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Wed, 23 Oct 2019 22:25:53 -0700 Subject: [PATCH] refactoring --- go.sum | 3 +++ weed/{ => storage/memory_map}/os_overloads/file_windows.go | 0 weed/{ => storage/memory_map}/os_overloads/syscall_windows.go | 0 weed/{ => storage/memory_map}/os_overloads/types_windows.go | 0 weed/storage/volume_create_windows.go | 2 +- 5 files changed, 4 insertions(+), 1 deletion(-) rename weed/{ => storage/memory_map}/os_overloads/file_windows.go (100%) rename weed/{ => storage/memory_map}/os_overloads/syscall_windows.go (100%) rename weed/{ => storage/memory_map}/os_overloads/types_windows.go (100%) diff --git a/go.sum b/go.sum index 7894b12ca..703e3819b 100644 --- a/go.sum +++ b/go.sum @@ -68,6 +68,7 @@ github.com/Shopify/sarama v1.23.1 h1:XxJBCZEoWJtoWjf/xRbmGUpAmTZGnuuF0ON0EvxxBrs github.com/Shopify/sarama v1.23.1/go.mod h1:XLH1GYJnLVE0XCr6KdJGVJRTwY30moWNJ4sERjXX6fs= github.com/Shopify/toxiproxy v2.1.4+incompatible h1:TKdv8HiTLgE5wdJuEML90aBgNWsokNbMijUGhmcoBJc= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= +github.com/StackExchange/wmi v0.0.0-20180725035823-b12b22c5341f h1:5ZfJxyXo8KyX8DgGXC5B7ILL8y51fci/qYz2B4j8iLY= github.com/StackExchange/wmi v0.0.0-20180725035823-b12b22c5341f/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= @@ -182,6 +183,7 @@ github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= +github.com/go-ole/go-ole v1.2.1 h1:2lOsA72HgjxAuMlKpFiCbHTvu44PIVkZ5hqm3RSdI/E= github.com/go-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8= github.com/go-playground/overalls v0.0.0-20180201144345-22ec1a223b7c/go.mod h1:UqxAgEOt89sCiXlrc/ycnx00LVvUO/eS8tMUkWX4R7w= github.com/go-redis/redis v6.15.2+incompatible h1:9SpNVG76gr6InJGxoZ6IuuxaCOQwDAhzyXg+Bs+0Sb4= @@ -330,6 +332,7 @@ github.com/klauspost/reedsolomon v1.9.2 h1:E9CMS2Pqbv+C7tsrYad4YC9MfhnMVWhMRsTi7 github.com/klauspost/reedsolomon v1.9.2/go.mod h1:CwCi+NUr9pqSVktrkN+Ondf06rkhYZ/pcNv7fu+8Un4= github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s= github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= diff --git a/weed/os_overloads/file_windows.go b/weed/storage/memory_map/os_overloads/file_windows.go similarity index 100% rename from weed/os_overloads/file_windows.go rename to weed/storage/memory_map/os_overloads/file_windows.go diff --git a/weed/os_overloads/syscall_windows.go b/weed/storage/memory_map/os_overloads/syscall_windows.go similarity index 100% rename from weed/os_overloads/syscall_windows.go rename to weed/storage/memory_map/os_overloads/syscall_windows.go diff --git a/weed/os_overloads/types_windows.go b/weed/storage/memory_map/os_overloads/types_windows.go similarity index 100% rename from weed/os_overloads/types_windows.go rename to weed/storage/memory_map/os_overloads/types_windows.go diff --git a/weed/storage/volume_create_windows.go b/weed/storage/volume_create_windows.go index 4c9a146f5..db0734436 100644 --- a/weed/storage/volume_create_windows.go +++ b/weed/storage/volume_create_windows.go @@ -9,7 +9,7 @@ import ( "golang.org/x/sys/windows" "github.com/chrislusf/seaweedfs/weed/glog" - "github.com/chrislusf/seaweedfs/weed/os_overloads" + "github.com/chrislusf/seaweedfs/weed/storage/memory_map/os_overloads" ) func createVolumeFile(fileName string, preallocate int64, memoryMapSizeMB uint32) (*os.File, error) {