MonetDB: default - changed sphinx code for new multi column resu...

[Niels Nes]

Changeset: 0f1878a62171 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0f1878a62171
Modified Files:
        monetdb5/extras/sphinx/sphinx.c
        monetdb5/extras/sphinx/sphinx.h
        monetdb5/extras/sphinx/sphinx.mal
Branch: default
Log Message:

changed sphinx code for new multi column result of table
returning functions.


diffs (73 lines):

diff --git a/monetdb5/extras/sphinx/sphinx.c b/monetdb5/extras/sphinx/sphinx.c
--- a/monetdb5/extras/sphinx/sphinx.c
+++ b/monetdb5/extras/sphinx/sphinx.c
@@ -87,27 +87,3 @@ SPHINXsearchIndexLimit(int *ret, str *qu
        return msg;
 }
 
-/* str sphinx_searchIndexLimit(int *ret, str *query, str *index, int *limit); 
*/
-str
-SPHINXsearchIndexLimitWrap(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr 
pci)
-{
-       bat ret;
-       BAT *t;
-       int *r = (int *) getArgReference(stk, pci, 0);
-       str *query = (str *) getArgReference(stk, pci, 1);
-       str *index = (str *) getArgReference(stk, pci, 2);
-       int *limit = (int *) getArgReference(stk, pci, 3);
-
-       (void) cntxt;
-       (void) mb;
-       SPHINXsearchIndexLimit(&ret, query, index, limit);
-
-       t = BATnew(TYPE_str, TYPE_bat, 1);
-       BUNins(t, "id", &ret, FALSE);
-
-       BBPdecref(ret, TRUE);
-       *r = t->batCacheid;
-       BBPkeepref(*r);
-       return MAL_SUCCEED;
-}
-
diff --git a/monetdb5/extras/sphinx/sphinx.h b/monetdb5/extras/sphinx/sphinx.h
--- a/monetdb5/extras/sphinx/sphinx.h
+++ b/monetdb5/extras/sphinx/sphinx.h
@@ -37,7 +37,6 @@
 #endif
 
 sphinx_export str SPHINXsearchIndexLimit(int *ret, str *query, str *index, int 
*limit);
-sphinx_export str SPHINXsearchIndexLimitWrap(Client cntxt, MalBlkPtr mb, 
MalStkPtr stk, InstrPtr pci);
 
 #endif /* SPHINX_H */
 
diff --git a/monetdb5/extras/sphinx/sphinx.mal 
b/monetdb5/extras/sphinx/sphinx.mal
--- a/monetdb5/extras/sphinx/sphinx.mal
+++ b/monetdb5/extras/sphinx/sphinx.mal
@@ -32,18 +32,19 @@ function searchIndex(q:str, i:str) :bat[
 end searchIndex;
 
 
-pattern sphinx_searchIndexLimit(q:str, i:str, l:int) :bat[:str,:bat]
-address SPHINXsearchIndexLimitWrap
-comment "Search the query on the specified index, with limit";
-
-function sphinx_search(q:str) :bat[:str,:bat];
-       ret := sphinx_searchIndexLimit(q, "*", 20);
+function sphinx_search(q:str)(id:bat[:oid,:lng]);
+       ret := searchIndexLimit(q, "*", 20);
        return ret;
 end sphinx_search;
 
-function sphinx_searchIndex(q:str, i:str) :bat[:str,:bat];
-       ret := sphinx_searchIndexLimit(q, i, 20);
+function sphinx_searchIndex(q:str, i:str)(id:bat[:oid,:lng]);
+       ret := searchIndexLimit(q, i, 20);
        return ret;
 end sphinx_searchIndex;
 
+function sphinx_searchIndexLimit(q:str, i:str, l:int)(id:bat[:oid,:lng]);
+       ret := searchIndexLimit(q, i, l);
+       return ret;
+end sphinx_searchIndexLimit;
 
+
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list