Revert last 9 commits

Author: sanikolaev

.github/workflows/win_test_template.yml

@@ -32,7 +32,7 @@ jobs:
       CTEST_START: ${{ inputs.CTEST_START }}
       CTEST_END: ${{ inputs.CTEST_END }}
       # The following is useful to test a specific test, just uncomment it, no need to disable CTEST_START/END
-      #CTEST_REGEX: test_307
+      CTEST_REGEX: test_307
       NO_BUILD: 1
       COLUMNAR_LOCATOR: ${{ inputs.COLUMNAR_LOCATOR }}
     steps:

src/sorterscroll.cpp

@@ -123,11 +123,6 @@ void ScrollSorter_T<COMP>::SetupRefMatch()
 	const ISphSchema * pSchema = m_pSorter->GetSchema();
 	assert(pSchema);
 
-	// Safety check: if scroll settings are invalid, don't set up reference match
-	// This check must come BEFORE FreeDataPtrAttrs() to prevent accessing corrupted data
-	if ( !m_tScroll.m_dAttrs.GetLength() )
-		return;
-
 	// Free old data pointer attributes before resetting
 	FreeDataPtrAttrs();
 
@@ -163,9 +158,13 @@ void ScrollSorter_T<COMP>::SetupRefMatch()
 		switch ( i.m_eType )
 		{
 		case SPH_ATTR_STRINGPTR:
-			sphSetRowAttr ( pRowData, pAttr->m_tLocator, (SphAttr_t)sphPackPtrAttr ( { (const BYTE*)i.m_sValue.cstr(), i.m_sValue.Length() } ) );
-			// Track that we allocated a pointer for this attribute
-			m_dAllocatedPtrAttrs.Add(pAttr);
+			// After remapping, pAttr should be SPH_ATTR_STRINGPTR, but check to be safe
+			if ( pAttr->m_eAttrType==SPH_ATTR_STRINGPTR )
+			{
+				sphSetRowAttr ( pRowData, pAttr->m_tLocator, (SphAttr_t)sphPackPtrAttr ( { (const BYTE*)i.m_sValue.cstr(), i.m_sValue.Length() } ) );
+				// Track that we allocated a pointer for this attribute
+				m_dAllocatedPtrAttrs.Add(pAttr);
+			}
 			break;
 
 		case SPH_ATTR_FLOAT:
@@ -402,6 +401,10 @@ bool SetupScroll ( CSphQuery & tQuery, CSphString & sError )
 	if ( !tQuery.m_tScrollSettings.m_dAttrs.GetLength() )
 		return true;
 
+	// Ensure m_sSortBy is set (scroll settings are valid)
+	if ( tQuery.m_tScrollSettings.m_sSortBy.IsEmpty() )
+		return true;
+
 	// replace order by with order_by_str here (if order by is default)
 	const char * szDefaultSortBy = "@weight desc";
 	if ( tQuery.m_sSortBy==szDefaultSortBy )