Skip to content
Permalink
Browse files

fixed indextool false error message on check of MVA; fixed build warn…

…ings
  • Loading branch information
tomatolog committed Dec 12, 2018
1 parent 3eacd2b commit e92c60240f8f9e1756bfa14fba0bbb402586a389
Showing with 2 additions and 3 deletions.
  1. +2 −2 src/sphinx.cpp
  2. +0 −1 src/sphinxpq.cpp
iLastEmpty = INT_MAX;

// check offset (index)
if ( uMvaID==uLastID && bIsSpaValid && rdMva.GetPos()!=int(sizeof(DWORD))*uSpaOffset )
if ( uMvaID==uLastID && bIsSpaValid && rdMva.GetPos()/sizeof(DWORD)!=uSpaOffset )
{
LOC_FAIL(( fp, "unexpected MVA docid (row=" INT64_FMT ", mvaattr=%d, docid expected=" DOCID_FMT ", got=" DOCID_FMT ", expected=" INT64_FMT ", got=%u)",
iRow, iItem, uLastID, uMvaID, rdMva.GetPos()/sizeof(DWORD), uSpaOffset ));

int64_t iBlockPos = sizeof(DWORD) * m_iMinMaxIndex + sizeof(DWORD) * iBlock * uMinMaxStride * 2;
// check docid vs global range
if ( iBlockPos + sizeof(DWORD) * uMinMaxStride > iMinMaxEnd )
if ( iBlockPos + int(sizeof(DWORD)) * uMinMaxStride > iMinMaxEnd )
LOC_FAIL(( fp, "unexpected block index end (row=" INT64_FMT ", block=" INT64_FMT ")",
iIndexEntry, iBlock ));

@@ -1831,7 +1831,6 @@ bool PercolateIndex_c::MultiQuery ( const CSphQuery * pQuery, CSphQueryResult *
ISphMatchSorter ** ppSorters, const CSphMultiQueryArgs &tArgs ) const
{
assert ( pQuery );
CSphQueryProfile * pProfile = pResult->m_pProfile;

MEMORY ( MEM_DISK_QUERY );

0 comments on commit e92c602

Please sign in to comment.