SQLite4
Check-in [7bc0e58875]
Check-in [7bc0e58875]
Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
| Comment: | Fix a memory leak in fts5.c. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
7bc0e58875c9bc4e93b0747cca69ab3d |
| User & Date: | dan 2013-01-01 18:41:17 |
|
2013-01-01
| ||
| 19:56 | Add APIs to allow fts5 to be augmented with ranking and snippet functions. Does not work yet. check-in: a235305d42 user: dan tags: matchinfo | |
| 19:02 | Add the sqlite4_kvfactory typedef to the interface and use that typedef throughout the implementation. This check-in also includes some unrelated cleanup of the sqlite4.h file. check-in: a2630e5d90 user: drh tags: trunk | |
| 18:41 | Fix a memory leak in fts5.c. check-in: 7bc0e58875 user: dan tags: trunk | |
| 18:24 | Add files "mem.h" and "mem.c". These are not currently linked into the build and have never been tested. At the moment they should be considered working notes, not real code. The code contained in these files might get folded into the build, or it might be deleted. check-in: e9efc61a51 user: drh tags: trunk | |
Changes to src/fts5.c.
1926 1927 1928 1929 1930 1931 1932 1933 1934 1935 1936 1937 1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950 .... 1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 .... 1974 1975 1976 1977 1978 1979 1980 1981 1982 1983 1984 1985 1986 1987 1988 |
}
}
return (p->iCol==pFirst->iCol && p->iOff==iReq);
}
static int fts5StringFindInstances(Fts5Cursor *pCsr, int iCol, Fts5Str *pStr){
int i;
int rc = SQLITE4_OK;
int bEof = 0;
int nByte = sizeof(InstanceList) * pStr->nToken;
InstanceList *aIn;
InstanceList out;
pStr->nList = 0;
memset(&out, 0, sizeof(InstanceList));
aIn = (InstanceList *)sqlite4DbMallocZero(pCsr->db, nByte);
if( !aIn ) rc = SQLITE4_NOMEM;
for(i=0; rc==SQLITE4_OK && i<pStr->nToken; i++){
const u8 *aData;
int nData;
rc = fts5TokenData(&pStr->aToken[i], &aData, &nData);
if( rc==SQLITE4_OK ){
fts5InstanceListInit((u8 *)aData, nData, &aIn[i]);
................................................................................
/* Allocate the output list */
if( rc==SQLITE4_OK ){
int nReq = aIn[0].nList;
if( nReq<=pStr->nListAlloc ){
out.aList = pStr->aList;
out.nList = pStr->nListAlloc;
}else{
pStr->aList = out.aList = sqlite4DbMallocZero(pCsr->db, nReq*2);
pStr->nListAlloc = out.nList = nReq*2;
if( out.aList==0 ) rc = SQLITE4_NOMEM;
}
}
while( rc==SQLITE4_OK && bEof==0 ){
for(i=1; i<pStr->nToken; i++){
................................................................................
/* Record a match here */
fts5InstanceListAppend(&out, aIn[0].iCol, aIn[0].iWeight, aIn[0].iOff);
}
bEof = fts5InstanceListNext(&aIn[0]);
}
pStr->nList = out.iList;
sqlite4DbFree(pCsr->db, aIn);
return rc;
}
static int fts5IsNear(InstanceList *p1, InstanceList *p2, int nNear){
if( p1->iCol==p2->iCol && p1->iOff<p2->iOff && (p1->iOff+nNear)>=p2->iOff ){
return 1;
|
> | | | |
1926 1927 1928 1929 1930 1931 1932 1933 1934 1935 1936 1937 1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950 1951 .... 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 .... 1975 1976 1977 1978 1979 1980 1981 1982 1983 1984 1985 1986 1987 1988 1989 |
}
}
return (p->iCol==pFirst->iCol && p->iOff==iReq);
}
static int fts5StringFindInstances(Fts5Cursor *pCsr, int iCol, Fts5Str *pStr){
sqlite4 *db = pCsr->db;
int i;
int rc = SQLITE4_OK;
int bEof = 0;
int nByte = sizeof(InstanceList) * pStr->nToken;
InstanceList *aIn;
InstanceList out;
pStr->nList = 0;
memset(&out, 0, sizeof(InstanceList));
aIn = (InstanceList *)sqlite4DbMallocZero(db, nByte);
if( !aIn ) rc = SQLITE4_NOMEM;
for(i=0; rc==SQLITE4_OK && i<pStr->nToken; i++){
const u8 *aData;
int nData;
rc = fts5TokenData(&pStr->aToken[i], &aData, &nData);
if( rc==SQLITE4_OK ){
fts5InstanceListInit((u8 *)aData, nData, &aIn[i]);
................................................................................
/* Allocate the output list */
if( rc==SQLITE4_OK ){
int nReq = aIn[0].nList;
if( nReq<=pStr->nListAlloc ){
out.aList = pStr->aList;
out.nList = pStr->nListAlloc;
}else{
pStr->aList = out.aList = sqlite4DbReallocOrFree(db, pStr->aList, nReq*2);
pStr->nListAlloc = out.nList = nReq*2;
if( out.aList==0 ) rc = SQLITE4_NOMEM;
}
}
while( rc==SQLITE4_OK && bEof==0 ){
for(i=1; i<pStr->nToken; i++){
................................................................................
/* Record a match here */
fts5InstanceListAppend(&out, aIn[0].iCol, aIn[0].iWeight, aIn[0].iOff);
}
bEof = fts5InstanceListNext(&aIn[0]);
}
pStr->nList = out.iList;
sqlite4DbFree(db, aIn);
return rc;
}
static int fts5IsNear(InstanceList *p1, InstanceList *p2, int nNear){
if( p1->iCol==p2->iCol && p1->iOff<p2->iOff && (p1->iOff+nNear)>=p2->iOff ){
return 1;
|