diff --git a/src/include/processor/operator/persistent/reader/rdf/rdf_reader.h b/src/include/processor/operator/persistent/reader/rdf/rdf_reader.h index 6ee28ae4385..9ec0771cdbf 100644 --- a/src/include/processor/operator/persistent/reader/rdf/rdf_reader.h +++ b/src/include/processor/operator/persistent/reader/rdf/rdf_reader.h @@ -22,20 +22,20 @@ class RdfReader { ~RdfReader(); - inline void initReader() { initReader(prefixSink, statementSink); } - inline void initCountReader() { initReader(nullptr, countStatementSink); } + inline void initReader() { initReader(prefixHandle, statementHandle); } + inline void initCountReader() { initReader(nullptr, countStatementHandle); } common::offset_t read(common::DataChunk* dataChunkToRead); common::offset_t countLine(); private: static SerdStatus errorHandle(void* handle, const SerdError* error); - static SerdStatus statementSink(void* handle, SerdStatementFlags flags, const SerdNode* graph, + static SerdStatus statementHandle(void* handle, SerdStatementFlags flags, const SerdNode* graph, const SerdNode* subject, const SerdNode* predicate, const SerdNode* object, const SerdNode* object_datatype, const SerdNode* object_lang); - static SerdStatus prefixSink(void* handle, const SerdNode* name, const SerdNode* uri); + static SerdStatus prefixHandle(void* handle, const SerdNode* name, const SerdNode* uri); - static SerdStatus countStatementSink(void* handle, SerdStatementFlags flags, + static SerdStatus countStatementHandle(void* handle, SerdStatementFlags flags, const SerdNode* graph, const SerdNode* subject, const SerdNode* predicate, const SerdNode* object, const SerdNode* object_datatype, const SerdNode* object_lang); diff --git a/src/processor/operator/persistent/reader/rdf/rdf_reader.cpp b/src/processor/operator/persistent/reader/rdf/rdf_reader.cpp index a7d434387a3..5c9289a858d 100644 --- a/src/processor/operator/persistent/reader/rdf/rdf_reader.cpp +++ b/src/processor/operator/persistent/reader/rdf/rdf_reader.cpp @@ -152,7 +152,7 @@ static common::offset_t lookupResourceNode(PrimaryKeyIndex* index, const SerdNod return offset; } -SerdStatus RdfReader::statementSink(void* handle, SerdStatementFlags /*flags*/, +SerdStatus RdfReader::statementHandle(void* handle, SerdStatementFlags /*flags*/, const SerdNode* /*graph*/, const SerdNode* subject, const SerdNode* predicate, const SerdNode* object, const SerdNode* object_datatype, const SerdNode* /*object_lang*/) { if (!supportSerdType(subject->type) || !supportSerdType(predicate->type) || @@ -209,7 +209,7 @@ SerdStatus RdfReader::statementSink(void* handle, SerdStatementFlags /*flags*/, return SERD_SUCCESS; } -SerdStatus RdfReader::countStatementSink(void* handle, SerdStatementFlags /*flags*/, +SerdStatus RdfReader::countStatementHandle(void* handle, SerdStatementFlags /*flags*/, const SerdNode* /*graph*/, const SerdNode* subject, const SerdNode* predicate, const SerdNode* object, const SerdNode* /*object_datatype*/, const SerdNode* /*object_lang*/) { if (!supportSerdType(subject->type) || !supportSerdType(predicate->type) || @@ -221,7 +221,7 @@ SerdStatus RdfReader::countStatementSink(void* handle, SerdStatementFlags /*flag return SERD_SUCCESS; } -SerdStatus RdfReader::prefixSink(void* handle, const SerdNode* /*name*/, const SerdNode* uri) { +SerdStatus RdfReader::prefixHandle(void* handle, const SerdNode* /*name*/, const SerdNode* uri) { auto reader = reinterpret_cast(handle); reader->currentPrefix = reinterpret_cast(uri->buf); return SERD_SUCCESS; diff --git a/test/test_files/rdf/spb1k.test b/test/test_files/rdf/spb1k.test index 2a5b9e872b2..1cfd9fb0590 100644 --- a/test/test_files/rdf/spb1k.test +++ b/test/test_files/rdf/spb1k.test @@ -13,4 +13,4 @@ 16 -STATEMENT MATCH (s:spb_resource_t)-[]->(:spb_literal_t) WHERE s.iri = "http://www.bbc.co.uk/things/3#id" RETURN COUNT(*); ---- 1 -7 \ No newline at end of file +7