You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by nw...@apache.org on 2015/05/05 11:41:29 UTC
[2/9] lucy git commit: Switch tv_cache over to Blob
Switch tv_cache over to Blob
Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/32e5dc4e
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/32e5dc4e
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/32e5dc4e
Branch: refs/heads/master
Commit: 32e5dc4e9f9015dc7d72fb3a884fce38b7a9ef5f
Parents: 9b2f567
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Mon May 4 16:31:02 2015 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Tue May 5 11:23:05 2015 +0200
----------------------------------------------------------------------
core/Lucy/Index/DocVector.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy/blob/32e5dc4e/core/Lucy/Index/DocVector.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/DocVector.c b/core/Lucy/Index/DocVector.c
index b9619b7..cc08125 100644
--- a/core/Lucy/Index/DocVector.c
+++ b/core/Lucy/Index/DocVector.c
@@ -33,8 +33,7 @@ S_extract_tv_cache(Blob *field_buf);
// Pull a TermVector object out from compressed positional data.
static TermVector*
-S_extract_tv_from_tv_buf(String *field, String *term_text,
- ByteBuf *tv_buf);
+S_extract_tv_from_tv_buf(String *field, String *term_text, Blob *tv_buf);
DocVector*
DocVec_new() {
@@ -110,7 +109,7 @@ DocVec_Term_Vector_IMP(DocVector *self, String *field,
}
// Get a buf for the term text or bail.
- ByteBuf *tv_buf = (ByteBuf*)Hash_Fetch(field_vector, term_text);
+ Blob *tv_buf = (Blob*)Hash_Fetch(field_vector, term_text);
if (tv_buf == NULL) {
return NULL;
}
@@ -148,7 +147,7 @@ S_extract_tv_cache(Blob *field_buf) {
// Store the $text => $posdata pair in the output hash.
String *text = CB_To_String(text_buf);
- Hash_Store(tv_cache, text, (Obj*)BB_new_bytes(bookmark_ptr, len));
+ Hash_Store(tv_cache, text, (Obj*)Blob_new(bookmark_ptr, len));
DECREF(text);
}
DECREF(text_buf);
@@ -157,11 +156,10 @@ S_extract_tv_cache(Blob *field_buf) {
}
static TermVector*
-S_extract_tv_from_tv_buf(String *field, String *term_text,
- ByteBuf *tv_buf) {
+S_extract_tv_from_tv_buf(String *field, String *term_text, Blob *tv_buf) {
TermVector *retval = NULL;
- const char *posdata = BB_Get_Buf(tv_buf);
- const char *posdata_end = posdata + BB_Get_Size(tv_buf);
+ const char *posdata = Blob_Get_Buf(tv_buf);
+ const char *posdata_end = posdata + Blob_Get_Size(tv_buf);
int32_t *positions = NULL;
int32_t *starts = NULL;
int32_t *ends = NULL;