You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by lo...@apache.org on 2011/12/02 07:41:24 UTC
[lucy-commits] svn commit: r1209372 - in /incubator/lucy/trunk/core/Lucy:
Index/Posting/RichPosting.c Index/TermVector.c Object/VArray.c
Author: logie
Date: Fri Dec 2 06:41:18 2011
New Revision: 1209372
URL: http://svn.apache.org/viewvc?rev=1209372&view=rev
Log:
c99_patch04.patch - https://issues.apache.org/jira/browse/LUCY-148
Modified:
incubator/lucy/trunk/core/Lucy/Index/Posting/RichPosting.c
incubator/lucy/trunk/core/Lucy/Index/TermVector.c
incubator/lucy/trunk/core/Lucy/Object/VArray.c
Modified: incubator/lucy/trunk/core/Lucy/Index/Posting/RichPosting.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Index/Posting/RichPosting.c?rev=1209372&r1=1209371&r2=1209372&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Index/Posting/RichPosting.c (original)
+++ incubator/lucy/trunk/core/Lucy/Index/Posting/RichPosting.c Fri Dec 2 06:41:18 2011
@@ -63,15 +63,12 @@ RichPost_destroy(RichPosting *self) {
void
RichPost_read_record(RichPosting *self, InStream *instream) {
float *const norm_decoder = self->norm_decoder;
- uint32_t doc_code;
uint32_t num_prox = 0;
uint32_t position = 0;
- uint32_t *positions;
- float *prox_boosts;
float aggregate_weight = 0.0;
// Decode delta doc.
- doc_code = InStream_Read_C32(instream);
+ uint32_t doc_code = InStream_Read_C32(instream);
self->doc_id += doc_code >> 1;
// If the stored num was odd, the freq is 1.
@@ -91,8 +88,8 @@ RichPost_read_record(RichPosting *self,
self->prox_boosts
= (float*)REALLOCATE(self->prox_boosts, num_prox * sizeof(float));
}
- positions = self->prox;
- prox_boosts = self->prox_boosts;
+ uint32_t *positions = self->prox;
+ uint32_t *prox_boosts = self->prox_boosts;
while (num_prox--) {
position += InStream_Read_C32(instream);
Modified: incubator/lucy/trunk/core/Lucy/Index/TermVector.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Index/TermVector.c?rev=1209372&r1=1209371&r2=1209372&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Index/TermVector.c (original)
+++ incubator/lucy/trunk/core/Lucy/Index/TermVector.c Fri Dec 2 06:41:18 2011
@@ -77,7 +77,6 @@ TV_get_end_offsets(TermVector *self) {
void
TV_serialize(TermVector *self, OutStream *target) {
- uint32_t i;
int32_t *posits = self->positions->ints;
int32_t *starts = self->start_offsets->ints;
int32_t *ends = self->start_offsets->ints;
@@ -86,7 +85,7 @@ TV_serialize(TermVector *self, OutStream
CB_Serialize(self->text, target);
OutStream_Write_C32(target, self->num_pos);
- for (i = 0; i < self->num_pos; i++) {
+ for (uint32_t i = 0; i < self->num_pos; i++) {
OutStream_Write_C32(target, posits[i]);
OutStream_Write_C32(target, starts[i]);
OutStream_Write_C32(target, ends[i]);
@@ -95,25 +94,22 @@ TV_serialize(TermVector *self, OutStream
TermVector*
TV_deserialize(TermVector *self, InStream *instream) {
- uint32_t i;
CharBuf *field = (CharBuf*)CB_deserialize(NULL, instream);
CharBuf *text = (CharBuf*)CB_deserialize(NULL, instream);
uint32_t num_pos = InStream_Read_C32(instream);
- int32_t *posits, *starts, *ends;
- I32Array *positions, *start_offsets, *end_offsets;
// Read positional data.
- posits = (int32_t*)MALLOCATE(num_pos * sizeof(int32_t));
- starts = (int32_t*)MALLOCATE(num_pos * sizeof(int32_t));
- ends = (int32_t*)MALLOCATE(num_pos * sizeof(int32_t));
- for (i = 0; i < num_pos; i++) {
+ int32_t *posits = (int32_t*)MALLOCATE(num_pos * sizeof(int32_t));
+ int32_t *starts = (int32_t*)MALLOCATE(num_pos * sizeof(int32_t));
+ int32_t *ends = (int32_t*)MALLOCATE(num_pos * sizeof(int32_t));
+ for (uint32_t i = 0; i < num_pos; i++) {
posits[i] = InStream_Read_C32(instream);
starts[i] = InStream_Read_C32(instream);
ends[i] = InStream_Read_C32(instream);
}
- positions = I32Arr_new_steal(posits, num_pos);
- start_offsets = I32Arr_new_steal(starts, num_pos);
- end_offsets = I32Arr_new_steal(ends, num_pos);
+ I32Array *positions = I32Arr_new_steal(posits, num_pos);
+ I32Array *start_offsets = I32Arr_new_steal(starts, num_pos);
+ I32Array *end_offsets = I32Arr_new_steal(ends, num_pos);
self = self ? self : (TermVector*)VTable_Make_Obj(TERMVECTOR);
self = TV_init(self, field, text, positions, start_offsets, end_offsets);
@@ -130,7 +126,6 @@ TV_deserialize(TermVector *self, InStrea
bool_t
TV_equals(TermVector *self, Obj *other) {
TermVector *const twin = (TermVector*)other;
- uint32_t i;
int32_t *const posits = self->positions->ints;
int32_t *const starts = self->start_offsets->ints;
int32_t *const ends = self->start_offsets->ints;
@@ -144,7 +139,7 @@ TV_equals(TermVector *self, Obj *other)
if (!CB_Equals(self->text, (Obj*)twin->text)) { return false; }
if (self->num_pos != twin->num_pos) { return false; }
- for (i = 0; i < self->num_pos; i++) {
+ for (uint32_t i = 0; i < self->num_pos; i++) {
if (posits[i] != other_posits[i]) { return false; }
if (starts[i] != other_starts[i]) { return false; }
if (ends[i] != other_ends[i]) { return false; }
Modified: incubator/lucy/trunk/core/Lucy/Object/VArray.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Object/VArray.c?rev=1209372&r1=1209371&r2=1209372&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Object/VArray.c (original)
+++ incubator/lucy/trunk/core/Lucy/Object/VArray.c Fri Dec 2 06:41:18 2011
@@ -67,8 +67,7 @@ VA_destroy(VArray *self) {
VArray*
VA_dump(VArray *self) {
VArray *dump = VA_new(self->size);
- uint32_t i, max;
- for (i = 0, max = self->size; i < max; i++) {
+ for (uint32_t i = 0, max = self->size; i < max; i++) {
Obj *elem = VA_Fetch(self, i);
if (elem) { VA_Store(dump, i, Obj_Dump(elem)); }
}
@@ -79,10 +78,9 @@ VArray*
VA_load(VArray *self, Obj *dump) {
VArray *source = (VArray*)CERTIFY(dump, VARRAY);
VArray *loaded = VA_new(source->size);
- uint32_t i, max;
UNUSED_VAR(self);
- for (i = 0, max = source->size; i < max; i++) {
+ for (uint32_t i = 0, max = source->size; i < max; i++) {
Obj *elem_dump = VA_Fetch(source, i);
if (elem_dump) {
VA_Store(loaded, i, Obj_Load(elem_dump, elem_dump));
@@ -94,10 +92,9 @@ VA_load(VArray *self, Obj *dump) {
void
VA_serialize(VArray *self, OutStream *outstream) {
- uint32_t i;
uint32_t last_valid_tick = 0;
OutStream_Write_C32(outstream, self->size);
- for (i = 0; i < self->size; i++) {
+ for (uint32_t i = 0; i < self->size; i++) {
Obj *elem = self->elems[i];
if (elem) {
OutStream_Write_C32(outstream, i - last_valid_tick);
@@ -111,7 +108,6 @@ VA_serialize(VArray *self, OutStream *ou
VArray*
VA_deserialize(VArray *self, InStream *instream) {
- uint32_t tick;
uint32_t size = InStream_Read_C32(instream);
if (self) {
self->size = size;
@@ -119,7 +115,7 @@ VA_deserialize(VArray *self, InStream *i
self->elems = (Obj**)CALLOCATE(self->cap, sizeof(Obj*));
}
else { self = VA_new(size); }
- for (tick = InStream_Read_C32(instream);
+ for (uint32_t tick = InStream_Read_C32(instream);
tick < size;
tick += InStream_Read_C32(instream)
) {
@@ -132,11 +128,10 @@ VA_deserialize(VArray *self, InStream *i
VArray*
VA_clone(VArray *self) {
- uint32_t i;
VArray *twin = VA_new(self->size);
// Clone each element.
- for (i = 0; i < self->size; i++) {
+ for (uint32_t i = 0; i < self->size; i++) {
Obj *elem = self->elems[i];
if (elem) {
twin->elems[i] = Obj_Clone(elem);
@@ -151,16 +146,12 @@ VA_clone(VArray *self) {
VArray*
VA_shallow_copy(VArray *self) {
- uint32_t i;
- VArray *twin;
- Obj **elems;
-
// Dupe, then increment refcounts.
- twin = VA_new(self->size);
- elems = twin->elems;
+ VArray *twin = VA_new(self->size);
+ Obj **elems = twin->elems;
memcpy(elems, self->elems, self->size * sizeof(Obj*));
twin->size = self->size;
- for (i = 0; i < self->size; i++) {
+ for (uint32_t i = 0; i < self->size; i++) {
if (elems[i] != NULL) {
(void)INCREF(elems[i]);
}
@@ -180,13 +171,12 @@ VA_push(VArray *self, Obj *element) {
void
VA_push_varray(VArray *self, VArray *other) {
- uint32_t i;
uint32_t tick = self->size;
uint32_t new_size = self->size + other->size;
if (new_size > self->cap) {
VA_Grow(self, Memory_oversize(new_size, sizeof(Obj*)));
}
- for (i = 0; i < other->size; i++, tick++) {
+ for (uint32_t i = 0; i < other->size; i++, tick++) {
Obj *elem = VA_Fetch(other, i);
if (elem != NULL) {
self->elems[tick] = INCREF(elem);
@@ -271,17 +261,14 @@ VA_delete(VArray *self, uint32_t num) {
void
VA_excise(VArray *self, uint32_t offset, uint32_t length) {
- uint32_t i;
- uint32_t num_to_move;
-
if (self->size <= offset) { return; }
else if (self->size < offset + length) { length = self->size - offset; }
- for (i = 0; i < length; i++) {
+ for (uint32_t i = 0; i < length; i++) {
DECREF(self->elems[offset + i]);
}
- num_to_move = self->size - (offset + length);
+ uint32_t num_to_move = self->size - (offset + length);
memmove(self->elems + offset, self->elems + offset + length,
num_to_move * sizeof(Obj*));
self->size -= length;
@@ -339,8 +326,7 @@ VA_equals(VArray *self, Obj *other) {
return false;
}
else {
- uint32_t i, max;
- for (i = 0, max = self->size; i < max; i++) {
+ for (uint32_t i = 0, max = self->size; i < max; i++) {
Obj *val = self->elems[i];
Obj *other_val = twin->elems[i];
if ((val && !other_val) || (other_val && !val)) { return false; }
@@ -352,9 +338,8 @@ VA_equals(VArray *self, Obj *other) {
VArray*
VA_gather(VArray *self, lucy_VA_gather_test_t test, void *data) {
- uint32_t i, max;
VArray *gathered = VA_new(self->size);
- for (i = 0, max = self->size; i < max; i++) {
+ for (uint32_t i = 0, max = self->size; i < max; i++) {
if (test(self, i, data)) {
Obj *elem = self->elems[i];
VA_Push(gathered, elem ? INCREF(elem) : NULL);