Skip to content

feat: store pins in datastore #221

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 21, 2020
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .aegir.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
'use strict'

module.exports = {
webpack: {
node: {
// this is needed until level stops using node buffers in browser code
Buffer: true
}
}
}
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"npm": ">=3.0.0"
},
"devDependencies": {
"aegir": "^23.0.0",
"aegir": "^25.0.0",
"chai": "^4.2.0",
"chai-as-promised": "^7.1.1",
"dirty-chai": "^2.0.1",
Expand All @@ -68,7 +68,7 @@
"debug": "^4.1.0",
"err-code": "^2.0.0",
"interface-datastore": "^1.0.2",
"ipfs-repo-migrations": "^1.0.0",
"ipfs-repo-migrations": "^2.0.0",
"ipfs-utils": "^2.2.0",
"ipld-block": "^0.9.1",
"it-map": "^1.0.2",
Expand Down
8 changes: 7 additions & 1 deletion src/default-options-browser.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ module.exports = {
root: require('datastore-level'),
blocks: require('datastore-level'),
keys: require('datastore-level'),
datastore: require('datastore-level')
datastore: require('datastore-level'),
pins: require('datastore-level')
},
storageBackendOptions: {
root: {
Expand All @@ -29,6 +30,11 @@ module.exports = {
sharding: false,
prefix: '',
version: 2
},
pins: {
sharding: false,
prefix: '',
version: 2
}
}
}
3 changes: 2 additions & 1 deletion src/default-options.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ module.exports = {
root: require('datastore-fs'),
blocks: require('datastore-fs'),
keys: require('datastore-fs'),
datastore: require('datastore-level')
datastore: require('datastore-level'),
pins: require('datastore-level')
},
storageBackendOptions: {
root: {
Expand Down
8 changes: 6 additions & 2 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ const lockers = {

/**
* IpfsRepo implements all required functionality to read and write to an ipfs repo.
*
*/
class IpfsRepo {
/**
Expand Down Expand Up @@ -122,6 +121,10 @@ class IpfsRepo {
log('creating keystore')
this.keys = backends.create('keys', pathJoin(this.path, 'keys'), this.options)
await this.keys.open()
log('creating pins')
this.pins = backends.create('pins', pathJoin(this.path, 'pins'), this.options)
await this.pins.open()

const isCompatible = await this.version.check(constants.repoVersion)
if (!isCompatible) {
if (await this._isAutoMigrationEnabled()) {
Expand Down Expand Up @@ -262,7 +265,8 @@ class IpfsRepo {
this.root,
this.blocks,
this.keys,
this.datastore
this.datastore,
this.pins
].map((store) => store.close()))

log('unlocking')
Expand Down
1 change: 1 addition & 0 deletions test/browser.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,6 @@ describe('IPFS Repo Tests on the Browser', () => {
require('./config-test')(repo)
require('./api-addr-test')(repo)
require('./lock-test')(repo)
require('./pins-test')(repo)
require('./is-initialized')
})
1 change: 1 addition & 0 deletions test/node.js
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ describe('IPFS Repo Tests onNode.js', () => {
if (!r.init) {
require('./interop-test')(repo)
}
require('./pins-test')(repo)
require('./is-initialized')
}))

Expand Down
79 changes: 79 additions & 0 deletions test/pins-test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
/* eslint max-nested-callbacks: ["error", 8] */
/* eslint-env mocha */
'use strict'

const { Buffer } = require('buffer')
const { expect } = require('./utils/chai')
const range = require('just-range')
const Key = require('interface-datastore').Key

module.exports = (repo) => {
describe('pins', () => {
const dataList = range(100).map((i) => Buffer.from(`hello-${i}-${Math.random()}`))
const data = Buffer.from('hello world')
const b = new Key('hello')

it('exists', () => {
expect(repo).to.have.property('pins')
})

it('implements interface-datastore', () => {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This test is redundant as datastore-level already runs the interface tests: https://github.com/ipfs/js-datastore-level/blob/master/test/index.spec.js#L44

const pins = repo.pins
expect(pins.batch).to.exist()
expect(pins.query).to.exist()
})

describe('.put', () => {
it('simple', async () => {
await repo.pins.put(b, data)
})

it('multi write (locks)', async () => {
await Promise.all([repo.pins.put(b, data), repo.pins.put(b, data)])
})

it('massive multiwrite', async function () {
this.timeout(15000) // add time for ci
await Promise.all(range(100).map((i) => {
return repo.pins.put(new Key('hello' + i), dataList[i])
}))
})
})

describe('.get', () => {
it('simple', async () => {
const val = await repo.pins.get(b)
expect(val).to.be.eql(data)
})

it('massive read', async function () {
this.timeout(15000) // add time for ci
await Promise.all(range(20 * 100).map(async (i) => {
const j = i % dataList.length
const val = await repo.pins.get(new Key('hello' + j))
expect(val).to.be.eql(dataList[j])
}))
}).timeout(10 * 1000)
})

describe('.has', () => {
it('existing pin', async () => {
const exists = await repo.pins.has(b)
expect(exists).to.eql(true)
})

it('non existent pin', async () => {
const exists = await repo.pins.has(new Key('world'))
expect(exists).to.eql(false)
})
})

describe('.delete', () => {
it('simple', async () => {
await repo.pins.delete(b)
const exists = await repo.pins.has(b)
expect(exists).to.equal(false)
})
})
})
}
5 changes: 3 additions & 2 deletions test/repo-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -162,13 +162,14 @@ module.exports = (repo) => {
root: FakeDatastore,
blocks: FakeDatastore,
keys: FakeDatastore,
datastore: FakeDatastore
datastore: FakeDatastore,
pins: FakeDatastore
}
})
await repo.init({})
await repo.open()
await repo.close()
expect(count).to.be.eq(4)
expect(count).to.be.eq(5)
})

it('open twice throws error', async () => {
Expand Down