Skip to content
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

Feature rdf store experimental #29

Draft
wants to merge 6 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all 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
6 changes: 6 additions & 0 deletions bin/cli.ts
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,12 @@ async function main() {
});
}

if (!quiet) {
client.on("error", (error) => {
console.error("Error", error);
});
}

const reader = client.stream({ highWaterMark: 10 }).getReader();
let el = await reader.read();
let count = 0;
Expand Down
13 changes: 11 additions & 2 deletions lib/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,6 @@
config.shape ? shapeConfigStore : store,
dereferencer,
{
cbdDefaultGraph: config.onlyDefaultGraph,
fetch: config.fetch,
},
),
Expand Down Expand Up @@ -423,7 +422,17 @@
fetch: fetch_f,
});
const url = resp.url;
const data = RdfStore.createDefault();
const data = new RdfStore<number>({
indexCombinations: [
[ 'graph', 'subject', 'predicate', 'object' ],
[ 'graph', 'predicate', 'object', 'subject' ],
[ 'graph', 'object', 'subject', 'predicate' ],
],
indexConstructor: subOptions => new RdfStoreIndexNestedMapQuoted(subOptions),

Check failure on line 431 in lib/client.ts

View workflow job for this annotation

GitHub Actions / Run tests

Cannot find name 'RdfStoreIndexNestedMapQuoted'.
dictionary: new TermDictionaryNumberRecordFullTerms(),

Check failure on line 432 in lib/client.ts

View workflow job for this annotation

GitHub Actions / Run tests

Cannot find name 'TermDictionaryNumberRecordFullTerms'.
dataFactory: df,
termsCardinalitySets: [ 'graph'] //enable quick overview of graphs using getGraph();
});
await new Promise((resolve, reject) => {
data.import(resp.data).on("end", resolve).on("error", reject);
});
Expand Down
14 changes: 13 additions & 1 deletion lib/memberManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@
private extractor: CBDShapeExtractor;
private shapeId?: Term;

private members: Array<Term>;

Check failure on line 47 in lib/memberManager.ts

View workflow job for this annotation

GitHub Actions / Run tests

Property 'members' has no initializer and is not definitely assigned in the constructor.

private timestampPath?: Term;
private isVersionOfPath?: Term;

Expand All @@ -67,7 +69,7 @@
) {
const logger = log.extend("extract");
const members = getObjects(page.data, this.ldesId, TREE.terms.member, null);

this.members = members;
logger("%d members", members.length);

const promises: Promise<Member | undefined | void>[] = [];
Expand Down Expand Up @@ -127,7 +129,17 @@
return await this.extractor.extract(data, member, this.shapeId);
}

private async extractMember(

Check failure on line 132 in lib/memberManager.ts

View workflow job for this annotation

GitHub Actions / Run tests

Duplicate function implementation.
member: Term,
data: RdfStore,
): Promise<Member | undefined> {
const quads: Quad[] = await this.extractMemberQuads(member, data);

// let the extractor do it's thing
return await this.extractor.extract(data, member);

Check failure on line 139 in lib/memberManager.ts

View workflow job for this annotation

GitHub Actions / Run tests

Type 'Quad[]' is missing the following properties from type 'Member': id, quads
}

private async extractMember(

Check failure on line 142 in lib/memberManager.ts

View workflow job for this annotation

GitHub Actions / Run tests

Duplicate function implementation.
member: Term,
data: RdfStore,
): Promise<Member | undefined> {
Expand Down
31 changes: 18 additions & 13 deletions lib/pageFetcher.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ import { Notifier } from "./utils";
import { extractRelations, Relation } from "./page";
import debug from "debug";
import { SimpleRelation } from "./relation";
import { RdfStore } from "rdf-stores";
import { RdfStore, RdfStoreIndexNestedMapQuoted, TermDictionaryNumberRecordFullTerms } from "rdf-stores";
import { DataFactory } from "rdf-data-factory";
const log = debug("fetcher");
const { namedNode } = new DataFactory();
const df = new DataFactory();

/**
* target: url to fetch
Expand Down Expand Up @@ -124,22 +124,27 @@ export class Fetcher {

logger("Cache for %s %o", node.target, cache);

const data = RdfStore.createDefault();
let quadCount = 0;
const data = new RdfStore<number>({
indexCombinations: [
[ 'graph', 'object', 'predicate', 'subject' ],
[ 'graph', 'subject', 'predicate', 'object' ],
[ 'graph', 'predicate', 'object', 'subject' ],
[ 'graph', 'object', 'subject', 'predicate' ],
],
indexConstructor: subOptions => new RdfStoreIndexNestedMapQuoted(subOptions),
dictionary: new TermDictionaryNumberRecordFullTerms(),
dataFactory: df,
termsCardinalitySets: ['graph'] //enable quick overview of graphs
});
logger("Start loading " + node.target + "into store");
await new Promise((resolve, reject) => {
resp.data
.on("data", (quad) => {
data.addQuad(quad);
quadCount++;
})
.on("end", resolve)
data.import(resp.data).on("end", resolve)
.on("error", reject);
});

logger("Got data %s (%d quads)", node.target, quadCount);
logger("Imported data %s (%d quads)", node.target, data.size);
for (let rel of extractRelations(
data,
namedNode(resp.url),
df.namedNode(resp.url),
this.loose,
this.after,
this.before,
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"n3": "^1.17.3",
"rdf-data-factory": "^1.1.2",
"rdf-dereference": "^2.2.0",
"rdf-stores": "^1.0.0"
"rdf-stores": "github:pietercolpaert/rdf-stores.js#feature-termcardinalities"
},
"devDependencies": {
"@ajuvercr/js-runner": "^0.1.20",
Expand Down
Loading