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
Support db2 #49
Merged
Support db2 #49
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node | ||
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions | ||
|
||
name: CI | ||
|
||
on: | ||
push: | ||
branches: [master] | ||
pull_request: | ||
branches: [master] | ||
|
||
jobs: | ||
test: | ||
runs-on: ubuntu-latest | ||
|
||
strategy: | ||
matrix: | ||
node-version: [10.x, 12.x, 14.x] | ||
|
||
steps: | ||
- uses: actions/checkout@v2 | ||
- name: Use Node.js ${{ matrix.node-version }} | ||
uses: actions/setup-node@v1 | ||
with: | ||
node-version: ${{ matrix.node-version }} | ||
- run: npm install | ||
- name: npm test | ||
run: npm test |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,195 @@ | ||
const bipf = require('bipf') | ||
const pull = require('pull-stream') | ||
const pl = require('pull-level') | ||
const jsonCodec = require('flumecodec/json') | ||
const Plugin = require('ssb-db2/indexes/plugin') | ||
|
||
const isFeed = require('ssb-ref').isFeed | ||
|
||
module.exports = function (sbot, createLayer, config) { | ||
const layer = createLayer('contacts') | ||
|
||
// used for dictionary compression where a feed is mapped to its index | ||
let feeds = [] | ||
|
||
// a map of feed -> { feed: followStatus } | ||
const feedValues = {} | ||
// assuming we have feed A (index 0) and B, and A follows B we will in feedValues store: | ||
// { 0: { 1: 1 } } meaning the map of values for feed A (0) is: index 1 (B) has value 1 (follow) | ||
// | ||
// feeds will be: [A,B] in this example | ||
|
||
const bValue = Buffer.from('value') | ||
const bAuthor = Buffer.from('author') | ||
const bContent = Buffer.from('content') | ||
const bType = Buffer.from('type') | ||
const bContact = Buffer.from('contact') | ||
|
||
const name = 'contacts' | ||
const { level, offset, stateLoaded, onData, writeBatch } = Plugin( | ||
config.path, | ||
name, | ||
2, | ||
handleData, | ||
writeData, | ||
beforeIndexUpdate | ||
) | ||
|
||
let batch = [] | ||
// it turns out that if you place the same key in a batch multiple | ||
// times. Level will happily write that key as many times as you give | ||
// it, instead of just writing the last value for the key, so we have | ||
// to help the poor bugger | ||
let batchKeys = {} // key to index | ||
|
||
function writeData(cb) { | ||
level.batch(batch, { valueEncoding: 'json' }, cb) | ||
batch = [] | ||
batchKeys = {} | ||
} | ||
|
||
function handleData(record, processed) { | ||
if (record.offset < offset.value) return batch.length | ||
const recBuffer = record.value | ||
if (!recBuffer) return batch.length // deleted | ||
|
||
let p = 0 // note you pass in p! | ||
p = bipf.seekKey(recBuffer, p, bValue) | ||
if (!~p) return batch.length | ||
|
||
const pAuthor = bipf.seekKey(recBuffer, p, bAuthor) | ||
const author = bipf.decode(recBuffer, pAuthor) | ||
|
||
const pContent = bipf.seekKey(recBuffer, p, bContent) | ||
if (!~pContent) return batch.length | ||
|
||
const pType = bipf.seekKey(recBuffer, pContent, bType) | ||
if (!~pType) return batch.length | ||
|
||
if (bipf.compareString(recBuffer, pType, bContact) === 0) { | ||
const content = bipf.decode(recBuffer, pContent) | ||
const to = content.contact | ||
|
||
if (isFeed(author) && isFeed(to)) { | ||
const value = content.blocking || content.flagged ? -1 : | ||
content.following === true ? 1 | ||
: -2 | ||
|
||
let updateFeeds = false | ||
|
||
let fromIndex = feeds.indexOf(author) | ||
if (fromIndex === -1) { | ||
feeds.push(author) | ||
fromIndex = feeds.length -1 | ||
updateFeeds = true | ||
} | ||
|
||
let toIndex = feeds.indexOf(to) | ||
if (toIndex === -1) { | ||
feeds.push(to) | ||
toIndex = feeds.length -1 | ||
updateFeeds = true | ||
} | ||
|
||
let fromValues = feedValues[fromIndex] || {} | ||
fromValues[toIndex] = value | ||
feedValues[fromIndex] = fromValues | ||
|
||
const batchValue = { | ||
type: 'put', | ||
key: fromIndex, | ||
value: fromValues | ||
} | ||
|
||
let existingKeyIndex = batchKeys[fromIndex] | ||
if (existingKeyIndex) { | ||
batch[existingKeyIndex] = batchValue | ||
} | ||
else { | ||
batch.push(batchValue) | ||
batchKeys[fromIndex] = batch.length - 1 | ||
} | ||
|
||
if (updateFeeds) { | ||
const feedsValue = { | ||
type: 'put', | ||
key: 'feeds', | ||
value: feeds | ||
} | ||
|
||
let existingFeedsIndex = batchKeys['feeds'] | ||
if (existingFeedsIndex) { | ||
batch[existingFeedsIndex] = feedsValue | ||
} else { | ||
batch.push(feedsValue) | ||
batchKeys['feeds'] = batch.length - 1 | ||
} | ||
} | ||
|
||
layer(author, to, value) | ||
} | ||
} | ||
|
||
return batch.length | ||
} | ||
|
||
layer({}) | ||
|
||
function beforeIndexUpdate(cb) { | ||
get((err, g) => { | ||
layer(g) | ||
cb() | ||
}) | ||
} | ||
|
||
function get(cb) { | ||
pull( | ||
pl.read(level, { | ||
valueEncoding: jsonCodec, | ||
keys: true | ||
}), | ||
pull.collect((err, data) => { | ||
if (err) return cb(err) | ||
|
||
for (let i = 0; i < data.length; ++i) { | ||
if (data[i].key === 'feeds') { | ||
feeds = data[i].value | ||
break | ||
} | ||
} | ||
|
||
let result = {} | ||
for (let i = 0; i < data.length; ++i) | ||
{ | ||
const relation = data[i] | ||
|
||
if (relation.key !== '\x00' && relation.key !== 'feeds') { | ||
const feed = feeds[parseInt(relation.key, 10)] | ||
const feedFollowStatus = result[feed] || {} | ||
let valueKeys = Object.keys(relation.value) | ||
for (var v = 0; v < valueKeys.length; ++v) { | ||
const to = feeds[valueKeys[v]] | ||
feedFollowStatus[to] = parseInt(relation.value[valueKeys[v]], 10) | ||
} | ||
result[feed] = feedFollowStatus | ||
} | ||
} | ||
|
||
cb(null, result) | ||
}) | ||
) | ||
} | ||
|
||
sbot.db.registerIndex(() => { | ||
return { | ||
offset, | ||
stateLoaded, | ||
onData, | ||
writeBatch, | ||
name, | ||
|
||
remove: level.clear, | ||
close: level.close.bind(level) | ||
} | ||
}) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
module.exports = function (sbot, isBlocking) { | ||
// opinion: do not authorize peers blocked by this node. | ||
sbot.auth.hook(function (fn, args) { | ||
const self = this | ||
isBlocking({ source: sbot.id, dest: args[0] }, (err, blocked) => { | ||
if (err) console.error(err) | ||
|
||
if (blocked) args[1](new Error('client is blocked')) | ||
else fn.apply(self, args) | ||
}) | ||
}) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
const isFeed = require('ssb-ref').isFeed | ||
|
||
module.exports = function (sbot, layered) { | ||
// check for ssb-replicate or similar, but with a delay so other plugins have time to be loaded | ||
setImmediate(function () { | ||
if (!sbot.replicate) { | ||
throw new Error('ssb-friends expects a replicate plugin to be available') | ||
} | ||
|
||
// opinion: replicate with everyone within max hops (max passed to layered above ^) | ||
pull( | ||
layered.hopStream({ live: true, old: true }), | ||
pull.drain(function (data) { | ||
if (data.sync) return | ||
for (const k in data) { | ||
sbot.replicate.request(k, data[k] >= 0) | ||
} | ||
}) | ||
) | ||
|
||
// opinion: pass the blocks to replicate.block | ||
const block = (sbot.replicate && sbot.replicate.block) || (sbot.ebt && sbot.ebt.block) | ||
if (block) { | ||
function handleBlockUnlock (from, to, value) { | ||
if (value === false) block(from, to, true) | ||
else block(from, to, false) | ||
} | ||
pull( | ||
legacy.stream({ live: true }), | ||
pull.drain(function (contacts) { | ||
if (!contacts) return | ||
|
||
if (isFeed(contacts.from) && isFeed(contacts.to)) { // live data | ||
handleBlockUnlock(contacts.from, contacts.to, contacts.value) | ||
} else { // initial data | ||
for (const from in contacts) { | ||
const relations = contacts[from] | ||
for (const to in relations) { handleBlockUnlock(from, to, relations[to]) } | ||
} | ||
} | ||
}) | ||
) | ||
} | ||
}) | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reading this backwards might be a speed up, because level scans the rows in lexicographic order of the key, and we have 99% of the keys are numbers, so I think
'feed'
will be the very last one. Not sure if it helps, but maybe worth putting a console.log inside the for-loop and then see whether doing it forwards or backwards is the best.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I just tried. Didn't really change anything. The part from collect to cb is 14ms on my machine.