Skip to content

/ manticoresearch

Permalink
Browse files

Fix #435 via refactor ISphFieldFilter to refcounted flavour

  • Loading branch information
@klirichek
klirichek committed Sep 6, 2018
1 parent 1366ee0 commit 25453e5387152c0575d1eda1b2beb89a49c7493a
Unified Split
Showing with 81 additions and 110 deletions.
  1. +1 −7 src/indexer.cpp
  2. +29 −40 src/sphinx.cpp
  3. +8 −4 src/sphinx.h
  4. +2 −4 src/sphinxint.h
  5. +19 −10 src/sphinxrlp.cpp
  6. +3 −2 src/sphinxrlp.h
  7. +17 −40 src/sphinxrt.cpp
  8. +1 −2 src/sphinxstd.h
  9. +1 −1 src/sphinxutils.cpp
8 src/indexer.cpp
View file
@@ -995,16 +995,13 @@ bool DoIndex ( const CSphConfigSection & hIndex, const char * sIndexName,
pTokenizer = sphAotCreateFilter ( pTokenizer, pDict, tSettings.m_bIndexExactWords, tSettings.m_uAotFilterMask );
}

ISphFieldFilter * pFieldFilter = NULL;
ISphFieldFilterRefPtr_c pFieldFilter;
CSphFieldFilterSettings tFilterSettings;
if ( sphConfFieldFilter ( hIndex, tFilterSettings, sError ) )
pFieldFilter = sphCreateRegexpFilter ( tFilterSettings, sError );

if ( !sphSpawnRLPFilter ( pFieldFilter, tSettings, tTokSettings, sIndexName, sError ) )
{
SafeDelete ( pFieldFilter );
sphDie ( "%s", sError.cstr() );
}

if ( !sError.IsEmpty () )
fprintf ( stdout, "WARNING: index '%s': %s\n", sIndexName, sError.cstr() );
@@ -1155,9 +1152,6 @@ bool DoIndex ( const CSphConfigSection & hIndex, const char * sIndexName,
fprintf ( stdout, "ERROR: index '%s': %s\n", sIndexName, sError.cstr() );
}
tDict->Save ( g_sBuildStops, g_iTopStops, g_bBuildFreqs );

SafeDelete ( pFieldFilter );

bOK = true;

} else
69 src/sphinx.cpp
View file
@@ -1093,7 +1093,7 @@ struct WriteHeader_t
const CSphSchema * m_pSchema;
ISphTokenizerRefPtr_c m_pTokenizer;
CSphDictRefPtr_c m_pDict;
const ISphFieldFilter * m_pFieldFilter;
ISphFieldFilterRefPtr_c m_pFieldFilter;
const int64_t * m_pFieldLens;
};

