mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
Upgraded sphinx to version 2.0.4
Fixed memory leaks and compiler warnings in ha_sphinx.cc Added HA_MUST_USE_TABLE_CONDITION_PUSHDOWN so that an engine can force index condition to be used mysql-test/suite/sphinx/sphinx.result: Added testing of pushdown conditions and sphinx status variables. mysql-test/suite/sphinx/sphinx.test: Added testing of pushdown conditions and sphinx status variables. mysql-test/suite/sphinx/suite.pm: Print version number if sphinx version is too old. sql/handler.h: Added HA_MUST_USE_TABLE_CONDITION_PUSHDOWN so that an engine can force index condition to be used sql/sql_base.cc: Added 'thd' argument to check_unused() to be able to set 'entry->in_use' if we call handler->extra(). This was needed as sphinx (and possible other storage engines) assumes that 'in_use' is set if handler functions are called. sql/sql_select.cc: Test if handler is forcing pushdown condition to be used. storage/sphinx/ha_sphinx.cc: Updated to version 2.0.4 Fixed memory leaks and compiler warnings. storage/sphinx/ha_sphinx.h: Updated to version 2.0.4 storage/sphinx/snippets_udf.cc: Updated to version 2.0.4
This commit is contained in:
@ -1,9 +1,11 @@
|
||||
//
|
||||
// $Id: snippets_udf.cc 2058 2009-11-07 04:01:57Z shodan $
|
||||
// $Id: snippets_udf.cc 3087 2012-01-30 23:07:35Z shodan $
|
||||
//
|
||||
|
||||
//
|
||||
// Copyright (c) 2001-2008, Andrew Aksyonoff. All rights reserved.
|
||||
// Copyright (c) 2001-2012, Andrew Aksyonoff
|
||||
// Copyright (c) 2008-2012, Sphinx Technologies Inc
|
||||
// All rights reserved
|
||||
//
|
||||
// This program is free software; you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License. You should have
|
||||
@ -11,14 +13,6 @@
|
||||
// did not, you can find it at http://www.gnu.org/
|
||||
//
|
||||
|
||||
#include <mysql_version.h>
|
||||
|
||||
#if MYSQL_VERSION_ID>50100
|
||||
#include <mysql/plugin.h>
|
||||
#else
|
||||
#include "../mysql_priv.h"
|
||||
#endif
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <assert.h>
|
||||
@ -26,14 +20,18 @@
|
||||
#include <sys/un.h>
|
||||
#include <netdb.h>
|
||||
|
||||
#include <mysql_version.h>
|
||||
|
||||
#if MYSQL_VERSION_ID>50100
|
||||
#include "mysql_priv.h"
|
||||
#include <mysql/plugin.h>
|
||||
#else
|
||||
#include "../mysql_priv.h"
|
||||
#endif
|
||||
|
||||
#include <mysys_err.h>
|
||||
#include <my_sys.h>
|
||||
|
||||
#include <mysqld_error.h>
|
||||
|
||||
#include <my_net.h>
|
||||
#include <mysql_com.h>
|
||||
|
||||
#if MYSQL_VERSION_ID>=50120
|
||||
typedef uchar byte;
|
||||
#endif
|
||||
@ -120,7 +118,7 @@ static bool sphSend ( int iFd, const char * pBuffer, int iSize, bool bReportErro
|
||||
assert ( iSize > 0 );
|
||||
|
||||
const int iResult = send ( iFd, pBuffer, iSize, 0 );
|
||||
if ( iResult != iSize )
|
||||
if ( iResult!=iSize )
|
||||
{
|
||||
if ( bReportErrors ) sphShowErrno("send");
|
||||
return false;
|
||||
@ -132,7 +130,7 @@ static bool sphRecv ( int iFd, char * pBuffer, int iSize, bool bReportErrors = f
|
||||
{
|
||||
assert ( pBuffer );
|
||||
assert ( iSize > 0 );
|
||||
|
||||
|
||||
while ( iSize )
|
||||
{
|
||||
const int iResult = recv ( iFd, pBuffer, iSize, 0 );
|
||||
@ -140,14 +138,12 @@ static bool sphRecv ( int iFd, char * pBuffer, int iSize, bool bReportErrors = f
|
||||
{
|
||||
iSize -= iResult;
|
||||
pBuffer += iSize;
|
||||
}
|
||||
else if ( iResult == 0 )
|
||||
} else if ( iResult==0 )
|
||||
{
|
||||
if ( bReportErrors )
|
||||
my_error ( ER_CONNECT_TO_FOREIGN_DATA_SOURCE, MYF(0), "recv() failed: disconnected" );
|
||||
return false;
|
||||
}
|
||||
else
|
||||
} else
|
||||
{
|
||||
if ( bReportErrors ) sphShowErrno("recv");
|
||||
return false;
|
||||
@ -160,11 +156,9 @@ enum
|
||||
{
|
||||
SPHINX_SEARCHD_PROTO = 1,
|
||||
|
||||
SEARCHD_COMMAND_SEARCH = 0,
|
||||
SEARCHD_COMMAND_EXCERPT = 1,
|
||||
|
||||
VER_COMMAND_SEARCH = 0x116,
|
||||
VER_COMMAND_EXCERPT = 0x100,
|
||||
VER_COMMAND_EXCERPT = 0x103,
|
||||
};
|
||||
|
||||
/// known answers
|
||||
@ -191,7 +185,7 @@ private:
|
||||
char * m_pCurrent;
|
||||
|
||||
public:
|
||||
CSphBuffer ( const int iSize )
|
||||
explicit CSphBuffer ( const int iSize )
|
||||
: m_bOverrun ( false )
|
||||
, m_iSize ( iSize )
|
||||
, m_iLeft ( iSize )
|
||||
@ -203,22 +197,22 @@ public:
|
||||
|
||||
~CSphBuffer ()
|
||||
{
|
||||
SafeDelete ( m_pBuffer );
|
||||
SafeDeleteArray ( m_pBuffer );
|
||||
}
|
||||
|
||||
const char * Ptr() const { return m_pBuffer; }
|
||||
|
||||
bool Finalize()
|
||||
{
|
||||
return !( m_bOverrun || m_iLeft != 0 || m_pCurrent - m_pBuffer != m_iSize );
|
||||
return !( m_bOverrun || m_iLeft!=0 || ( m_pCurrent - m_pBuffer )!=m_iSize );
|
||||
}
|
||||
|
||||
|
||||
void SendBytes ( const void * pBytes, int iBytes );
|
||||
|
||||
void SendWord ( short int v ) { v = ntohs(v); SendBytes ( &v, sizeof(v) ); }
|
||||
|
||||
void SendWord ( short int v ) { v = ntohs(v); SendBytes ( &v, sizeof(v) ); } // NOLINT
|
||||
void SendInt ( int v ) { v = ntohl(v); SendBytes ( &v, sizeof(v) ); }
|
||||
void SendDword ( DWORD v ) { v = ntohl(v) ;SendBytes ( &v, sizeof(v) ); }
|
||||
void SendUint64 ( ulonglong v ) { SendDword ( uint(v>>32) ); SendDword ( uint(v&0xFFFFFFFFUL) ); }
|
||||
void SendUint64 ( ulonglong v ) { SendDword ( uint ( v>>32 ) ); SendDword ( uint ( v&0xFFFFFFFFUL ) ); }
|
||||
void SendString ( const char * v ) { SendString ( v, strlen(v) ); }
|
||||
void SendString ( const char * v, int iLen ) { SendDword(iLen); SendBytes ( v, iLen ); }
|
||||
void SendFloat ( float v ) { SendDword ( sphF2DW(v) ); }
|
||||
@ -242,28 +236,28 @@ struct CSphUrl
|
||||
{
|
||||
char * m_sBuffer;
|
||||
char * m_sFormatted;
|
||||
|
||||
|
||||
char * m_sScheme;
|
||||
char * m_sHost;
|
||||
char * m_sIndex;
|
||||
|
||||
|
||||
int m_iPort;
|
||||
|
||||
|
||||
CSphUrl()
|
||||
: m_sBuffer ( NULL )
|
||||
, m_sFormatted ( NULL )
|
||||
, m_sScheme ( (char*) SPHINXSE_DEFAULT_SCHEME )
|
||||
, m_sHost ( (char*) SPHINXSE_DEFAULT_HOST )
|
||||
, m_sIndex ( (char*) SPHINXSE_DEFAULT_INDEX )
|
||||
, m_sScheme ( SPHINXSE_DEFAULT_SCHEME )
|
||||
, m_sHost ( SPHINXSE_DEFAULT_HOST )
|
||||
, m_sIndex ( SPHINXSE_DEFAULT_INDEX )
|
||||
, m_iPort ( SPHINXSE_DEFAULT_PORT )
|
||||
{}
|
||||
|
||||
|
||||
~CSphUrl()
|
||||
{
|
||||
SafeDeleteArray ( m_sFormatted );
|
||||
SafeDeleteArray ( m_sBuffer );
|
||||
}
|
||||
|
||||
|
||||
bool Parse ( const char * sUrl, int iLen );
|
||||
int Connect();
|
||||
const char * Format();
|
||||
@ -295,32 +289,32 @@ bool CSphUrl::Parse ( const char * sUrl, int iLen )
|
||||
while ( iLen )
|
||||
{
|
||||
bOk = false;
|
||||
|
||||
|
||||
m_sBuffer = sphDup ( sUrl, iLen );
|
||||
m_sScheme = m_sBuffer;
|
||||
|
||||
|
||||
m_sHost = strstr ( m_sBuffer, "://" );
|
||||
if ( !m_sHost )
|
||||
break;
|
||||
m_sHost[0] = '\0';
|
||||
m_sHost += 2;
|
||||
|
||||
|
||||
if ( !strcmp ( m_sScheme, "unix" ) )
|
||||
{
|
||||
// unix-domain socket
|
||||
m_iPort = 0;
|
||||
if (!( m_sIndex = strrchr ( m_sHost, ':' ) ))
|
||||
m_sIndex = (char*) SPHINXSE_DEFAULT_INDEX;
|
||||
m_sIndex = SPHINXSE_DEFAULT_INDEX;
|
||||
else
|
||||
{
|
||||
*m_sIndex++ = '\0';
|
||||
if ( !*m_sIndex )
|
||||
m_sIndex = (char*) SPHINXSE_DEFAULT_INDEX;
|
||||
m_sIndex = SPHINXSE_DEFAULT_INDEX;
|
||||
}
|
||||
bOk = true;
|
||||
break;
|
||||
}
|
||||
if( strcmp ( m_sScheme, "sphinx" ) != 0 && strcmp ( m_sScheme, "inet" ) != 0 )
|
||||
if ( strcmp ( m_sScheme, "sphinx" )!=0 && strcmp ( m_sScheme, "inet" )!=0 )
|
||||
break;
|
||||
|
||||
// inet
|
||||
@ -333,10 +327,10 @@ bool CSphUrl::Parse ( const char * sUrl, int iLen )
|
||||
{
|
||||
m_sIndex = strchr ( sPort, '/' );
|
||||
if ( m_sIndex )
|
||||
*m_sIndex++ = '\0';
|
||||
*m_sIndex++ = '\0';
|
||||
else
|
||||
m_sIndex = (char*) SPHINXSE_DEFAULT_INDEX;
|
||||
|
||||
m_sIndex = SPHINXSE_DEFAULT_INDEX;
|
||||
|
||||
m_iPort = atoi(sPort);
|
||||
if ( !m_iPort )
|
||||
m_iPort = SPHINXSE_DEFAULT_PORT;
|
||||
@ -347,13 +341,13 @@ bool CSphUrl::Parse ( const char * sUrl, int iLen )
|
||||
if ( m_sIndex )
|
||||
*m_sIndex++ = '\0';
|
||||
else
|
||||
m_sIndex = (char*) SPHINXSE_DEFAULT_INDEX;
|
||||
m_sIndex = SPHINXSE_DEFAULT_INDEX;
|
||||
}
|
||||
|
||||
bOk = true;
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
return bOk;
|
||||
}
|
||||
|
||||
@ -378,35 +372,33 @@ int CSphUrl::Connect()
|
||||
|
||||
memset ( &sin, 0, sizeof(sin) );
|
||||
sin.sin_family = AF_INET;
|
||||
sin.sin_port = htons(m_iPort);
|
||||
|
||||
sin.sin_port = htons ( m_iPort );
|
||||
|
||||
// resolve address
|
||||
if ( (int)( ip_addr=inet_addr(m_sHost) ) != (int)INADDR_NONE )
|
||||
if ( (int)( ip_addr = inet_addr ( m_sHost ) )!=(int)INADDR_NONE )
|
||||
memcpy ( &sin.sin_addr, &ip_addr, sizeof(ip_addr) );
|
||||
else
|
||||
{
|
||||
int tmp_errno;
|
||||
struct hostent tmp_hostent, *hp;
|
||||
char buff2 [ GETHOSTBYNAME_BUFF_SIZE ];
|
||||
|
||||
hp = my_gethostbyname_r ( m_sHost, &tmp_hostent,
|
||||
buff2, sizeof(buff2), &tmp_errno );
|
||||
|
||||
hp = my_gethostbyname_r ( m_sHost, &tmp_hostent, buff2, sizeof(buff2), &tmp_errno );
|
||||
if ( !hp )
|
||||
{
|
||||
{
|
||||
my_gethostbyname_r_free();
|
||||
|
||||
|
||||
char sError[256];
|
||||
snprintf ( sError, sizeof(sError), "failed to resolve searchd host (name=%s)", m_sHost );
|
||||
|
||||
|
||||
my_error ( ER_CONNECT_TO_FOREIGN_DATA_SOURCE, MYF(0), sError );
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
memcpy ( &sin.sin_addr, hp->h_addr, Min ( sizeof(sin.sin_addr), (size_t)hp->h_length ) );
|
||||
my_gethostbyname_r_free();
|
||||
}
|
||||
}
|
||||
else
|
||||
} else
|
||||
{
|
||||
#ifndef __WIN__
|
||||
iDomain = AF_UNIX;
|
||||
@ -426,17 +418,17 @@ int CSphUrl::Connect()
|
||||
uint uServerVersion;
|
||||
uint uClientVersion = htonl ( SPHINX_SEARCHD_PROTO );
|
||||
int iSocket = -1;
|
||||
const char * pError = NULL;
|
||||
char * pError = NULL;
|
||||
do
|
||||
{
|
||||
iSocket = socket ( iDomain, SOCK_STREAM, 0 );
|
||||
if ( iSocket == -1 )
|
||||
if ( iSocket==-1 )
|
||||
{
|
||||
pError = "Failed to create client socket";
|
||||
break;
|
||||
}
|
||||
|
||||
if ( connect ( iSocket, pSockaddr, iSockaddrSize ) == -1)
|
||||
|
||||
if ( connect ( iSocket, pSockaddr, iSockaddrSize )==-1 )
|
||||
{
|
||||
pError = "Failed to connect to searchd";
|
||||
break;
|
||||
@ -447,7 +439,7 @@ int CSphUrl::Connect()
|
||||
pError = "Failed to receive searchd version";
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
if ( !sphSend ( iSocket, (char *)&uClientVersion, sizeof(uClientVersion) ) )
|
||||
{
|
||||
pError = "Failed to send client version";
|
||||
@ -464,9 +456,9 @@ int CSphUrl::Connect()
|
||||
snprintf ( sError, sizeof(sError), "%s [%d] %s", Format(), errno, strerror(errno) );
|
||||
my_error ( ER_CONNECT_TO_FOREIGN_DATA_SOURCE, MYF(0), sError );
|
||||
|
||||
if ( iSocket != -1 )
|
||||
if ( iSocket!=-1 )
|
||||
close ( iSocket );
|
||||
|
||||
|
||||
return -1;
|
||||
}
|
||||
|
||||
@ -483,7 +475,7 @@ struct CSphResponse
|
||||
, m_pBody ( NULL )
|
||||
{}
|
||||
|
||||
CSphResponse ( DWORD uSize )
|
||||
explicit CSphResponse ( DWORD uSize )
|
||||
: m_pBody ( NULL )
|
||||
{
|
||||
m_pBuffer = new char[uSize];
|
||||
@ -493,7 +485,7 @@ struct CSphResponse
|
||||
{
|
||||
SafeDeleteArray ( m_pBuffer );
|
||||
}
|
||||
|
||||
|
||||
static CSphResponse * Read ( int iSocket, int iClientVersion );
|
||||
};
|
||||
|
||||
@ -504,14 +496,14 @@ CSphResponse::Read ( int iSocket, int iClientVersion )
|
||||
if ( !sphRecv ( iSocket, sHeader, sizeof(sHeader) ) )
|
||||
return NULL;
|
||||
|
||||
int iStatus = ntohs ( sphUnalignedRead ( *(short int *) &sHeader[0] ) );
|
||||
int iVersion = ntohs ( sphUnalignedRead ( *(short int *) &sHeader[2] ) );
|
||||
DWORD uLength = ntohl ( sphUnalignedRead ( *(DWORD *) &sHeader[4] ) );
|
||||
int iStatus = ntohs ( sphUnalignedRead ( *(short int *) &sHeader[0] ) );
|
||||
int iVersion = ntohs ( sphUnalignedRead ( *(short int *) &sHeader[2] ) );
|
||||
DWORD uLength = ntohl ( sphUnalignedRead ( *(DWORD *) &sHeader[4] ) );
|
||||
|
||||
if ( iVersion < iClientVersion ) // fixme: warn
|
||||
{}
|
||||
if ( iVersion<iClientVersion )
|
||||
return NULL;
|
||||
|
||||
if ( uLength <= SPHINXSE_MAX_ALLOC )
|
||||
if ( uLength<=SPHINXSE_MAX_ALLOC )
|
||||
{
|
||||
CSphResponse * pResponse = new CSphResponse ( uLength );
|
||||
if ( !sphRecv ( iSocket, pResponse->m_pBuffer, uLength ) )
|
||||
@ -521,16 +513,17 @@ CSphResponse::Read ( int iSocket, int iClientVersion )
|
||||
}
|
||||
|
||||
pResponse->m_pBody = pResponse->m_pBuffer;
|
||||
if ( iStatus != SEARCHD_OK )
|
||||
if ( iStatus!=SEARCHD_OK )
|
||||
{
|
||||
DWORD uSize = ntohl ( *(DWORD *)pResponse->m_pBuffer );
|
||||
if ( iStatus == SEARCHD_WARNING )
|
||||
if ( iStatus==SEARCHD_WARNING )
|
||||
{
|
||||
pResponse->m_pBody += uSize; // fixme: report the warning somehow
|
||||
else
|
||||
} else
|
||||
{
|
||||
char * sMessage = sphDup ( pResponse->m_pBuffer + sizeof(DWORD), uSize );
|
||||
my_error ( ER_QUERY_ON_FOREIGN_DATA_SOURCE, MYF(0), sMessage );
|
||||
SafeDelete ( sMessage );
|
||||
SafeDeleteArray ( sMessage );
|
||||
SafeDelete ( pResponse );
|
||||
return NULL;
|
||||
}
|
||||
@ -560,8 +553,13 @@ struct CSphSnippets
|
||||
int m_iBeforeMatch;
|
||||
int m_iAfterMatch;
|
||||
int m_iChunkSeparator;
|
||||
int m_iStripMode;
|
||||
int m_iPassageBoundary;
|
||||
int m_iLimit;
|
||||
int m_iLimitWords;
|
||||
int m_iLimitPassages;
|
||||
int m_iAround;
|
||||
int m_iPassageId;
|
||||
int m_iFlags;
|
||||
|
||||
CSphSnippets()
|
||||
@ -569,9 +567,14 @@ struct CSphSnippets
|
||||
, m_iBeforeMatch(0)
|
||||
, m_iAfterMatch(0)
|
||||
, m_iChunkSeparator(0)
|
||||
// defaults
|
||||
, m_iStripMode(0)
|
||||
, m_iPassageBoundary(0)
|
||||
// defaults
|
||||
, m_iLimit(256)
|
||||
, m_iLimitWords(0)
|
||||
, m_iLimitPassages(0)
|
||||
, m_iAround(5)
|
||||
, m_iPassageId(1)
|
||||
, m_iFlags(1)
|
||||
{
|
||||
}
|
||||
@ -582,24 +585,24 @@ struct CSphSnippets
|
||||
}
|
||||
};
|
||||
|
||||
#define KEYWORD(NAME) else if ( strncmp ( NAME, pArgs->attributes[i], pArgs->attribute_lengths[i] ) == 0 )
|
||||
#define KEYWORD(NAME) else if ( strncmp ( NAME, pArgs->attributes[i], pArgs->attribute_lengths[i] )==0 )
|
||||
|
||||
#define CHECK_TYPE(TYPE) \
|
||||
if ( pArgs->arg_type[i] != TYPE ) \
|
||||
if ( pArgs->arg_type[i]!=TYPE ) \
|
||||
{ \
|
||||
snprintf ( sMessage, MAX_MESSAGE_LENGTH, \
|
||||
"%.*s argument must be a string", \
|
||||
(int)pArgs->attribute_lengths[i], \
|
||||
pArgs->attributes[i] ); \
|
||||
"%.*s argument must be a string", \
|
||||
(int)pArgs->attribute_lengths[i], \
|
||||
pArgs->attributes[i] ); \
|
||||
bFail = true; \
|
||||
break; \
|
||||
} \
|
||||
if ( TYPE == STRING_RESULT && !pArgs->args[i] ) \
|
||||
if ( TYPE==STRING_RESULT && !pArgs->args[i] ) \
|
||||
{ \
|
||||
snprintf ( sMessage, MAX_MESSAGE_LENGTH, \
|
||||
"%.*s argument must be constant (and not NULL)", \
|
||||
(int)pArgs->attribute_lengths[i], \
|
||||
pArgs->attributes[i] ); \
|
||||
"%.*s argument must be constant (and not NULL)", \
|
||||
(int)pArgs->attribute_lengths[i], \
|
||||
pArgs->attributes[i] ); \
|
||||
bFail = true; \
|
||||
break; \
|
||||
}
|
||||
@ -621,7 +624,7 @@ my_bool sphinx_snippets_init ( UDF_INIT * pUDF, UDF_ARGS * pArgs, char * sMessag
|
||||
{
|
||||
if ( i < 3 )
|
||||
{
|
||||
if ( pArgs->arg_type[i] != STRING_RESULT )
|
||||
if ( pArgs->arg_type[i]!=STRING_RESULT )
|
||||
{
|
||||
strncpy ( sMessage, "first three arguments must be of string type", MAX_MESSAGE_LENGTH );
|
||||
bFail = true;
|
||||
@ -641,21 +644,33 @@ my_bool sphinx_snippets_init ( UDF_INIT * pUDF, UDF_ARGS * pArgs, char * sMessag
|
||||
KEYWORD("before_match") { STRING; pOpts->m_iBeforeMatch = i; }
|
||||
KEYWORD("after_match") { STRING; pOpts->m_iAfterMatch = i; }
|
||||
KEYWORD("chunk_separator") { STRING; pOpts->m_iChunkSeparator = i; }
|
||||
KEYWORD("html_strip_mode") { STRING; pOpts->m_iStripMode = i; }
|
||||
KEYWORD("passage_boundary") { STRING; pOpts->m_iPassageBoundary = i; }
|
||||
|
||||
KEYWORD("limit") { INT; pOpts->m_iLimit = iValue; }
|
||||
KEYWORD("limit_words") { INT; pOpts->m_iLimitWords = iValue; }
|
||||
KEYWORD("limit_passages") { INT; pOpts->m_iLimitPassages = iValue; }
|
||||
KEYWORD("around") { INT; pOpts->m_iAround = iValue; }
|
||||
KEYWORD("start_passage_id") { INT; pOpts->m_iPassageId = iValue; }
|
||||
|
||||
KEYWORD("exact_phrase") { INT; if ( iValue ) pOpts->m_iFlags |= 2; }
|
||||
KEYWORD("single_passage") { INT; if ( iValue ) pOpts->m_iFlags |= 4; }
|
||||
KEYWORD("use_boundaries") { INT; if ( iValue ) pOpts->m_iFlags |= 8; }
|
||||
KEYWORD("weight_order") { INT; if ( iValue ) pOpts->m_iFlags |= 16; }
|
||||
KEYWORD("query_mode") { INT; if ( iValue ) pOpts->m_iFlags |= 32; }
|
||||
KEYWORD("force_all_words") { INT; if ( iValue ) pOpts->m_iFlags |= 64; }
|
||||
KEYWORD("load_files") { INT; if ( iValue ) pOpts->m_iFlags |= 128; }
|
||||
KEYWORD("allow_empty") { INT; if ( iValue ) pOpts->m_iFlags |= 256; }
|
||||
KEYWORD("emit_zones") { INT; if ( iValue ) pOpts->m_iFlags |= 512; }
|
||||
else
|
||||
{
|
||||
snprintf ( sMessage, MAX_MESSAGE_LENGTH, "unrecognized argument: %.*s",
|
||||
(int)pArgs->attribute_lengths[i], pArgs->attributes[i] );
|
||||
(int)pArgs->attribute_lengths[i], pArgs->attributes[i] );
|
||||
bFail = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if ( bFail )
|
||||
{
|
||||
SafeDelete ( pOpts );
|
||||
@ -691,15 +706,14 @@ char * sphinx_snippets ( UDF_INIT * pUDF, UDF_ARGS * pArgs, char * sResult, unsi
|
||||
return sResult;
|
||||
}
|
||||
|
||||
const int iSize =
|
||||
8 + // header
|
||||
8 +
|
||||
4 + pArgs->lengths[1] + // index
|
||||
4 + pArgs->lengths[2] + // words
|
||||
4 + ARG_LEN ( pOpts->m_iBeforeMatch, 3 ) +
|
||||
4 + ARG_LEN ( pOpts->m_iAfterMatch, 4 ) +
|
||||
4 + ARG_LEN ( pOpts->m_iChunkSeparator, 5 ) +
|
||||
12 +
|
||||
const int iSize = 68 +
|
||||
pArgs->lengths[1] + // index
|
||||
pArgs->lengths[2] + // words
|
||||
ARG_LEN ( pOpts->m_iBeforeMatch, 3 ) +
|
||||
ARG_LEN ( pOpts->m_iAfterMatch, 4 ) +
|
||||
ARG_LEN ( pOpts->m_iChunkSeparator, 5 ) +
|
||||
ARG_LEN ( pOpts->m_iStripMode, 5 ) +
|
||||
ARG_LEN ( pOpts->m_iPassageBoundary, 0 ) +
|
||||
4 + pArgs->lengths[0]; // document
|
||||
|
||||
CSphBuffer tBuffer(iSize);
|
||||
@ -721,6 +735,13 @@ char * sphinx_snippets ( UDF_INIT * pUDF, UDF_ARGS * pArgs, char * sResult, unsi
|
||||
tBuffer.SendInt ( pOpts->m_iLimit );
|
||||
tBuffer.SendInt ( pOpts->m_iAround );
|
||||
|
||||
tBuffer.SendInt ( pOpts->m_iLimitPassages );
|
||||
tBuffer.SendInt ( pOpts->m_iLimitWords );
|
||||
tBuffer.SendInt ( pOpts->m_iPassageId );
|
||||
|
||||
SEND_STRING ( pOpts->m_iStripMode, "index" );
|
||||
SEND_STRING ( pOpts->m_iPassageBoundary, "" );
|
||||
|
||||
// single document
|
||||
tBuffer.SendInt ( 1 );
|
||||
tBuffer.SendString ( ARG(0) );
|
||||
@ -733,22 +754,22 @@ char * sphinx_snippets ( UDF_INIT * pUDF, UDF_ARGS * pArgs, char * sResult, unsi
|
||||
my_error ( ER_QUERY_ON_FOREIGN_DATA_SOURCE, MYF(0), "INTERNAL ERROR: failed to build request" );
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
iSocket = pOpts->m_tUrl.Connect();
|
||||
if ( iSocket == -1 ) break;
|
||||
if ( iSocket==-1 ) break;
|
||||
if ( !sphSend ( iSocket, tBuffer.Ptr(), iSize, sphReportErrors ) ) break;
|
||||
|
||||
CSphResponse * pResponse = CSphResponse::Read ( iSocket, 0x100 );
|
||||
CSphResponse * pResponse = CSphResponse::Read ( iSocket, VER_COMMAND_EXCERPT );
|
||||
if ( !pResponse ) break;
|
||||
|
||||
close ( iSocket );
|
||||
pOpts->m_pResponse = pResponse;
|
||||
*pLength = ntohl( *(DWORD *)pResponse->m_pBody );
|
||||
*pLength = ntohl ( *(DWORD *)pResponse->m_pBody );
|
||||
return pResponse->m_pBody + sizeof(DWORD);
|
||||
}
|
||||
while(0);
|
||||
|
||||
if ( iSocket != -1 )
|
||||
if ( iSocket!=-1 )
|
||||
close ( iSocket );
|
||||
|
||||
*pError = 1;
|
||||
@ -756,7 +777,7 @@ char * sphinx_snippets ( UDF_INIT * pUDF, UDF_ARGS * pArgs, char * sResult, unsi
|
||||
}
|
||||
|
||||
#undef SEND_STRING
|
||||
#undef ARG_LEN
|
||||
#undef ARG_LEN
|
||||
#undef ARG
|
||||
|
||||
void sphinx_snippets_deinit ( UDF_INIT * pUDF )
|
||||
@ -766,5 +787,5 @@ void sphinx_snippets_deinit ( UDF_INIT * pUDF )
|
||||
}
|
||||
|
||||
//
|
||||
// $Id: snippets_udf.cc 2058 2009-11-07 04:01:57Z shodan $
|
||||
// $Id: snippets_udf.cc 3087 2012-01-30 23:07:35Z shodan $
|
||||
//
|
||||
|
Reference in New Issue
Block a user