Skip to content
This repository was archived by the owner on May 12, 2021. It is now read-only.

LUCY-295 Adapt for changed return type of Vec_Get_Size #36

Merged
asfgit merged 4 commits into from
Apr 4, 2016
Merged

LUCY-295 Adapt for changed return type of Vec_Get_Size #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e2235fe
Iter var change to match Vec_Get_Size.
rectang Mar 29, 2016
f0884c6
Type change to match Vec_Get_Size.
rectang Mar 30, 2016
e7d675a
Tricky type changes to match Vec_Get_Size.
rectang Mar 30, 2016
10c5775
Fix sign of arg to sizeof.
rectang Mar 30, 2016
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
8 changes: 4 additions & 4 deletions core/Lucy/Analysis/PolyAnalyzer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ PolyAnalyzer_init(PolyAnalyzer *self, String *language,
PolyAnalyzerIVARS *const ivars = PolyAnalyzer_IVARS(self);

if (analyzers) {
for (uint32_t i = 0, max = Vec_Get_Size(analyzers); i < max; i++) {
for (size_t i = 0, max = Vec_Get_Size(analyzers); i < max; i++) {
CERTIFY(Vec_Fetch(analyzers, i), ANALYZER);
}
ivars->analyzers = (Vector*)INCREF(analyzers);
Expand Down Expand Up @@ -74,7 +74,7 @@ PolyAnalyzer_Transform_IMP(PolyAnalyzer *self, Inversion *inversion) {
(void)INCREF(inversion);

// Iterate through each of the analyzers in order.
for (uint32_t i = 0, max = Vec_Get_Size(analyzers); i < max; i++) {
for (size_t i = 0, max = Vec_Get_Size(analyzers); i < max; i++) {
Analyzer *analyzer = (Analyzer*)Vec_Fetch(analyzers, i);
Inversion *new_inversion = Analyzer_Transform(analyzer, inversion);
DECREF(inversion);
Expand All @@ -87,7 +87,7 @@ PolyAnalyzer_Transform_IMP(PolyAnalyzer *self, Inversion *inversion) {
Inversion*
PolyAnalyzer_Transform_Text_IMP(PolyAnalyzer *self, String *text) {
Vector *const analyzers = PolyAnalyzer_IVARS(self)->analyzers;
const uint32_t num_analyzers = Vec_Get_Size(analyzers);
const size_t num_analyzers = Vec_Get_Size(analyzers);
Inversion *retval;

if (num_analyzers == 0) {
Expand All @@ -100,7 +100,7 @@ PolyAnalyzer_Transform_Text_IMP(PolyAnalyzer *self, String *text) {
else {
Analyzer *first_analyzer = (Analyzer*)Vec_Fetch(analyzers, 0);
retval = Analyzer_Transform_Text(first_analyzer, text);
for (uint32_t i = 1; i < num_analyzers; i++) {
for (size_t i = 1; i < num_analyzers; i++) {
Analyzer *analyzer = (Analyzer*)Vec_Fetch(analyzers, i);
Inversion *new_inversion = Analyzer_Transform(analyzer, retval);
DECREF(retval);
Expand Down
30 changes: 15 additions & 15 deletions core/Lucy/Highlight/HeatMap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,19 +65,19 @@ S_compare_i32(const void *va, const void *vb) {
// offsets and lengths... but leave the scores at 0.
static Vector*
S_flattened_but_empty_spans(Vector *spans) {
const uint32_t num_spans = Vec_Get_Size(spans);
const size_t num_spans = Vec_Get_Size(spans);
int32_t *bounds = (int32_t*)MALLOCATE((num_spans * 2) * sizeof(int32_t));

// Assemble a list of all unique start/end boundaries.
for (uint32_t i = 0; i < num_spans; i++) {
for (size_t i = 0; i < num_spans; i++) {
Span *span = (Span*)Vec_Fetch(spans, i);
bounds[i] = Span_Get_Offset(span);
bounds[i + num_spans] = Span_Get_Offset(span) + Span_Get_Length(span);
}
qsort(bounds, num_spans * 2, sizeof(uint32_t), S_compare_i32);
uint32_t num_bounds = 0;
qsort(bounds, num_spans * 2, sizeof(int32_t), S_compare_i32);
size_t num_bounds = 0;
int32_t last = INT32_MAX;
for (uint32_t i = 0; i < num_spans * 2; i++) {
for (size_t i = 0; i < num_spans * 2; i++) {
if (bounds[i] != last) {
bounds[num_bounds++] = bounds[i];
last = bounds[i];
Expand All @@ -86,7 +86,7 @@ S_flattened_but_empty_spans(Vector *spans) {

// Create one Span for each zone between two bounds.
Vector *flattened = Vec_new(num_bounds - 1);
for (uint32_t i = 0; i < num_bounds - 1; i++) {
for (size_t i = 0; i < num_bounds - 1; i++) {
int32_t start = bounds[i];
int32_t length = bounds[i + 1] - start;
Vec_Push(flattened, (Obj*)Span_new(start, length, 0.0f));
Expand All @@ -98,20 +98,20 @@ S_flattened_but_empty_spans(Vector *spans) {

Vector*
HeatMap_Flatten_Spans_IMP(HeatMap *self, Vector *spans) {
const uint32_t num_spans = Vec_Get_Size(spans);
const size_t num_spans = Vec_Get_Size(spans);
UNUSED_VAR(self);

if (!num_spans) {
return Vec_new(0);
}
else {
Vector *flattened = S_flattened_but_empty_spans(spans);
const uint32_t num_raw_flattened = Vec_Get_Size(flattened);
const size_t num_raw_flattened = Vec_Get_Size(flattened);

// Iterate over each of the source spans, contributing their scores to
// any destination span that falls within range.
uint32_t dest_tick = 0;
for (uint32_t i = 0; i < num_spans; i++) {
size_t dest_tick = 0;
for (size_t i = 0; i < num_spans; i++) {
Span *source_span = (Span*)Vec_Fetch(spans, i);
int32_t source_span_offset = Span_Get_Offset(source_span);
int32_t source_span_len = Span_Get_Length(source_span);
Expand All @@ -127,7 +127,7 @@ HeatMap_Flatten_Spans_IMP(HeatMap *self, Vector *spans) {
}

// Fill in scores.
for (uint32_t j = dest_tick; j < num_raw_flattened; j++) {
for (size_t j = dest_tick; j < num_raw_flattened; j++) {
Span *dest_span = (Span*)Vec_Fetch(flattened, j);
if (Span_Get_Offset(dest_span) == source_span_end) {
break;
Expand All @@ -142,7 +142,7 @@ HeatMap_Flatten_Spans_IMP(HeatMap *self, Vector *spans) {

// Leave holes instead of spans that don't have any score.
dest_tick = 0;
for (uint32_t i = 0; i < num_raw_flattened; i++) {
for (size_t i = 0; i < num_raw_flattened; i++) {
Span *span = (Span*)Vec_Fetch(flattened, i);
if (Span_Get_Weight(span)) {
Vec_Store(flattened, dest_tick++, INCREF(span));
Expand Down Expand Up @@ -180,13 +180,13 @@ HeatMap_Calc_Proximity_Boost_IMP(HeatMap *self, Span *span1, Span *span2) {
Vector*
HeatMap_Generate_Proximity_Boosts_IMP(HeatMap *self, Vector *spans) {
Vector *boosts = Vec_new(0);
const uint32_t num_spans = Vec_Get_Size(spans);
const size_t num_spans = Vec_Get_Size(spans);

if (num_spans > 1) {
for (uint32_t i = 0, max = num_spans - 1; i < max; i++) {
for (size_t i = 0, max = num_spans - 1; i < max; i++) {
Span *span1 = (Span*)Vec_Fetch(spans, i);

for (uint32_t j = i + 1; j <= max; j++) {
for (size_t j = i + 1; j <= max; j++) {
Span *span2 = (Span*)Vec_Fetch(spans, j);
float prox_score
= HeatMap_Calc_Proximity_Boost(self, span1, span2);
Expand Down
4 changes: 2 additions & 2 deletions core/Lucy/Highlight/Highlighter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ S_hottest(HeatMap *heat_map) {
float max_score = 0.0f;
int32_t retval = 0;
Vector *spans = HeatMap_Get_Spans(heat_map);
for (uint32_t i = Vec_Get_Size(spans); i--;) {
for (size_t i = Vec_Get_Size(spans); i--;) {
Span *span = (Span*)Vec_Fetch(spans, i);
if (Span_Get_Weight(span) >= max_score) {
retval = Span_Get_Offset(span);
Expand Down Expand Up @@ -477,7 +477,7 @@ Highlighter_Highlight_Excerpt_IMP(Highlighter *self, Vector *spans,
CharBuf *encode_buf = NULL;
int32_t raw_excerpt_end = top + Str_Length(raw_excerpt);

for (uint32_t i = 0, max = Vec_Get_Size(spans); i < max; i++) {
for (size_t i = 0, max = Vec_Get_Size(spans); i < max; i++) {
Span *span = (Span*)Vec_Fetch(spans, i);
int32_t offset = Span_Get_Offset(span);
if (offset < top) {
Expand Down
22 changes: 11 additions & 11 deletions core/Lucy/Index/BackgroundMerger.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ BGMerger_init(BackgroundMerger *self, Obj *index, IndexManager *manager) {
= IxManager_Highest_Seg_Num(ivars->manager, ivars->snapshot) + 1;
Vector *fields = Schema_All_Fields(ivars->schema);
ivars->segment = Seg_new(new_seg_num);
for (uint32_t i = 0, max = Vec_Get_Size(fields); i < max; i++) {
for (size_t i = 0, max = Vec_Get_Size(fields); i < max; i++) {
Seg_Add_Field(ivars->segment, (String*)Vec_Fetch(fields, i));
}
DECREF(fields);
Expand Down Expand Up @@ -203,12 +203,12 @@ BGMerger_Optimize_IMP(BackgroundMerger *self) {
BGMerger_IVARS(self)->optimize = true;
}

static uint32_t
static size_t
S_maybe_merge(BackgroundMerger *self) {
BackgroundMergerIVARS *const ivars = BGMerger_IVARS(self);
Vector *to_merge = IxManager_Recycle(ivars->manager, ivars->polyreader,
ivars->del_writer, 0, ivars->optimize);
int32_t num_to_merge = Vec_Get_Size(to_merge);
size_t num_to_merge = Vec_Get_Size(to_merge);

// There's no point in merging one segment if it has no deletions, because
// we'd just be rewriting it. */
Expand All @@ -228,7 +228,7 @@ S_maybe_merge(BackgroundMerger *self) {
SegWriter_Prep_Seg_Dir(ivars->seg_writer);

// Consolidate segments.
for (uint32_t i = 0, max = num_to_merge; i < max; i++) {
for (size_t i = 0, max = num_to_merge; i < max; i++) {
SegReader *seg_reader = (SegReader*)Vec_Fetch(to_merge, i);
String *seg_name = SegReader_Get_Seg_Name(seg_reader);
int64_t doc_count = Seg_Get_Count(ivars->segment);
Expand Down Expand Up @@ -261,13 +261,13 @@ S_merge_updated_deletions(BackgroundMerger *self) {
= PolyReader_Get_Seg_Readers(ivars->polyreader);
Hash *new_segs = Hash_new(Vec_Get_Size(new_seg_readers));

for (uint32_t i = 0, max = Vec_Get_Size(new_seg_readers); i < max; i++) {
for (size_t i = 0, max = Vec_Get_Size(new_seg_readers); i < max; i++) {
SegReader *seg_reader = (SegReader*)Vec_Fetch(new_seg_readers, i);
String *seg_name = SegReader_Get_Seg_Name(seg_reader);
Hash_Store(new_segs, seg_name, INCREF(seg_reader));
}

for (uint32_t i = 0, max = Vec_Get_Size(old_seg_readers); i < max; i++) {
for (size_t i = 0, max = Vec_Get_Size(old_seg_readers); i < max; i++) {
SegReader *seg_reader = (SegReader*)Vec_Fetch(old_seg_readers, i);
String *seg_name = SegReader_Get_Seg_Name(seg_reader);

Expand Down Expand Up @@ -319,12 +319,12 @@ S_merge_updated_deletions(BackgroundMerger *self) {

SegWriter_Prep_Seg_Dir(seg_writer);

for (uint32_t i = 0, max = Vec_Get_Size(merge_seg_readers); i < max; i++) {
for (size_t i = 0, max = Vec_Get_Size(merge_seg_readers); i < max; i++) {
SegReader *seg_reader
= (SegReader*)Vec_Fetch(merge_seg_readers, i);
if (SegReader_Get_Seg_Num(seg_reader) == merge_seg_num) {
I32Array *offsets = PolyReader_Offsets(merge_polyreader);
seg_tick = i;
seg_tick = (uint32_t)i;
offset = I32Arr_Get(offsets, seg_tick);
DECREF(offsets);
}
Expand Down Expand Up @@ -372,8 +372,8 @@ void
BGMerger_Prepare_Commit_IMP(BackgroundMerger *self) {
BackgroundMergerIVARS *const ivars = BGMerger_IVARS(self);
Vector *seg_readers = PolyReader_Get_Seg_Readers(ivars->polyreader);
uint32_t num_seg_readers = Vec_Get_Size(seg_readers);
uint32_t segs_merged = 0;
size_t num_seg_readers = Vec_Get_Size(seg_readers);
size_t segs_merged = 0;

if (ivars->prepared) {
THROW(ERR, "Can't call Prepare_Commit() more than once");
Expand Down Expand Up @@ -443,7 +443,7 @@ BGMerger_Prepare_Commit_IMP(BackgroundMerger *self) {
// run this AFTER S_merge_updated_deletions, because otherwise
// we couldn't tell whether the deletion counts changed.)
Vector *files = Snapshot_List(latest_snapshot);
for (uint32_t i = 0, max = Vec_Get_Size(files); i < max; i++) {
for (size_t i = 0, max = Vec_Get_Size(files); i < max; i++) {
String *file = (String*)Vec_Fetch(files, i);
if (Str_Starts_With_Utf8(file, "seg_", 4)) {
int64_t gen = (int64_t)IxFileNames_extract_gen(file);
Expand Down
12 changes: 6 additions & 6 deletions core/Lucy/Index/DeletionsReader.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ PolyDelReader_init(PolyDeletionsReader *self, Vector *readers,
DelReader_init((DeletionsReader*)self, NULL, NULL, NULL, NULL, -1);
PolyDeletionsReaderIVARS *const ivars = PolyDelReader_IVARS(self);
ivars->del_count = 0;
for (uint32_t i = 0, max = Vec_Get_Size(readers); i < max; i++) {
for (size_t i = 0, max = Vec_Get_Size(readers); i < max; i++) {
DeletionsReader *reader = (DeletionsReader*)CERTIFY(
Vec_Fetch(readers, i), DELETIONSREADER);
ivars->del_count += DelReader_Del_Count(reader);
Expand All @@ -75,7 +75,7 @@ void
PolyDelReader_Close_IMP(PolyDeletionsReader *self) {
PolyDeletionsReaderIVARS *const ivars = PolyDelReader_IVARS(self);
if (ivars->readers) {
for (uint32_t i = 0, max = Vec_Get_Size(ivars->readers); i < max; i++) {
for (size_t i = 0, max = Vec_Get_Size(ivars->readers); i < max; i++) {
DeletionsReader *reader
= (DeletionsReader*)Vec_Fetch(ivars->readers, i);
if (reader) { DelReader_Close(reader); }
Expand All @@ -102,9 +102,9 @@ PolyDelReader_Iterator_IMP(PolyDeletionsReader *self) {
PolyDeletionsReaderIVARS *const ivars = PolyDelReader_IVARS(self);
SeriesMatcher *deletions = NULL;
if (ivars->del_count) {
uint32_t num_readers = Vec_Get_Size(ivars->readers);
size_t num_readers = Vec_Get_Size(ivars->readers);
Vector *matchers = Vec_new(num_readers);
for (uint32_t i = 0; i < num_readers; i++) {
for (size_t i = 0; i < num_readers; i++) {
DeletionsReader *reader
= (DeletionsReader*)Vec_Fetch(ivars->readers, i);
Matcher *matcher = DelReader_Iterator(reader);
Expand Down Expand Up @@ -166,8 +166,8 @@ DefDelReader_Read_Deletions_IMP(DefaultDeletionsReader *self) {
// Start with deletions files in the most recently added segments and work
// backwards. The first one we find which addresses our segment is the
// one we need.
for (int32_t i = Vec_Get_Size(segments) - 1; i >= 0; i--) {
Segment *other_seg = (Segment*)Vec_Fetch(segments, i);
for (int32_t i = (int32_t)Vec_Get_Size(segments) - 1; i >= 0; i--) {
Segment *other_seg = (Segment*)Vec_Fetch(segments, (size_t)i);
Hash *metadata
= (Hash*)Seg_Fetch_Metadata_Utf8(other_seg, "deletions", 9);
if (metadata) {
Expand Down
16 changes: 8 additions & 8 deletions core/Lucy/Index/DeletionsWriter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,15 +85,15 @@ DefDelWriter_init(DefaultDeletionsWriter *self, Schema *schema,
DataWriter_init((DataWriter*)self, schema, snapshot, segment, polyreader);
DefaultDeletionsWriterIVARS *const ivars = DefDelWriter_IVARS(self);
ivars->seg_readers = PolyReader_Seg_Readers(polyreader);
uint32_t num_seg_readers = Vec_Get_Size(ivars->seg_readers);
size_t num_seg_readers = Vec_Get_Size(ivars->seg_readers);
ivars->seg_starts = PolyReader_Offsets(polyreader);
ivars->bit_vecs = Vec_new(num_seg_readers);
ivars->updated = (bool*)CALLOCATE(num_seg_readers, sizeof(bool));
ivars->searcher = IxSearcher_new((Obj*)polyreader);
ivars->name_to_tick = Hash_new(num_seg_readers);

// Materialize a BitVector of deletions for each segment.
for (uint32_t i = 0; i < num_seg_readers; i++) {
for (size_t i = 0; i < num_seg_readers; i++) {
SegReader *seg_reader = (SegReader*)Vec_Fetch(ivars->seg_readers, i);
BitVector *bit_vec = BitVec_new(SegReader_Doc_Max(seg_reader));
DeletionsReader *del_reader
Expand Down Expand Up @@ -144,7 +144,7 @@ DefDelWriter_Finish_IMP(DefaultDeletionsWriter *self) {
DefaultDeletionsWriterIVARS *const ivars = DefDelWriter_IVARS(self);
Folder *const folder = ivars->folder;

for (uint32_t i = 0, max = Vec_Get_Size(ivars->seg_readers); i < max; i++) {
for (size_t i = 0, max = Vec_Get_Size(ivars->seg_readers); i < max; i++) {
SegReader *seg_reader = (SegReader*)Vec_Fetch(ivars->seg_readers, i);
if (ivars->updated[i]) {
BitVector *deldocs = (BitVector*)Vec_Fetch(ivars->bit_vecs, i);
Expand Down Expand Up @@ -181,7 +181,7 @@ DefDelWriter_Metadata_IMP(DefaultDeletionsWriter *self) {
Hash *const metadata = super_meta(self);
Hash *const files = Hash_new(0);

for (uint32_t i = 0, max = Vec_Get_Size(ivars->seg_readers); i < max; i++) {
for (size_t i = 0, max = Vec_Get_Size(ivars->seg_readers); i < max; i++) {
SegReader *seg_reader = (SegReader*)Vec_Fetch(ivars->seg_readers, i);
if (ivars->updated[i]) {
BitVector *deldocs = (BitVector*)Vec_Fetch(ivars->bit_vecs, i);
Expand Down Expand Up @@ -250,7 +250,7 @@ void
DefDelWriter_Delete_By_Term_IMP(DefaultDeletionsWriter *self,
String *field, Obj *term) {
DefaultDeletionsWriterIVARS *const ivars = DefDelWriter_IVARS(self);
for (uint32_t i = 0, max = Vec_Get_Size(ivars->seg_readers); i < max; i++) {
for (size_t i = 0, max = Vec_Get_Size(ivars->seg_readers); i < max; i++) {
SegReader *seg_reader = (SegReader*)Vec_Fetch(ivars->seg_readers, i);
PostingListReader *plist_reader
= (PostingListReader*)SegReader_Fetch(
Expand Down Expand Up @@ -280,7 +280,7 @@ DefDelWriter_Delete_By_Query_IMP(DefaultDeletionsWriter *self, Query *query) {
Compiler *compiler = Query_Make_Compiler(query, (Searcher*)ivars->searcher,
Query_Get_Boost(query), false);

for (uint32_t i = 0, max = Vec_Get_Size(ivars->seg_readers); i < max; i++) {
for (size_t i = 0, max = Vec_Get_Size(ivars->seg_readers); i < max; i++) {
SegReader *seg_reader = (SegReader*)Vec_Fetch(ivars->seg_readers, i);
BitVector *bit_vec = (BitVector*)Vec_Fetch(ivars->bit_vecs, i);
Matcher *matcher = Compiler_Make_Matcher(compiler, seg_reader, false);
Expand Down Expand Up @@ -320,7 +320,7 @@ DefDelWriter_Delete_By_Doc_ID_IMP(DefaultDeletionsWriter *self, int32_t doc_id)
bool
DefDelWriter_Updated_IMP(DefaultDeletionsWriter *self) {
DefaultDeletionsWriterIVARS *const ivars = DefDelWriter_IVARS(self);
for (uint32_t i = 0, max = Vec_Get_Size(ivars->seg_readers); i < max; i++) {
for (size_t i = 0, max = Vec_Get_Size(ivars->seg_readers); i < max; i++) {
if (ivars->updated[i]) { return true; }
}
return false;
Expand Down Expand Up @@ -358,7 +358,7 @@ DefDelWriter_Merge_Segment_IMP(DefaultDeletionsWriter *self,
* we're adding correspond to. If it's gone, we don't
* need to worry about losing deletions files that point
* at it. */
for (uint32_t i = 0, max = Vec_Get_Size(seg_readers); i < max; i++) {
for (size_t i = 0, max = Vec_Get_Size(seg_readers); i < max; i++) {
SegReader *candidate
= (SegReader*)Vec_Fetch(seg_readers, i);
String *candidate_name
Expand Down
4 changes: 2 additions & 2 deletions core/Lucy/Index/DocReader.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ PolyDocReader*
PolyDocReader_init(PolyDocReader *self, Vector *readers, I32Array *offsets) {
DocReader_init((DocReader*)self, NULL, NULL, NULL, NULL, -1);
PolyDocReaderIVARS *const ivars = PolyDocReader_IVARS(self);
for (uint32_t i = 0, max = Vec_Get_Size(readers); i < max; i++) {
for (size_t i = 0, max = Vec_Get_Size(readers); i < max; i++) {
CERTIFY(Vec_Fetch(readers, i), DOCREADER);
}
ivars->readers = (Vector*)INCREF(readers);
Expand All @@ -66,7 +66,7 @@ void
PolyDocReader_Close_IMP(PolyDocReader *self) {
PolyDocReaderIVARS *const ivars = PolyDocReader_IVARS(self);
if (ivars->readers) {
for (uint32_t i = 0, max = Vec_Get_Size(ivars->readers); i < max; i++) {
for (size_t i = 0, max = Vec_Get_Size(ivars->readers); i < max; i++) {
DocReader *reader = (DocReader*)Vec_Fetch(ivars->readers, i);
if (reader) { DocReader_Close(reader); }
}
Expand Down
Loading