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:32 UTC
[5/9] lucy git commit: Switch MockMatcher over to Blob
Switch MockMatcher 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/5651dd32
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/5651dd32
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/5651dd32
Branch: refs/heads/master
Commit: 5651dd329a8e084beede06305712ad43db712d9b
Parents: 2f7df54
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Mon May 4 18:04:19 2015 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Tue May 5 11:23:05 2015 +0200
----------------------------------------------------------------------
core/LucyX/Search/MockMatcher.c | 9 +++++----
core/LucyX/Search/MockMatcher.cfh | 6 +++---
perl/lib/LucyX/Search/MockMatcher.pm | 2 +-
3 files changed, 9 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy/blob/5651dd32/core/LucyX/Search/MockMatcher.c
----------------------------------------------------------------------
diff --git a/core/LucyX/Search/MockMatcher.c b/core/LucyX/Search/MockMatcher.c
index 867d7a2..73a1b8d 100644
--- a/core/LucyX/Search/MockMatcher.c
+++ b/core/LucyX/Search/MockMatcher.c
@@ -18,21 +18,22 @@
#include "Lucy/Util/ToolSet.h"
#include "LucyX/Search/MockMatcher.h"
+#include "Clownfish/Blob.h"
MockMatcher*
-MockMatcher_new(I32Array *doc_ids, ByteBuf *scores) {
+MockMatcher_new(I32Array *doc_ids, Blob *scores) {
MockMatcher *self = (MockMatcher*)Class_Make_Obj(MOCKMATCHER);
return MockMatcher_init(self, doc_ids, scores);
}
MockMatcher*
-MockMatcher_init(MockMatcher *self, I32Array *doc_ids, ByteBuf *scores) {
+MockMatcher_init(MockMatcher *self, I32Array *doc_ids, Blob *scores) {
Matcher_init((Matcher*)self);
MockMatcherIVARS *const ivars = MockMatcher_IVARS(self);
ivars->tick = -1;
ivars->size = I32Arr_Get_Size(doc_ids);
ivars->doc_ids = (I32Array*)INCREF(doc_ids);
- ivars->scores = (ByteBuf*)INCREF(scores);
+ ivars->scores = (Blob*)INCREF(scores);
return self;
}
@@ -60,7 +61,7 @@ MockMatcher_Score_IMP(MockMatcher* self) {
if (!ivars->scores) {
THROW(ERR, "Can't call Score() unless scores supplied");
}
- const float *raw_scores = (const float*)BB_Get_Buf(ivars->scores);
+ const float *raw_scores = (const float*)Blob_Get_Buf(ivars->scores);
return raw_scores[ivars->tick];
}
http://git-wip-us.apache.org/repos/asf/lucy/blob/5651dd32/core/LucyX/Search/MockMatcher.cfh
----------------------------------------------------------------------
diff --git a/core/LucyX/Search/MockMatcher.cfh b/core/LucyX/Search/MockMatcher.cfh
index 4115575..88666aa 100644
--- a/core/LucyX/Search/MockMatcher.cfh
+++ b/core/LucyX/Search/MockMatcher.cfh
@@ -20,11 +20,11 @@ class LucyX::Search::MockMatcher inherits Lucy::Search::Matcher {
size_t size;
I32Array *doc_ids;
- ByteBuf *scores;
+ Blob *scores;
int32_t tick;
inert incremented MockMatcher*
- new(I32Array *doc_ids, ByteBuf *scores = NULL);
+ new(I32Array *doc_ids, Blob *scores = NULL);
/**
* @param doc_ids An array of matching doc ids.
@@ -32,7 +32,7 @@ class LucyX::Search::MockMatcher inherits Lucy::Search::Matcher {
* supplied, calling [](cfish:.Score) will throw an exception.
*/
inert incremented MockMatcher*
- init(MockMatcher *self, I32Array *doc_ids, ByteBuf *scores = NULL);
+ init(MockMatcher *self, I32Array *doc_ids, Blob *scores = NULL);
public void
Destroy(MockMatcher *self);
http://git-wip-us.apache.org/repos/asf/lucy/blob/5651dd32/perl/lib/LucyX/Search/MockMatcher.pm
----------------------------------------------------------------------
diff --git a/perl/lib/LucyX/Search/MockMatcher.pm b/perl/lib/LucyX/Search/MockMatcher.pm
index f33a3af..0937f11 100644
--- a/perl/lib/LucyX/Search/MockMatcher.pm
+++ b/perl/lib/LucyX/Search/MockMatcher.pm
@@ -30,7 +30,7 @@ sub new {
if ( ref( $args{scores} ) eq 'ARRAY' ) {
confess("Mismatch between scores and doc_ids array sizes")
unless scalar @{ $args{scores} } == $size;
- $scores = Clownfish::ByteBuf->new(
+ $scores = Clownfish::Blob->new(
pack( "f$size", @{ $args{scores} } ) );
}