From de6eb419591edaebbf569520a6a03e5bfde8bdfb Mon Sep 17 00:00:00 2001
From: Ashwin <ashwin2007ray@gmail.com>
Date: Mon, 7 Mar 2016 17:39:29 +1100
Subject: [PATCH] make MergeFolder local
---
tools/merge/main.go | 4 ++--
tools/merge/main_test.go | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/merge/main.go b/tools/merge/main.go
index 92c0439d..52e9cac6 100644
--- a/tools/merge/main.go
+++ b/tools/merge/main.go
@@ -83,7 +83,7 @@ func equalValue(a, b interface{}) bool {
bytes.Compare(x.ValueBytes(), y.ValueBytes()) == 0)
}
-func MergeFolders(mergePath, destPath string) {
+func mergeFolders(mergePath, destPath string) {
dirList, err := ioutil.ReadDir(mergePath)
if err != nil {
glog.Fatal("Cannot open stores directory")
@@ -167,5 +167,5 @@ func main() {
glog.Fatal("No Directory specified")
}
- MergeFolders(*stores, *destinationDB)
+ mergeFolders(*stores, *destinationDB)
}
diff --git a/tools/merge/main_test.go b/tools/merge/main_test.go
index 6de61503..a52c36e9 100644
--- a/tools/merge/main_test.go
+++ b/tools/merge/main_test.go
@@ -81,7 +81,7 @@ func TestMergeFolders(t *testing.T) {
ps1.Close()
ps2.Close()
- MergeFolders(rootDir, destDir)
+ mergeFolders(rootDir, destDir)
var opt *rocksdb.Options
var ropt *rocksdb.ReadOptions
--
GitLab