Fix feedback comments
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/b22097bf Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/b22097bf Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/b22097bf Branch: refs/heads/master Commit: b22097bf4a85bac4b04b8c89956ba93ae65df626 Parents: 4eea94b Author: Prashant Vasudev <prashanth.vasu...@esgyn.com> Authored: Tue Nov 22 20:43:11 2016 +0000 Committer: Prashant Vasudev <prashanth.vasu...@esgyn.com> Committed: Tue Nov 22 20:43:11 2016 +0000 ---------------------------------------------------------------------- .../sqf/src/seatrans/tm/hbasetmlib2/hbasetm.cpp | 13 ++++++++----- core/sqf/src/tm/tmddlrequests.cpp | 20 ++++++-------------- 2 files changed, 14 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b22097bf/core/sqf/src/seatrans/tm/hbasetmlib2/hbasetm.cpp ---------------------------------------------------------------------- diff --git a/core/sqf/src/seatrans/tm/hbasetmlib2/hbasetm.cpp b/core/sqf/src/seatrans/tm/hbasetmlib2/hbasetm.cpp index 5c619a7..683d181 100644 --- a/core/sqf/src/seatrans/tm/hbasetmlib2/hbasetm.cpp +++ b/core/sqf/src/seatrans/tm/hbasetmlib2/hbasetm.cpp @@ -862,7 +862,8 @@ int CHbaseTM::createTable(int64 pv_transid, jba_tbldesc, j_keys); if (getExceptionDetails(NULL)) { - errstrlen = ((int)_tlp_error_msg->length() < errstrlen) ? (int)_tlp_error_msg->length() : errstrlen; + int errMsgLen = (int)_tlp_error_msg->length(); + errstrlen = ((errMsgLen < errstrlen) && (errMsgLen > 0)) ? errMsgLen : errstrlen; strncpy(errstr, _tlp_error_msg->c_str(), errstrlen); errstr[errstrlen -1] = '\0'; tm_log_write(DTM_TM_JNI_ERROR, SQ_LOG_ERR, (char *)"CHbaseTM::createTable()", (char *)_tlp_error_msg->c_str(), pv_transid); @@ -920,7 +921,8 @@ int CHbaseTM::alterTable(int64 pv_transid, jba_tblname, j_tblopts); if (getExceptionDetails(NULL)) { - errstrlen = ((int)_tlp_error_msg->length() < errstrlen) ? (int)_tlp_error_msg->length() : errstrlen; + int errMsgLen = (int)_tlp_error_msg->length(); + errstrlen = ((errMsgLen < errstrlen) && (errMsgLen > 0)) ? errMsgLen : errstrlen; strncpy(errstr, _tlp_error_msg->c_str(), errstrlen); errstr[errstrlen -1] = '\0'; tm_log_write(DTM_TM_JNI_ERROR, SQ_LOG_ERR, (char *)"CHbaseTM::alterTable()", (char *)_tlp_error_msg->c_str(), pv_transid); @@ -972,8 +974,8 @@ int CHbaseTM::regTruncateOnAbort(int64 pv_transid, jlv_transid, jba_tblname); if (getExceptionDetails(NULL)) { - errstrlen = ((int)_tlp_error_msg->length() < errstrlen) ? (int)_tlp_error_msg->length() : errstrlen; - strncpy(errstr, _tlp_error_msg->c_str(), errstrlen); + int errMsgLen = (int)_tlp_error_msg->length(); + errstrlen = ((errMsgLen < errstrlen) && (errMsgLen > 0)) ? errMsgLen : errstrlen; strncpy(errstr, _tlp_error_msg->c_str(), errstrlen); errstr[errstrlen -1] = '\0'; tm_log_write(DTM_TM_JNI_ERROR, SQ_LOG_ERR, (char *)"CHbaseTM::regTruncateOnAbort()", (char *)_tlp_error_msg->c_str(), pv_transid); return RET_EXCEPTION; @@ -1022,7 +1024,8 @@ int CHbaseTM::dropTable(int64 pv_transid, jlv_transid, jba_tblname); if (getExceptionDetails(NULL)) { - errstrlen = ((int)_tlp_error_msg->length() < errstrlen) ? (int)_tlp_error_msg->length() : errstrlen; + int errMsgLen = (int)_tlp_error_msg->length(); + errstrlen = ((errMsgLen < errstrlen) && (errMsgLen > 0)) ? errMsgLen : errstrlen; strncpy(errstr, _tlp_error_msg->c_str(), errstrlen); errstr[errstrlen -1] = '\0'; tm_log_write(DTM_TM_JNI_ERROR, SQ_LOG_ERR, (char *)"CHbaseTM::dropTable()", (char *)_tlp_error_msg->c_str(), pv_transid); http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b22097bf/core/sqf/src/tm/tmddlrequests.cpp ---------------------------------------------------------------------- diff --git a/core/sqf/src/tm/tmddlrequests.cpp b/core/sqf/src/tm/tmddlrequests.cpp index 64b20ac..58ed0d6 100644 --- a/core/sqf/src/tm/tmddlrequests.cpp +++ b/core/sqf/src/tm/tmddlrequests.cpp @@ -40,20 +40,15 @@ JNIEXPORT jstring JNICALL Java_org_apache_hadoop_hbase_client_transactional_RMIn char *la_err_str = 0; int la_err_len = 0; - char* str_key; - str_key = new char[pv_keyLength]; char** la_keys; - la_keys = new char *[TM_MAX_DDLREQUEST_STRING]; int lv_error = FEOK; - int lv_tblname_len = pp_env->GetArrayLength(pv_tblname); - if(lv_tblname_len > TM_MAX_DDLREQUEST_STRING) + int lv_tbldesc_length = pp_env->GetArrayLength(pv_tableDescriptor); + if(lv_tbldesc_length > TM_MAX_DDLREQUEST_STRING) { - jstring lv_err_str = pp_env->NewStringUTF("Table name length is larger than max allowed"); + jstring lv_err_str = pp_env->NewStringUTF("Table Desc length is larger than max allowed"); return lv_err_str; } - - int lv_tbldesc_length = pp_env->GetArrayLength(pv_tableDescriptor); jbyte *lp_tbldesc = pp_env->GetByteArrayElements(pv_tableDescriptor, 0); jbyte *lp_tblname = pp_env->GetByteArrayElements(pv_tblname, 0); @@ -62,16 +57,14 @@ JNIEXPORT jstring JNICALL Java_org_apache_hadoop_hbase_client_transactional_RMIn // Keys for Salted Tables int lv_numSplits = (int) pv_numSplits; int lv_keyLength = (int) pv_keyLength; - + la_keys = new char *[lv_numSplits]; + for(int i=0; i<lv_numSplits; i++) { jbyteArray jba_keyarray = (jbyteArray)(pp_env->GetObjectArrayElement((jobjectArray)pv_keys, i)); int lv_key_len = pp_env->GetArrayLength(jba_keyarray); - pp_env->GetByteArrayRegion(jba_keyarray, 0, lv_key_len, (jbyte*)str_key); - la_keys[i] = new char[lv_key_len]; - memcpy(la_keys[i], str_key, lv_key_len); - + pp_env->GetByteArrayRegion(jba_keyarray, 0, lv_key_len, (jbyte*)la_keys[i]); pp_env->DeleteLocalRef(jba_keyarray); } @@ -82,7 +75,6 @@ JNIEXPORT jstring JNICALL Java_org_apache_hadoop_hbase_client_transactional_RMIn pp_env->ReleaseByteArrayElements(pv_tableDescriptor, lp_tbldesc, 0); pp_env->ReleaseByteArrayElements(pv_tblname, lp_tblname, 0); - delete str_key; delete [] la_keys; if(lv_error) {