Forks/privacore-open-source-search-engine
1
0
Fork 0
forked from Mirrors/privacore-open-source-search-engine
Code Pull Requests Activity

fix parm checksum for syncing parms.

Browse Source 
was not using gbstrlen() for strings.
This commit is contained in:
Matt Wells
2013-12-27 11:56:20 -08:00
parent 0181a32311
commit 958becbdf0
2 changed files with 35 additions and 15 deletions

22
Parms.cpp

@ -16823,6 +16823,13 @@ bool Parms::addCurrentParmToList2 ( SafeBuf *parmList ,
long dataSize = m->m_size;
if ( occNum > 0 ) data += occNum * m->m_size;
if ( m->m_type == TYPE_STRING ||
m->m_type == TYPE_STRINGBOX ||
m->m_type == TYPE_SAFEBUF ||
m->m_type == TYPE_STRINGNONEMPTY )
// include \0 in string
dataSize = gbstrlen(data) + 1;
// if a safebuf, point to the string within
if ( m->m_type == TYPE_SAFEBUF ) {
SafeBuf *sb = (SafeBuf *)data;
@ -17968,7 +17975,20 @@ bool Parms::addAllParmsToList ( SafeBuf *parmList, collnum_t collnum ) {
collnum ,
occNum ,
parm ) )
return false;
return false;
/*
//
// use this to debug parm list checksums being off
//
long long h64 ;
h64 = hash64 ( parmList->getBufStart(),
parmList->length() );
// note it for debugging hash
SafeBuf xb;
parm->printVal ( &xb ,collnum,occNum);
log("parms: adding (h=%llx) parm %s = %s",
h64,parm->m_title,xb.getBufStart());
*/
}
}

28
main.cpp

@ -4100,11 +4100,11 @@ int install ( install_flag_konst_t installFlag , long hostId , char *dir ,
"ssh %s \"cd %s ; "
"cp -f gb gb.oldsave ; "
"mv -f gb.installed gb ; "
"./gb -c %shosts.conf dumpmissing %s %li "
"./gb dumpmissing %s %li "
">& ./missing%li &\" &",
iptoa(h2->m_ip),
h2->m_dir ,
h2->m_dir ,
//h2->m_dir ,
coll ,
h2->m_hostId ,
h2->m_hostId );
@ -4118,11 +4118,11 @@ int install ( install_flag_konst_t installFlag , long hostId , char *dir ,
"ssh %s \"cd %s ; "
"cp -f gb gb.oldsave ; "
"mv -f gb.installed gb ; "
"./gb -c %shosts.conf dumpdups %s %li "
"./gb dumpdups %s %li "
">& ./dups%li &\" &",
iptoa(h2->m_ip),
h2->m_dir ,
h2->m_dir ,
//h2->m_dir ,
coll ,
h2->m_hostId ,
h2->m_hostId );
@ -4137,12 +4137,12 @@ int install ( install_flag_konst_t installFlag , long hostId , char *dir ,
"ssh %s \"cd %s ; "
"cp -f gb gb.oldsave ; "
"mv -f gb.installed gb ; "
"./gb -c %shosts.conf %li "
"./gb %li "
"removedocids %s %s %li "
">& ./removelog%03li &\" &",
iptoa(h2->m_ip),
h2->m_dir ,
h2->m_dir ,
//h2->m_dir ,
h2->m_hostId ,
coll ,
dir , // really docidsFile
@ -4384,11 +4384,11 @@ int install ( install_flag_konst_t installFlag , long hostId , char *dir ,
"ssh %s \"cd %s ; "
"cp -f gb gb.oldsave ; "
"mv -f gb.installed gb ; %s"
"./gb -c %shosts.conf %li >& ./log%03li &\" &",
"./gb %li >& ./log%03li &\" &",
iptoa(h2->m_ip),
h2->m_dir ,
tmp2 ,
h2->m_dir ,
//h2->m_dir ,
h2->m_hostId ,
h2->m_hostId );
// log it
@ -4433,11 +4433,11 @@ int install ( install_flag_konst_t installFlag , long hostId , char *dir ,
"ssh %s \"cd %s ; "
"cp -f gb gb.oldsave ; "
"mv -f gb.installed gb ; %s"
"./gb -c %shosts.conf %li >& ./log%03li &\" &",
"./gb %li >& ./log%03li &\" &",
iptoa(h2->m_ipShotgun),
h2->m_dir ,
tmp2 ,
h2->m_dir ,
//h2->m_dir ,
h2->m_hostId ,
h2->m_hostId );
// log it
@ -4470,7 +4470,7 @@ int install ( install_flag_konst_t installFlag , long hostId , char *dir ,
"{ "
"mv ./log%03li ./log%03li-\\`date '+"
"%%Y_%%m_%%d-%%H:%%M:%%S'\\` ; "
"./gb -c %shosts.conf %li "
"./gb %li "
"\\$ADDARGS "
" >& ./log%03li ;"
"EXITSTATUS=\\$? ; "
@ -4481,7 +4481,7 @@ int install ( install_flag_konst_t installFlag , long hostId , char *dir ,
h2->m_dir ,
h2->m_hostId ,
h2->m_hostId ,
h2->m_dir ,
//h2->m_dir ,
h2->m_hostId ,
h2->m_hostId );
@ -4698,11 +4698,11 @@ int install ( install_flag_konst_t installFlag , long hostId , char *dir ,
sprintf(tmp,
"ssh %s \"cd %s ;"
//"%s"
"./gb -c %shosts.conf genclusterdb %s %li >&"
"./gb genclusterdb %s %li >&"
"./log%03li-genclusterdb &\" &",
iptoa(h2->m_ip),
h2->m_dir ,
h2->m_dir ,
//h2->m_dir ,
//tmp2 ,
coll ,
h2->m_hostId ,