Vendor new go-datastore, with Windows fixes
fixes #1108
Tommi Virtanen committed
Apr 25, 2015 at 19:13 UTC
ce0b10a9d3d25e54408706e609a5837ac68f85da
12 files changed
+317
-21
Godeps/Godeps.json
+5
-1
@@ -162,7 +162,7 @@
162
},
163
{
164
"ImportPath": "github.com/jbenet/go-datastore",
165
- "Rev": "f1a0a0fd88f23b67589957f02b7500372aca186f"
165
+ "Rev": "2525cae416316b9cf2eb66ec8d4792f567436efa"
166
},
167
{
168
"ImportPath": "github.com/jbenet/go-detect-race",
@@ -194,6 +194,10 @@
194
"Comment": "0.1.0-36-g87e53a9",
195
"Rev": "87e53a9d2875a18a7863b351d22f912545e6b3a3"
196
},
197
+ {
198
+ "ImportPath": "github.com/jbenet/go-os-rename",
199
+ "Rev": "2d93ae970ba96c41f717036a5bf5494faf1f38c0"
200
+ },
201
{
202
"ImportPath": "github.com/jbenet/go-peerstream",
203
"Rev": "bbe2a6461aa80ee25fd87eccf35bd54bac7f788d"
Godeps/_workspace/src/github.com/jbenet/go-datastore/Godeps/Godeps.json
+4
@@ -18,6 +18,10 @@
18
"ImportPath": "github.com/hashicorp/golang-lru",
19
"Rev": "4dfff096c4973178c8f35cf6dd1a732a0a139370"
20
},
21
+ {
22
+ "ImportPath": "github.com/jbenet/go-os-rename",
23
+ "Rev": "2d93ae970ba96c41f717036a5bf5494faf1f38c0"
24
+ },
25
{
26
"ImportPath": "github.com/jbenet/goprocess",
27
"Rev": "5b02f8d275a2dd882fb06f8bbdf74347795ff3b1"
Godeps/_workspace/src/github.com/jbenet/go-datastore/flatfs/flatfs.go
+4
-15
@@ -13,6 +13,7 @@ import (
13
14
"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
15
"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/query"
16
+ "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-os-rename"
17
)
18
19
const (
@@ -79,12 +80,7 @@ func (fs *Datastore) makePrefixDir(dir string) error {
80
// it, the creation of the prefix dir itself might not be
81
// durable yet. Sync the root dir after a successful mkdir of
82
// a prefix dir, just to be paranoid.
82
- f, err := os.Open(fs.path)
83
- if err != nil {
84
- return err
85
- }
86
- defer f.Close()
87
- if err := f.Sync(); err != nil {
83
+ if err := syncDir(fs.path); err != nil {
84
return err
85
}
86
return nil
@@ -101,12 +97,6 @@ func (fs *Datastore) Put(key datastore.Key, value interface{}) error {
97
return err
98
}
99
104
- dirF, err := os.Open(dir)
105
- if err != nil {
106
- return err
107
- }
108
- defer dirF.Close()
109
-
100
tmp, err := ioutil.TempFile(dir, "put-")
101
if err != nil {
102
return err
@@ -135,16 +125,15 @@ func (fs *Datastore) Put(key datastore.Key, value interface{}) error {
125
}
126
closed = true
127
138
- err = os.Rename(tmp.Name(), path)
128
+ err = osrename.Rename(tmp.Name(), path)
129
if err != nil {
130
return err
131
}
132
removed = true
133
144
- if err := dirF.Sync(); err != nil {
134
+ if err := syncDir(dir); err != nil {
135
return err
136
}
147
-
137
return nil
138
}
139
Godeps/_workspace/src/github.com/jbenet/go-datastore/flatfs/flatfs_test.go
+7
-4
@@ -4,6 +4,7 @@ import (
4
"io/ioutil"
5
"os"
6
"path/filepath"
7
+ "runtime"
8
"testing"
9
10
"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
@@ -147,8 +148,8 @@ func TestStorage(t *testing.T) {
148
defer cleanup()
149
150
const prefixLen = 2
150
- const prefix = "2f71"
151
- const target = prefix + "/2f71757578.data"
151
+ const prefix = "7175"
152
+ const target = prefix + string(os.PathSeparator) + "71757578.data"
153
fs, err := flatfs.New(temp, prefixLen)
154
if err != nil {
155
t.Fatalf("New fail: %v\n", err)
@@ -182,8 +183,10 @@ func TestStorage(t *testing.T) {
183
if !fi.Mode().IsRegular() {
184
t.Errorf("expected a regular file, mode: %04o", fi.Mode())
185
}
185
- if g, e := fi.Mode()&os.ModePerm&0007, os.FileMode(0000); g != e {
186
- t.Errorf("file should not be world accessible: %04o", fi.Mode())
186
+ if runtime.GOOS != "windows" {
187
+ if g, e := fi.Mode()&os.ModePerm&0007, os.FileMode(0000); g != e {
188
+ t.Errorf("file should not be world accessible: %04o", fi.Mode())
189
+ }
190
}
191
default:
192
t.Errorf("saw unexpected directory entry: %q %v", path, fi.Mode())
Godeps/_workspace/src/github.com/jbenet/go-datastore/flatfs/sync_std.go
new
+17
@@ -0,0 +1,17 @@
1
+// +build !windows
2
+
3
+package flatfs
4
+
5
+import "os"
6
+
7
+func syncDir(dir string) error {
8
+ dirF, err := os.Open(dir)
9
+ if err != nil {
10
+ return err
11
+ }
12
+ defer dirF.Close()
13
+ if err := dirF.Sync(); err != nil {
14
+ return err
15
+ }
16
+ return nil
17
+}
Godeps/_workspace/src/github.com/jbenet/go-datastore/flatfs/sync_windows.go
new
+5
@@ -0,0 +1,5 @@
1
+package flatfs
2
+
3
+func syncDir(dir string) error {
4
+ return nil
5
+}
Godeps/_workspace/src/github.com/jbenet/go-datastore/lru/datastore_test.go
+1
-1
@@ -5,7 +5,7 @@ import (
5
"testing"
6
7
ds "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
8
- lru "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/lru"
8
+ lru "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/lru" // Hook up gocheck into the "go test" runner.
9
. "gopkg.in/check.v1"
10
)
11
Godeps/_workspace/src/github.com/jbenet/go-os-rename/.travis.yml
new
+8
@@ -0,0 +1,8 @@
1
+language: go
2
+
3
+go:
4
+ - 1.4
5
+ - release
6
+
7
+script:
8
+ - go test -race -cpu=5 -v ./...
Godeps/_workspace/src/github.com/jbenet/go-os-rename/LICENSE
new
+201
@@ -0,0 +1,201 @@
1
+Apache License
2
+ Version 2.0, January 2004
3
+ http://www.apache.org/licenses/
4
+
5
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6
+
7
+ 1. Definitions.
8
+
9
+ "License" shall mean the terms and conditions for use, reproduction,
10
+ and distribution as defined by Sections 1 through 9 of this document.
11
+
12
+ "Licensor" shall mean the copyright owner or entity authorized by
13
+ the copyright owner that is granting the License.
14
+
15
+ "Legal Entity" shall mean the union of the acting entity and all
16
+ other entities that control, are controlled by, or are under common
17
+ control with that entity. For the purposes of this definition,
18
+ "control" means (i) the power, direct or indirect, to cause the
19
+ direction or management of such entity, whether by contract or
20
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
21
+ outstanding shares, or (iii) beneficial ownership of such entity.
22
+
23
+ "You" (or "Your") shall mean an individual or Legal Entity
24
+ exercising permissions granted by this License.
25
+
26
+ "Source" form shall mean the preferred form for making modifications,
27
+ including but not limited to software source code, documentation
28
+ source, and configuration files.
29
+
30
+ "Object" form shall mean any form resulting from mechanical
31
+ transformation or translation of a Source form, including but
32
+ not limited to compiled object code, generated documentation,
33
+ and conversions to other media types.
34
+
35
+ "Work" shall mean the work of authorship, whether in Source or
36
+ Object form, made available under the License, as indicated by a
37
+ copyright notice that is included in or attached to the work
38
+ (an example is provided in the Appendix below).
39
+
40
+ "Derivative Works" shall mean any work, whether in Source or Object
41
+ form, that is based on (or derived from) the Work and for which the
42
+ editorial revisions, annotations, elaborations, or other modifications
43
+ represent, as a whole, an original work of authorship. For the purposes
44
+ of this License, Derivative Works shall not include works that remain
45
+ separable from, or merely link (or bind by name) to the interfaces of,
46
+ the Work and Derivative Works thereof.
47
+
48
+ "Contribution" shall mean any work of authorship, including
49
+ the original version of the Work and any modifications or additions
50
+ to that Work or Derivative Works thereof, that is intentionally
51
+ submitted to Licensor for inclusion in the Work by the copyright owner
52
+ or by an individual or Legal Entity authorized to submit on behalf of
53
+ the copyright owner. For the purposes of this definition, "submitted"
54
+ means any form of electronic, verbal, or written communication sent
55
+ to the Licensor or its representatives, including but not limited to
56
+ communication on electronic mailing lists, source code control systems,
57
+ and issue tracking systems that are managed by, or on behalf of, the
58
+ Licensor for the purpose of discussing and improving the Work, but
59
+ excluding communication that is conspicuously marked or otherwise
60
+ designated in writing by the copyright owner as "Not a Contribution."
61
+
62
+ "Contributor" shall mean Licensor and any individual or Legal Entity
63
+ on behalf of whom a Contribution has been received by Licensor and
64
+ subsequently incorporated within the Work.
65
+
66
+ 2. Grant of Copyright License. Subject to the terms and conditions of
67
+ this License, each Contributor hereby grants to You a perpetual,
68
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69
+ copyright license to reproduce, prepare Derivative Works of,
70
+ publicly display, publicly perform, sublicense, and distribute the
71
+ Work and such Derivative Works in Source or Object form.
72
+
73
+ 3. Grant of Patent License. Subject to the terms and conditions of
74
+ this License, each Contributor hereby grants to You a perpetual,
75
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76
+ (except as stated in this section) patent license to make, have made,
77
+ use, offer to sell, sell, import, and otherwise transfer the Work,
78
+ where such license applies only to those patent claims licensable
79
+ by such Contributor that are necessarily infringed by their
80
+ Contribution(s) alone or by combination of their Contribution(s)
81
+ with the Work to which such Contribution(s) was submitted. If You
82
+ institute patent litigation against any entity (including a
83
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
84
+ or a Contribution incorporated within the Work constitutes direct
85
+ or contributory patent infringement, then any patent licenses
86
+ granted to You under this License for that Work shall terminate
87
+ as of the date such litigation is filed.
88
+
89
+ 4. Redistribution. You may reproduce and distribute copies of the
90
+ Work or Derivative Works thereof in any medium, with or without
91
+ modifications, and in Source or Object form, provided that You
92
+ meet the following conditions:
93
+
94
+ (a) You must give any other recipients of the Work or
95
+ Derivative Works a copy of this License; and
96
+
97
+ (b) You must cause any modified files to carry prominent notices
98
+ stating that You changed the files; and
99
+
100
+ (c) You must retain, in the Source form of any Derivative Works
101
+ that You distribute, all copyright, patent, trademark, and
102
+ attribution notices from the Source form of the Work,
103
+ excluding those notices that do not pertain to any part of
104
+ the Derivative Works; and
105
+
106
+ (d) If the Work includes a "NOTICE" text file as part of its
107
+ distribution, then any Derivative Works that You distribute must
108
+ include a readable copy of the attribution notices contained
109
+ within such NOTICE file, excluding those notices that do not
110
+ pertain to any part of the Derivative Works, in at least one
111
+ of the following places: within a NOTICE text file distributed
112
+ as part of the Derivative Works; within the Source form or
113
+ documentation, if provided along with the Derivative Works; or,
114
+ within a display generated by the Derivative Works, if and
115
+ wherever such third-party notices normally appear. The contents
116
+ of the NOTICE file are for informational purposes only and
117
+ do not modify the License. You may add Your own attribution
118
+ notices within Derivative Works that You distribute, alongside
119
+ or as an addendum to the NOTICE text from the Work, provided
120
+ that such additional attribution notices cannot be construed
121
+ as modifying the License.
122
+
123
+ You may add Your own copyright statement to Your modifications and
124
+ may provide additional or different license terms and conditions
125
+ for use, reproduction, or distribution of Your modifications, or
126
+ for any such Derivative Works as a whole, provided Your use,
127
+ reproduction, and distribution of the Work otherwise complies with
128
+ the conditions stated in this License.
129
+
130
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
131
+ any Contribution intentionally submitted for inclusion in the Work
132
+ by You to the Licensor shall be under the terms and conditions of
133
+ this License, without any additional terms or conditions.
134
+ Notwithstanding the above, nothing herein shall supersede or modify
135
+ the terms of any separate license agreement you may have executed
136
+ with Licensor regarding such Contributions.
137
+
138
+ 6. Trademarks. This License does not grant permission to use the trade
139
+ names, trademarks, service marks, or product names of the Licensor,
140
+ except as required for reasonable and customary use in describing the
141
+ origin of the Work and reproducing the content of the NOTICE file.
142
+
143
+ 7. Disclaimer of Warranty. Unless required by applicable law or
144
+ agreed to in writing, Licensor provides the Work (and each
145
+ Contributor provides its Contributions) on an "AS IS" BASIS,
146
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147
+ implied, including, without limitation, any warranties or conditions
148
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149
+ PARTICULAR PURPOSE. You are solely responsible for determining the
150
+ appropriateness of using or redistributing the Work and assume any
151
+ risks associated with Your exercise of permissions under this License.
152
+
153
+ 8. Limitation of Liability. In no event and under no legal theory,
154
+ whether in tort (including negligence), contract, or otherwise,
155
+ unless required by applicable law (such as deliberate and grossly
156
+ negligent acts) or agreed to in writing, shall any Contributor be
157
+ liable to You for damages, including any direct, indirect, special,
158
+ incidental, or consequential damages of any character arising as a
159
+ result of this License or out of the use or inability to use the
160
+ Work (including but not limited to damages for loss of goodwill,
161
+ work stoppage, computer failure or malfunction, or any and all
162
+ other commercial damages or losses), even if such Contributor
163
+ has been advised of the possibility of such damages.
164
+
165
+ 9. Accepting Warranty or Additional Liability. While redistributing
166
+ the Work or Derivative Works thereof, You may choose to offer,
167
+ and charge a fee for, acceptance of support, warranty, indemnity,
168
+ or other liability obligations and/or rights consistent with this
169
+ License. However, in accepting such obligations, You may act only
170
+ on Your own behalf and on Your sole responsibility, not on behalf
171
+ of any other Contributor, and only if You agree to indemnify,
172
+ defend, and hold each Contributor harmless for any liability
173
+ incurred by, or claims asserted against, such Contributor by reason
174
+ of your accepting any such warranty or additional liability.
175
+
176
+ END OF TERMS AND CONDITIONS
177
+
178
+ APPENDIX: How to apply the Apache License to your work.
179
+
180
+ To apply the Apache License to your work, attach the following
181
+ boilerplate notice, with the fields enclosed by brackets "{}"
182
+ replaced with your own identifying information. (Don't include
183
+ the brackets!) The text should be enclosed in the appropriate
184
+ comment syntax for the file format. We also recommend that a
185
+ file or class name and description of purpose be included on the
186
+ same "printed page" as the copyright notice for easier
187
+ identification within third-party archives.
188
+
189
+ Copyright {yyyy} {name of copyright owner}
190
+
191
+ Licensed under the Apache License, Version 2.0 (the "License");
192
+ you may not use this file except in compliance with the License.
193
+ You may obtain a copy of the License at
194
+
195
+ http://www.apache.org/licenses/LICENSE-2.0
196
+
197
+ Unless required by applicable law or agreed to in writing, software
198
+ distributed under the License is distributed on an "AS IS" BASIS,
199
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200
+ See the License for the specific language governing permissions and
201
+ limitations under the License.
Godeps/_workspace/src/github.com/jbenet/go-os-rename/README.md
new
+13
@@ -0,0 +1,13 @@
1
+# go-os-rename
2
+
3
+Easily rename files in place. This is needed because Windows errors on rename if a file already exists. Please see this commit, from which the code is extracted: https://github.com/lvarvel/cacheddownloader/commit/505a1fd
4
+
5
+#### Godoc: https://godoc.org/github.com/jbenet/go-os-rename
6
+
7
+## Author
8
+
9
+The original author of this code are "David Morhovich, David Varvel and John Shahid" (see [this commit](https://github.com/lvarvel/cacheddownloader/commit/505a1fdcc5af7823f20d7c87d9e4d1c833c59053))
10
+
11
+## License
12
+
13
+The code originally comes from https://github.com/lvarvel/cacheddownloader, which is licensed Apache 2.0.
Godeps/_workspace/src/github.com/jbenet/go-os-rename/rename_std.go
new
+9
@@ -0,0 +1,9 @@
1
+// +build !windows
2
+
3
+package osrename
4
+
5
+import "os"
6
+
7
+func Rename(src, dst string) error {
8
+ return os.Rename(src, dst)
9
+}
Godeps/_workspace/src/github.com/jbenet/go-os-rename/rename_windows.go
new
+43
@@ -0,0 +1,43 @@
1
+// +build windows
2
+
3
+package osrename
4
+
5
+import (
6
+ "syscall"
7
+ "unsafe"
8
+)
9
+
10
+func Rename(src, dst string) error {
11
+ kernel32, err := syscall.LoadLibrary("kernel32.dll")
12
+ if err != nil {
13
+ return err
14
+ }
15
+ defer syscall.FreeLibrary(kernel32)
16
+ moveFileExUnicode, err := syscall.GetProcAddress(kernel32, "MoveFileExW")
17
+ if err != nil {
18
+ return err
19
+ }
20
+
21
+ srcString, err := syscall.UTF16PtrFromString(src)
22
+ if err != nil {
23
+ return err
24
+ }
25
+
26
+ dstString, err := syscall.UTF16PtrFromString(dst)
27
+ if err != nil {
28
+ return err
29
+ }
30
+
31
+ srcPtr := uintptr(unsafe.Pointer(srcString))
32
+ dstPtr := uintptr(unsafe.Pointer(dstString))
33
+
34
+ MOVEFILE_REPLACE_EXISTING := 0x1
35
+ flag := uintptr(MOVEFILE_REPLACE_EXISTING)
36
+
37
+ _, _, callErr := syscall.Syscall(uintptr(moveFileExUnicode), 3, srcPtr, dstPtr, flag)
38
+ if callErr != 0 {
39
+ return callErr
40
+ }
41
+
42
+ return nil
43
+}