http://git-wip-us.apache.org/repos/asf/lucy/blob/0c238b13/core/Lucy/Test/Highlight/TestHeatMap.c ---------------------------------------------------------------------- diff --git a/core/Lucy/Test/Highlight/TestHeatMap.c b/core/Lucy/Test/Highlight/TestHeatMap.c index d1e2055..6749bc4 100644 --- a/core/Lucy/Test/Highlight/TestHeatMap.c +++ b/core/Lucy/Test/Highlight/TestHeatMap.c @@ -31,7 +31,7 @@ TestHeatMap_new() { static void test_calc_proximity_boost(TestBatchRunner *runner) { - VArray *spans = VA_new(0); + Vector *spans = Vec_new(0); HeatMap *heat_map = HeatMap_new(spans, 133); Span *span1 = Span_new( 0, 10, 1.0f); Span *span2 = Span_new( 10, 10, 1.0f); @@ -61,102 +61,102 @@ test_calc_proximity_boost(TestBatchRunner *runner) { static void test_flatten_spans(TestBatchRunner *runner) { - VArray *spans = VA_new(8); - VArray *wanted = VA_new(8); + Vector *spans = Vec_new(8); + Vector *wanted = Vec_new(8); HeatMap *heat_map = HeatMap_new(spans, 133); - VArray *flattened, *boosts; + Vector *flattened, *boosts; - VA_Push(spans, (Obj*)Span_new(10, 10, 1.0f)); - VA_Push(spans, (Obj*)Span_new(16, 14, 2.0f)); + Vec_Push(spans, (Obj*)Span_new(10, 10, 1.0f)); + Vec_Push(spans, (Obj*)Span_new(16, 14, 2.0f)); flattened = HeatMap_Flatten_Spans(heat_map, spans); - VA_Push(wanted, (Obj*)Span_new(10, 6, 1.0f)); - VA_Push(wanted, (Obj*)Span_new(16, 4, 3.0f)); - VA_Push(wanted, (Obj*)Span_new(20, 10, 2.0f)); - TEST_TRUE(runner, VA_Equals(flattened, (Obj*)wanted), + Vec_Push(wanted, (Obj*)Span_new(10, 6, 1.0f)); + Vec_Push(wanted, (Obj*)Span_new(16, 4, 3.0f)); + Vec_Push(wanted, (Obj*)Span_new(20, 10, 2.0f)); + TEST_TRUE(runner, Vec_Equals(flattened, (Obj*)wanted), "flatten two overlapping spans"); - VA_Clear(wanted); + Vec_Clear(wanted); boosts = HeatMap_Generate_Proximity_Boosts(heat_map, spans); - VA_Push(wanted, (Obj*)Span_new(10, 20, 3.0f)); - TEST_TRUE(runner, VA_Equals(boosts, (Obj*)wanted), + Vec_Push(wanted, (Obj*)Span_new(10, 20, 3.0f)); + TEST_TRUE(runner, Vec_Equals(boosts, (Obj*)wanted), "prox boosts for overlap"); - VA_Clear(wanted); - VA_Clear(spans); + Vec_Clear(wanted); + Vec_Clear(spans); DECREF(boosts); DECREF(flattened); - VA_Push(spans, (Obj*)Span_new(10, 10, 1.0f)); - VA_Push(spans, (Obj*)Span_new(16, 14, 2.0f)); - VA_Push(spans, (Obj*)Span_new(50, 1, 1.0f)); + Vec_Push(spans, (Obj*)Span_new(10, 10, 1.0f)); + Vec_Push(spans, (Obj*)Span_new(16, 14, 2.0f)); + Vec_Push(spans, (Obj*)Span_new(50, 1, 1.0f)); flattened = HeatMap_Flatten_Spans(heat_map, spans); - VA_Push(wanted, (Obj*)Span_new(10, 6, 1.0f)); - VA_Push(wanted, (Obj*)Span_new(16, 4, 3.0f)); - VA_Push(wanted, (Obj*)Span_new(20, 10, 2.0f)); - VA_Push(wanted, (Obj*)Span_new(50, 1, 1.0f)); - TEST_TRUE(runner, VA_Equals(flattened, (Obj*)wanted), + Vec_Push(wanted, (Obj*)Span_new(10, 6, 1.0f)); + Vec_Push(wanted, (Obj*)Span_new(16, 4, 3.0f)); + Vec_Push(wanted, (Obj*)Span_new(20, 10, 2.0f)); + Vec_Push(wanted, (Obj*)Span_new(50, 1, 1.0f)); + TEST_TRUE(runner, Vec_Equals(flattened, (Obj*)wanted), "flatten two overlapping spans, leave hole, then third span"); - VA_Clear(wanted); + Vec_Clear(wanted); boosts = HeatMap_Generate_Proximity_Boosts(heat_map, spans); - TEST_TRUE(runner, VA_Get_Size(boosts) == 2 + 1, + TEST_TRUE(runner, Vec_Get_Size(boosts) == 2 + 1, "boosts generated for each unique pair, since all were in range"); - VA_Clear(spans); + Vec_Clear(spans); DECREF(boosts); DECREF(flattened); - VA_Push(spans, (Obj*)Span_new(10, 10, 1.0f)); - VA_Push(spans, (Obj*)Span_new(14, 4, 4.0f)); - VA_Push(spans, (Obj*)Span_new(16, 14, 2.0f)); + Vec_Push(spans, (Obj*)Span_new(10, 10, 1.0f)); + Vec_Push(spans, (Obj*)Span_new(14, 4, 4.0f)); + Vec_Push(spans, (Obj*)Span_new(16, 14, 2.0f)); flattened = HeatMap_Flatten_Spans(heat_map, spans); - VA_Push(wanted, (Obj*)Span_new(10, 4, 1.0f)); - VA_Push(wanted, (Obj*)Span_new(14, 2, 5.0f)); - VA_Push(wanted, (Obj*)Span_new(16, 2, 7.0f)); - VA_Push(wanted, (Obj*)Span_new(18, 2, 3.0f)); - VA_Push(wanted, (Obj*)Span_new(20, 10, 2.0f)); - TEST_TRUE(runner, VA_Equals(flattened, (Obj*)wanted), + Vec_Push(wanted, (Obj*)Span_new(10, 4, 1.0f)); + Vec_Push(wanted, (Obj*)Span_new(14, 2, 5.0f)); + Vec_Push(wanted, (Obj*)Span_new(16, 2, 7.0f)); + Vec_Push(wanted, (Obj*)Span_new(18, 2, 3.0f)); + Vec_Push(wanted, (Obj*)Span_new(20, 10, 2.0f)); + TEST_TRUE(runner, Vec_Equals(flattened, (Obj*)wanted), "flatten three overlapping spans"); - VA_Clear(wanted); + Vec_Clear(wanted); boosts = HeatMap_Generate_Proximity_Boosts(heat_map, spans); - TEST_TRUE(runner, VA_Get_Size(boosts) == 2 + 1, + TEST_TRUE(runner, Vec_Get_Size(boosts) == 2 + 1, "boosts generated for each unique pair, since all were in range"); - VA_Clear(spans); + Vec_Clear(spans); DECREF(boosts); DECREF(flattened); - VA_Push(spans, (Obj*)Span_new(10, 10, 1.0f)); - VA_Push(spans, (Obj*)Span_new(16, 14, 4.0f)); - VA_Push(spans, (Obj*)Span_new(16, 14, 2.0f)); - VA_Push(spans, (Obj*)Span_new(30, 10, 10.0f)); + Vec_Push(spans, (Obj*)Span_new(10, 10, 1.0f)); + Vec_Push(spans, (Obj*)Span_new(16, 14, 4.0f)); + Vec_Push(spans, (Obj*)Span_new(16, 14, 2.0f)); + Vec_Push(spans, (Obj*)Span_new(30, 10, 10.0f)); flattened = HeatMap_Flatten_Spans(heat_map, spans); - VA_Push(wanted, (Obj*)Span_new(10, 6, 1.0f)); - VA_Push(wanted, (Obj*)Span_new(16, 4, 7.0f)); - VA_Push(wanted, (Obj*)Span_new(20, 10, 6.0f)); - VA_Push(wanted, (Obj*)Span_new(30, 10, 10.0f)); - TEST_TRUE(runner, VA_Equals(flattened, (Obj*)wanted), + Vec_Push(wanted, (Obj*)Span_new(10, 6, 1.0f)); + Vec_Push(wanted, (Obj*)Span_new(16, 4, 7.0f)); + Vec_Push(wanted, (Obj*)Span_new(20, 10, 6.0f)); + Vec_Push(wanted, (Obj*)Span_new(30, 10, 10.0f)); + TEST_TRUE(runner, Vec_Equals(flattened, (Obj*)wanted), "flatten 4 spans, middle two have identical range"); - VA_Clear(wanted); + Vec_Clear(wanted); boosts = HeatMap_Generate_Proximity_Boosts(heat_map, spans); - TEST_TRUE(runner, VA_Get_Size(boosts) == 3 + 2 + 1, + TEST_TRUE(runner, Vec_Get_Size(boosts) == 3 + 2 + 1, "boosts generated for each unique pair, since all were in range"); - VA_Clear(spans); + Vec_Clear(spans); DECREF(boosts); DECREF(flattened); - VA_Push(spans, (Obj*)Span_new( 10, 10, 1.0f)); - VA_Push(spans, (Obj*)Span_new( 16, 4, 4.0f)); - VA_Push(spans, (Obj*)Span_new( 16, 14, 2.0f)); - VA_Push(spans, (Obj*)Span_new(230, 10, 10.0f)); + Vec_Push(spans, (Obj*)Span_new( 10, 10, 1.0f)); + Vec_Push(spans, (Obj*)Span_new( 16, 4, 4.0f)); + Vec_Push(spans, (Obj*)Span_new( 16, 14, 2.0f)); + Vec_Push(spans, (Obj*)Span_new(230, 10, 10.0f)); flattened = HeatMap_Flatten_Spans(heat_map, spans); - VA_Push(wanted, (Obj*)Span_new( 10, 6, 1.0f)); - VA_Push(wanted, (Obj*)Span_new( 16, 4, 7.0f)); - VA_Push(wanted, (Obj*)Span_new( 20, 10, 2.0f)); - VA_Push(wanted, (Obj*)Span_new(230, 10, 10.0f)); - TEST_TRUE(runner, VA_Equals(flattened, (Obj*)wanted), + Vec_Push(wanted, (Obj*)Span_new( 10, 6, 1.0f)); + Vec_Push(wanted, (Obj*)Span_new( 16, 4, 7.0f)); + Vec_Push(wanted, (Obj*)Span_new( 20, 10, 2.0f)); + Vec_Push(wanted, (Obj*)Span_new(230, 10, 10.0f)); + TEST_TRUE(runner, Vec_Equals(flattened, (Obj*)wanted), "flatten 4 spans, middle two have identical starts but different ends"); - VA_Clear(wanted); + Vec_Clear(wanted); boosts = HeatMap_Generate_Proximity_Boosts(heat_map, spans); - TEST_TRUE(runner, VA_Get_Size(boosts) == 2 + 1, + TEST_TRUE(runner, Vec_Get_Size(boosts) == 2 + 1, "boosts not generated for out of range span"); - VA_Clear(spans); + Vec_Clear(spans); DECREF(boosts); DECREF(flattened);
http://git-wip-us.apache.org/repos/asf/lucy/blob/0c238b13/core/Lucy/Test/Highlight/TestHighlighter.c ---------------------------------------------------------------------- diff --git a/core/Lucy/Test/Highlight/TestHighlighter.c b/core/Lucy/Test/Highlight/TestHighlighter.c index 3dfc8d0..ebd845d 100644 --- a/core/Lucy/Test/Highlight/TestHighlighter.c +++ b/core/Lucy/Test/Highlight/TestHighlighter.c @@ -65,8 +65,8 @@ test_Raw_Excerpt(TestBatchRunner *runner, Searcher *searcher, Obj *query) { String *raw_excerpt; String *field_val = (String *)SSTR_WRAP_UTF8("Ook. Urk. Ick. ", 18); - VArray *spans = VA_new(1); - VA_Push(spans, (Obj*)Span_new(0, 18, 1.0f)); + Vector *spans = Vec_new(1); + Vec_Push(spans, (Obj*)Span_new(0, 18, 1.0f)); HeatMap *heat_map = HeatMap_new(spans, 133); DECREF(spans); raw_excerpt = Highlighter_Raw_Excerpt(highlighter, field_val, &top, @@ -80,8 +80,8 @@ test_Raw_Excerpt(TestBatchRunner *runner, Searcher *searcher, Obj *query) { DECREF(raw_excerpt); DECREF(heat_map); - spans = VA_new(1); - VA_Push(spans, (Obj*)Span_new(6, 12, 1.0f)); + spans = Vec_new(1); + Vec_Push(spans, (Obj*)Span_new(6, 12, 1.0f)); heat_map = HeatMap_new(spans, 133); DECREF(spans); raw_excerpt = Highlighter_Raw_Excerpt(highlighter, field_val, &top, @@ -96,8 +96,8 @@ test_Raw_Excerpt(TestBatchRunner *runner, Searcher *searcher, Obj *query) { DECREF(heat_map); field_val = (String *)SSTR_WRAP_UTF8("Ook urk ick i.", 14); - spans = VA_new(1); - VA_Push(spans, (Obj*)Span_new(12, 1, 1.0f)); + spans = Vec_new(1); + Vec_Push(spans, (Obj*)Span_new(12, 1, 1.0f)); heat_map = HeatMap_new(spans, 133); DECREF(spans); raw_excerpt = Highlighter_Raw_Excerpt(highlighter, field_val, &top, @@ -112,8 +112,8 @@ test_Raw_Excerpt(TestBatchRunner *runner, Searcher *searcher, Obj *query) { DECREF(raw_excerpt); field_val = (String *)SSTR_WRAP_UTF8("Urk. Iz no good.", 17); - spans = VA_new(1); - VA_Push(spans, (Obj*)Span_new(6, 2, 1.0f)); + spans = Vec_new(1); + Vec_Push(spans, (Obj*)Span_new(6, 2, 1.0f)); heat_map = HeatMap_new(spans, 133); DECREF(spans); raw_excerpt = Highlighter_Raw_Excerpt(highlighter, field_val, &top, @@ -131,8 +131,8 @@ test_Raw_Excerpt(TestBatchRunner *runner, Searcher *searcher, Obj *query) { field_val = (String *)SSTR_WRAP_UTF8("abc/def/ghi/jkl/mno", 19); - spans = VA_new(1); - VA_Push(spans, (Obj*)Span_new(0, 3, 1.0f)); + spans = Vec_new(1); + Vec_Push(spans, (Obj*)Span_new(0, 3, 1.0f)); heat_map = HeatMap_new(spans, 133); DECREF(spans); raw_excerpt = Highlighter_Raw_Excerpt(highlighter, field_val, &top, @@ -143,8 +143,8 @@ test_Raw_Excerpt(TestBatchRunner *runner, Searcher *searcher, Obj *query) { DECREF(heat_map); DECREF(raw_excerpt); - spans = VA_new(1); - VA_Push(spans, (Obj*)Span_new(8, 3, 1.0f)); + spans = Vec_new(1); + Vec_Push(spans, (Obj*)Span_new(8, 3, 1.0f)); heat_map = HeatMap_new(spans, 133); DECREF(spans); raw_excerpt = Highlighter_Raw_Excerpt(highlighter, field_val, &top, @@ -164,8 +164,8 @@ test_Highlight_Excerpt(TestBatchRunner *runner, Searcher *searcher, Obj *query) Highlighter *highlighter = Highlighter_new(searcher, query, content, 3); String *highlighted; - VArray *spans = VA_new(1); - VA_Push(spans, (Obj*)Span_new(2, 1, 0.0f)); + Vector *spans = Vec_new(1); + Vec_Push(spans, (Obj*)Span_new(2, 1, 0.0f)); String *raw_excerpt = (String *)SSTR_WRAP_UTF8("a b c", 5); highlighted = Highlighter_Highlight_Excerpt(highlighter, spans, raw_excerpt, 0); @@ -175,9 +175,9 @@ test_Highlight_Excerpt(TestBatchRunner *runner, Searcher *searcher, Obj *query) DECREF(highlighted); DECREF(spans); - spans = VA_new(2); - VA_Push(spans, (Obj*)Span_new(0, 1, 1.0f)); - VA_Push(spans, (Obj*)Span_new(10, 10, 1.0f)); + spans = Vec_new(2); + Vec_Push(spans, (Obj*)Span_new(0, 1, 1.0f)); + Vec_Push(spans, (Obj*)Span_new(10, 10, 1.0f)); raw_excerpt = (String *)SSTR_WRAP_UTF8(PHI, 2); highlighted = Highlighter_Highlight_Excerpt(highlighter, spans, raw_excerpt, 0); @@ -187,8 +187,8 @@ test_Highlight_Excerpt(TestBatchRunner *runner, Searcher *searcher, Obj *query) DECREF(highlighted); DECREF(spans); - spans = VA_new(1); - VA_Push(spans, (Obj*)Span_new(3, 1, 1.0f)); + spans = Vec_new(1); + Vec_Push(spans, (Obj*)Span_new(3, 1, 1.0f)); raw_excerpt = (String *)SSTR_WRAP_UTF8(PHI " " PHI " " PHI, 8); highlighted = Highlighter_Highlight_Excerpt(highlighter, spans, raw_excerpt, 1); @@ -199,11 +199,11 @@ test_Highlight_Excerpt(TestBatchRunner *runner, Searcher *searcher, Obj *query) DECREF(highlighted); DECREF(spans); - spans = VA_new(4); - VA_Push(spans, (Obj*)Span_new(2, 10, 1.0f)); - VA_Push(spans, (Obj*)Span_new(2, 4, 1.0f)); - VA_Push(spans, (Obj*)Span_new(8, 9, 1.0f)); - VA_Push(spans, (Obj*)Span_new(8, 4, 1.0f)); + spans = Vec_new(4); + Vec_Push(spans, (Obj*)Span_new(2, 10, 1.0f)); + Vec_Push(spans, (Obj*)Span_new(2, 4, 1.0f)); + Vec_Push(spans, (Obj*)Span_new(8, 9, 1.0f)); + Vec_Push(spans, (Obj*)Span_new(8, 4, 1.0f)); raw_excerpt = (String *)SSTR_WRAP_UTF8(PHI " Oook. Urk. Ick. " PHI, 21); highlighted = Highlighter_Highlight_Excerpt(highlighter, spans, raw_excerpt, 0); http://git-wip-us.apache.org/repos/asf/lucy/blob/0c238b13/core/Lucy/Test/Index/TestSnapshot.c ---------------------------------------------------------------------- diff --git a/core/Lucy/Test/Index/TestSnapshot.c b/core/Lucy/Test/Index/TestSnapshot.c index 4290c09..da47630 100644 --- a/core/Lucy/Test/Index/TestSnapshot.c +++ b/core/Lucy/Test/Index/TestSnapshot.c @@ -36,10 +36,10 @@ test_Add_and_Delete(TestBatchRunner *runner) { Snapshot_Add_Entry(snapshot, foo); Snapshot_Add_Entry(snapshot, foo); // redundant - VArray *entries = Snapshot_List(snapshot); + Vector *entries = Snapshot_List(snapshot); TEST_INT_EQ(runner, Snapshot_Num_Entries(snapshot), 1, "One entry added"); - TEST_TRUE(runner, Str_Equals(foo, VA_Fetch(entries, 0)), "correct entry"); + TEST_TRUE(runner, Str_Equals(foo, Vec_Fetch(entries, 0)), "correct entry"); DECREF(entries); Snapshot_Add_Entry(snapshot, bar); @@ -89,9 +89,9 @@ test_Read_File_and_Write_File(TestBatchRunner *runner) { Snapshot *read_retval = Snapshot_Read_File(dupe, folder, snap); TEST_TRUE(runner, dupe == read_retval, "Read_File() returns the object"); - VArray *orig_list = Snapshot_List(snapshot); - VArray *dupe_list = Snapshot_List(dupe); - TEST_TRUE(runner, VA_Equals(orig_list, (Obj*)dupe_list), + Vector *orig_list = Snapshot_List(snapshot); + Vector *dupe_list = Snapshot_List(dupe); + TEST_TRUE(runner, Vec_Equals(orig_list, (Obj*)dupe_list), "Round trip through Write_File() and Read_File()"); DECREF(orig_list); http://git-wip-us.apache.org/repos/asf/lucy/blob/0c238b13/core/Lucy/Test/Index/TestSortWriter.c ---------------------------------------------------------------------- diff --git a/core/Lucy/Test/Index/TestSortWriter.c b/core/Lucy/Test/Index/TestSortWriter.c index ac27c33..4127d3e 100644 --- a/core/Lucy/Test/Index/TestSortWriter.c +++ b/core/Lucy/Test/Index/TestSortWriter.c @@ -201,8 +201,8 @@ test_sort_writer(TestBatchRunner *runner) { { PolyReader *poly_reader = PolyReader_open((Obj*)folder, NULL, NULL); - VArray *seg_readers = PolyReader_Get_Seg_Readers(poly_reader); - SegReader *seg_reader = (SegReader*)VA_Fetch(seg_readers, 0); + Vector *seg_readers = PolyReader_Get_Seg_Readers(poly_reader); + SegReader *seg_reader = (SegReader*)Vec_Fetch(seg_readers, 0); S_test_sort_cache(runner, folder, seg_reader, "1", true, name_str); S_test_sort_cache(runner, folder, seg_reader, "1", true, speed_str); @@ -241,10 +241,10 @@ test_sort_writer(TestBatchRunner *runner) { } { - VArray *filenames = RAMFolder_List_R(folder, NULL); + Vector *filenames = RAMFolder_List_R(folder, NULL); int num_old_seg_files = 0; - for (uint32_t i = 0, size = VA_Get_Size(filenames); i < size; ++i) { - String *filename = (String*)VA_Fetch(filenames, i); + for (uint32_t i = 0, size = Vec_Get_Size(filenames); i < size; ++i) { + String *filename = (String*)Vec_Fetch(filenames, i); if (Str_Find_Utf8(filename, "seg_1", 5) >= 0 || Str_Find_Utf8(filename, "seg_2", 5) >= 0 ) { @@ -258,8 +258,8 @@ test_sort_writer(TestBatchRunner *runner) { { PolyReader *poly_reader = PolyReader_open((Obj*)folder, NULL, NULL); - VArray *seg_readers = PolyReader_Get_Seg_Readers(poly_reader); - SegReader *seg_reader = (SegReader*)VA_Fetch(seg_readers, 0); + Vector *seg_readers = PolyReader_Get_Seg_Readers(poly_reader); + SegReader *seg_reader = (SegReader*)Vec_Fetch(seg_readers, 0); S_test_sort_cache(runner, folder, seg_reader, "3", true, name_str); S_test_sort_cache(runner, folder, seg_reader, "3", true, speed_str); @@ -300,7 +300,7 @@ NMIxManager_init(NonMergingIndexManager *self) { return self; } -VArray* +Vector* NMIxManager_Recycle_IMP(NonMergingIndexManager *self, PolyReader *reader, lucy_DeletionsWriter *del_writer, int64_t cutoff, bool optimize) { @@ -309,7 +309,7 @@ NMIxManager_Recycle_IMP(NonMergingIndexManager *self, PolyReader *reader, UNUSED_VAR(del_writer); UNUSED_VAR(cutoff); UNUSED_VAR(optimize); - return VA_new(0); + return Vec_new(0); } http://git-wip-us.apache.org/repos/asf/lucy/blob/0c238b13/core/Lucy/Test/Index/TestSortWriter.cfh ---------------------------------------------------------------------- diff --git a/core/Lucy/Test/Index/TestSortWriter.cfh b/core/Lucy/Test/Index/TestSortWriter.cfh index 98e3ec6..5aa63ab 100644 --- a/core/Lucy/Test/Index/TestSortWriter.cfh +++ b/core/Lucy/Test/Index/TestSortWriter.cfh @@ -35,7 +35,7 @@ class Lucy::Test::Index::NonMergingIndexManager nickname NMIxManager public inert NonMergingIndexManager* init(NonMergingIndexManager *self); - public incremented VArray* + public incremented Vector* Recycle(NonMergingIndexManager *self, PolyReader *reader, DeletionsWriter *del_writer, int64_t cutoff, bool optimize = false); http://git-wip-us.apache.org/repos/asf/lucy/blob/0c238b13/core/Lucy/Test/Search/TestQueryParserLogic.c ---------------------------------------------------------------------- diff --git a/core/Lucy/Test/Search/TestQueryParserLogic.c b/core/Lucy/Test/Search/TestQueryParserLogic.c index d5468d0..e4cd66d 100644 --- a/core/Lucy/Test/Search/TestQueryParserLogic.c +++ b/core/Lucy/Test/Search/TestQueryParserLogic.c @@ -860,14 +860,14 @@ static Folder* S_create_index() { Schema *schema = (Schema*)TestSchema_new(false); RAMFolder *folder = RAMFolder_new(NULL); - VArray *doc_set = TestUtils_doc_set(); + Vector *doc_set = TestUtils_doc_set(); Indexer *indexer = Indexer_new(schema, (Obj*)folder, NULL, 0); uint32_t i, max; String *field = (String*)SSTR_WRAP_UTF8("content", 7); - for (i = 0, max = VA_Get_Size(doc_set); i < max; i++) { + for (i = 0, max = Vec_Get_Size(doc_set); i < max; i++) { Doc *doc = Doc_new(NULL, 0); - Doc_Store(doc, field, VA_Fetch(doc_set, i)); + Doc_Store(doc, field, Vec_Fetch(doc_set, i)); Indexer_Add_Doc(indexer, doc, 1.0f); DECREF(doc); } http://git-wip-us.apache.org/repos/asf/lucy/blob/0c238b13/core/Lucy/Test/Search/TestQueryParserSyntax.c ---------------------------------------------------------------------- diff --git a/core/Lucy/Test/Search/TestQueryParserSyntax.c b/core/Lucy/Test/Search/TestQueryParserSyntax.c index 119cce8..0eea781 100644 --- a/core/Lucy/Test/Search/TestQueryParserSyntax.c +++ b/core/Lucy/Test/Search/TestQueryParserSyntax.c @@ -71,9 +71,9 @@ build_index() { Hash_Store_Utf8(stop_list, "x", 1, (Obj*)CFISH_TRUE); SnowballStopFilter *stop_filter = SnowStop_new(NULL, stop_list); - VArray *analyzers = VA_new(0); - VA_Push(analyzers, (Obj*)word_tokenizer); - VA_Push(analyzers, (Obj*)stop_filter); + Vector *analyzers = Vec_new(0); + Vec_Push(analyzers, (Obj*)word_tokenizer); + Vec_Push(analyzers, (Obj*)stop_filter); PolyAnalyzer *fancy_analyzer = PolyAnalyzer_new(NULL, analyzers); FullTextType *fancy = FullTextType_new((Analyzer*)fancy_analyzer); @@ -90,9 +90,9 @@ build_index() { Indexer *indexer = Indexer_new(schema, (Obj*)folder, NULL, 0); // Index documents. - VArray *doc_set = TestUtils_doc_set(); - for (uint32_t i = 0; i < VA_Get_Size(doc_set); ++i) { - String *content_string = (String*)VA_Fetch(doc_set, i); + Vector *doc_set = TestUtils_doc_set(); + for (uint32_t i = 0; i < Vec_Get_Size(doc_set); ++i) { + String *content_string = (String*)Vec_Fetch(doc_set, i); Doc *doc = Doc_new(NULL, 0); Doc_Store(doc, plain_str, (Obj*)content_string); Doc_Store(doc, fancy_str, (Obj*)content_string); http://git-wip-us.apache.org/repos/asf/lucy/blob/0c238b13/core/Lucy/Test/Search/TestSeriesMatcher.c ---------------------------------------------------------------------- diff --git a/core/Lucy/Test/Search/TestSeriesMatcher.c b/core/Lucy/Test/Search/TestSeriesMatcher.c index e8e8466..f8a355a 100644 --- a/core/Lucy/Test/Search/TestSeriesMatcher.c +++ b/core/Lucy/Test/Search/TestSeriesMatcher.c @@ -34,7 +34,7 @@ static SeriesMatcher* S_make_series_matcher(I32Array *doc_ids, I32Array *offsets, int32_t doc_max) { int32_t num_doc_ids = I32Arr_Get_Size(doc_ids); int32_t num_matchers = I32Arr_Get_Size(offsets); - VArray *matchers = VA_new(num_matchers); + Vector *matchers = Vec_new(num_matchers); int32_t tick = 0; int32_t i; @@ -51,7 +51,7 @@ S_make_series_matcher(I32Array *doc_ids, I32Array *offsets, int32_t doc_max) { else { tick++; } BitVec_Set(bit_vec, doc_id - offset); } - VA_Push(matchers, (Obj*)BitVecMatcher_new(bit_vec)); + Vec_Push(matchers, (Obj*)BitVecMatcher_new(bit_vec)); DECREF(bit_vec); } http://git-wip-us.apache.org/repos/asf/lucy/blob/0c238b13/core/Lucy/Test/Search/TestSortSpec.c ---------------------------------------------------------------------- diff --git a/core/Lucy/Test/Search/TestSortSpec.c b/core/Lucy/Test/Search/TestSortSpec.c index d1d1331..fb84516 100644 --- a/core/Lucy/Test/Search/TestSortSpec.c +++ b/core/Lucy/Test/Search/TestSortSpec.c @@ -307,36 +307,36 @@ S_random_float64() { return (Obj*)Float64_new(CHY_U64_TO_DOUBLE(num) * (10.0 / UINT64_MAX)); } -static VArray* +static Vector* S_add_random_objects(Indexer **indexer, Schema *schema, RAMFolder *folder, random_generator_t rng, String *field_name, String *cat) { - VArray *objects = VA_new(100); + Vector *objects = Vec_new(100); for (int i = 0; i < 100; ++i) { Obj *object = rng(); S_add_doc(*indexer, object, cat, field_name); - VA_Push(objects, object); + Vec_Push(objects, object); if (i % 10 == 0) { S_refresh_indexer(indexer, schema, folder); } } - VA_Sort(objects); + Vec_Sort(objects); for (int i = 0; i < 100; ++i) { - Obj *obj = VA_Fetch(objects, i); + Obj *obj = Vec_Fetch(objects, i); String *string = Obj_To_String(obj); - VA_Store(objects, i, (Obj*)string); + Vec_Store(objects, i, (Obj*)string); } return objects; } -static VArray* +static Vector* S_test_sorted_search(IndexSearcher *searcher, String *query, uint32_t num_wanted, ...) { - VArray *rules = VA_new(2); + Vector *rules = Vec_new(2); String *field; va_list args; @@ -344,20 +344,20 @@ S_test_sorted_search(IndexSearcher *searcher, String *query, while (NULL != (field = va_arg(args, String*))) { int reverse = va_arg(args, int); SortRule *rule = SortRule_new(SortRule_FIELD, field, !!reverse); - VA_Push(rules, (Obj*)rule); + Vec_Push(rules, (Obj*)rule); } va_end(args); SortRule *rule = SortRule_new(SortRule_DOC_ID, NULL, 0); - VA_Push(rules, (Obj*)rule); + Vec_Push(rules, (Obj*)rule); SortSpec *spec = SortSpec_new(rules); Hits *hits = IxSearcher_Hits(searcher, (Obj*)query, 0, num_wanted, spec); - VArray *results = VA_new(10); + Vector *results = Vec_new(10); HitDoc *hit_doc; while (NULL != (hit_doc = Hits_Next(hits))) { String *name = (String*)HitDoc_Extract(hit_doc, name_str); - VA_Push(results, (Obj*)Str_Clone((String*)name)); + Vec_Push(results, (Obj*)Str_Clone((String*)name)); DECREF(name); DECREF(hit_doc); } @@ -377,7 +377,7 @@ typedef struct SortContext { static void S_attempt_sorted_search(void *context) { SortContext *sort_ctx = (SortContext*)context; - VArray *results = S_test_sorted_search(sort_ctx->searcher, vehicle_str, 100, + Vector *results = S_test_sorted_search(sort_ctx->searcher, vehicle_str, 100, sort_ctx->sort_field, false, NULL); DECREF(results); } @@ -387,9 +387,9 @@ test_sort_spec(TestBatchRunner *runner) { RAMFolder *folder = RAMFolder_new(NULL); Schema *schema = S_create_schema(); Indexer *indexer = NULL; - VArray *wanted = VA_new(10); - VArray *results; - VArray *results2; + Vector *wanted = Vec_new(10); + Vector *results; + Vector *results2; // First, add vehicles. S_refresh_indexer(&indexer, schema, folder); @@ -398,19 +398,19 @@ test_sort_spec(TestBatchRunner *runner) { S_add_vehicle(indexer, car_str, 70, 70, 3000, land_str, vehicle_str); // Add random objects. - VArray *random_strings = + Vector *random_strings = S_add_random_objects(&indexer, schema, folder, S_random_string, NULL, random_str); - VArray *random_int32s = + Vector *random_int32s = S_add_random_objects(&indexer, schema, folder, S_random_int32, int32_str, random_int32s_str); - VArray *random_int64s = + Vector *random_int64s = S_add_random_objects(&indexer, schema, folder, S_random_int64, int64_str, random_int64s_str); - VArray *random_float32s = + Vector *random_float32s = S_add_random_objects(&indexer, schema, folder, S_random_float32, float32_str, random_float32s_str); - VArray *random_float64s = + Vector *random_float64s = S_add_random_objects(&indexer, schema, folder, S_random_float64, float64_str, random_float64s_str); @@ -449,11 +449,11 @@ test_sort_spec(TestBatchRunner *runner) { results = S_test_sorted_search(searcher, vehicle_str, 100, name_str, false, NULL); - VA_Clear(wanted); - VA_Push(wanted, INCREF(airplane_str)); - VA_Push(wanted, INCREF(bike_str)); - VA_Push(wanted, INCREF(car_str)); - TEST_TRUE(runner, VA_Equals(results, (Obj*)wanted), "sort by one criteria"); + Vec_Clear(wanted); + Vec_Push(wanted, INCREF(airplane_str)); + Vec_Push(wanted, INCREF(bike_str)); + Vec_Push(wanted, INCREF(car_str)); + TEST_TRUE(runner, Vec_Equals(results, (Obj*)wanted), "sort by one criteria"); DECREF(results); #ifdef LUCY_VALGRIND @@ -482,38 +482,38 @@ test_sort_spec(TestBatchRunner *runner) { results = S_test_sorted_search(searcher, vehicle_str, 100, weight_str, false, NULL); - VA_Clear(wanted); - VA_Push(wanted, INCREF(bike_str)); - VA_Push(wanted, INCREF(car_str)); - VA_Push(wanted, INCREF(airplane_str)); - TEST_TRUE(runner, VA_Equals(results, (Obj*)wanted), "sort by one criteria"); + Vec_Clear(wanted); + Vec_Push(wanted, INCREF(bike_str)); + Vec_Push(wanted, INCREF(car_str)); + Vec_Push(wanted, INCREF(airplane_str)); + TEST_TRUE(runner, Vec_Equals(results, (Obj*)wanted), "sort by one criteria"); DECREF(results); results = S_test_sorted_search(searcher, vehicle_str, 100, name_str, true, NULL); - VA_Clear(wanted); - VA_Push(wanted, INCREF(car_str)); - VA_Push(wanted, INCREF(bike_str)); - VA_Push(wanted, INCREF(airplane_str)); - TEST_TRUE(runner, VA_Equals(results, (Obj*)wanted), "reverse sort"); + Vec_Clear(wanted); + Vec_Push(wanted, INCREF(car_str)); + Vec_Push(wanted, INCREF(bike_str)); + Vec_Push(wanted, INCREF(airplane_str)); + TEST_TRUE(runner, Vec_Equals(results, (Obj*)wanted), "reverse sort"); DECREF(results); results = S_test_sorted_search(searcher, vehicle_str, 100, home_str, false, name_str, false, NULL); - VA_Clear(wanted); - VA_Push(wanted, INCREF(airplane_str)); - VA_Push(wanted, INCREF(bike_str)); - VA_Push(wanted, INCREF(car_str)); - TEST_TRUE(runner, VA_Equals(results, (Obj*)wanted), "multiple criteria"); + Vec_Clear(wanted); + Vec_Push(wanted, INCREF(airplane_str)); + Vec_Push(wanted, INCREF(bike_str)); + Vec_Push(wanted, INCREF(car_str)); + TEST_TRUE(runner, Vec_Equals(results, (Obj*)wanted), "multiple criteria"); DECREF(results); results = S_test_sorted_search(searcher, vehicle_str, 100, home_str, false, name_str, true, NULL); - VA_Clear(wanted); - VA_Push(wanted, INCREF(airplane_str)); - VA_Push(wanted, INCREF(car_str)); - VA_Push(wanted, INCREF(bike_str)); - TEST_TRUE(runner, VA_Equals(results, (Obj*)wanted), + Vec_Clear(wanted); + Vec_Push(wanted, INCREF(airplane_str)); + Vec_Push(wanted, INCREF(car_str)); + Vec_Push(wanted, INCREF(bike_str)); + TEST_TRUE(runner, Vec_Equals(results, (Obj*)wanted), "multiple criteria with reverse"); DECREF(results); @@ -521,49 +521,49 @@ test_sort_spec(TestBatchRunner *runner) { speed_str, true, NULL); results2 = S_test_sorted_search(searcher, vehicle_str, 100, sloth_str, false, NULL); - TEST_TRUE(runner, VA_Equals(results, (Obj*)results2), + TEST_TRUE(runner, Vec_Equals(results, (Obj*)results2), "FieldType_Compare_Values"); DECREF(results2); DECREF(results); results = S_test_sorted_search(searcher, random_str, 100, name_str, false, NULL); - TEST_TRUE(runner, VA_Equals(results, (Obj*)random_strings), + TEST_TRUE(runner, Vec_Equals(results, (Obj*)random_strings), "random strings"); DECREF(results); results = S_test_sorted_search(searcher, random_int32s_str, 100, int32_str, false, NULL); - TEST_TRUE(runner, VA_Equals(results, (Obj*)random_int32s), + TEST_TRUE(runner, Vec_Equals(results, (Obj*)random_int32s), "int32"); DECREF(results); results = S_test_sorted_search(searcher, random_int64s_str, 100, int64_str, false, NULL); - TEST_TRUE(runner, VA_Equals(results, (Obj*)random_int64s), + TEST_TRUE(runner, Vec_Equals(results, (Obj*)random_int64s), "int64"); DECREF(results); results = S_test_sorted_search(searcher, random_float32s_str, 100, float32_str, false, NULL); - TEST_TRUE(runner, VA_Equals(results, (Obj*)random_float32s), + TEST_TRUE(runner, Vec_Equals(results, (Obj*)random_float32s), "float32"); DECREF(results); results = S_test_sorted_search(searcher, random_float64s_str, 100, float64_str, false, NULL); - TEST_TRUE(runner, VA_Equals(results, (Obj*)random_float64s), + TEST_TRUE(runner, Vec_Equals(results, (Obj*)random_float64s), "float64"); DECREF(results); String *bbbcca_str = Str_newf("bike bike bike car car airplane"); results = S_test_sorted_search(searcher, bbbcca_str, 100, unused_str, false, NULL); - VA_Clear(wanted); - VA_Push(wanted, INCREF(airplane_str)); - VA_Push(wanted, INCREF(bike_str)); - VA_Push(wanted, INCREF(car_str)); - TEST_TRUE(runner, VA_Equals(results, (Obj*)wanted), + Vec_Clear(wanted); + Vec_Push(wanted, INCREF(airplane_str)); + Vec_Push(wanted, INCREF(bike_str)); + Vec_Push(wanted, INCREF(car_str)); + TEST_TRUE(runner, Vec_Equals(results, (Obj*)wanted), "sorting on field with no values sorts by doc id"); DECREF(results); DECREF(bbbcca_str); @@ -572,10 +572,10 @@ test_sort_spec(TestBatchRunner *runner) { String *nn_or_car_str = Str_newf("99 OR car"); results = S_test_sorted_search(searcher, nn_or_car_str, 10, speed_str, false, NULL); - VA_Clear(wanted); - VA_Push(wanted, INCREF(car_str)); - VA_Push(wanted, INCREF(nn_str)); - TEST_TRUE(runner, VA_Equals(results, (Obj*)wanted), + Vec_Clear(wanted); + Vec_Push(wanted, INCREF(car_str)); + Vec_Push(wanted, INCREF(nn_str)); + TEST_TRUE(runner, Vec_Equals(results, (Obj*)wanted), "doc with NULL value sorts last"); DECREF(results); DECREF(nn_str); @@ -585,8 +585,8 @@ test_sort_spec(TestBatchRunner *runner) { name_str, false, NULL); results2 = S_test_sorted_search(searcher, num_str, 30, name_str, false, NULL); - VA_Resize(results2, 10); - TEST_TRUE(runner, VA_Equals(results, (Obj*)results2), + Vec_Resize(results2, 10); + TEST_TRUE(runner, Vec_Equals(results, (Obj*)results2), "same order regardless of queue size"); DECREF(results2); DECREF(results); @@ -595,8 +595,8 @@ test_sort_spec(TestBatchRunner *runner) { name_str, true, NULL); results2 = S_test_sorted_search(searcher, num_str, 30, name_str, true, NULL); - VA_Resize(results2, 10); - TEST_TRUE(runner, VA_Equals(results, (Obj*)results2), + Vec_Resize(results2, 10); + TEST_TRUE(runner, Vec_Equals(results, (Obj*)results2), "same order regardless of queue size (reverse sort)"); DECREF(results2); DECREF(results); @@ -612,11 +612,11 @@ test_sort_spec(TestBatchRunner *runner) { searcher = IxSearcher_new((Obj*)folder); results = S_test_sorted_search(searcher, vehicle_str, 100, name_str, false, NULL); - VA_Clear(wanted); - VA_Push(wanted, INCREF(airplane_str)); - VA_Push(wanted, INCREF(bike_str)); - VA_Push(wanted, INCREF(car_str)); - TEST_TRUE(runner, VA_Equals(results, (Obj*)wanted), "Multi-segment sort"); + Vec_Clear(wanted); + Vec_Push(wanted, INCREF(airplane_str)); + Vec_Push(wanted, INCREF(bike_str)); + Vec_Push(wanted, INCREF(car_str)); + TEST_TRUE(runner, Vec_Equals(results, (Obj*)wanted), "Multi-segment sort"); DECREF(results); DECREF(searcher); http://git-wip-us.apache.org/repos/asf/lucy/blob/0c238b13/core/Lucy/Test/Store/TestFSFolder.c ---------------------------------------------------------------------- diff --git a/core/Lucy/Test/Store/TestFSFolder.c b/core/Lucy/Test/Store/TestFSFolder.c index cb65d05..aba0acc 100644 --- a/core/Lucy/Test/Store/TestFSFolder.c +++ b/core/Lucy/Test/Store/TestFSFolder.c @@ -117,10 +117,10 @@ test_protect_symlinks(TestBatchRunner *runner) { FSFolder_Delete_Tree(folder, bar); } else { - VArray *list = FSFolder_List_R(folder, NULL); + Vector *list = FSFolder_List_R(folder, NULL); bool saw_bazooka_boffo = false; - for (uint32_t i = 0, max = VA_Get_Size(list); i < max; i++) { - String *entry = (String*)VA_Fetch(list, i); + for (uint32_t i = 0, max = Vec_Get_Size(list); i < max; i++) { + String *entry = (String*)Vec_Fetch(list, i); if (Str_Ends_With_Utf8(entry, "bazooka/boffo", 13)) { saw_bazooka_boffo = true; } http://git-wip-us.apache.org/repos/asf/lucy/blob/0c238b13/core/Lucy/Test/Store/TestFolder.c ---------------------------------------------------------------------- diff --git a/core/Lucy/Test/Store/TestFolder.c b/core/Lucy/Test/Store/TestFolder.c index ae437d7..34d683d 100644 --- a/core/Lucy/Test/Store/TestFolder.c +++ b/core/Lucy/Test/Store/TestFolder.c @@ -230,7 +230,7 @@ static void test_List(TestBatchRunner *runner) { Folder *folder = (Folder*)RAMFolder_new(NULL); FileHandle *fh; - VArray *list; + Vector *list; String *elem; Folder_MkDir(folder, foo); @@ -242,21 +242,21 @@ test_List(TestBatchRunner *runner) { DECREF(fh); list = Folder_List(folder, NULL); - VA_Sort(list); - TEST_INT_EQ(runner, VA_Get_Size(list), 3, "List"); - elem = (String*)DOWNCAST(VA_Fetch(list, 0), STRING); + Vec_Sort(list); + TEST_INT_EQ(runner, Vec_Get_Size(list), 3, "List"); + elem = (String*)DOWNCAST(Vec_Fetch(list, 0), STRING); TEST_TRUE(runner, elem && Str_Equals(elem, (Obj*)banana), "List first file"); - elem = (String*)DOWNCAST(VA_Fetch(list, 1), STRING); + elem = (String*)DOWNCAST(Vec_Fetch(list, 1), STRING); TEST_TRUE(runner, elem && Str_Equals(elem, (Obj*)boffo), "List second file"); - elem = (String*)DOWNCAST(VA_Fetch(list, 2), STRING); + elem = (String*)DOWNCAST(Vec_Fetch(list, 2), STRING); TEST_TRUE(runner, elem && Str_Equals(elem, (Obj*)foo), "List dir"); DECREF(list); list = Folder_List(folder, foo_bar); - TEST_INT_EQ(runner, VA_Get_Size(list), 1, "List subdirectory contents"); - elem = (String*)DOWNCAST(VA_Fetch(list, 0), STRING); + TEST_INT_EQ(runner, Vec_Get_Size(list), 1, "List subdirectory contents"); + elem = (String*)DOWNCAST(Vec_Fetch(list, 0), STRING); TEST_TRUE(runner, elem && Str_Equals(elem, (Obj*)baz), "Just the filename"); DECREF(list); http://git-wip-us.apache.org/repos/asf/lucy/blob/0c238b13/core/Lucy/Test/TestUtils.c ---------------------------------------------------------------------- diff --git a/core/Lucy/Test/TestUtils.c b/core/Lucy/Test/TestUtils.c index c106d76..4534a28 100644 --- a/core/Lucy/Test/TestUtils.c +++ b/core/Lucy/Test/TestUtils.c @@ -39,17 +39,17 @@ #include "Lucy/Store/RAMFile.h" #include "Lucy/Util/Freezer.h" -VArray* +Vector* TestUtils_doc_set() { - VArray *docs = VA_new(10); + Vector *docs = Vec_new(10); - VA_Push(docs, (Obj*)TestUtils_get_str("x")); - VA_Push(docs, (Obj*)TestUtils_get_str("y")); - VA_Push(docs, (Obj*)TestUtils_get_str("z")); - VA_Push(docs, (Obj*)TestUtils_get_str("x a")); - VA_Push(docs, (Obj*)TestUtils_get_str("x a b")); - VA_Push(docs, (Obj*)TestUtils_get_str("x a b c")); - VA_Push(docs, (Obj*)TestUtils_get_str("x foo a b c d")); + Vec_Push(docs, (Obj*)TestUtils_get_str("x")); + Vec_Push(docs, (Obj*)TestUtils_get_str("y")); + Vec_Push(docs, (Obj*)TestUtils_get_str("z")); + Vec_Push(docs, (Obj*)TestUtils_get_str("x a")); + Vec_Push(docs, (Obj*)TestUtils_get_str("x a b")); + Vec_Push(docs, (Obj*)TestUtils_get_str("x a b c")); + Vec_Push(docs, (Obj*)TestUtils_get_str("x foo a b c d")); return docs; } @@ -59,11 +59,11 @@ TestUtils_make_poly_query(uint32_t boolop, ...) { va_list args; Query *child; PolyQuery *retval; - VArray *children = VA_new(0); + Vector *children = Vec_new(0); va_start(args, boolop); while (NULL != (child = va_arg(args, Query*))) { - VA_Push(children, (Obj*)child); + Vec_Push(children, (Obj*)child); } va_end(args); @@ -85,13 +85,13 @@ PhraseQuery* TestUtils_make_phrase_query(const char *field, ...) { String *field_str = (String*)SSTR_WRAP_UTF8(field, strlen(field)); va_list args; - VArray *terms = VA_new(0); + Vector *terms = Vec_new(0); PhraseQuery *query; char *term_str; va_start(args, field); while (NULL != (term_str = va_arg(args, char*))) { - VA_Push(terms, (Obj*)TestUtils_get_str(term_str)); + Vec_Push(terms, (Obj*)TestUtils_get_str(term_str)); } va_end(args); @@ -129,37 +129,37 @@ TestUtils_make_range_query(const char *field, const char *lower_term, void TestUtils_test_analyzer(TestBatchRunner *runner, Analyzer *analyzer, - String *source, VArray *expected, + String *source, Vector *expected, const char *message) { Token *seed = Token_new(Str_Get_Ptr8(source), Str_Get_Size(source), 0, 0, 1.0f, 1); Inversion *starter = Inversion_new(seed); Inversion *transformed = Analyzer_Transform(analyzer, starter); - VArray *got = VA_new(1); + Vector *got = Vec_new(1); Token *token; while (NULL != (token = Inversion_Next(transformed))) { String *token_text = Str_new_from_utf8(Token_Get_Text(token), Token_Get_Len(token)); - VA_Push(got, (Obj*)token_text); + Vec_Push(got, (Obj*)token_text); } - TEST_TRUE(runner, VA_Equals(expected, (Obj*)got), + TEST_TRUE(runner, Vec_Equals(expected, (Obj*)got), "Transform(): %s", message); DECREF(transformed); transformed = Analyzer_Transform_Text(analyzer, source); - VA_Clear(got); + Vec_Clear(got); while (NULL != (token = Inversion_Next(transformed))) { String *token_text = Str_new_from_utf8(Token_Get_Text(token), Token_Get_Len(token)); - VA_Push(got, (Obj*)token_text); + Vec_Push(got, (Obj*)token_text); } - TEST_TRUE(runner, VA_Equals(expected, (Obj*)got), + TEST_TRUE(runner, Vec_Equals(expected, (Obj*)got), "Transform_Text(): %s", message); DECREF(transformed); DECREF(got); got = Analyzer_Split(analyzer, source); - TEST_TRUE(runner, VA_Equals(expected, (Obj*)got), "Split(): %s", message); + TEST_TRUE(runner, Vec_Equals(expected, (Obj*)got), "Split(): %s", message); DECREF(got); DECREF(starter); http://git-wip-us.apache.org/repos/asf/lucy/blob/0c238b13/core/Lucy/Test/TestUtils.cfh ---------------------------------------------------------------------- diff --git a/core/Lucy/Test/TestUtils.cfh b/core/Lucy/Test/TestUtils.cfh index 37c0ce9..5960283 100644 --- a/core/Lucy/Test/TestUtils.cfh +++ b/core/Lucy/Test/TestUtils.cfh @@ -18,10 +18,10 @@ parcel TestLucy; inert class Lucy::Test::TestUtils { - /** Return a VArray of Strings, each representing the content for a + /** Return a Vector of Strings, each representing the content for a * document in the shared collection. */ - inert incremented VArray* + inert incremented Vector* doc_set(); /** Testing-only TermQuery factory. @@ -63,7 +63,7 @@ inert class Lucy::Test::TestUtils { */ inert void test_analyzer(TestBatchRunner *runner, Analyzer *analyzer, String *source, - VArray *expected, const char *message); + Vector *expected, const char *message); /** Return the "modules" folder. */ http://git-wip-us.apache.org/repos/asf/lucy/blob/0c238b13/core/Lucy/Test/Util/TestFreezer.c ---------------------------------------------------------------------- diff --git a/core/Lucy/Test/Util/TestFreezer.c b/core/Lucy/Test/Util/TestFreezer.c index 67f10d5..90c8336 100644 --- a/core/Lucy/Test/Util/TestFreezer.c +++ b/core/Lucy/Test/Util/TestFreezer.c @@ -148,20 +148,20 @@ test_num(TestBatchRunner *runner) { static void test_varray(TestBatchRunner *runner) { - VArray *array = VA_new(0); - VA_Store(array, 1, (Obj*)Str_newf("foo")); - VA_Store(array, 3, (Obj*)Str_newf("bar")); + Vector *array = Vec_new(0); + Vec_Store(array, 1, (Obj*)Str_newf("foo")); + Vec_Store(array, 3, (Obj*)Str_newf("bar")); { Obj *got = S_freeze_thaw((Obj*)array); - TEST_TRUE(runner, got && VA_Equals(array, got), + TEST_TRUE(runner, got && Vec_Equals(array, got), "Round trip through FREEZE/THAW"); DECREF(got); } { Obj *got = S_dump_load((Obj*)array); - TEST_TRUE(runner, got && VA_Equals(array, got), + TEST_TRUE(runner, got && Vec_Equals(array, got), "Dump => Load round trip"); DECREF(got); } http://git-wip-us.apache.org/repos/asf/lucy/blob/0c238b13/core/Lucy/Test/Util/TestJson.c ---------------------------------------------------------------------- diff --git a/core/Lucy/Test/Util/TestJson.c b/core/Lucy/Test/Util/TestJson.c index b978cf4..af24ea3 100644 --- a/core/Lucy/Test/Util/TestJson.c +++ b/core/Lucy/Test/Util/TestJson.c @@ -30,13 +30,13 @@ TestJson_new() { return (TestJson*)Class_Make_Obj(TESTJSON); } -// Create a test data structure including at least one each of Hash, VArray, +// Create a test data structure including at least one each of Hash, Vector, // and String. static Obj* S_make_dump() { Hash *dump = Hash_new(0); Hash_Store_Utf8(dump, "foo", 3, (Obj*)Str_newf("foo")); - Hash_Store_Utf8(dump, "stuff", 5, (Obj*)VA_new(0)); + Hash_Store_Utf8(dump, "stuff", 5, (Obj*)Vec_new(0)); return (Obj*)dump; } @@ -279,11 +279,11 @@ test_syntax_errors(TestBatchRunner *runner) { static void S_round_trip_integer(TestBatchRunner *runner, int64_t value) { Integer64 *num = Int64_new(value); - VArray *array = VA_new(1); - VA_Store(array, 0, (Obj*)num); + Vector *array = Vec_new(1); + Vec_Store(array, 0, (Obj*)num); String *json = Json_to_json((Obj*)array); Obj *dump = Json_from_json(json); - TEST_TRUE(runner, VA_Equals(array, dump), "Round trip integer %ld", + TEST_TRUE(runner, Vec_Equals(array, dump), "Round trip integer %ld", (long)value); DECREF(dump); DECREF(json); @@ -301,11 +301,11 @@ test_integers(TestBatchRunner *runner) { static void S_round_trip_float(TestBatchRunner *runner, double value, double max_diff) { Float64 *num = Float64_new(value); - VArray *array = VA_new(1); - VA_Store(array, 0, (Obj*)num); + Vector *array = Vec_new(1); + Vec_Store(array, 0, (Obj*)num); String *json = Json_to_json((Obj*)array); - Obj *dump = CERTIFY(Json_from_json(json), VARRAY); - Float64 *got = (Float64*)CERTIFY(VA_Fetch((VArray*)dump, 0), FLOAT64); + Obj *dump = CERTIFY(Json_from_json(json), VECTOR); + Float64 *got = (Float64*)CERTIFY(Vec_Fetch((Vector*)dump, 0), FLOAT64); double diff = Float64_Get_Value(num) - Float64_Get_Value(got); if (diff < 0) { diff = 0 - diff; } TEST_TRUE(runner, diff <= max_diff, "Round trip float %f", value); http://git-wip-us.apache.org/repos/asf/lucy/blob/0c238b13/core/Lucy/Test/Util/TestPriorityQueue.c ---------------------------------------------------------------------- diff --git a/core/Lucy/Test/Util/TestPriorityQueue.c b/core/Lucy/Test/Util/TestPriorityQueue.c index aa9ec57..4e939f2 100644 --- a/core/Lucy/Test/Util/TestPriorityQueue.c +++ b/core/Lucy/Test/Util/TestPriorityQueue.c @@ -72,16 +72,16 @@ test_Peek_and_Pop_All(TestBatchRunner *runner) { TEST_INT_EQ(runner, (long)Float64_Get_Value(val), 1, "peek at the least item in the queue"); - VArray *got = NumPriQ_Pop_All(pq); - val = (Float64*)CERTIFY(VA_Fetch(got, 0), FLOAT64); + Vector *got = NumPriQ_Pop_All(pq); + val = (Float64*)CERTIFY(Vec_Fetch(got, 0), FLOAT64); TEST_INT_EQ(runner, (long)Float64_Get_Value(val), 20, "pop_all"); - val = (Float64*)CERTIFY(VA_Fetch(got, 1), FLOAT64); + val = (Float64*)CERTIFY(Vec_Fetch(got, 1), FLOAT64); TEST_INT_EQ(runner, (long)Float64_Get_Value(val), 10, "pop_all"); - val = (Float64*)CERTIFY(VA_Fetch(got, 2), FLOAT64); + val = (Float64*)CERTIFY(Vec_Fetch(got, 2), FLOAT64); TEST_INT_EQ(runner, (long)Float64_Get_Value(val), 3, "pop_all"); - val = (Float64*)CERTIFY(VA_Fetch(got, 3), FLOAT64); + val = (Float64*)CERTIFY(Vec_Fetch(got, 3), FLOAT64); TEST_INT_EQ(runner, (long)Float64_Get_Value(val), 2, "pop_all"); - val = (Float64*)CERTIFY(VA_Fetch(got, 4), FLOAT64); + val = (Float64*)CERTIFY(Vec_Fetch(got, 4), FLOAT64); TEST_INT_EQ(runner, (long)Float64_Get_Value(val), 1, "pop_all"); DECREF(got); http://git-wip-us.apache.org/repos/asf/lucy/blob/0c238b13/core/Lucy/Test/Util/TestSortExternal.c ---------------------------------------------------------------------- diff --git a/core/Lucy/Test/Util/TestSortExternal.c b/core/Lucy/Test/Util/TestSortExternal.c index e7ca8f9..059ccca 100644 --- a/core/Lucy/Test/Util/TestSortExternal.c +++ b/core/Lucy/Test/Util/TestSortExternal.c @@ -74,12 +74,12 @@ test_bbsortex(TestBatchRunner *runner) { BBSortEx_Sort_Buffer(sortex); { - VArray *cache = BBSortEx_Peek_Cache(sortex); - VArray *wanted = VA_new(3); - VA_Push(wanted, INCREF(b_bb)); - VA_Push(wanted, INCREF(c_bb)); - VA_Push(wanted, INCREF(d_bb)); - TEST_TRUE(runner, VA_Equals(cache, (Obj*)wanted), "sort cache"); + Vector *cache = BBSortEx_Peek_Cache(sortex); + Vector *wanted = Vec_new(3); + Vec_Push(wanted, INCREF(b_bb)); + Vec_Push(wanted, INCREF(c_bb)); + Vec_Push(wanted, INCREF(d_bb)); + TEST_TRUE(runner, Vec_Equals(cache, (Obj*)wanted), "sort cache"); DECREF(wanted); DECREF(cache); } @@ -89,31 +89,31 @@ test_bbsortex(TestBatchRunner *runner) { "cache flushed automatically when mem_thresh crossed"); TEST_INT_EQ(runner, BBSortEx_Get_Num_Runs(sortex), 1, "run added"); - VArray *external = VA_new(3); - VA_Push(external, INCREF(x_bb)); - VA_Push(external, INCREF(y_bb)); - VA_Push(external, INCREF(z_bb)); + Vector *external = Vec_new(3); + Vec_Push(external, INCREF(x_bb)); + Vec_Push(external, INCREF(y_bb)); + Vec_Push(external, INCREF(z_bb)); BBSortEx *run = BBSortEx_new(0x1000000, external); BBSortEx_Add_Run(sortex, (SortExternal*)run); BBSortEx_Flip(sortex); { - VArray *got = VA_new(7); + Vector *got = Vec_new(7); Obj *object; while (NULL != (object = BBSortEx_Fetch(sortex))) { - VA_Push(got, object); + Vec_Push(got, object); } - VArray *wanted = VA_new(7); - VA_Push(wanted, INCREF(a_bb)); - VA_Push(wanted, INCREF(b_bb)); - VA_Push(wanted, INCREF(c_bb)); - VA_Push(wanted, INCREF(d_bb)); - VA_Push(wanted, INCREF(x_bb)); - VA_Push(wanted, INCREF(y_bb)); - VA_Push(wanted, INCREF(z_bb)); + Vector *wanted = Vec_new(7); + Vec_Push(wanted, INCREF(a_bb)); + Vec_Push(wanted, INCREF(b_bb)); + Vec_Push(wanted, INCREF(c_bb)); + Vec_Push(wanted, INCREF(d_bb)); + Vec_Push(wanted, INCREF(x_bb)); + Vec_Push(wanted, INCREF(y_bb)); + Vec_Push(wanted, INCREF(z_bb)); - TEST_TRUE(runner, VA_Equals(got, (Obj*)wanted), "Add_Run"); + TEST_TRUE(runner, Vec_Equals(got, (Obj*)wanted), "Add_Run"); DECREF(wanted); DECREF(got); @@ -138,14 +138,14 @@ test_clear_buffer(TestBatchRunner *runner) { Obj *object = BBSortEx_Peek(sortex); TEST_TRUE(runner, BB_Equals(a_bb, object), "Peek"); - VArray *got = VA_new(2); + Vector *got = Vec_new(2); while (NULL != (object = BBSortEx_Fetch(sortex))) { - VA_Push(got, object); + Vec_Push(got, object); } - VArray *wanted = VA_new(2); - VA_Push(wanted, INCREF(a_bb)); - VA_Push(wanted, INCREF(b_bb)); - TEST_TRUE(runner, VA_Equals(got, (Obj*)wanted), + Vector *wanted = Vec_new(2); + Vec_Push(wanted, INCREF(a_bb)); + Vec_Push(wanted, INCREF(b_bb)); + TEST_TRUE(runner, Vec_Equals(got, (Obj*)wanted), "elements cleared via Clear_Buffer truly cleared"); DECREF(wanted); @@ -154,14 +154,14 @@ test_clear_buffer(TestBatchRunner *runner) { } static void -S_test_sort(TestBatchRunner *runner, VArray *bytebufs, uint32_t mem_thresh, +S_test_sort(TestBatchRunner *runner, Vector *bytebufs, uint32_t mem_thresh, const char *test_name) { - int size = (int)VA_Get_Size(bytebufs); + int size = (int)Vec_Get_Size(bytebufs); BBSortEx *sortex = BBSortEx_new(mem_thresh, NULL); ByteBuf **shuffled = (ByteBuf**)MALLOCATE(size * sizeof(ByteBuf*)); for (int i = 0; i < size; ++i) { - shuffled[i] = (ByteBuf*)CERTIFY(VA_Fetch(bytebufs, i), BYTEBUF); + shuffled[i] = (ByteBuf*)CERTIFY(Vec_Fetch(bytebufs, i), BYTEBUF); } for (int i = size - 1; i > 0; --i) { int shuffle_pos = rand() % (i + 1); @@ -174,12 +174,12 @@ S_test_sort(TestBatchRunner *runner, VArray *bytebufs, uint32_t mem_thresh, } BBSortEx_Flip(sortex); - VArray *got = VA_new(size); + Vector *got = Vec_new(size); Obj *object; while (NULL != (object = BBSortEx_Fetch(sortex))) { - VA_Push(got, object); + Vec_Push(got, object); } - TEST_TRUE(runner, VA_Equals(got, (Obj*)bytebufs), test_name); + TEST_TRUE(runner, Vec_Equals(got, (Obj*)bytebufs), test_name); FREEMEM(shuffled); DECREF(got); @@ -190,13 +190,13 @@ static void S_test_sort_letters(TestBatchRunner *runner, const char *letters, uint32_t mem_thresh, const char *test_name) { size_t num_letters = strlen(letters); - VArray *bytebufs = VA_new(num_letters); + Vector *bytebufs = Vec_new(num_letters); for (size_t i = 0; i < num_letters; ++i) { char ch = letters[i]; size_t size = ch == '_' ? 0 : 1; ByteBuf *bytebuf = BB_new_bytes(&ch, size); - VA_Push(bytebufs, (Obj*)bytebuf); + Vec_Push(bytebufs, (Obj*)bytebuf); } S_test_sort(runner, bytebufs, mem_thresh, test_name); @@ -230,7 +230,7 @@ test_sort_nothing(TestBatchRunner *runner) { static void test_sort_packed_ints(TestBatchRunner *runner) { size_t num_ints = 11001; - VArray *bytebufs = VA_new(num_ints); + Vector *bytebufs = Vec_new(num_ints); for (uint32_t i = 0; i < num_ints; ++i) { char buf[4]; @@ -239,7 +239,7 @@ test_sort_packed_ints(TestBatchRunner *runner) { buf[2] = i >> 8; buf[3] = i; ByteBuf *bytebuf = BB_new_bytes(&buf, 4); - VA_Push(bytebufs, (Obj*)bytebuf); + Vec_Push(bytebufs, (Obj*)bytebuf); } S_test_sort(runner, bytebufs, 5000, "Sorting packed integers..."); @@ -250,7 +250,7 @@ test_sort_packed_ints(TestBatchRunner *runner) { static void test_sort_random_strings(TestBatchRunner *runner) { size_t num_strings = 1001; - VArray *bytebufs = VA_new(num_strings); + Vector *bytebufs = Vec_new(num_strings); for (uint32_t i = 0; i < num_strings; ++i) { char buf[1201]; @@ -259,10 +259,10 @@ test_sort_random_strings(TestBatchRunner *runner) { buf[i] = rand(); } ByteBuf *bytebuf = BB_new_bytes(&buf, size); - VA_Push(bytebufs, (Obj*)bytebuf); + Vec_Push(bytebufs, (Obj*)bytebuf); } - VA_Sort(bytebufs); + Vec_Sort(bytebufs); S_test_sort(runner, bytebufs, 15000, "Random binary strings of random length"); @@ -271,11 +271,11 @@ test_sort_random_strings(TestBatchRunner *runner) { static void test_run(TestBatchRunner *runner) { - VArray *letters = VA_new(26); + Vector *letters = Vec_new(26); for (int i = 0; i < 26; ++i) { char ch = 'a' + i; ByteBuf *bytebuf = BB_new_bytes(&ch, 1); - VA_Push(letters, (Obj*)bytebuf); + Vec_Push(letters, (Obj*)bytebuf); } BBSortEx *run = BBSortEx_new(0x1000000, letters); BBSortEx_Set_Mem_Thresh(run, 5); @@ -288,14 +288,14 @@ test_run(TestBatchRunner *runner) { ByteBuf *wanted = BB_new_bytes("e", 1); TEST_TRUE(runner, BB_Equals(wanted, endpost), "Peek_Last"); - VArray *elems = VA_new(26); + Vector *elems = Vec_new(26); do { while (BBSortEx_Buffer_Count(run) > 0) { Obj *object = BBSortEx_Fetch(run); - VA_Push(elems, object); + Vec_Push(elems, object); } } while (BBSortEx_Refill(run) > 0); - TEST_TRUE(runner, VA_Equals(elems, (Obj*)letters), "retrieve all elems"); + TEST_TRUE(runner, Vec_Equals(elems, (Obj*)letters), "retrieve all elems"); DECREF(elems); DECREF(wanted); http://git-wip-us.apache.org/repos/asf/lucy/blob/0c238b13/core/Lucy/Util/BBSortEx.c ---------------------------------------------------------------------- diff --git a/core/Lucy/Util/BBSortEx.c b/core/Lucy/Util/BBSortEx.c index ef1cd91..5a9a3e0 100644 --- a/core/Lucy/Util/BBSortEx.c +++ b/core/Lucy/Util/BBSortEx.c @@ -26,17 +26,17 @@ #include "Lucy/Store/OutStream.h" BBSortEx* -BBSortEx_new(uint32_t mem_threshold, VArray *external) { +BBSortEx_new(uint32_t mem_threshold, Vector *external) { BBSortEx *self = (BBSortEx*)Class_Make_Obj(BBSORTEX); return BBSortEx_init(self, mem_threshold, external); } BBSortEx* -BBSortEx_init(BBSortEx *self, uint32_t mem_threshold, VArray *external) { +BBSortEx_init(BBSortEx *self, uint32_t mem_threshold, Vector *external) { SortEx_init((SortExternal*)self); BBSortExIVARS *const ivars = BBSortEx_IVARS(self); ivars->external_tick = 0; - ivars->external = (VArray*)INCREF(external); + ivars->external = (Vector*)INCREF(external); ivars->mem_consumed = 0; BBSortEx_Set_Mem_Thresh(self, mem_threshold); return self; @@ -78,15 +78,15 @@ BBSortEx_Flush_IMP(BBSortEx *self) { BBSortExIVARS *const ivars = BBSortEx_IVARS(self); uint32_t buf_count = ivars->buf_max - ivars->buf_tick; Obj **buffer = ivars->buffer; - VArray *elems; + Vector *elems; if (!buf_count) { return; } - else { elems = VA_new(buf_count); } + else { elems = Vec_new(buf_count); } // Sort, then create a new run. BBSortEx_Sort_Buffer(self); for (uint32_t i = ivars->buf_tick; i < ivars->buf_max; i++) { - VA_Push(elems, buffer[i]); + Vec_Push(elems, buffer[i]); } BBSortEx *run = BBSortEx_new(0, elems); DECREF(elems); @@ -117,11 +117,11 @@ BBSortEx_Refill_IMP(BBSortEx *self) { ivars->mem_consumed = 0; break; } - else if (ivars->external_tick >= VA_Get_Size(ivars->external)) { + else if (ivars->external_tick >= Vec_Get_Size(ivars->external)) { break; } else { - elem = (ByteBuf*)VA_Fetch(ivars->external, ivars->external_tick); + elem = (ByteBuf*)Vec_Fetch(ivars->external, ivars->external_tick); ivars->external_tick++; // Should be + sizeof(ByteBuf), but that's ok. ivars->mem_consumed += BB_Get_Size(elem); @@ -146,7 +146,7 @@ BBSortEx_Flip_IMP(BBSortEx *self) { BBSortEx_Flush(self); // Recalculate the approximate mem allowed for each run. - uint32_t num_runs = VA_Get_Size(ivars->runs); + uint32_t num_runs = Vec_Get_Size(ivars->runs); if (num_runs) { run_mem_thresh = (ivars->mem_thresh / 2) / num_runs; if (run_mem_thresh < 65536) { @@ -155,7 +155,7 @@ BBSortEx_Flip_IMP(BBSortEx *self) { } for (uint32_t i = 0; i < num_runs; i++) { - BBSortEx *run = (BBSortEx*)VA_Fetch(ivars->runs, i); + BBSortEx *run = (BBSortEx*)Vec_Fetch(ivars->runs, i); BBSortEx_Set_Mem_Thresh(run, run_mem_thresh); } @@ -169,15 +169,15 @@ BBSortEx_Compare_IMP(BBSortEx *self, void *va, void *vb) { return BB_compare((ByteBuf**)va, (ByteBuf**)vb); } -VArray* +Vector* BBSortEx_Peek_Cache_IMP(BBSortEx *self) { BBSortExIVARS *const ivars = BBSortEx_IVARS(self); uint32_t count = ivars->buf_max - ivars->buf_tick; Obj **buffer = ivars->buffer; - VArray *retval = VA_new(count); + Vector *retval = Vec_new(count); for (uint32_t i = ivars->buf_tick; i < ivars->buf_max; ++i) { - VA_Push(retval, INCREF(buffer[i])); + Vec_Push(retval, INCREF(buffer[i])); } return retval; @@ -194,7 +194,7 @@ BBSortEx_Peek_Last_IMP(BBSortEx *self) { uint32_t BBSortEx_Get_Num_Runs_IMP(BBSortEx *self) { BBSortExIVARS *const ivars = BBSortEx_IVARS(self); - return VA_Get_Size(ivars->runs); + return Vec_Get_Size(ivars->runs); } http://git-wip-us.apache.org/repos/asf/lucy/blob/0c238b13/core/Lucy/Util/BBSortEx.cfh ---------------------------------------------------------------------- diff --git a/core/Lucy/Util/BBSortEx.cfh b/core/Lucy/Util/BBSortEx.cfh index a43b1fd..eaac4c6 100644 --- a/core/Lucy/Util/BBSortEx.cfh +++ b/core/Lucy/Util/BBSortEx.cfh @@ -22,16 +22,16 @@ parcel Lucy; class Lucy::Util::BBSortEx inherits Lucy::Util::SortExternal { - VArray *external; + Vector *external; uint32_t external_tick; uint32_t mem_consumed; inert BBSortEx* - new(uint32_t mem_thresh = 0x1000000, VArray *external = NULL); + new(uint32_t mem_thresh = 0x1000000, Vector *external = NULL); inert BBSortEx* init(BBSortEx *self, uint32_t mem_thresh = 0x1000000, - VArray *external = NULL); + Vector *external = NULL); void Feed(BBSortEx *self, decremented Obj *item); @@ -51,7 +51,7 @@ class Lucy::Util::BBSortEx int Compare(BBSortEx *self, void *va, void *vb); - incremented VArray* + incremented Vector* Peek_Cache(BBSortEx *self); incremented nullable Obj* http://git-wip-us.apache.org/repos/asf/lucy/blob/0c238b13/core/Lucy/Util/Freezer.c ---------------------------------------------------------------------- diff --git a/core/Lucy/Util/Freezer.c b/core/Lucy/Util/Freezer.c index 784d62d..c427d55 100644 --- a/core/Lucy/Util/Freezer.c +++ b/core/Lucy/Util/Freezer.c @@ -57,8 +57,8 @@ Freezer_serialize(Obj *obj, OutStream *outstream) { else if (Obj_Is_A(obj, BYTEBUF)) { Freezer_serialize_bytebuf((ByteBuf*)obj, outstream); } - else if (Obj_Is_A(obj, VARRAY)) { - Freezer_serialize_varray((VArray*)obj, outstream); + else if (Obj_Is_A(obj, VECTOR)) { + Freezer_serialize_varray((Vector*)obj, outstream); } else if (Obj_Is_A(obj, HASH)) { Freezer_serialize_hash((Hash*)obj, outstream); @@ -130,8 +130,8 @@ Freezer_deserialize(Obj *obj, InStream *instream) { else if (Obj_Is_A(obj, BYTEBUF)) { obj = (Obj*)Freezer_deserialize_bytebuf((ByteBuf*)obj, instream); } - else if (Obj_Is_A(obj, VARRAY)) { - obj = (Obj*)Freezer_deserialize_varray((VArray*)obj, instream); + else if (Obj_Is_A(obj, VECTOR)) { + obj = (Obj*)Freezer_deserialize_varray((Vector*)obj, instream); } else if (Obj_Is_A(obj, HASH)) { obj = (Obj*)Freezer_deserialize_hash((Hash*)obj, instream); @@ -250,12 +250,12 @@ Freezer_read_bytebuf(InStream *instream) { } void -Freezer_serialize_varray(VArray *array, OutStream *outstream) { +Freezer_serialize_varray(Vector *array, OutStream *outstream) { uint32_t last_valid_tick = 0; - size_t size = VA_Get_Size(array); + size_t size = Vec_Get_Size(array); OutStream_Write_C32(outstream, size); for (uint32_t i = 0; i < size; i++) { - Obj *elem = VA_Fetch(array, i); + Obj *elem = Vec_Fetch(array, i); if (elem) { OutStream_Write_C32(outstream, i - last_valid_tick); FREEZE(elem, outstream); @@ -266,24 +266,24 @@ Freezer_serialize_varray(VArray *array, OutStream *outstream) { OutStream_Write_C32(outstream, size - last_valid_tick); } -VArray* -Freezer_deserialize_varray(VArray *array, InStream *instream) { +Vector* +Freezer_deserialize_varray(Vector *array, InStream *instream) { uint32_t size = InStream_Read_C32(instream); - VA_init(array, size); + Vec_init(array, size); for (uint32_t tick = InStream_Read_C32(instream); tick < size; tick += InStream_Read_C32(instream) ) { Obj *obj = THAW(instream); - VA_Store(array, tick, obj); + Vec_Store(array, tick, obj); } - VA_Resize(array, size); + Vec_Resize(array, size); return array; } -VArray* +Vector* Freezer_read_varray(InStream *instream) { - VArray *array = (VArray*)Class_Make_Obj(VARRAY); + Vector *array = (Vector*)Class_Make_Obj(VECTOR); return Freezer_deserialize_varray(array, instream); } @@ -328,12 +328,12 @@ Freezer_read_hash(InStream *instream) { } static Obj* -S_dump_array(VArray *array) { - VArray *dump = VA_new(VA_Get_Size(array)); - for (uint32_t i = 0, max = VA_Get_Size(array); i < max; i++) { - Obj *elem = VA_Fetch(array, i); +S_dump_array(Vector *array) { + Vector *dump = Vec_new(Vec_Get_Size(array)); + for (uint32_t i = 0, max = Vec_Get_Size(array); i < max; i++) { + Obj *elem = Vec_Fetch(array, i); if (elem) { - VA_Store(dump, i, Freezer_dump(elem)); + Vec_Store(dump, i, Freezer_dump(elem)); } } return (Obj*)dump; @@ -359,8 +359,8 @@ Freezer_dump(Obj *obj) { if (Obj_Is_A(obj, STRING)) { return (Obj*)Obj_To_String(obj); } - else if (Obj_Is_A(obj, VARRAY)) { - return S_dump_array((VArray*)obj); + else if (Obj_Is_A(obj, VECTOR)) { + return S_dump_array((Vector*)obj); } else if (Obj_Is_A(obj, HASH)) { return S_dump_hash((Hash*)obj); @@ -466,13 +466,13 @@ S_load_from_hash(Hash *dump) { Obj* -S_load_from_array(VArray *dump) { - VArray *loaded = VA_new(VA_Get_Size(dump)); +S_load_from_array(Vector *dump) { + Vector *loaded = Vec_new(Vec_Get_Size(dump)); - for (uint32_t i = 0, max = VA_Get_Size(dump); i < max; i++) { - Obj *elem_dump = VA_Fetch(dump, i); + for (uint32_t i = 0, max = Vec_Get_Size(dump); i < max; i++) { + Obj *elem_dump = Vec_Fetch(dump, i); if (elem_dump) { - VA_Store(loaded, i, Freezer_load(elem_dump)); + Vec_Store(loaded, i, Freezer_load(elem_dump)); } } @@ -484,8 +484,8 @@ Freezer_load(Obj *obj) { if (Obj_Is_A(obj, HASH)) { return S_load_from_hash((Hash*)obj); } - else if (Obj_Is_A(obj, VARRAY)) { - return S_load_from_array((VArray*)obj); + else if (Obj_Is_A(obj, VECTOR)) { + return S_load_from_array((Vector*)obj); } else { return Obj_Clone(obj); http://git-wip-us.apache.org/repos/asf/lucy/blob/0c238b13/core/Lucy/Util/Freezer.cfh ---------------------------------------------------------------------- diff --git a/core/Lucy/Util/Freezer.cfh b/core/Lucy/Util/Freezer.cfh index e3992e8..ef6da38 100644 --- a/core/Lucy/Util/Freezer.cfh +++ b/core/Lucy/Util/Freezer.cfh @@ -74,12 +74,12 @@ inert class Lucy::Util::Freezer { read_bytebuf(InStream *instream); inert void - serialize_varray(VArray *array, OutStream *outstream); + serialize_varray(Vector *array, OutStream *outstream); - inert incremented VArray* - deserialize_varray(decremented VArray *array, InStream *instream); + inert incremented Vector* + deserialize_varray(decremented Vector *array, InStream *instream); - inert incremented VArray* + inert incremented Vector* read_varray(InStream *instream); inert void http://git-wip-us.apache.org/repos/asf/lucy/blob/0c238b13/core/Lucy/Util/Json.c ---------------------------------------------------------------------- diff --git a/core/Lucy/Util/Json.c b/core/Lucy/Util/Json.c index 4176f41..cb60c3b 100644 --- a/core/Lucy/Util/Json.c +++ b/core/Lucy/Util/Json.c @@ -143,7 +143,7 @@ Json_spew_json(Obj *dump, Folder *folder, String *path) { String* Json_to_json(Obj *dump) { // Validate object type, only allowing hashes and arrays per JSON spec. - if (!dump || !(Obj_Is_A(dump, HASH) || Obj_Is_A(dump, VARRAY))) { + if (!dump || !(Obj_Is_A(dump, HASH) || Obj_Is_A(dump, VECTOR))) { if (!tolerant) { String *class_name = dump ? Obj_Get_Class_Name(dump) : NULL; String *mess = MAKE_MESS("Illegal top-level object type: %o", @@ -287,17 +287,17 @@ S_to_json(Obj *dump, CharBuf *buf, int32_t depth) { else if (Obj_Is_A(dump, FLOATNUM)) { CB_catf(buf, "%f64", Obj_To_F64(dump)); } - else if (Obj_Is_A(dump, VARRAY)) { - VArray *array = (VArray*)dump; - size_t size = VA_Get_Size(array); + else if (Obj_Is_A(dump, VECTOR)) { + Vector *array = (Vector*)dump; + size_t size = Vec_Get_Size(array); if (size == 0) { // Put empty array on single line. CB_Cat_Trusted_Utf8(buf, "[]", 2); return true; } else if (size == 1) { - Obj *elem = VA_Fetch(array, 0); - if (!(Obj_Is_A(elem, HASH) || Obj_Is_A(elem, VARRAY))) { + Obj *elem = Vec_Fetch(array, 0); + if (!(Obj_Is_A(elem, HASH) || Obj_Is_A(elem, VECTOR))) { // Put array containing single scalar element on one line. CB_Cat_Trusted_Utf8(buf, "[", 1); if (!S_to_json(elem, buf, depth + 1)) { @@ -312,7 +312,7 @@ S_to_json(Obj *dump, CharBuf *buf, int32_t depth) { for (size_t i = 0; i < size; i++) { CB_Cat_Trusted_Utf8(buf, "\n", 1); S_cat_whitespace(buf, depth + 1); - if (!S_to_json(VA_Fetch(array, i), buf, depth + 1)) { + if (!S_to_json(Vec_Fetch(array, i), buf, depth + 1)) { return false; } if (i + 1 < size) { @@ -334,9 +334,9 @@ S_to_json(Obj *dump, CharBuf *buf, int32_t depth) { } // Validate that all keys are strings, then sort. - VArray *keys = Hash_Keys(hash); + Vector *keys = Hash_Keys(hash); for (size_t i = 0; i < size; i++) { - Obj *key = VA_Fetch(keys, i); + Obj *key = Vec_Fetch(keys, i); if (!key || !Obj_Is_A(key, STRING)) { DECREF(keys); String *key_class = key ? Obj_Get_Class_Name(key) : NULL; @@ -345,12 +345,12 @@ S_to_json(Obj *dump, CharBuf *buf, int32_t depth) { return false; } } - VA_Sort(keys); + Vec_Sort(keys); // Spread pairs across multiple lines. CB_Cat_Trusted_Utf8(buf, "{", 1); for (size_t i = 0; i < size; i++) { - String *key = (String*)VA_Fetch(keys, i); + String *key = (String*)Vec_Fetch(keys, i); CB_Cat_Trusted_Utf8(buf, "\n", 1); S_cat_whitespace(buf, depth + 1); S_append_json_string(key, buf); http://git-wip-us.apache.org/repos/asf/lucy/blob/0c238b13/core/Lucy/Util/Json.cfh ---------------------------------------------------------------------- diff --git a/core/Lucy/Util/Json.cfh b/core/Lucy/Util/Json.cfh index 631cf23..ff8d32e 100644 --- a/core/Lucy/Util/Json.cfh +++ b/core/Lucy/Util/Json.cfh @@ -29,7 +29,7 @@ class Lucy::Util::Json inherits Clownfish::Obj { to_json(Obj *dump); /** Decode the supplied JSON and return a data structure made - * of Hashes, VArrays, and Strings. Returns NULL and sets the global + * of Hashes, Vectors, and Strings. Returns NULL and sets the global * error object returned by [](cfish:cfish.Err.get_error) on failure. */ inert incremented nullable Obj* @@ -44,7 +44,7 @@ class Lucy::Util::Json inherits Clownfish::Obj { spew_json(Obj *dump, Folder *folder, String *path); /** Decode the JSON in the file at `path` and return a data - * structure made of Hashes, VArrays, and Strings. Returns NULL and sets + * structure made of Hashes, Vectors, and Strings. Returns NULL and sets * the global error object returned by [](cfish:cfish.Err.get_error) if * the file can't be can't be opened or if the file doesn't contain valid * JSON. http://git-wip-us.apache.org/repos/asf/lucy/blob/0c238b13/core/Lucy/Util/Json/JsonParser.y ---------------------------------------------------------------------- diff --git a/core/Lucy/Util/Json/JsonParser.y b/core/Lucy/Util/Json/JsonParser.y index bdbfa1e..7866ae9 100644 --- a/core/Lucy/Util/Json/JsonParser.y +++ b/core/Lucy/Util/Json/JsonParser.y @@ -25,7 +25,7 @@ #include <string.h> #include <assert.h> #include "Clownfish/Hash.h" -#include "Clownfish/VArray.h" +#include "Clownfish/Vector.h" #include "Clownfish/String.h" #include "Clownfish/Err.h" #include "Lucy/Util/Json.h" @@ -111,11 +111,11 @@ key_value_pair_list(A) ::= STRING(B) COLON value(C) COMMA. } /* Arrays. */ -%type array { cfish_VArray* } -%type empty_array { cfish_VArray* } -%type single_elem_array { cfish_VArray* } -%type multi_elem_array { cfish_VArray* } -%type array_elem_list { cfish_VArray* } +%type array { cfish_Vector* } +%type empty_array { cfish_Vector* } +%type single_elem_array { cfish_Vector* } +%type multi_elem_array { cfish_Vector* } +%type array_elem_list { cfish_Vector* } %destructor array { CFISH_DECREF($$); } %destructor single_elem_array { CFISH_DECREF($$); } %destructor multi_elem_array { CFISH_DECREF($$); } @@ -127,30 +127,30 @@ array(A) ::= multi_elem_array(B). { A = B; } empty_array(A) ::= LEFT_SQUARE_BRACKET RIGHT_SQUARE_BRACKET. { - A = cfish_VA_new(0); + A = cfish_Vec_new(0); } single_elem_array(A) ::= LEFT_SQUARE_BRACKET value(B) RIGHT_SQUARE_BRACKET. { - A = cfish_VA_new(1); - CFISH_VA_Push(A, B); + A = cfish_Vec_new(1); + CFISH_Vec_Push(A, B); } multi_elem_array(A) ::= LEFT_SQUARE_BRACKET array_elem_list(B) value(C) RIGHT_SQUARE_BRACKET. { A = B; - CFISH_VA_Push(A, C); + CFISH_Vec_Push(A, C); } array_elem_list(A) ::= array_elem_list(B) value(C) COMMA. { A = B; - CFISH_VA_Push(A, C); + CFISH_Vec_Push(A, C); } array_elem_list(A) ::= value(B) COMMA. { - A = cfish_VA_new(1); - CFISH_VA_Push(A, B); + A = cfish_Vec_new(1); + CFISH_Vec_Push(A, B); } http://git-wip-us.apache.org/repos/asf/lucy/blob/0c238b13/core/Lucy/Util/MemoryPool.c ---------------------------------------------------------------------- diff --git a/core/Lucy/Util/MemoryPool.c b/core/Lucy/Util/MemoryPool.c index 0d79b84..455d137 100644 --- a/core/Lucy/Util/MemoryPool.c +++ b/core/Lucy/Util/MemoryPool.c @@ -44,7 +44,7 @@ MemoryPool* MemPool_init(MemoryPool *self, uint32_t arena_size) { MemoryPoolIVARS *const ivars = MemPool_IVARS(self); ivars->arena_size = arena_size == 0 ? DEFAULT_BUF_SIZE : arena_size; - ivars->arenas = VA_new(16); + ivars->arenas = Vec_new(16); ivars->tick = -1; ivars->buf = NULL; ivars->limit = NULL; @@ -68,9 +68,9 @@ S_init_arena(MemoryPool *self, MemoryPoolIVARS *ivars, size_t amount) { // Indicate which arena we're using at present. ivars->tick++; - if (ivars->tick < (int32_t)VA_Get_Size(ivars->arenas)) { + if (ivars->tick < (int32_t)Vec_Get_Size(ivars->arenas)) { // In recycle mode, use previously acquired memory. - bb = (ByteBuf*)VA_Fetch(ivars->arenas, ivars->tick); + bb = (ByteBuf*)Vec_Fetch(ivars->arenas, ivars->tick); if (amount >= BB_Get_Size(bb)) { BB_Grow(bb, amount); BB_Set_Size(bb, amount); @@ -83,13 +83,13 @@ S_init_arena(MemoryPool *self, MemoryPoolIVARS *ivars, size_t amount) { : ivars->arena_size; char *ptr = (char*)MALLOCATE(buf_size); bb = BB_new_steal_bytes(ptr, buf_size - 1, buf_size); - VA_Push(ivars->arenas, (Obj*)bb); + Vec_Push(ivars->arenas, (Obj*)bb); } // Recalculate consumption to take into account blocked off space. ivars->consumed = 0; for (int32_t i = 0; i < ivars->tick; i++) { - ByteBuf *bb = (ByteBuf*)VA_Fetch(ivars->arenas, i); + ByteBuf *bb = (ByteBuf*)Vec_Fetch(ivars->arenas, i); ivars->consumed += BB_Get_Size(bb); } @@ -149,7 +149,7 @@ void MemPool_Release_All_IMP(MemoryPool *self) { MemoryPoolIVARS *const ivars = MemPool_IVARS(self); DECREF(ivars->arenas); - ivars->arenas = VA_new(16); + ivars->arenas = Vec_new(16); ivars->tick = -1; ivars->buf = NULL; ivars->last_buf = NULL; http://git-wip-us.apache.org/repos/asf/lucy/blob/0c238b13/core/Lucy/Util/MemoryPool.cfh ---------------------------------------------------------------------- diff --git a/core/Lucy/Util/MemoryPool.cfh b/core/Lucy/Util/MemoryPool.cfh index 684895e..30216e4 100644 --- a/core/Lucy/Util/MemoryPool.cfh +++ b/core/Lucy/Util/MemoryPool.cfh @@ -30,7 +30,7 @@ class Lucy::Util::MemoryPool nickname MemPool inherits Clownfish::Obj { uint32_t arena_size; - VArray *arenas; + Vector *arenas; int32_t tick; char *buf; char *last_buf; http://git-wip-us.apache.org/repos/asf/lucy/blob/0c238b13/core/Lucy/Util/PriorityQueue.c ---------------------------------------------------------------------- diff --git a/core/Lucy/Util/PriorityQueue.c b/core/Lucy/Util/PriorityQueue.c index 85bf48c..bf0a616 100644 --- a/core/Lucy/Util/PriorityQueue.c +++ b/core/Lucy/Util/PriorityQueue.c @@ -147,16 +147,16 @@ PriQ_Pop_IMP(PriorityQueue *self) { } } -VArray* +Vector* PriQ_Pop_All_IMP(PriorityQueue *self) { PriorityQueueIVARS *const ivars = PriQ_IVARS(self); - VArray *retval = VA_new(ivars->size); + Vector *retval = Vec_new(ivars->size); // Map the queue nodes onto the array in reverse order. if (ivars->size) { for (uint32_t i = ivars->size; i--;) { Obj *const elem = PriQ_Pop(self); - VA_Store(retval, i, elem); + Vec_Store(retval, i, elem); } } http://git-wip-us.apache.org/repos/asf/lucy/blob/0c238b13/core/Lucy/Util/PriorityQueue.cfh ---------------------------------------------------------------------- diff --git a/core/Lucy/Util/PriorityQueue.cfh b/core/Lucy/Util/PriorityQueue.cfh index 1d19d32..984215e 100644 --- a/core/Lucy/Util/PriorityQueue.cfh +++ b/core/Lucy/Util/PriorityQueue.cfh @@ -67,7 +67,7 @@ class Lucy::Util::PriorityQueue nickname PriQ /** Empty out the PriorityQueue into a sorted array. */ - incremented VArray* + incremented Vector* Pop_All(PriorityQueue *self); /** Return the least item in the queue, but don't remove it. http://git-wip-us.apache.org/repos/asf/lucy/blob/0c238b13/core/Lucy/Util/SortExternal.c ---------------------------------------------------------------------- diff --git a/core/Lucy/Util/SortExternal.c b/core/Lucy/Util/SortExternal.c index f688948..37e7c4b 100644 --- a/core/Lucy/Util/SortExternal.c +++ b/core/Lucy/Util/SortExternal.c @@ -52,7 +52,7 @@ SortEx_init(SortExternal *self) { ivars->buf_tick = 0; ivars->scratch = NULL; ivars->scratch_cap = 0; - ivars->runs = VA_new(0); + ivars->runs = Vec_new(0); ivars->slice_sizes = NULL; ivars->slice_starts = NULL; ivars->num_slices = 0; @@ -157,8 +157,8 @@ SortEx_Flip_IMP(SortExternal *self) { void SortEx_Add_Run_IMP(SortExternal *self, SortExternal *run) { SortExternalIVARS *const ivars = SortEx_IVARS(self); - VA_Push(ivars->runs, (Obj*)run); - uint32_t num_runs = VA_Get_Size(ivars->runs); + Vec_Push(ivars->runs, (Obj*)run); + uint32_t num_runs = Vec_Get_Size(ivars->runs); ivars->slice_sizes = (uint32_t*)REALLOCATE(ivars->slice_sizes, num_runs * sizeof(uint32_t)); @@ -192,8 +192,8 @@ SortEx_Shrink_IMP(SortExternal *self) { FREEMEM(ivars->scratch); ivars->scratch = NULL; - for (uint32_t i = 0, max = VA_Get_Size(ivars->runs); i < max; i++) { - SortExternal *run = (SortExternal*)VA_Fetch(ivars->runs, i); + for (uint32_t i = 0, max = Vec_Get_Size(ivars->runs); i < max; i++) { + SortExternal *run = (SortExternal*)Vec_Fetch(ivars->runs, i); SortEx_Shrink(run); } } @@ -205,18 +205,18 @@ S_refill_buffer(SortExternal *self, SortExternalIVARS *ivars) { // Make sure all runs have at least one item in the buffer. uint32_t i = 0; - while (i < VA_Get_Size(ivars->runs)) { - SortExternal *const run = (SortExternal*)VA_Fetch(ivars->runs, i); + while (i < Vec_Get_Size(ivars->runs)) { + SortExternal *const run = (SortExternal*)Vec_Fetch(ivars->runs, i); if (SortEx_Buffer_Count(run) > 0 || SortEx_Refill(run) > 0) { i++; // Run has some elements, so keep. } else { - VA_Excise(ivars->runs, i, 1); + Vec_Excise(ivars->runs, i, 1); } } // Absorb as many elems as possible from all runs into main buffer. - if (VA_Get_Size(ivars->runs)) { + if (Vec_Get_Size(ivars->runs)) { Obj **endpost = S_find_endpost(self, ivars); S_absorb_slices(self, ivars, endpost); } @@ -226,9 +226,9 @@ static Obj** S_find_endpost(SortExternal *self, SortExternalIVARS *ivars) { Obj **endpost = NULL; - for (uint32_t i = 0, max = VA_Get_Size(ivars->runs); i < max; i++) { + for (uint32_t i = 0, max = Vec_Get_Size(ivars->runs); i < max; i++) { // Get a run and retrieve the last item in its buffer. - SortExternal *const run = (SortExternal*)VA_Fetch(ivars->runs, i); + SortExternal *const run = (SortExternal*)Vec_Fetch(ivars->runs, i); SortExternalIVARS *const run_ivars = SortEx_IVARS(run); const uint32_t tick = run_ivars->buf_max - 1; if (tick >= run_ivars->buf_cap || run_ivars->buf_max < 1) { @@ -257,7 +257,7 @@ S_find_endpost(SortExternal *self, SortExternalIVARS *ivars) { static void S_absorb_slices(SortExternal *self, SortExternalIVARS *ivars, Obj **endpost) { - uint32_t num_runs = VA_Get_Size(ivars->runs); + uint32_t num_runs = Vec_Get_Size(ivars->runs); Obj ***slice_starts = ivars->slice_starts; uint32_t *slice_sizes = ivars->slice_sizes; Class *klass = SortEx_Get_Class(self); @@ -268,7 +268,7 @@ S_absorb_slices(SortExternal *self, SortExternalIVARS *ivars, // Move all the elements in range into the main buffer as slices. for (uint32_t i = 0; i < num_runs; i++) { - SortExternal *const run = (SortExternal*)VA_Fetch(ivars->runs, i); + SortExternal *const run = (SortExternal*)Vec_Fetch(ivars->runs, i); SortExternalIVARS *const run_ivars = SortEx_IVARS(run); uint32_t slice_size = S_find_slice_size(run, run_ivars, endpost); http://git-wip-us.apache.org/repos/asf/lucy/blob/0c238b13/core/Lucy/Util/SortExternal.cfh ---------------------------------------------------------------------- diff --git a/core/Lucy/Util/SortExternal.cfh b/core/Lucy/Util/SortExternal.cfh index 29ffebe..8ac0ad0 100644 --- a/core/Lucy/Util/SortExternal.cfh +++ b/core/Lucy/Util/SortExternal.cfh @@ -44,7 +44,7 @@ abstract class Lucy::Util::SortExternal nickname SortEx uint32_t buf_tick; Obj **scratch; uint32_t scratch_cap; - VArray *runs; + Vector *runs; uint32_t num_slices; Obj ***slice_starts; uint32_t *slice_sizes; http://git-wip-us.apache.org/repos/asf/lucy/blob/0c238b13/core/Lucy/Util/ToolSet.h ---------------------------------------------------------------------- diff --git a/core/Lucy/Util/ToolSet.h b/core/Lucy/Util/ToolSet.h index b3f20dd..853d51a 100644 --- a/core/Lucy/Util/ToolSet.h +++ b/core/Lucy/Util/ToolSet.h @@ -43,7 +43,7 @@ extern "C" { #include "Clownfish/Hash.h" #include "Lucy/Object/I32Array.h" #include "Clownfish/Num.h" -#include "Clownfish/VArray.h" +#include "Clownfish/Vector.h" #include "Clownfish/Class.h" #include "Clownfish/Util/NumberUtils.h" #include "Clownfish/Util/Memory.h" http://git-wip-us.apache.org/repos/asf/lucy/blob/0c238b13/core/LucyX/Search/ProximityMatcher.c ---------------------------------------------------------------------- diff --git a/core/LucyX/Search/ProximityMatcher.c b/core/LucyX/Search/ProximityMatcher.c index 8ccf1d9..8967386 100644 --- a/core/LucyX/Search/ProximityMatcher.c +++ b/core/LucyX/Search/ProximityMatcher.c @@ -27,7 +27,7 @@ ProximityMatcher* -ProximityMatcher_new(Similarity *sim, VArray *plists, Compiler *compiler, +ProximityMatcher_new(Similarity *sim, Vector *plists, Compiler *compiler, uint32_t within) { ProximityMatcher *self = (ProximityMatcher*)Class_Make_Obj(PROXIMITYMATCHER); @@ -37,7 +37,7 @@ ProximityMatcher_new(Similarity *sim, VArray *plists, Compiler *compiler, ProximityMatcher* ProximityMatcher_init(ProximityMatcher *self, Similarity *similarity, - VArray *plists, Compiler *compiler, uint32_t within) { + Vector *plists, Compiler *compiler, uint32_t within) { Matcher_init((Matcher*)self); ProximityMatcherIVARS *const ivars = ProximityMatcher_IVARS(self); @@ -49,13 +49,13 @@ ProximityMatcher_init(ProximityMatcher *self, Similarity *similarity, ivars->more = true; ivars->within = within; - // Extract PostingLists out of VArray into local C array for quick access. - ivars->num_elements = VA_Get_Size(plists); + // Extract PostingLists out of Vector into local C array for quick access. + ivars->num_elements = Vec_Get_Size(plists); ivars->plists = (PostingList**)MALLOCATE( ivars->num_elements * sizeof(PostingList*)); for (size_t i = 0; i < ivars->num_elements; i++) { PostingList *const plist - = (PostingList*)CERTIFY(VA_Fetch(plists, i), POSTINGLIST); + = (PostingList*)CERTIFY(Vec_Fetch(plists, i), POSTINGLIST); if (plist == NULL) { THROW(ERR, "Missing element %u32", i); } http://git-wip-us.apache.org/repos/asf/lucy/blob/0c238b13/core/LucyX/Search/ProximityMatcher.cfh ---------------------------------------------------------------------- diff --git a/core/LucyX/Search/ProximityMatcher.cfh b/core/LucyX/Search/ProximityMatcher.cfh index 1c20d17..2ec796b 100644 --- a/core/LucyX/Search/ProximityMatcher.cfh +++ b/core/LucyX/Search/ProximityMatcher.cfh @@ -35,11 +35,11 @@ class LucyX::Search::ProximityMatcher inherits Lucy::Search::Matcher { uint32_t within; inert incremented ProximityMatcher* - new(Similarity *similarity, VArray *posting_lists, Compiler *compiler, + new(Similarity *similarity, Vector *posting_lists, Compiler *compiler, uint32_t within); inert ProximityMatcher* - init(ProximityMatcher *self, Similarity *similarity, VArray *posting_lists, + init(ProximityMatcher *self, Similarity *similarity, Vector *posting_lists, Compiler *compiler, uint32_t within); public void