@@ -1289,12 +1289,12 @@ bool CSphTokenizerIndex::GetKeywords ( CSphVector <CSphKeywordInfo> & dKeywords,
dKeywords.Resize ( 0 );

CSphVector<BYTE> dFiltered;
CSphScopedPtr<ISphFieldFilter> pFieldFilter ( NULL );
ISphFieldFilterRefPtr_c pFieldFilter;
const BYTE * sModifiedQuery = (const BYTE *)szQuery;
if ( m_pFieldFilter && szQuery )
{
pFieldFilter = m_pFieldFilter->Clone();
if ( pFieldFilter.Ptr() && pFieldFilter->Apply ( sModifiedQuery, strlen ( (char*)sModifiedQuery ), dFiltered, true ) )
if ( pFieldFilter && pFieldFilter->Apply ( sModifiedQuery, strlen ( (char*)sModifiedQuery ), dFiltered, true ) )
sModifiedQuery = dFiltered.Begin();
}

@@ -8447,7 +8447,6 @@ CSphIndex::CSphIndex ( const char * sIndexName, const char * sFilename )
CSphIndex::~CSphIndex ()
{
QcacheDeleteIndex ( m_iIndexId );
SafeDelete ( m_pFieldFilter );
}


@@ -8463,8 +8462,7 @@ void CSphIndex::SetInplaceSettings ( int iHitGap, int iDocinfoGap, float fRelocF

void CSphIndex::SetFieldFilter ( ISphFieldFilter * pFieldFilter )
{
if ( m_pFieldFilter!=pFieldFilter )
SafeDelete ( m_pFieldFilter );
SafeAddRef ( pFieldFilter );
m_pFieldFilter = pFieldFilter;
}

@@ -15412,8 +15410,6 @@ void CSphIndex_VLN::Dealloc ()
m_iMinMaxIndex = 0;
m_tSettings.m_eDocinfo = SPH_DOCINFO_NONE;

SafeDelete ( m_pFieldFilter );

if ( m_iIndexTag>=0 && g_pMvaArena )
g_tMvaArena.TaggedFreeTag ( m_iIndexTag );
m_iIndexTag = -1;
@@ -15647,17 +15643,14 @@ bool CSphIndex_VLN::LoadHeader ( const char * sHeaderName, bool bStripPath, CSph

if ( m_uVersion>=28 )
{
ISphFieldFilter * pFieldFilter = NULL;
ISphFieldFilterRefPtr_c pFieldFilter;
CSphFieldFilterSettings tFieldFilterSettings;
LoadFieldFilterSettings ( rdInfo, tFieldFilterSettings );
if ( tFieldFilterSettings.m_dRegexps.GetLength() )
pFieldFilter = sphCreateRegexpFilter ( tFieldFilterSettings, m_sLastError );

if ( !sphSpawnRLPFilter ( pFieldFilter, m_tSettings, tTokSettings, sHeaderName, m_sLastError ) )
{
SafeDelete ( pFieldFilter );
return false;
}

SetFieldFilter ( pFieldFilter );
}
@@ -16864,12 +16857,12 @@ bool CSphIndex_VLN::DoGetKeywords ( CSphVector <CSphKeywordInfo> & dKeywords,
SetupExactDict ( pDict );

CSphVector<BYTE> dFiltered;
CSphScopedPtr<ISphFieldFilter> pFieldFilter ( NULL );
ISphFieldFilterRefPtr_c pFieldFilter;
const BYTE * sModifiedQuery = (const BYTE *)szQuery;
if ( m_pFieldFilter && szQuery )
{
pFieldFilter = m_pFieldFilter->Clone();
if ( pFieldFilter.Ptr() && pFieldFilter->Apply ( sModifiedQuery, strlen ( (char*)sModifiedQuery ), dFiltered, true ) )
if ( pFieldFilter && pFieldFilter->Apply ( sModifiedQuery, strlen ( (char*)sModifiedQuery ), dFiltered, true ) )
sModifiedQuery = dFiltered.Begin();
}

CSphVector<BYTE> dFiltered;
const BYTE * sModifiedQuery = (BYTE *)pQuery->m_sQuery.cstr();

CSphScopedPtr<ISphFieldFilter> pFieldFilter ( NULL );
ISphFieldFilterRefPtr_c pFieldFilter;
if ( m_pFieldFilter )
{
pFieldFilter = m_pFieldFilter->Clone();
if ( pFieldFilter.Ptr() && pFieldFilter->Apply ( sModifiedQuery, strlen ( (char*)sModifiedQuery ), dFiltered, true ) )
if ( pFieldFilter && pFieldFilter->Apply ( sModifiedQuery, strlen ( (char*)sModifiedQuery ), dFiltered, true ) )
sModifiedQuery = dFiltered.Begin();
}


ISphFieldFilter::~ISphFieldFilter()
{
SafeDelete ( m_pParent );
SafeRelease ( m_pParent );
}


void ISphFieldFilter::SetParent ( ISphFieldFilter * pParent )
{
SafeDelete ( m_pParent );
SafeAddRef ( pParent );
SafeRelease ( m_pParent );
m_pParent = pParent;
}


#if USE_RE2
class CSphFieldRegExps : public ISphFieldFilter
{
protected:
~CSphFieldRegExps() override;
public:
CSphFieldRegExps ( bool bCloned );
virtual ~CSphFieldRegExps();
CSphFieldRegExps () = default;
CSphFieldRegExps ( const StrVec_t& m_dRegexps, CSphString & sError );

virtual int Apply ( const BYTE * sField, int iLength, CSphVector<BYTE> & dStorage, bool );
virtual void GetSettings ( CSphFieldFilterSettings & tSettings ) const;
};

CSphVector<RegExp_t> m_dRegexps;
bool m_bCloned;
bool m_bCloned = true;
};


CSphFieldRegExps::CSphFieldRegExps ( bool bCloned )
: m_bCloned ( bCloned )
CSphFieldRegExps::CSphFieldRegExps ( const StrVec_t &dRegexps, CSphString &sError )
: m_bCloned ( false )
{
for ( const auto &sRegexp : dRegexps )
AddRegExp ( sRegexp.cstr (), sError );
}


CSphFieldRegExps::~CSphFieldRegExps ()
{
if ( !m_bCloned )
{
ARRAY_FOREACH ( i, m_dRegexps )
SafeDelete ( m_dRegexps[i].m_pRE2 );
for ( auto & dRegexp : m_dRegexps )
SafeDelete ( dRegexp.m_pRE2 );
}
}


ISphFieldFilter * CSphFieldRegExps::Clone()
{
CSphFieldRegExps * pCloned = new CSphFieldRegExps ( true );
CSphFieldRegExps * pCloned = new CSphFieldRegExps;
pCloned->m_dRegexps = m_dRegexps;

return pCloned;
#if USE_RE2
ISphFieldFilter * sphCreateRegexpFilter ( const CSphFieldFilterSettings & tFilterSettings, CSphString & sError )
{
CSphFieldRegExps * pFilter = new CSphFieldRegExps ( false );
ARRAY_FOREACH ( i, tFilterSettings.m_dRegexps )
pFilter->AddRegExp ( tFilterSettings.m_dRegexps[i].cstr(), sError );

return pFilter;
return new CSphFieldRegExps ( tFilterSettings.m_dRegexps, sError );
}
#else
ISphFieldFilter * sphCreateRegexpFilter ( const CSphFieldFilterSettings &, CSphString & )
{
return NULL;
return nullptr;
}
#endif


void CSphSource::SetFieldFilter ( ISphFieldFilter * pFilter )
{
SafeAddRef ( pFilter );
m_pFieldFilter = pFilter;
}

void CSphSource::SetTokenizer ( ISphTokenizer * pTokenizer )
{
assert ( pTokenizer );
m_pTokenizer = pTokenizer;
SafeAddRef ( pTokenizer );
m_pTokenizer = pTokenizer;
}


else if ( uVersion>=20 )
uMinMaxIndex = rdHeader.GetDword ();

ISphFieldFilter* pFieldFilter = NULL;
ISphFieldFilterRefPtr_c pFieldFilter;
if ( uVersion>=28 )
{
CSphFieldFilterSettings tFieldFilterSettings;
pFieldFilter = sphCreateRegexpFilter ( tFieldFilterSettings, sError );

if ( !sphSpawnRLPFilter ( pFieldFilter, tIndexSettings, tTokenizerSettings, sPath, sError ) )
{
SafeDelete ( pFieldFilter );
sphDie ( "%s", sError.cstr() );
}
}

CSphFixedVector<uint64_t> dFieldLens ( tSchema.GetFieldsCount() );
wrHeader.PutOffset ( uMinMaxIndex );
SaveFieldFilterSettings ( wrHeader, pFieldFilter );

SafeDelete ( pFieldFilter );

// average field lengths
if ( tIndexSettings.m_bIndexFieldLens )
for ( int i = 0; i < tSchema.GetFieldsCount(); i++ )
12 src/sphinx.h
View file
@@ -1891,11 +1891,12 @@ struct CSphFieldFilterSettings
};

/// field filter
class ISphFieldFilter // fixme! Made refcounted
class ISphFieldFilter : public ISphRefcountedMT
{
protected:
virtual ~ISphFieldFilter ();
public:
ISphFieldFilter();
virtual ~ISphFieldFilter();

virtual int Apply ( const BYTE * sField, int iLength, CSphVector<BYTE> & dStorage, bool bQuery ) = 0;
virtual void GetSettings ( CSphFieldFilterSettings & tSettings ) const = 0;
@@ -1907,6 +1908,9 @@ class ISphFieldFilter // fixme! Made refcounted
ISphFieldFilter * m_pParent;
};

using ISphFieldFilterRefPtr_c = CSphRefcountedPtr<ISphFieldFilter>;


/// create a regexp field filter
ISphFieldFilter * sphCreateRegexpFilter ( const CSphFieldFilterSettings & tFilterSettings, CSphString & sError );

@@ -2030,7 +2034,7 @@ class CSphSource : public CSphSourceSettings
protected:
ISphTokenizerRefPtr_c m_pTokenizer; ///< my tokenizer
CSphDictRefPtr_c m_pDict; ///< my dict
ISphFieldFilter * m_pFieldFilter = nullptr; ///< my field filter
ISphFieldFilterRefPtr_c m_pFieldFilter; ///< my field filter

CSphSourceStats m_tStats; ///< my stats
CSphSchema m_tSchema; ///< my schema
@@ -3451,7 +3455,7 @@ class CSphIndex : public ISphKeywordsStat
protected:
CSphIndexSettings m_tSettings;

ISphFieldFilter * m_pFieldFilter = nullptr;
ISphFieldFilterRefPtr_c m_pFieldFilter;
ISphTokenizerRefPtr_c m_pTokenizer;
ISphTokenizerRefPtr_c m_pQueryTokenizer;
ISphTokenizerRefPtr_c m_pQueryTokenizerJson;
6 src/sphinxint.h
View file
@@ -1693,11 +1693,9 @@ struct CSphReconfigureSetup
{
ISphTokenizerRefPtr_c m_pTokenizer;
CSphDictRefPtr_c m_pDict;
CSphIndexSettings m_tIndex;
ISphFieldFilter * m_pFieldFilter = nullptr;
CSphIndexSettings m_tIndex;
ISphFieldFilterRefPtr_c m_pFieldFilter;
CSphSchema m_tSchema;

~CSphReconfigureSetup ();
};

uint64_t sphGetSettingsFNV ( const CSphIndexSettings & tSettings );

0 comments on commit 25453e5

Please sign in to comment.