Misc C32/C64 transition. Transition all remaining Read/Write C32/C64 to Read_CI64/etc.
Project: http://git-wip-us.apache.org/repos/asf/lucy/repo Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/febd2ff3 Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/febd2ff3 Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/febd2ff3 Branch: refs/heads/master Commit: febd2ff3cb76b460e0778e6d732830cf1f860e50 Parents: 656a773 Author: Marvin Humphrey <[email protected]> Authored: Wed Apr 20 19:01:15 2016 -0700 Committer: Marvin Humphrey <[email protected]> Committed: Wed Apr 20 19:26:48 2016 -0700 ---------------------------------------------------------------------- c/src/Lucy/Index/DocReader.c | 2 +- core/Lucy/Index/DocWriter.c | 6 +++--- core/Lucy/Index/HighlightWriter.c | 2 +- core/Lucy/Index/Posting/MatchPosting.c | 6 +++--- core/Lucy/Plan/TextType.c | 2 +- core/Lucy/Search/SortRule.c | 8 ++++---- core/Lucy/Search/TopDocs.c | 4 ++-- core/Lucy/Util/Freezer.c | 6 +++--- core/LucyX/Search/ProximityQuery.c | 6 +++--- 9 files changed, 21 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucy/blob/febd2ff3/c/src/Lucy/Index/DocReader.c ---------------------------------------------------------------------- diff --git a/c/src/Lucy/Index/DocReader.c b/c/src/Lucy/Index/DocReader.c index 16e184e..97c8df0 100644 --- a/c/src/Lucy/Index/DocReader.c +++ b/c/src/Lucy/Index/DocReader.c @@ -47,7 +47,7 @@ DefDocReader_Fetch_Doc_IMP(DefaultDocReader *self, int32_t doc_id) { InStream_Seek(ix_in, (int64_t)doc_id * 8); start = InStream_Read_U64(ix_in); InStream_Seek(dat_in, start); - num_fields = InStream_Read_C32(dat_in); + num_fields = InStream_Read_CU32(dat_in); // Decode stored data and build up the doc field by field. while (num_fields--) { http://git-wip-us.apache.org/repos/asf/lucy/blob/febd2ff3/core/Lucy/Index/DocWriter.c ---------------------------------------------------------------------- diff --git a/core/Lucy/Index/DocWriter.c b/core/Lucy/Index/DocWriter.c index ec583cc..43ac738 100644 --- a/core/Lucy/Index/DocWriter.c +++ b/core/Lucy/Index/DocWriter.c @@ -105,7 +105,7 @@ DocWriter_Add_Inverted_Doc_IMP(DocWriter *self, Inverter *inverter, FieldType *type = Inverter_Get_Type(inverter); if (FType_Stored(type)) { num_stored++; } } - OutStream_Write_C32(dat_out, num_stored); + OutStream_Write_CU32(dat_out, num_stored); Inverter_Iterate(inverter); while (Inverter_Next(inverter)) { @@ -140,12 +140,12 @@ DocWriter_Add_Inverted_Doc_IMP(DocWriter *self, Inverter *inverter, } case FType_INT32: { int32_t val = (int32_t)Int_Get_Value((Integer*)value); - OutStream_Write_C32(dat_out, val); + OutStream_Write_CI32(dat_out, val); break; } case FType_INT64: { int64_t val = Int_Get_Value((Integer*)value); - OutStream_Write_C64(dat_out, val); + OutStream_Write_CI64(dat_out, val); break; } case FType_FLOAT32: { http://git-wip-us.apache.org/repos/asf/lucy/blob/febd2ff3/core/Lucy/Index/HighlightWriter.c ---------------------------------------------------------------------- diff --git a/core/Lucy/Index/HighlightWriter.c b/core/Lucy/Index/HighlightWriter.c index d81b623..72153b2 100644 --- a/core/Lucy/Index/HighlightWriter.c +++ b/core/Lucy/Index/HighlightWriter.c @@ -121,7 +121,7 @@ HLWriter_Add_Inverted_Doc_IMP(HighlightWriter *self, Inverter *inverter, num_highlightable++; } } - OutStream_Write_C32(dat_out, num_highlightable); + OutStream_Write_CU32(dat_out, num_highlightable); Inverter_Iterate(inverter); while (Inverter_Next(inverter)) { http://git-wip-us.apache.org/repos/asf/lucy/blob/febd2ff3/core/Lucy/Index/Posting/MatchPosting.c ---------------------------------------------------------------------- diff --git a/core/Lucy/Index/Posting/MatchPosting.c b/core/Lucy/Index/Posting/MatchPosting.c index e44eee8..cfe9efd 100644 --- a/core/Lucy/Index/Posting/MatchPosting.c +++ b/core/Lucy/Index/Posting/MatchPosting.c @@ -272,7 +272,7 @@ MatchTInfoStepper_Write_Key_Frame_IMP(MatchTermInfoStepper *self, TermInfoIVARS *const tinfo_ivars = TInfo_IVARS((TermInfo*)value); // Write doc_freq. - OutStream_Write_C32(outstream, doc_freq); + OutStream_Write_CI32(outstream, doc_freq); // Write postings file pointer. OutStream_Write_CI64(outstream, tinfo_ivars->post_filepos); @@ -316,7 +316,7 @@ MatchTInfoStepper_Read_Key_Frame_IMP(MatchTermInfoStepper *self, TermInfoIVARS *const tinfo_ivars = TInfo_IVARS((TermInfo*)ivars->value); // Read doc freq. - tinfo_ivars->doc_freq = InStream_Read_C32(instream); + tinfo_ivars->doc_freq = InStream_Read_CI32(instream); // Read postings file pointer. tinfo_ivars->post_filepos = InStream_Read_CI64(instream); @@ -336,7 +336,7 @@ MatchTInfoStepper_Read_Delta_IMP(MatchTermInfoStepper *self, InStream *instream) TermInfoIVARS *const tinfo_ivars = TInfo_IVARS((TermInfo*)ivars->value); // Read doc freq. - tinfo_ivars->doc_freq = InStream_Read_C32(instream); + tinfo_ivars->doc_freq = InStream_Read_CI32(instream); // Adjust postings file pointer. tinfo_ivars->post_filepos += InStream_Read_CI64(instream); http://git-wip-us.apache.org/repos/asf/lucy/blob/febd2ff3/core/Lucy/Plan/TextType.c ---------------------------------------------------------------------- diff --git a/core/Lucy/Plan/TextType.c b/core/Lucy/Plan/TextType.c index 67f64a3..318fa47 100644 --- a/core/Lucy/Plan/TextType.c +++ b/core/Lucy/Plan/TextType.c @@ -135,7 +135,7 @@ TextTermStepper_Write_Delta_IMP(TextTermStepper *self, OutStream *outstream, const size_t diff_len = new_size - overlap; // Write number of common bytes and common bytes. - OutStream_Write_C32(outstream, overlap); + OutStream_Write_CI32(outstream, overlap); OutStream_Write_String(outstream, diff_start_str, diff_len); // Update value. http://git-wip-us.apache.org/repos/asf/lucy/blob/febd2ff3/core/Lucy/Search/SortRule.c ---------------------------------------------------------------------- diff --git a/core/Lucy/Search/SortRule.c b/core/Lucy/Search/SortRule.c index 736205c..dfb650c 100644 --- a/core/Lucy/Search/SortRule.c +++ b/core/Lucy/Search/SortRule.c @@ -63,22 +63,22 @@ SortRule_Destroy_IMP(SortRule *self) { SortRule* SortRule_Deserialize_IMP(SortRule *self, InStream *instream) { SortRuleIVARS *ivars = SortRule_IVARS(self); - ivars->type = InStream_Read_C32(instream); + ivars->type = InStream_Read_CI32(instream); if (ivars->type == SortRule_FIELD) { ivars->field = Freezer_read_string(instream); } - ivars->reverse = !!InStream_Read_C32(instream); + ivars->reverse = !!InStream_Read_CU32(instream); return self; } void SortRule_Serialize_IMP(SortRule *self, OutStream *target) { SortRuleIVARS *ivars = SortRule_IVARS(self); - OutStream_Write_C32(target, ivars->type); + OutStream_Write_CI32(target, ivars->type); if (ivars->type == SortRule_FIELD) { Freezer_serialize_string(ivars->field, target); } - OutStream_Write_C32(target, !!ivars->reverse); + OutStream_Write_CU32(target, !!ivars->reverse); } String* http://git-wip-us.apache.org/repos/asf/lucy/blob/febd2ff3/core/Lucy/Search/TopDocs.c ---------------------------------------------------------------------- diff --git a/core/Lucy/Search/TopDocs.c b/core/Lucy/Search/TopDocs.c index ddaeb13..b685048 100644 --- a/core/Lucy/Search/TopDocs.c +++ b/core/Lucy/Search/TopDocs.c @@ -51,14 +51,14 @@ void TopDocs_Serialize_IMP(TopDocs *self, OutStream *outstream) { TopDocsIVARS *const ivars = TopDocs_IVARS(self); Freezer_serialize_varray(ivars->match_docs, outstream); - OutStream_Write_C32(outstream, ivars->total_hits); + OutStream_Write_CU32(outstream, ivars->total_hits); } TopDocs* TopDocs_Deserialize_IMP(TopDocs *self, InStream *instream) { TopDocsIVARS *const ivars = TopDocs_IVARS(self); ivars->match_docs = Freezer_read_varray(instream); - ivars->total_hits = InStream_Read_C32(instream); + ivars->total_hits = InStream_Read_CU32(instream); return self; } http://git-wip-us.apache.org/repos/asf/lucy/blob/febd2ff3/core/Lucy/Util/Freezer.c ---------------------------------------------------------------------- diff --git a/core/Lucy/Util/Freezer.c b/core/Lucy/Util/Freezer.c index 90a63c3..26039d2 100644 --- a/core/Lucy/Util/Freezer.c +++ b/core/Lucy/Util/Freezer.c @@ -68,7 +68,7 @@ Freezer_serialize(Obj *obj, OutStream *outstream) { } else if (Obj_is_a(obj, INTEGER)) { int64_t val = Int_Get_Value((Integer*)obj); - OutStream_Write_C64(outstream, (uint64_t)val); + OutStream_Write_CI64(outstream, val); } else if (Obj_is_a(obj, FLOAT)) { double val = Float_Get_Value((Float*)obj); @@ -241,13 +241,13 @@ Freezer_serialize_varray(Vector *array, OutStream *outstream) { for (uint32_t i = 0; i < size; i++) { Obj *elem = Vec_Fetch(array, i); if (elem) { - OutStream_Write_C32(outstream, i - last_valid_tick); + OutStream_Write_CU32(outstream, i - last_valid_tick); FREEZE(elem, outstream); last_valid_tick = i; } } // Terminate. - OutStream_Write_C32(outstream, size - last_valid_tick); + OutStream_Write_CU32(outstream, size - last_valid_tick); } Vector* http://git-wip-us.apache.org/repos/asf/lucy/blob/febd2ff3/core/LucyX/Search/ProximityQuery.c ---------------------------------------------------------------------- diff --git a/core/LucyX/Search/ProximityQuery.c b/core/LucyX/Search/ProximityQuery.c index 637fcce..1a93584 100644 --- a/core/LucyX/Search/ProximityQuery.c +++ b/core/LucyX/Search/ProximityQuery.c @@ -87,7 +87,7 @@ ProximityQuery_Serialize_IMP(ProximityQuery *self, OutStream *outstream) { OutStream_Write_F32(outstream, ivars->boost); Freezer_serialize_string(ivars->field, outstream); Freezer_serialize_varray(ivars->terms, outstream); - OutStream_Write_C32(outstream, ivars->within); + OutStream_Write_CU32(outstream, ivars->within); } ProximityQuery* @@ -264,7 +264,7 @@ ProximityCompiler_Serialize_IMP(ProximityCompiler *self, OutStream_Write_F32(outstream, ivars->raw_weight); OutStream_Write_F32(outstream, ivars->query_norm_factor); OutStream_Write_F32(outstream, ivars->normalized_weight); - OutStream_Write_C32(outstream, ivars->within); + OutStream_Write_CU32(outstream, ivars->within); } ProximityCompiler* @@ -278,7 +278,7 @@ ProximityCompiler_Deserialize_IMP(ProximityCompiler *self, ivars->raw_weight = InStream_Read_F32(instream); ivars->query_norm_factor = InStream_Read_F32(instream); ivars->normalized_weight = InStream_Read_F32(instream); - ivars->within = InStream_Read_C32(instream); + ivars->within = InStream_Read_CU32(instream); return self; }
