lucy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nwelln...@apache.org
Subject [02/14] lucy git commit: Switch from VA_Push_VArray to VA_Push_All
Date Wed, 29 Apr 2015 19:56:23 GMT
Switch from VA_Push_VArray to VA_Push_All


Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/444918fd
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/444918fd
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/444918fd

Branch: refs/heads/master
Commit: 444918fd3b5953d88dbf721131ca87d3825d1458
Parents: 5f0f936
Author: Nick Wellnhofer <wellnhofer@aevum.de>
Authored: Sun Apr 26 20:18:08 2015 +0200
Committer: Nick Wellnhofer <wellnhofer@aevum.de>
Committed: Sun Apr 26 20:18:08 2015 +0200

----------------------------------------------------------------------
 core/Lucy/Highlight/HeatMap.c  | 2 +-
 core/Lucy/Index/FilePurger.c   | 4 ++--
 core/Lucy/Search/PolyQuery.c   | 2 +-
 core/Lucy/Search/QueryParser.c | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucy/blob/444918fd/core/Lucy/Highlight/HeatMap.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Highlight/HeatMap.c b/core/Lucy/Highlight/HeatMap.c
index 439f196..f631b77 100644
--- a/core/Lucy/Highlight/HeatMap.c
+++ b/core/Lucy/Highlight/HeatMap.c
@@ -38,7 +38,7 @@ HeatMap_init(HeatMap *self, VArray *spans, uint32_t window) {
 
     VA_Sort(spans_copy, NULL, NULL);
     spans_plus_boosts = HeatMap_Generate_Proximity_Boosts(self, spans_copy);
-    VA_Push_VArray(spans_plus_boosts, spans_copy);
+    VA_Push_All(spans_plus_boosts, spans_copy);
     VA_Sort(spans_plus_boosts, NULL, NULL);
     ivars->spans = HeatMap_Flatten_Spans(self, spans_plus_boosts);
 

http://git-wip-us.apache.org/repos/asf/lucy/blob/444918fd/core/Lucy/Index/FilePurger.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/FilePurger.c b/core/Lucy/Index/FilePurger.c
index 9cc3d8c..e016b77 100644
--- a/core/Lucy/Index/FilePurger.c
+++ b/core/Lucy/Index/FilePurger.c
@@ -199,7 +199,7 @@ S_discover_unused(FilePurger *self, VArray **purgables_ptr,
     if (ivars->snapshot) {
         VArray *entries    = Snapshot_List(ivars->snapshot);
         VArray *referenced = S_find_all_referenced(folder, entries);
-        VA_Push_VArray(spared, referenced);
+        VA_Push_All(spared, referenced);
         DECREF(entries);
         DECREF(referenced);
         snapfile = Snapshot_Get_Path(ivars->snapshot);
@@ -233,7 +233,7 @@ S_discover_unused(FilePurger *self, VArray **purgables_ptr,
                                     + 1;
                 VA_Grow(spared, new_size);
                 VA_Push(spared, (Obj*)Str_Clone(entry));
-                VA_Push_VArray(spared, referenced);
+                VA_Push_All(spared, referenced);
             }
             else {
                 // No one's using this snapshot, so all of its entries are

http://git-wip-us.apache.org/repos/asf/lucy/blob/444918fd/core/Lucy/Search/PolyQuery.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Search/PolyQuery.c b/core/Lucy/Search/PolyQuery.c
index df0395f..18b1626 100644
--- a/core/Lucy/Search/PolyQuery.c
+++ b/core/Lucy/Search/PolyQuery.c
@@ -193,7 +193,7 @@ PolyCompiler_Highlight_Spans_IMP(PolyCompiler *self, Searcher *searcher,
         VArray *child_spans = Compiler_Highlight_Spans(child, searcher,
                                                        doc_vec, field);
         if (child_spans) {
-            VA_Push_VArray(spans, child_spans);
+            VA_Push_All(spans, child_spans);
             DECREF(child_spans);
         }
     }

http://git-wip-us.apache.org/repos/asf/lucy/blob/444918fd/core/Lucy/Search/QueryParser.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Search/QueryParser.c b/core/Lucy/Search/QueryParser.c
index 273e48a..ce73981 100644
--- a/core/Lucy/Search/QueryParser.c
+++ b/core/Lucy/Search/QueryParser.c
@@ -597,7 +597,7 @@ S_compose_subquery(QueryParser *self, VArray *elems, bool enclosed) {
         if (num_required || num_negated) {
             if (enclosed || num_required + num_negated > 1) {
                 VArray *children = VA_Shallow_Copy(required);
-                VA_Push_VArray(children, negated);
+                VA_Push_All(children, negated);
                 req_query = QParser_Make_AND_Query(self, children);
                 DECREF(children);
             }


Mime
View raw message