<div dir="ltr">I have tested this and it works great.<div>can you please proceed to backport it.<br></div><div><br></div><div>thanks</div><div><br></div><div>Jay</div><div><br></div><div><br></div></div><div class="gmail_extra">
<br><br><div class="gmail_quote">On 7 February 2014 01:09, Daniel-Constantin Mierla <span dir="ltr"><<a href="mailto:miconda@gmail.com" target="_blank">miconda@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<div text="#000000" bgcolor="#FFFFFF">
I pushed a rework-ed patch. Can you try with the patch from commit:<br>
<br>
-
<a href="http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3cde37cf10795b4eb785ffd141a8b28e64864f5d" target="_blank">http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3cde37cf10795b4eb785ffd141a8b28e64864f5d</a><br>
<br>
I don't use cassandra, so didn't test it. If all goes fine with the
tests, then I can backport.<br>
<br>
Cheersm<br>
Daniel<div><div class="h5"><br>
<br>
<br>
<div>On 06/02/14 05:30, jay binks wrote:<br>
</div>
</div></div><blockquote type="cite"><div><div class="h5">
<div dir="ltr">So I posted this to the user list in December, and
got nowhere..
<div><br>
</div>
<div>Can someone familiar with db_cassandra review my patch (
possibly clean this up and commit it )</div>
<div>
<div class="gmail_quote">
<div dir="ltr">
<div><br>
</div>
<div><br>
</div>
<div>
<div># git diff dbcassa_base.cpp </div>
<div>diff --git a/modules/db_cassandra/dbcassa_base.cpp
b/modules/db_cassandra/dbcassa_base.cpp</div>
<div>index e9d3a32..155221d 100644</div>
<div>--- a/modules/db_cassandra/dbcassa_base.cpp</div>
<div>+++ b/modules/db_cassandra/dbcassa_base.cpp</div>
<div>@@ -439,6 +439,7 @@ ColumnVecPtr
cassa_translate_query(const db1_con_t* _h, const
db_key_t* _k,</div>
<div> int key_len=0, seckey_len = 0;</div>
<div> int no_kc, no_sec_kc;</div>
<div> dbcassa_table_p tbc;</div>
<div>+ char pk[255];</div>
<div> </div>
<div> /** Lock table schema and construct primary
and secondary key **/</div>
<div> if(_k) {</div>
<div>@@ -495,8 +496,12 @@ ColumnVecPtr
cassa_translate_query(const db1_con_t* _h, const
db_key_t* _k,</div>
<div> } else { /* the table doesn't have
any secondary key defined */</div>
<div> if(_c) {</div>
<div>
<div> for(int i=0;
i< _nc; i++) {</div>
</div>
<div>-
sp.column_names.push_back(_c[i]->s);</div>
<div>
<div>-
LM_DBG("Query col: %s\n", _c[i]->s);</div>
</div>
<div>+ sprintf(pk,
"%.*s", _c[i]->len, _c[i]->s );</div>
<div>
+
sp.column_names.push_back( pk);</div>
<div>+
//sp.column_names.push_back(_c[i]->s);</div>
<div>+
LM_DBG("Query col: %s\n", pk );</div>
<div>+
//LM_DBG("Query col: %s\n", _c[i]->s);</div>
<div>
<div>+
LM_DBG("JAY Query col: %.*s\n", _c[i]->len,
_c[i]->s);</div>
<div> }</div>
</div>
<div>
<div> LM_DBG("get %d
columns\n", _nc);</div>
</div>
<div>
<div>
sp.__isset.column_names = true; // set</div>
</div>
</div>
<div><br>
</div>
<div><br>
</div>
<div><br>
</div>
<div><br>
</div>
<div>yea I know I left crap in there, but it gives you an
idea... also...</div>
<div>yea pk is a crap name... copy paste... and I havnt
given any thought to the size 255 , but thats probably
fairly safe and anything smaller might not be so safe.</div>
<div>( unless there is a limit elsewhere I should observe
)</div>
<div><br>
</div>
<div>Jay</div>
</div>
</div>
</div>
</div>
<br>
<fieldset></fieldset>
<br>
</div></div><pre>_______________________________________________
sr-dev mailing list
<a href="mailto:sr-dev@lists.sip-router.org" target="_blank">sr-dev@lists.sip-router.org</a>
<a href="http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev" target="_blank">http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev</a>
</pre>
</blockquote><div class="im">
<br>
<pre cols="72">--
Daniel-Constantin Mierla - <a href="http://www.asipto.com" target="_blank">http://www.asipto.com</a>
<a href="http://twitter.com/#!/miconda" target="_blank">http://twitter.com/#!/miconda</a> - <a href="http://www.linkedin.com/in/miconda" target="_blank">http://www.linkedin.com/in/miconda</a></pre>
</div></div>
<br>_______________________________________________<br>
sr-dev mailing list<br>
<a href="mailto:sr-dev@lists.sip-router.org">sr-dev@lists.sip-router.org</a><br>
<a href="http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev" target="_blank">http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev</a><br>
<br></blockquote></div><br><br clear="all"><div><br></div>-- <br>Sincerely<br><br>Jay
</div>