Skip to content
This repository was archived by the owner on Mar 23, 2023. It is now read-only.

Commit 682f8b3

Browse files
fix: key handling
1 parent c1f1dce commit 682f8b3

File tree

10 files changed

+462
-82
lines changed

10 files changed

+462
-82
lines changed

package.json

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "datastore-level",
3-
"version": "1.0.0",
3+
"version": "0.0.1",
44
"description": "Datastore implementation with level(up|down) backend",
55
"main": "src/index.js",
66
"scripts": {
@@ -10,11 +10,12 @@
1010
"flow": "flow",
1111
"test:node": "aegir-test --env node",
1212
"test:browser": "aegir-test --env browser",
13-
"release": "aegir-release",
14-
"release-minor": "aegir-release --type minor",
15-
"release-major": "aegir-release --type major",
13+
"release": "aegir-release --docs",
14+
"release-minor": "aegir-release --type minor --docs",
15+
"release-major": "aegir-release --type major --docs",
1616
"coverage": "aegir-coverage",
17-
"coverage-publish": "aegir-coverage publish"
17+
"coverage-publish": "aegir-coverage publish",
18+
"docs": "aegir-docs"
1819
},
1920
"repository": {
2021
"type": "git",
@@ -36,6 +37,8 @@
3637
},
3738
"homepage": "https://github.com/ipfs/js-datastore-level#readme",
3839
"dependencies": {
40+
"datastore-core": "^0.1.0",
41+
"interface-datastore": "^0.1.1",
3942
"level-js": "^2.2.4",
4043
"leveldown": "^1.6.0",
4144
"levelup": "^1.3.5",

src/index.js

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,21 +27,20 @@ class LevelDatastore {
2727
this.db = levelup(path, Object.assign({}, {
2828
compression: false // same default as go
2929
}, opts, {
30-
keyEncoding: 'binary',
3130
valueEncoding: 'binary'
3231
}))
3332
}
3433

3534
put (key /* : Key */, value /* : Buffer */, callback /* : Callback<void> */) /* : void */ {
36-
this.db.put(key.toBuffer(), value, callback)
35+
this.db.put(key.toString(), value, callback)
3736
}
3837

3938
get (key /* : Key */, callback /* : Callback<Buffer> */) /* : void */ {
40-
this.db.get(key.toBuffer(), callback)
39+
this.db.get(key.toString(), callback)
4140
}
4241

4342
has (key /* : Key */, callback /* : Callback<bool> */) /* : void */ {
44-
this.db.get(key.toBuffer(), (err, res) => {
43+
this.db.get(key.toString(), (err, res) => {
4544
if (err) {
4645
if (err.notFound) {
4746
callback(null, false)
@@ -56,7 +55,7 @@ class LevelDatastore {
5655
}
5756

5857
delete (key /* : Key */, callback /* : Callback<void> */) /* : void */ {
59-
this.db.del(key.toBuffer(), callback)
58+
this.db.del(key.toString(), callback)
6059
}
6160

6261
close (callback /* : Callback<void> */) /* : void */ {
@@ -69,14 +68,14 @@ class LevelDatastore {
6968
put: (key /* : Key */, value /* : Buffer */) /* : void */ => {
7069
ops.push({
7170
type: 'put',
72-
key: key.toBuffer(),
71+
key: key.toString(),
7372
value: value
7473
})
7574
},
7675
delete: (key /* : Key */) /* : void */ => {
7776
ops.push({
7877
type: 'del',
79-
key: key.toBuffer()
78+
key: key.toString()
8079
})
8180
},
8281
commit: (callback /* : Callback<void> */) /* : void */ => {

test/browser.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
'use strict'
44

55
const each = require('async/each')
6-
const MountStore = require('interface-datastore').MountDatastore
6+
const MountStore = require('datastore-core').MountDatastore
77
const Key = require('interface-datastore').Key
88
const leveljs = require('level-js')
99

1010
const LevelStore = require('../src')
1111

1212
describe('LevelDatastore', () => {
1313
describe('interface-datastore (leveljs)', () => {
14-
require('interface-datastore/test/interface')({
14+
require('interface-datastore/src/tests')({
1515
setup (callback) {
1616
callback(null, new LevelStore('hello', {db: leveljs}))
1717
},
@@ -22,7 +22,7 @@ describe('LevelDatastore', () => {
2222
})
2323

2424
describe('interface-datastore (mount(leveljs, leveljs, leveljs))', () => {
25-
require('interface-datastore/test/interface')({
25+
require('interface-datastore/src/tests')({
2626
setup (callback) {
2727
callback(null, new MountStore([{
2828
prefix: new Key('/a'),

test/index.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const LevelStore = require('../src')
88

99
describe('LevelDatastore', () => {
1010
describe('interface-datastore (memdown)', () => {
11-
require('interface-datastore/test/interface')({
11+
require('interface-datastore/src/tests')({
1212
setup (callback) {
1313
callback(null, new LevelStore('hello', {db: memdown}))
1414
},

test/node.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const path = require('path')
77
const utils = require('interface-datastore').utils
88
const rimraf = require('rimraf')
99
const each = require('async/each')
10-
const MountStore = require('interface-datastore').MountDatastore
10+
const MountStore = require('datastore-core').MountDatastore
1111
const Key = require('interface-datastore').Key
1212
const expect = require('chai').expect
1313
const CID = require('cids')
@@ -17,7 +17,7 @@ const LevelStore = require('../src')
1717
describe('LevelDatastore', () => {
1818
describe('interface-datastore (leveldown)', () => {
1919
const dir = utils.tmpdir()
20-
require('interface-datastore/test/interface')({
20+
require('interface-datastore/src/tests')({
2121
setup (callback) {
2222
callback(null, new LevelStore(dir))
2323
},
@@ -33,7 +33,7 @@ describe('LevelDatastore', () => {
3333
utils.tmpdir(),
3434
utils.tmpdir()
3535
]
36-
require('interface-datastore/test/interface')({
36+
require('interface-datastore/src/tests')({
3737
setup (callback) {
3838
callback(null, new MountStore([{
3939
prefix: new Key('/a'),

test/test-repo/datastore/CURRENT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
MANIFEST-000036
1+
MANIFEST-000054

test/test-repo/datastore/LOG

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
2017/03/13-13:52:56.574311 70000f009000 Recovering log #35
2-
2017/03/13-13:52:56.575960 70000f009000 Delete type=0 #35
3-
2017/03/13-13:52:56.576081 70000f009000 Delete type=3 #34
1+
2017/03/15-14:58:36.441989 70000b29f000 Recovering log #53
2+
2017/03/15-14:58:36.443168 70000b29f000 Delete type=0 #53
3+
2017/03/15-14:58:36.443262 70000b29f000 Delete type=3 #52

test/test-repo/datastore/LOG.old

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
2017/03/13-13:52:16.502220 70000f6c7000 Recovering log #33
2-
2017/03/13-13:52:16.503900 70000f6c7000 Delete type=0 #33
3-
2017/03/13-13:52:16.504085 70000f6c7000 Delete type=3 #32
1+
2017/03/15-14:57:31.986982 700010d11000 Recovering log #51
2+
2017/03/15-14:57:31.990378 700010d11000 Delete type=0 #51
3+
2017/03/15-14:57:31.990492 700010d11000 Delete type=3 #50

0 commit comments

Comments
 (0)