Use concrete value for quad.Quad
Comparison of -short benchmarks in cayley.
$ benchcmp pointer.bench concrete.bench
benchmark old ns/op new ns/op delta
BenchmarkNamePredicate 1673276 1655093 -1.09%
BenchmarkLargeSetsNoIntersection 318985907 261499984 -18.02%
BenchmarkNetAndSpeed 104403743 41516981 -60.23%
BenchmarkKeanuAndNet 17309258 16857513 -2.61%
BenchmarkKeanuAndSpeed 20159161 19282833 -4.35%
Comparison of pathological cases are not so happy.
benchmark old ns/op new ns/op delta
BenchmarkVeryLargeSetsSmallIntersection 55269775527 246084606672 +345.24%
BenchmarkHelplessContainsChecker 23436501319 24308906949 +3.72%
Profiling the worst case:
Pointer:
Total: 6121 samples
1973 32.2% 32.2% 1973 32.2% runtime.findfunc
773 12.6% 44.9% 773 12.6% readvarint
510 8.3% 53.2% 511 8.3% step
409 6.7% 59.9% 410 6.7% runtime.gentraceback
390 6.4% 66.2% 391 6.4% pcvalue
215 3.5% 69.8% 215 3.5% runtime.funcdata
181 3.0% 72.7% 181 3.0% checkframecopy
118 1.9% 74.6% 119 1.9% runtime.funcspdelta
96 1.6% 76.2% 96 1.6% runtime.topofstack
76 1.2% 77.5% 76 1.2% scanblock
Concrete:
Total: 25027 samples
9437 37.7% 37.7% 9437 37.7% runtime.findfunc
3853 15.4% 53.1% 3853 15.4% readvarint
2366 9.5% 62.6% 2366 9.5% step
2186 8.7% 71.3% 2186 8.7% runtime.gentraceback
1816 7.3% 78.5% 1816 7.3% pcvalue
1016 4.1% 82.6% 1016 4.1% runtime.funcdata
859 3.4% 86.0% 859 3.4% checkframecopy
506 2.0% 88.1% 506 2.0% runtime.funcspdelta
410 1.6% 89.7% 410 1.6% runtime.topofstack
303 1.2% 90.9% 303 1.2% runtime.newstack
This commit is contained in:
kortschak
parent
1ae81e6d00
commit
6acfdcc5d6
19 changed files with 183 additions and 183 deletions
|
|
@ -33,9 +33,9 @@ import (
|
|||
// Parse returns a valid quad.Quad or a non-nil error. Parse does
|
||||
// handle comments except where the comment placement does not prevent
|
||||
// a complete valid quad.Quad from being defined.
|
||||
func Parse(str string) (*quad.Quad, error) {
|
||||
func Parse(str string) (quad.Quad, error) {
|
||||
q, err := parse([]rune(str))
|
||||
return &q, err
|
||||
return q, err
|
||||
}
|
||||
|
||||
// Decoder implements N-Quad document parsing according to the RDF
|
||||
|
|
@ -52,14 +52,14 @@ func NewDecoder(r io.Reader) *Decoder {
|
|||
}
|
||||
|
||||
// Unmarshal returns the next valid N-Quad as a quad.Quad, or an error.
|
||||
func (dec *Decoder) Unmarshal() (*quad.Quad, error) {
|
||||
func (dec *Decoder) Unmarshal() (quad.Quad, error) {
|
||||
dec.line = dec.line[:0]
|
||||
var line []byte
|
||||
for {
|
||||
for {
|
||||
l, pre, err := dec.r.ReadLine()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
return quad.Quad{}, err
|
||||
}
|
||||
dec.line = append(dec.line, l...)
|
||||
if !pre {
|
||||
|
|
@ -73,9 +73,9 @@ func (dec *Decoder) Unmarshal() (*quad.Quad, error) {
|
|||
}
|
||||
triple, err := Parse(string(line))
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("failed to parse %q: %v", dec.line, err)
|
||||
return quad.Quad{}, fmt.Errorf("failed to parse %q: %v", dec.line, err)
|
||||
}
|
||||
if triple == nil {
|
||||
if !triple.IsValid() {
|
||||
return dec.Unmarshal()
|
||||
}
|
||||
return triple, nil
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ import (
|
|||
var testNTriples = []struct {
|
||||
message string
|
||||
input string
|
||||
expect *quad.Quad
|
||||
expect quad.Quad
|
||||
err error
|
||||
}{
|
||||
// Tests taken from http://www.w3.org/TR/n-quads/ and http://www.w3.org/TR/n-triples/.
|
||||
|
|
@ -40,7 +40,7 @@ var testNTriples = []struct {
|
|||
{
|
||||
message: "parse triple with commment",
|
||||
input: `_:100000 </film/performance/actor> </en/larry_fine_1902> . # example from 30movies`,
|
||||
expect: &quad.Quad{
|
||||
expect: quad.Quad{
|
||||
Subject: "_:100000",
|
||||
Predicate: "</film/performance/actor>",
|
||||
Object: "</en/larry_fine_1902>",
|
||||
|
|
@ -52,7 +52,7 @@ var testNTriples = []struct {
|
|||
{
|
||||
message: "parse triple with commment",
|
||||
input: `_:10011 </film/performance/character> "Tomás de Torquemada" . # example from 30movies with unicode`,
|
||||
expect: &quad.Quad{
|
||||
expect: quad.Quad{
|
||||
Subject: "_:10011",
|
||||
Predicate: "</film/performance/character>",
|
||||
Object: `"Tomás de Torquemada"`,
|
||||
|
|
@ -65,7 +65,7 @@ var testNTriples = []struct {
|
|||
{
|
||||
message: "parse triple with commment",
|
||||
input: `<http://one.example/subject1> <http://one.example/predicate1> <http://one.example/object1> . # comments here`,
|
||||
expect: &quad.Quad{
|
||||
expect: quad.Quad{
|
||||
Subject: "<http://one.example/subject1>",
|
||||
Predicate: "<http://one.example/predicate1>",
|
||||
Object: "<http://one.example/object1>",
|
||||
|
|
@ -76,7 +76,7 @@ var testNTriples = []struct {
|
|||
{
|
||||
message: "parse triple with blank subject node, literal object and no comment (1)",
|
||||
input: `_:subject1 <http://an.example/predicate1> "object1" .`,
|
||||
expect: &quad.Quad{
|
||||
expect: quad.Quad{
|
||||
Subject: "_:subject1",
|
||||
Predicate: "<http://an.example/predicate1>",
|
||||
Object: `"object1"`,
|
||||
|
|
@ -87,7 +87,7 @@ var testNTriples = []struct {
|
|||
{
|
||||
message: "parse triple with blank subject node, literal object and no comment (2)",
|
||||
input: `_:subject2 <http://an.example/predicate2> "object2" .`,
|
||||
expect: &quad.Quad{
|
||||
expect: quad.Quad{
|
||||
Subject: "_:subject2",
|
||||
Predicate: "<http://an.example/predicate2>",
|
||||
Object: `"object2"`,
|
||||
|
|
@ -100,7 +100,7 @@ var testNTriples = []struct {
|
|||
{
|
||||
message: "parse triple with three IRIREFs",
|
||||
input: `<http://example.org/#spiderman> <http://www.perceive.net/schemas/relationship/enemyOf> <http://example.org/#green-goblin> .`,
|
||||
expect: &quad.Quad{
|
||||
expect: quad.Quad{
|
||||
Subject: "<http://example.org/#spiderman>",
|
||||
Predicate: "<http://www.perceive.net/schemas/relationship/enemyOf>",
|
||||
Object: "<http://example.org/#green-goblin>",
|
||||
|
|
@ -113,7 +113,7 @@ var testNTriples = []struct {
|
|||
{
|
||||
message: "parse triple with blank node labelled subject and object and IRIREF predicate (1)",
|
||||
input: `_:alice <http://xmlns.com/foaf/0.1/knows> _:bob .`,
|
||||
expect: &quad.Quad{
|
||||
expect: quad.Quad{
|
||||
Subject: "_:alice",
|
||||
Predicate: "<http://xmlns.com/foaf/0.1/knows>",
|
||||
Object: "_:bob",
|
||||
|
|
@ -124,7 +124,7 @@ var testNTriples = []struct {
|
|||
{
|
||||
message: "parse triple with blank node labelled subject and object and IRIREF predicate (2)",
|
||||
input: `_:bob <http://xmlns.com/foaf/0.1/knows> _:alice .`,
|
||||
expect: &quad.Quad{
|
||||
expect: quad.Quad{
|
||||
Subject: "_:bob",
|
||||
Predicate: "<http://xmlns.com/foaf/0.1/knows>",
|
||||
Object: "_:alice",
|
||||
|
|
@ -137,7 +137,7 @@ var testNTriples = []struct {
|
|||
{
|
||||
message: "parse quad with commment",
|
||||
input: `<http://one.example/subject1> <http://one.example/predicate1> <http://one.example/object1> <http://example.org/graph3> . # comments here`,
|
||||
expect: &quad.Quad{
|
||||
expect: quad.Quad{
|
||||
Subject: "<http://one.example/subject1>",
|
||||
Predicate: "<http://one.example/predicate1>",
|
||||
Object: "<http://one.example/object1>",
|
||||
|
|
@ -148,7 +148,7 @@ var testNTriples = []struct {
|
|||
{
|
||||
message: "parse quad with blank subject node, literal object, IRIREF predicate and label, and no comment (1)",
|
||||
input: `_:subject1 <http://an.example/predicate1> "object1" <http://example.org/graph1> .`,
|
||||
expect: &quad.Quad{
|
||||
expect: quad.Quad{
|
||||
Subject: "_:subject1",
|
||||
Predicate: "<http://an.example/predicate1>",
|
||||
Object: `"object1"`,
|
||||
|
|
@ -159,7 +159,7 @@ var testNTriples = []struct {
|
|||
{
|
||||
message: "parse quad with blank subject node, literal object, IRIREF predicate and label, and no comment (2)",
|
||||
input: `_:subject2 <http://an.example/predicate2> "object2" <http://example.org/graph5> .`,
|
||||
expect: &quad.Quad{
|
||||
expect: quad.Quad{
|
||||
Subject: "_:subject2",
|
||||
Predicate: "<http://an.example/predicate2>",
|
||||
Object: `"object2"`,
|
||||
|
|
@ -172,7 +172,7 @@ var testNTriples = []struct {
|
|||
{
|
||||
message: "parse quad with all IRIREF parts",
|
||||
input: `<http://example.org/#spiderman> <http://www.perceive.net/schemas/relationship/enemyOf> <http://example.org/#green-goblin> <http://example.org/graphs/spiderman> .`,
|
||||
expect: &quad.Quad{
|
||||
expect: quad.Quad{
|
||||
Subject: "<http://example.org/#spiderman>",
|
||||
Predicate: "<http://www.perceive.net/schemas/relationship/enemyOf>",
|
||||
Object: "<http://example.org/#green-goblin>",
|
||||
|
|
@ -185,7 +185,7 @@ var testNTriples = []struct {
|
|||
{
|
||||
message: "parse quad with blank node labelled subject and object and IRIREF predicate and label (1)",
|
||||
input: `_:alice <http://xmlns.com/foaf/0.1/knows> _:bob <http://example.org/graphs/john> .`,
|
||||
expect: &quad.Quad{
|
||||
expect: quad.Quad{
|
||||
Subject: "_:alice",
|
||||
Predicate: "<http://xmlns.com/foaf/0.1/knows>",
|
||||
Object: "_:bob",
|
||||
|
|
@ -196,7 +196,7 @@ var testNTriples = []struct {
|
|||
{
|
||||
message: "parse quad with blank node labelled subject and object and IRIREF predicate and label (2)",
|
||||
input: `_:bob <http://xmlns.com/foaf/0.1/knows> _:alice <http://example.org/graphs/james> .`,
|
||||
expect: &quad.Quad{
|
||||
expect: quad.Quad{
|
||||
Subject: "_:bob",
|
||||
Predicate: "<http://xmlns.com/foaf/0.1/knows>",
|
||||
Object: "_:alice",
|
||||
|
|
@ -209,7 +209,7 @@ var testNTriples = []struct {
|
|||
{
|
||||
message: "parse triple with all IRIREF parts",
|
||||
input: `<http://example.org/bob#me> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .`,
|
||||
expect: &quad.Quad{
|
||||
expect: quad.Quad{
|
||||
Subject: "<http://example.org/bob#me>",
|
||||
Predicate: "<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>",
|
||||
Object: "<http://xmlns.com/foaf/0.1/Person>",
|
||||
|
|
@ -220,7 +220,7 @@ var testNTriples = []struct {
|
|||
{
|
||||
message: "parse triple with all IRIREF parts",
|
||||
input: `<http://example.org/bob#me> <http://xmlns.com/foaf/0.1/knows> <http://example.org/alice#me> .`,
|
||||
expect: &quad.Quad{
|
||||
expect: quad.Quad{
|
||||
Subject: "<http://example.org/bob#me>",
|
||||
Predicate: "<http://xmlns.com/foaf/0.1/knows>",
|
||||
Object: "<http://example.org/alice#me>",
|
||||
|
|
@ -231,7 +231,7 @@ var testNTriples = []struct {
|
|||
{
|
||||
message: "parse triple with IRIREF schema on literal object",
|
||||
input: `<http://example.org/bob#me> <http://schema.org/birthDate> "1990-07-04"^^<http://www.w3.org/2001/XMLSchema#date> .`,
|
||||
expect: &quad.Quad{
|
||||
expect: quad.Quad{
|
||||
Subject: "<http://example.org/bob#me>",
|
||||
Predicate: "<http://schema.org/birthDate>",
|
||||
Object: `"1990-07-04"^^<http://www.w3.org/2001/XMLSchema#date>`,
|
||||
|
|
@ -242,7 +242,7 @@ var testNTriples = []struct {
|
|||
{
|
||||
message: "parse commented IRIREF in triple",
|
||||
input: `<http://example.org/bob#me> <http://xmlns.com/foaf/0.1/topic_interest> <http://www.wikidata.org/entity/Q12418> .`,
|
||||
expect: &quad.Quad{
|
||||
expect: quad.Quad{
|
||||
Subject: "<http://example.org/bob#me>",
|
||||
Predicate: "<http://xmlns.com/foaf/0.1/topic_interest>",
|
||||
Object: "<http://www.wikidata.org/entity/Q12418>",
|
||||
|
|
@ -253,7 +253,7 @@ var testNTriples = []struct {
|
|||
{
|
||||
message: "parse triple with literal subject",
|
||||
input: `<http://www.wikidata.org/entity/Q12418> <http://purl.org/dc/terms/title> "Mona Lisa" .`,
|
||||
expect: &quad.Quad{
|
||||
expect: quad.Quad{
|
||||
Subject: "<http://www.wikidata.org/entity/Q12418>",
|
||||
Predicate: "<http://purl.org/dc/terms/title>",
|
||||
Object: `"Mona Lisa"`,
|
||||
|
|
@ -264,7 +264,7 @@ var testNTriples = []struct {
|
|||
{
|
||||
message: "parse triple with all IRIREF parts (1)",
|
||||
input: `<http://www.wikidata.org/entity/Q12418> <http://purl.org/dc/terms/creator> <http://dbpedia.org/resource/Leonardo_da_Vinci> .`,
|
||||
expect: &quad.Quad{
|
||||
expect: quad.Quad{
|
||||
Subject: "<http://www.wikidata.org/entity/Q12418>",
|
||||
Predicate: "<http://purl.org/dc/terms/creator>",
|
||||
Object: "<http://dbpedia.org/resource/Leonardo_da_Vinci>",
|
||||
|
|
@ -275,7 +275,7 @@ var testNTriples = []struct {
|
|||
{
|
||||
message: "parse triple with all IRIREF parts (2)",
|
||||
input: `<http://data.europeana.eu/item/04802/243FA8618938F4117025F17A8B813C5F9AA4D619> <http://purl.org/dc/terms/subject> <http://www.wikidata.org/entity/Q12418> .`,
|
||||
expect: &quad.Quad{
|
||||
expect: quad.Quad{
|
||||
Subject: "<http://data.europeana.eu/item/04802/243FA8618938F4117025F17A8B813C5F9AA4D619>",
|
||||
Predicate: "<http://purl.org/dc/terms/subject>",
|
||||
Object: "<http://www.wikidata.org/entity/Q12418>",
|
||||
|
|
@ -288,7 +288,7 @@ var testNTriples = []struct {
|
|||
{
|
||||
message: "parse commented IRIREF in quad (1)",
|
||||
input: `<http://example.org/bob#me> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> <http://example.org/bob> .`,
|
||||
expect: &quad.Quad{
|
||||
expect: quad.Quad{
|
||||
Subject: "<http://example.org/bob#me>",
|
||||
Predicate: "<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>",
|
||||
Object: "<http://xmlns.com/foaf/0.1/Person>",
|
||||
|
|
@ -299,7 +299,7 @@ var testNTriples = []struct {
|
|||
{
|
||||
message: "parse quad with all IRIREF parts",
|
||||
input: `<http://example.org/bob#me> <http://xmlns.com/foaf/0.1/knows> <http://example.org/alice#me> <http://example.org/bob> .`,
|
||||
expect: &quad.Quad{
|
||||
expect: quad.Quad{
|
||||
Subject: "<http://example.org/bob#me>",
|
||||
Predicate: "<http://xmlns.com/foaf/0.1/knows>",
|
||||
Object: "<http://example.org/alice#me>",
|
||||
|
|
@ -310,7 +310,7 @@ var testNTriples = []struct {
|
|||
{
|
||||
message: "parse quad with IRIREF schema on literal object",
|
||||
input: `<http://example.org/bob#me> <http://schema.org/birthDate> "1990-07-04"^^<http://www.w3.org/2001/XMLSchema#date> <http://example.org/bob> .`,
|
||||
expect: &quad.Quad{
|
||||
expect: quad.Quad{
|
||||
Subject: "<http://example.org/bob#me>",
|
||||
Predicate: "<http://schema.org/birthDate>",
|
||||
Object: `"1990-07-04"^^<http://www.w3.org/2001/XMLSchema#date>`,
|
||||
|
|
@ -321,7 +321,7 @@ var testNTriples = []struct {
|
|||
{
|
||||
message: "parse commented IRIREF in quad (2)",
|
||||
input: `<http://example.org/bob#me> <http://xmlns.com/foaf/0.1/topic_interest> <http://www.wikidata.org/entity/Q12418> <http://example.org/bob> .`,
|
||||
expect: &quad.Quad{
|
||||
expect: quad.Quad{
|
||||
Subject: "<http://example.org/bob#me>",
|
||||
Predicate: "<http://xmlns.com/foaf/0.1/topic_interest>",
|
||||
Object: "<http://www.wikidata.org/entity/Q12418>",
|
||||
|
|
@ -332,7 +332,7 @@ var testNTriples = []struct {
|
|||
{
|
||||
message: "parse literal object and colon qualified label in quad",
|
||||
input: `<http://www.wikidata.org/entity/Q12418> <http://purl.org/dc/terms/title> "Mona Lisa" <https://www.wikidata.org/wiki/Special:EntityData/Q12418> .`,
|
||||
expect: &quad.Quad{
|
||||
expect: quad.Quad{
|
||||
Subject: "<http://www.wikidata.org/entity/Q12418>",
|
||||
Predicate: "<http://purl.org/dc/terms/title>",
|
||||
Object: `"Mona Lisa"`,
|
||||
|
|
@ -343,7 +343,7 @@ var testNTriples = []struct {
|
|||
{
|
||||
message: "parse all IRIREF parts with colon qualified label in quad (1)",
|
||||
input: `<http://www.wikidata.org/entity/Q12418> <http://purl.org/dc/terms/creator> <http://dbpedia.org/resource/Leonardo_da_Vinci> <https://www.wikidata.org/wiki/Special:EntityData/Q12418> .`,
|
||||
expect: &quad.Quad{
|
||||
expect: quad.Quad{
|
||||
Subject: "<http://www.wikidata.org/entity/Q12418>",
|
||||
Predicate: "<http://purl.org/dc/terms/creator>",
|
||||
Object: "<http://dbpedia.org/resource/Leonardo_da_Vinci>",
|
||||
|
|
@ -354,7 +354,7 @@ var testNTriples = []struct {
|
|||
{
|
||||
message: "parse all IRIREF parts with colon qualified label in quad (2)",
|
||||
input: `<http://data.europeana.eu/item/04802/243FA8618938F4117025F17A8B813C5F9AA4D619> <http://purl.org/dc/terms/subject> <http://www.wikidata.org/entity/Q12418> <https://www.wikidata.org/wiki/Special:EntityData/Q12418> .`,
|
||||
expect: &quad.Quad{
|
||||
expect: quad.Quad{
|
||||
Subject: "<http://data.europeana.eu/item/04802/243FA8618938F4117025F17A8B813C5F9AA4D619>",
|
||||
Predicate: "<http://purl.org/dc/terms/subject>",
|
||||
Object: "<http://www.wikidata.org/entity/Q12418>",
|
||||
|
|
@ -365,7 +365,7 @@ var testNTriples = []struct {
|
|||
{
|
||||
message: "parse all IRIREF parts (quad section - 1)",
|
||||
input: `<http://example.org/bob> <http://purl.org/dc/terms/publisher> <http://example.org> .`,
|
||||
expect: &quad.Quad{
|
||||
expect: quad.Quad{
|
||||
Subject: "<http://example.org/bob>",
|
||||
Predicate: "<http://purl.org/dc/terms/publisher>",
|
||||
Object: "<http://example.org>",
|
||||
|
|
@ -376,7 +376,7 @@ var testNTriples = []struct {
|
|||
{
|
||||
message: "parse all IRIREF parts (quad section - 2)",
|
||||
input: `<http://example.org/bob> <http://purl.org/dc/terms/rights> <http://creativecommons.org/licenses/by/3.0/> .`,
|
||||
expect: &quad.Quad{
|
||||
expect: quad.Quad{
|
||||
Subject: "<http://example.org/bob>",
|
||||
Predicate: "<http://purl.org/dc/terms/rights>",
|
||||
Object: "<http://creativecommons.org/licenses/by/3.0/>",
|
||||
|
|
@ -389,19 +389,19 @@ var testNTriples = []struct {
|
|||
{
|
||||
message: "parse empty",
|
||||
input: ``,
|
||||
expect: &quad.Quad{},
|
||||
expect: quad.Quad{},
|
||||
err: quad.ErrIncomplete,
|
||||
},
|
||||
{
|
||||
message: "parse commented",
|
||||
input: `# comment`,
|
||||
expect: &quad.Quad{},
|
||||
expect: quad.Quad{},
|
||||
err: fmt.Errorf("%v: unexpected rune '#' at 0", quad.ErrInvalid),
|
||||
},
|
||||
{
|
||||
message: "parse incomplete quad",
|
||||
input: `<http://example.org/bob#me> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> .`,
|
||||
expect: &quad.Quad{
|
||||
expect: quad.Quad{
|
||||
Subject: "<http://example.org/bob#me>",
|
||||
Predicate: "<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>",
|
||||
Object: "",
|
||||
|
|
@ -412,7 +412,7 @@ var testNTriples = []struct {
|
|||
{
|
||||
message: "parse incomplete quad",
|
||||
input: `<http://example.org/bob#me> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> .`,
|
||||
expect: &quad.Quad{
|
||||
expect: quad.Quad{
|
||||
Subject: "<http://example.org/bob#me>",
|
||||
Predicate: "<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>",
|
||||
Object: "",
|
||||
|
|
@ -580,7 +580,7 @@ func TestUnescape(t *testing.T) {
|
|||
}
|
||||
}
|
||||
|
||||
var result *quad.Quad
|
||||
var result quad.Quad
|
||||
|
||||
func BenchmarkParser(b *testing.B) {
|
||||
for n := 0; n < b.N; n++ {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue