updated SI CalcCount API; added test

cmake/GetColumnar.cmake

@@ -19,7 +19,7 @@ include ( update_bundle )
 
 # Versions of API headers we are need to build with.
 set ( NEED_COLUMNAR_API 21 )
-set ( NEED_SECONDARY_API 8 )
+set ( NEED_SECONDARY_API 9 )
 
 
 # Note: we don't build, neither link with columnar. Only thing we expect to get is a few interface headers, aka 'columnar_api'.

src/sphinx.cpp

@@ -3113,7 +3113,7 @@ int64_t CSphIndex_VLN::GetCount ( const CSphFilterSettings & tFilter ) const
 
 	uint32_t uCount = 0;
 	std::string sError;
-	if ( !m_pSIdx.get()->CalcCount ( uCount, tColumnarFilter, sError ) )
+	if ( !m_pSIdx.get()->CalcCount ( uCount, tColumnarFilter, m_iDocinfo, sError ) )
 		return -1;
 
 	return uCount;

test/test_452/test.xml

@@ -129,6 +129,10 @@ select * from test1 where extra='' order by id desc /*+ NO_SecondaryIndex(extra)
 select * from test1 where extra='' order by id desc /*+ SecondaryIndex(extra) */;
 select * from test1 where extra!='' order by id desc /*+ NO_SecondaryIndex(extra) */;
 select * from test1 where extra!='' order by id desc /*+ SecondaryIndex(extra) */;
+
+select count(*) from test1 where tag=1;
+select count(*) from test1 where tag!=1;
+select count(*) from test1;
 </sphinxql>
 
 </queries>