wip

nsqio · Oct 18, 2015 · 8ba7f9e · 8ba7f9e
1 parent 942eb25
commit 8ba7f9e
Show file tree

Hide file tree

Showing 27 changed files with 730 additions and 1,252 deletions.
diff --git a/nsqd/rename.go → internal/atomic_rename/rename.go b/nsqd/rename.go → internal/atomic_rename/rename.go
@@ -1,11 +1,11 @@
 // +build !windows
 
-package nsqd
+package atomic_rename
 
 import (
 	"os"
 )
 
-func atomicRename(sourceFile, targetFile string) error {
+func Rename(sourceFile, targetFile string) error {
 	return os.Rename(sourceFile, targetFile)
 }
diff --git a/nsqd/rename_windows.go → internal/atomic_rename/rename_windows.go b/nsqd/rename_windows.go → internal/atomic_rename/rename_windows.go
@@ -1,6 +1,6 @@
 // +build windows
 
-package nsqd
+package atomic_rename
 
 import (
 	"syscall"
@@ -27,7 +27,7 @@ func moveFileEx(sourceFile, targetFile *uint16, flags uint32) error {
 	return nil
 }
 
-func atomicRename(sourceFile, targetFile string) error {
+func Rename(sourceFile, targetFile string) error {
 	lpReplacedFileName, err := syscall.UTF16PtrFromString(targetFile)
 	if err != nil {
 		return err

diff --git a/nsqd/rename_windows_test.go → ...rnal/atomic_rename/rename_windows_test.go b/nsqd/rename_windows_test.go → ...rnal/atomic_rename/rename_windows_test.go
@@ -1,6 +1,6 @@
 // +build windows
 
-package nsqd
+package atomic_rename
 
 import (
 	"fmt"
@@ -55,11 +55,11 @@ func TestConcurrentRenames(t *testing.T) {
 
 		waitGroup.Wrap(func() {
 			_, _ = <-trigger
-			err := atomicRename(sourcePath1, targetPath)
+			err := Rename(sourcePath1, targetPath)
 			if err != nil {
 				t.Error(err)
 			}
-			err = atomicRename(sourcePath2, targetPath)
+			err = Rename(sourcePath2, targetPath)
 			if err != nil {
 				t.Error(err)
 			}

diff --git a/nsqd/backend_queue.go b/nsqd/backend_queue.go