You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2017/04/05 15:35:54 UTC
[1/3] incubator-trafodion git commit: [TRAFODION-2449] dtmci - Adding
'status regions' command
Repository: incubator-trafodion
Updated Branches:
refs/heads/master a955827b2 -> 8de588865
[TRAFODION-2449] dtmci - Adding 'status regions' command
Prints the full region name, hostname:port, and startkey/endkeys in hex format.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/0a3af6f8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/0a3af6f8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/0a3af6f8
Branch: refs/heads/master
Commit: 0a3af6f813c75696882b46918b692b4fe4c0a309
Parents: 6155ff1
Author: oliver <ob...@gmail.com>
Authored: Mon Mar 27 19:15:30 2017 -0700
Committer: oliver <ob...@gmail.com>
Committed: Mon Mar 27 19:15:30 2017 -0700
----------------------------------------------------------------------
.../sqf/src/seatrans/tm/hbasetmlib2/hbasetm.cpp | 18 ++++
core/sqf/src/seatrans/tm/hbasetmlib2/hbasetm.h | 2 +
.../java/org/trafodion/dtm/HBaseTxClient.java | 91 +++++++----------
.../java/org/trafodion/dtm/HashMapArray.java | 27 +++++
core/sqf/src/tm/tm.cpp | 10 +-
core/sqf/src/tm/tools/dtmci.cpp | 101 ++++++++++---------
6 files changed, 142 insertions(+), 107 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0a3af6f8/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 090b1c8..f703583 100644
--- a/core/sqf/src/seatrans/tm/hbasetmlib2/hbasetm.cpp
+++ b/core/sqf/src/seatrans/tm/hbasetmlib2/hbasetm.cpp
@@ -1196,6 +1196,8 @@ HMN_RetCode HashMapArray::init()
JavaMethods_[JM_GET_HOSTNAME ].jm_signature = "(I)Ljava/lang/String;";
JavaMethods_[JM_GET_PORT ].jm_name = "getPort";
JavaMethods_[JM_GET_PORT ].jm_signature = "(I)Ljava/lang/String;";
+ JavaMethods_[JM_GET_REGINFO ].jm_name = "getRegionInfo";
+ JavaMethods_[JM_GET_REGINFO ].jm_signature = "(J)Ljava/lang/String;";
return (HMN_RetCode)JavaObjectInterfaceTM::init(className, javaClass_, JavaMethods_, (int32)JM_LAST, false);
}
@@ -1218,6 +1220,22 @@ char* HashMapArray::get(int tid)
return cp_val;
}
+char* HashMapArray::getRegionInfo(int64 tid)
+{
+ jstring js_val = (jstring)(_tlp_jenv->CallObjectMethod(javaObj_, JavaMethods_[JM_GET_REGINFO].methodID, tid));
+ if (getExceptionDetails(NULL)) {
+ tm_log_write(DTM_TM_JNI_ERROR, SQ_LOG_ERR, (char *)"HashMapArray::getRegionInfo()", (char *)_tlp_error_msg->c_str(), -1LL);
+ return NULL;
+ }
+ if(js_val == NULL){
+ return NULL;
+ }
+
+ const jbyte* jb_val = (jbyte*)_tlp_jenv->GetStringUTFChars(js_val, NULL);
+ char* cp_val = (char *)jb_val;
+ return cp_val;
+}
+
char* HashMapArray::getTableName(int tid)
{
jstring js_val = (jstring)(_tlp_jenv->CallObjectMethod(javaObj_, JavaMethods_[JM_GET_TNAME].methodID, tid));
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0a3af6f8/core/sqf/src/seatrans/tm/hbasetmlib2/hbasetm.h
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/tm/hbasetmlib2/hbasetm.h b/core/sqf/src/seatrans/tm/hbasetmlib2/hbasetm.h
index e745b49..5ad8863 100644
--- a/core/sqf/src/seatrans/tm/hbasetmlib2/hbasetm.h
+++ b/core/sqf/src/seatrans/tm/hbasetmlib2/hbasetm.h
@@ -62,6 +62,7 @@ public:
char* getRegionId(int index);
char* getHostName(int index);
char* getPort(int index);
+ char* getRegionInfo(int64 index);
private:
enum JAVA_METHODS {
@@ -74,6 +75,7 @@ private:
JM_GET_REGID,
JM_GET_HOSTNAME,
JM_GET_PORT,
+ JM_GET_REGINFO,
JM_LAST
};
static JavaMethodInit* JavaMethods_;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0a3af6f8/core/sqf/src/seatrans/tm/hbasetmlib2/src/main/java/org/trafodion/dtm/HBaseTxClient.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/tm/hbasetmlib2/src/main/java/org/trafodion/dtm/HBaseTxClient.java b/core/sqf/src/seatrans/tm/hbasetmlib2/src/main/java/org/trafodion/dtm/HBaseTxClient.java
index dd6bffe..5fab6e5 100644
--- a/core/sqf/src/seatrans/tm/hbasetmlib2/src/main/java/org/trafodion/dtm/HBaseTxClient.java
+++ b/core/sqf/src/seatrans/tm/hbasetmlib2/src/main/java/org/trafodion/dtm/HBaseTxClient.java
@@ -57,6 +57,7 @@ import org.apache.hadoop.hbase.client.transactional.TransactionMap;
import org.apache.hadoop.hbase.client.transactional.TransactionalReturn;
import org.apache.hadoop.hbase.client.transactional.TmDDL;
import org.apache.hadoop.hbase.exceptions.DeserializationException;
+import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.HColumnDescriptor;
import org.apache.hadoop.hbase.HRegionInfo;
import org.apache.hadoop.hbase.HRegionLocation;
@@ -1244,7 +1245,7 @@ public class HBaseTxClient {
//--------------------------------------------------------------------------------
public HashMapArray callRequestRegionInfo() throws IOException {
- String tablename, encoded_region_name, region_name, is_offline, region_id, hostname, port, thn;
+ String tablename, encoded_region_name, region_name, is_offline, region_id, hostname, port, thn, startkey, endkey;
HashMap<String, String> inMap;
long lv_ret = -1;
@@ -1264,64 +1265,40 @@ public class HBaseTxClient {
TransactionState ts = mapTransactionStates.get(id);
final Set<TransactionRegionLocation> regions = ts.getParticipatingRegions();
- // TableName
Iterator<TransactionRegionLocation> it = regions.iterator();
- tablename = it.next().getRegionInfo().getTable().getNameAsString();
- while(it.hasNext()){
- tablename = tablename + ";" + it.next().getRegionInfo().getTable().getNameAsString();
- }
- hm.addElement(tnum, "TableName", tablename);
-
- // Encoded Region Name
- Iterator<TransactionRegionLocation> it2 = regions.iterator();
- encoded_region_name = it2.next().getRegionInfo().getEncodedName();
- while(it2.hasNext()){
- encoded_region_name = encoded_region_name + ";" + it2.next().getRegionInfo().getTable().getNameAsString();
- }
- hm.addElement(tnum, "EncodedRegionName", encoded_region_name);
-
- // Region Name
- Iterator<TransactionRegionLocation> it3 = regions.iterator();
- region_name = it3.next().getRegionInfo().getRegionNameAsString();
- while(it3.hasNext()){
- region_name = region_name + ";" + it3.next().getRegionInfo().getTable().getNameAsString();
- }
- hm.addElement(tnum, "RegionName", region_name);
-
- // Region Offline
- Iterator<TransactionRegionLocation> it4 = regions.iterator();
- boolean is_offline_bool = it4.next().getRegionInfo().isOffline();
- is_offline = String.valueOf(is_offline_bool);
- hm.addElement(tnum, "RegionOffline", is_offline);
-
- // Region ID
- Iterator<TransactionRegionLocation> it5 = regions.iterator();
- region_id = String.valueOf(it5.next().getRegionInfo().getRegionId());
- while(it5.hasNext()){
- region_id = region_id + ";" + it5.next().getRegionInfo().getRegionId();
- }
- hm.addElement(tnum, "RegionID", region_id);
-
- // Hostname
- Iterator<TransactionRegionLocation> it6 = regions.iterator();
- thn = String.valueOf(it6.next().getHostname());
- hostname = thn.substring(0, thn.length()-1);
- while(it6.hasNext()){
- thn = String.valueOf(it6.next().getHostname());
- hostname = hostname + ";" + thn.substring(0, thn.length()-1);
- }
- hm.addElement(tnum, "Hostname", hostname);
-
- // Port
- Iterator<TransactionRegionLocation> it7 = regions.iterator();
- port = String.valueOf(it7.next().getPort());
- while(it7.hasNext()){
- port = port + ";" + String.valueOf(it7.next().getPort());
- }
- hm.addElement(tnum, "Port", port);
+
+ while(it.hasNext()) {
+ TransactionRegionLocation trl = it.next();
+ tablename = trl.getRegionInfo().getTable().getNameAsString();
+ if(tablename.contains("_MD_"))
+ continue;
+ encoded_region_name = trl.getRegionInfo().getEncodedName();
+ region_name = trl.getRegionInfo().getRegionNameAsString();
+ boolean is_offline_bool = trl.getRegionInfo().isOffline();
+ is_offline = String.valueOf(is_offline_bool);
+ region_id = String.valueOf(trl.getRegionInfo().getRegionId());
+ thn = String.valueOf(trl.getHostname());
+ hostname = thn.substring(0, thn.length()-1);
+ port = String.valueOf(trl.getPort());
+ startkey = Bytes.equals(trl.getRegionInfo().getStartKey(), HConstants.EMPTY_START_ROW) ?
+ "INFINITE" : Hex.encodeHexString(trl.getRegionInfo().getStartKey());
+ endkey = Bytes.equals(trl.getRegionInfo().getEndKey(), HConstants.EMPTY_END_ROW) ?
+ "INFINITE" : Hex.encodeHexString(trl.getRegionInfo().getEndKey());
+
+ StringBuilder inputStr = new StringBuilder();
+ inputStr.append(tablename).append(";");
+ inputStr.append(encoded_region_name).append(";");
+ inputStr.append(region_name).append(";");
+ inputStr.append(region_id).append(";");
+ inputStr.append(hostname).append(";");
+ inputStr.append(port).append(";");
+ inputStr.append(startkey).append(";");
+ inputStr.append(endkey);
+ hm.appendRegionInfo(id, inputStr.toString());
- tnum = tnum + 1;
- }
+ }
+ tnum = tnum + 1;
+ }
if (LOG.isTraceEnabled()) LOG.trace("HBaseTxClient::callRequestRegionInfo:: end size: " + hm.getSize());
return hm;
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0a3af6f8/core/sqf/src/seatrans/tm/hbasetmlib2/src/main/java/org/trafodion/dtm/HashMapArray.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/tm/hbasetmlib2/src/main/java/org/trafodion/dtm/HashMapArray.java b/core/sqf/src/seatrans/tm/hbasetmlib2/src/main/java/org/trafodion/dtm/HashMapArray.java
index 0f31128..00eabb3 100644
--- a/core/sqf/src/seatrans/tm/hbasetmlib2/src/main/java/org/trafodion/dtm/HashMapArray.java
+++ b/core/sqf/src/seatrans/tm/hbasetmlib2/src/main/java/org/trafodion/dtm/HashMapArray.java
@@ -30,12 +30,16 @@ import java.util.ArrayList;
public class HashMapArray {
+ private static String regionKey = "RegionInfo";
+ private static String delimiter = "|";
private HashMap<String, String> inMap;
private ArrayList<HashMap<String, String>> outList;
+ private HashMap<Long, String> regionInfoMap;
public HashMapArray(){
inMap = new HashMap<String, String>();
outList = new ArrayList<HashMap<String, String>>();
+ regionInfoMap = new HashMap<Long, String>();
}
//-------------------------------------------------------
@@ -66,6 +70,18 @@ public class HashMapArray {
outList.add(inMap);
}
+ public void appendRegionInfo(long tnum, String value) {
+ //if(outList.size() <= tnum) {
+ if(regionInfoMap.containsKey(tnum)) {
+ String regionInfo = regionInfoMap.get(tnum);
+ regionInfo = regionInfo + HashMapArray.delimiter + value;
+ regionInfoMap.put(tnum, regionInfo);
+ }
+ else {
+ regionInfoMap.put(tnum, value);
+ }
+ }
+
//---------------------------------------------------------
// getElement
// Purpose: gets element from the HashMap
@@ -83,6 +99,17 @@ public class HashMapArray {
}
return inMap.get("Transid").toString();
}
+ //
+ //-------------------------------------------------------
+ // getRegInfo
+ // Purpose: gets tableName from the HashMap
+ //-------------------------------------------------------
+ public String getRegionInfo(long tnum){
+
+ if(!regionInfoMap.containsKey(tnum))
+ return new String("");
+ return regionInfoMap.get(tnum);
+ }
//-------------------------------------------------------
// getTableName
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0a3af6f8/core/sqf/src/tm/tm.cpp
----------------------------------------------------------------------
diff --git a/core/sqf/src/tm/tm.cpp b/core/sqf/src/tm/tm.cpp
index 0414e1b..cd141ac 100644
--- a/core/sqf/src/tm/tm.cpp
+++ b/core/sqf/src/tm/tm.cpp
@@ -460,7 +460,7 @@ void tm_process_req_requestregioninfo(CTmTxMessage * pp_msg)
TM_Txid_legacy lv_transid;
} u;
- char tname[300], ername[50], rname[100], offline[20], regid[200], hostname[200], port[100];
+ char tname[10000], ername[50], rname[100], offline[20], regid[200], hostname[200], port[100];
tname[299] = '\0', ername[49] = '\0', rname[99] = '\0', offline[19] = '\0';
regid[199]= '\0', hostname[199]='\0', port[99]='\0';
@@ -473,16 +473,19 @@ void tm_process_req_requestregioninfo(CTmTxMessage * pp_msg)
{
TM_TX_Info *lp_current_tx = (TM_TX_Info *)lp_tx_list[lv_inx];
if (!lp_current_tx)
- break;
+ continue;
pp_msg->response()->u.iv_hbaseregion_info.iv_trans[lv_inx].iv_status = lp_current_tx->tx_state();
u.lv_transid.iv_seq_num = lp_current_tx->seqnum();
pp_msg->response()->u.iv_hbaseregion_info.iv_trans[lv_inx].iv_transid = u.lv_transid_int64;
pp_msg->response()->u.iv_hbaseregion_info.iv_trans[lv_inx].iv_nid = lp_current_tx->node();
pp_msg->response()->u.iv_hbaseregion_info.iv_trans[lv_inx].iv_seqnum = lp_current_tx->seqnum();
- char* res2 = map->getTableName(lv_inx);
+ char* res2 = map->getRegionInfo(lp_current_tx->legacyTransid());
+ if(strlen(res2) == 0)
+ continue;
strncpy(tname, res2, sizeof(tname) -1);
strncpy(pp_msg->response()->u.iv_hbaseregion_info.iv_trans[lv_inx].iv_tablename, tname, sizeof(tname)-1);
+/*
char* res3 = map->getEncodedRegionName(lv_inx);
strncpy(ername, res3, sizeof(ername) -1);
@@ -507,6 +510,7 @@ void tm_process_req_requestregioninfo(CTmTxMessage * pp_msg)
char* res8 = map->getPort(lv_inx);
strncpy(port, res8, sizeof(port) -1);
strncpy(pp_msg->response()->u.iv_hbaseregion_info.iv_trans[lv_inx].iv_port, port, sizeof(port)-1);
+*/
pp_msg->response()->u.iv_hbaseregion_info.iv_count++;
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0a3af6f8/core/sqf/src/tm/tools/dtmci.cpp
----------------------------------------------------------------------
diff --git a/core/sqf/src/tm/tools/dtmci.cpp b/core/sqf/src/tm/tools/dtmci.cpp
index 1021672..43ed2f0 100644
--- a/core/sqf/src/tm/tools/dtmci.cpp
+++ b/core/sqf/src/tm/tools/dtmci.cpp
@@ -33,6 +33,9 @@
#include <readline/readline.h>
#include <readline/history.h>
#include <sys/time.h>
+#include <vector>
+#include <sstream>
+#include <iomanip>
#include "dtm/tm.h"
#include "../tmlibmsg.h"
@@ -1136,9 +1139,7 @@ void process_request_regions_info()
short lv_count = 0;
TM_HBASEREGIONINFO lv_trans_reg[TM_MAX_LIST_TRANS];
- size_t tn_end, rid_end, h_end, p_end;
- string tname, tname_tmp, regid, hname, pname;
- size_t init = 0;
+ string regioninfo, regioninfo_full, regioninfo_tmp, tname, tname_tmp, tablename, regid, hname, pname, startkey, endkey, tstamp;
lv_error = HBASETM_REQUESTREGIONINFO((TM_HBASEREGIONINFO *) &lv_trans_reg, &lv_count);
@@ -1147,56 +1148,62 @@ void process_request_regions_info()
else
{
if(lv_count == 0)
- printf("Error returned for HBASE_REQUESTREGIONINFO %d\n", lv_error);
+ printf("No Regions Returned from HBASETM_REQUESTREGIONINFO\n");
else
{
- printf("Transid\t\tStatus\tRegionId\tHostname\t\tPort\tTableName\n");
+ printf("\nTransid\t\tStatus\n");
for(int i=0; i<lv_count; i++)
{
- printf("----------------------------------------------------------------------------------------------\n");
+ bool first_entry = true;
+ printf("-----------------------------------------------------------------------------------------------------\n");
print_transid_str(lv_trans_reg[i].iv_nid, lv_trans_reg[i].iv_seqnum);
print_txnstatus(lv_trans_reg[i].iv_status);
+ cout << "\n-----------";
tname = lv_trans_reg[i].iv_tablename;
- tn_end = tname.find(';');
- regid = lv_trans_reg[i].iv_region_id;
- rid_end = regid.find(';');
- hname = lv_trans_reg[i].iv_hostname;
- h_end = hname.find(';');
- pname = lv_trans_reg[i].iv_port;
- p_end = pname.find(';');
-
- while(tn_end != std::string::npos){
-
- // tablename
- tname_tmp = tname.substr(init, tn_end);
-
- if((tname_tmp.compare("TRAFODION._MD_.VIEWS") && tname_tmp.compare("TRAFODION._MD_.UNIQUE_REF_CONSTR_USAGE")
- && tname_tmp.compare("TRAFODION._MD_.OBJECTS_UNIQ_IDX") && tname_tmp.compare("TRAFODION._MD_.TABLE_CONSTRAINTS")
- && tname_tmp.compare("TRAFODION._MD_.INDEXES") && tname_tmp.compare("TRAFODION._MD_.KEYS")
- && tname_tmp.compare("TRAFODION._MD_.COLUMNS") && tname_tmp.compare("TRAFODION._MD_.TABLES")) != 0) {
-
- // region id
- cout << "\n\t\t\t" << regid.substr(init, rid_end) << '\t';
- regid = regid.substr(rid_end+1);
- rid_end = regid.find(';');
-
- // hostname
- cout << hname.substr(init, h_end) << '\t';
- hname = hname.substr(h_end+1);
- h_end = hname.find(';');
-
- // port
- cout << pname.substr(init, p_end) << '\t';
- pname = pname.substr(p_end+1);
- p_end = pname.find(';');
-
- // tablename
- cout << tname_tmp << '\t';
+
+ while(tname.length() > 0) {
+ std::size_t position = tname.find("|");
+ if(! (position == string::npos )) {
+ regioninfo_tmp = tname.substr(0, position);
+ tname = tname.substr(position + 1);
+ }
+ else {
+ regioninfo_tmp = tname;
+ tname = "";
}
- tname = tname.substr(tn_end+1);
- tn_end = tname.find(';');
+ tablename = regioninfo_tmp.substr(0, regioninfo_tmp.find(";"));
+ regioninfo_tmp = regioninfo_tmp.substr(regioninfo_tmp.find(";") + 1);
+
+ regid = regioninfo_tmp.substr(0, regioninfo_tmp.find(";"));
+ regioninfo_tmp = regioninfo_tmp.substr(regioninfo_tmp.find(";") + 1);
+
+ regioninfo_full = regioninfo_tmp.substr(0, regioninfo_tmp.find(";"));
+ regioninfo_tmp = regioninfo_tmp.substr(regioninfo_tmp.find(";") + 1);
+
+ tstamp = regioninfo_tmp.substr(0, regioninfo_tmp.find(";"));
+ regioninfo_tmp = regioninfo_tmp.substr(regioninfo_tmp.find(";") + 1);
+
+ hname = regioninfo_tmp.substr(0, regioninfo_tmp.find(";"));
+ regioninfo_tmp = regioninfo_tmp.substr(regioninfo_tmp.find(";") + 1);
+
+ pname = regioninfo_tmp.substr(0, regioninfo_tmp.find(";"));
+ regioninfo_tmp = regioninfo_tmp.substr(regioninfo_tmp.find(";") + 1);
+
+ startkey = regioninfo_tmp.substr(0, regioninfo_tmp.find(";"));
+ regioninfo_tmp = regioninfo_tmp.substr(regioninfo_tmp.find(";") + 1);
+
+ endkey = regioninfo_tmp.substr(0, regioninfo_tmp.find(";"));
+
+ if(!first_entry)
+ cout << "-----------";
+ first_entry = false;
+
+ cout << endl;
+ cout << "RegionInfo: \t" << regioninfo_full << endl;
+ cout << "Hostname: \t" << hname << ":" <<pname << endl;
+ cout << "Start/End Key: \t" << setw(40) << left << startkey << setw(40) << left << endkey << endl;
}
printf("\n");
}
@@ -1305,8 +1312,8 @@ void print_helptext()
cout << endl << " status trans[action] [transid]";
cout << endl << " : Status of the specified transaction.";
cout << endl << " : transid may be in numeric or <node>,<sequence> format.";
- // cout << endl << " status regions";
- // cout << endl << " : Status of the transactions on the hbase regions - client side";
+ cout << endl << " status regions";
+ cout << endl << " : Status of the transactions on the hbase regions - client side";
cout << endl << " transid [string] <transid>";
cout << endl << " : Prints transaction ID information";
cout << endl << " : Entering string option outputs (node, sequence, incarn #)";
@@ -1783,10 +1790,10 @@ int main(int argc, char *argv[])
{
process_statussystem();
}
- /*else if(!strcmp(lp_nextcmd, "regions"))
+ else if(!strcmp(lp_nextcmd, "regions"))
{
process_request_regions_info();
- }*/
+ }
else
{
cout << endl << "** Invalid qualifier '" <<lp_nextcmd
[3/3] incubator-trafodion git commit: Merge [TRAFODION-2449] PR 1028
Adding dtmci 'status regions' command
Posted by db...@apache.org.
Merge [TRAFODION-2449] PR 1028 Adding dtmci 'status regions' command
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/8de58886
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/8de58886
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/8de58886
Branch: refs/heads/master
Commit: 8de58886535238ec89cb12e49c4c933d31be2215
Parents: a955827 2ecf49d
Author: Dave Birdsall <db...@apache.org>
Authored: Wed Apr 5 15:34:46 2017 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Wed Apr 5 15:34:46 2017 +0000
----------------------------------------------------------------------
core/sqf/export/include/dtm/tm.h | 2 +-
.../sqf/src/seatrans/tm/hbasetmlib2/hbasetm.cpp | 18 ++++
core/sqf/src/seatrans/tm/hbasetmlib2/hbasetm.h | 2 +
.../java/org/trafodion/dtm/HBaseTxClient.java | 91 ++++++----------
.../java/org/trafodion/dtm/HashMapArray.java | 27 +++++
core/sqf/src/tm/tm.cpp | 11 +-
core/sqf/src/tm/tools/dtmci.cpp | 104 ++++++++++---------
7 files changed, 147 insertions(+), 108 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8de58886/core/sqf/src/seatrans/tm/hbasetmlib2/src/main/java/org/trafodion/dtm/HBaseTxClient.java
----------------------------------------------------------------------
[2/3] incubator-trafodion git commit: [TRAFODION-2449] dtmci - Adding
'status regions' command
Posted by db...@apache.org.
[TRAFODION-2449] dtmci - Adding 'status regions' command
Implementing changes from code review
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/2ecf49db
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/2ecf49db
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/2ecf49db
Branch: refs/heads/master
Commit: 2ecf49db57a71d3004711397136f138db388ecfc
Parents: 0a3af6f
Author: oliver <ob...@gmail.com>
Authored: Wed Mar 29 21:02:53 2017 -0700
Committer: oliver <ob...@gmail.com>
Committed: Wed Mar 29 21:02:53 2017 -0700
----------------------------------------------------------------------
core/sqf/export/include/dtm/tm.h | 2 +-
core/sqf/src/seatrans/tm/hbasetmlib2/hbasetm.h | 2 +-
.../src/main/java/org/trafodion/dtm/HBaseTxClient.java | 2 +-
core/sqf/src/tm/tm.cpp | 3 ++-
core/sqf/src/tm/tools/dtmci.cpp | 5 ++++-
5 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/2ecf49db/core/sqf/export/include/dtm/tm.h
----------------------------------------------------------------------
diff --git a/core/sqf/export/include/dtm/tm.h b/core/sqf/export/include/dtm/tm.h
index 0c042f7..62c5587 100644
--- a/core/sqf/export/include/dtm/tm.h
+++ b/core/sqf/export/include/dtm/tm.h
@@ -262,7 +262,7 @@ typedef struct TM_HBASEREGIONINFO {
int iv_seqnum; // Transaction sequence number
int iv_owner_nid; // Transaction owner nid
int iv_owner_pid; // Transaction owner pid
- char iv_tablename[300]; // Tablename
+ char iv_tablename[2000]; // Tablename
char iv_enc_regionname[50]; // Encoded region name
char iv_regionname[300]; // Region name
char iv_is_offline[20]; // IsOffline
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/2ecf49db/core/sqf/src/seatrans/tm/hbasetmlib2/hbasetm.h
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/tm/hbasetmlib2/hbasetm.h b/core/sqf/src/seatrans/tm/hbasetmlib2/hbasetm.h
index 5ad8863..fb482a9 100644
--- a/core/sqf/src/seatrans/tm/hbasetmlib2/hbasetm.h
+++ b/core/sqf/src/seatrans/tm/hbasetmlib2/hbasetm.h
@@ -62,7 +62,7 @@ public:
char* getRegionId(int index);
char* getHostName(int index);
char* getPort(int index);
- char* getRegionInfo(int64 index);
+ char* getRegionInfo(int64 tid);
private:
enum JAVA_METHODS {
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/2ecf49db/core/sqf/src/seatrans/tm/hbasetmlib2/src/main/java/org/trafodion/dtm/HBaseTxClient.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/tm/hbasetmlib2/src/main/java/org/trafodion/dtm/HBaseTxClient.java b/core/sqf/src/seatrans/tm/hbasetmlib2/src/main/java/org/trafodion/dtm/HBaseTxClient.java
index 5fab6e5..558ea77 100644
--- a/core/sqf/src/seatrans/tm/hbasetmlib2/src/main/java/org/trafodion/dtm/HBaseTxClient.java
+++ b/core/sqf/src/seatrans/tm/hbasetmlib2/src/main/java/org/trafodion/dtm/HBaseTxClient.java
@@ -1270,7 +1270,7 @@ public class HBaseTxClient {
while(it.hasNext()) {
TransactionRegionLocation trl = it.next();
tablename = trl.getRegionInfo().getTable().getNameAsString();
- if(tablename.contains("_MD_"))
+ if(tablename.contains("TRAFODION._MD_."))
continue;
encoded_region_name = trl.getRegionInfo().getEncodedName();
region_name = trl.getRegionInfo().getRegionNameAsString();
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/2ecf49db/core/sqf/src/tm/tm.cpp
----------------------------------------------------------------------
diff --git a/core/sqf/src/tm/tm.cpp b/core/sqf/src/tm/tm.cpp
index cd141ac..a168db5 100644
--- a/core/sqf/src/tm/tm.cpp
+++ b/core/sqf/src/tm/tm.cpp
@@ -460,7 +460,7 @@ void tm_process_req_requestregioninfo(CTmTxMessage * pp_msg)
TM_Txid_legacy lv_transid;
} u;
- char tname[10000], ername[50], rname[100], offline[20], regid[200], hostname[200], port[100];
+ char tname[2000], ername[50], rname[100], offline[20], regid[200], hostname[200], port[100];
tname[299] = '\0', ername[49] = '\0', rname[99] = '\0', offline[19] = '\0';
regid[199]= '\0', hostname[199]='\0', port[99]='\0';
@@ -519,6 +519,7 @@ void tm_process_req_requestregioninfo(CTmTxMessage * pp_msg)
delete []lp_tx_list;
pp_msg->reply(FEOK);
delete pp_msg;
+ delete map;
TMTrace(2, ("tm_process_req_requestregioninfo EXIT\n"));
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/2ecf49db/core/sqf/src/tm/tools/dtmci.cpp
----------------------------------------------------------------------
diff --git a/core/sqf/src/tm/tools/dtmci.cpp b/core/sqf/src/tm/tools/dtmci.cpp
index 43ed2f0..fff798f 100644
--- a/core/sqf/src/tm/tools/dtmci.cpp
+++ b/core/sqf/src/tm/tools/dtmci.cpp
@@ -1191,9 +1191,12 @@ void process_request_regions_info()
pname = regioninfo_tmp.substr(0, regioninfo_tmp.find(";"));
regioninfo_tmp = regioninfo_tmp.substr(regioninfo_tmp.find(";") + 1);
+ if(regioninfo_tmp.find(";") == string::npos)
+ continue;
+
startkey = regioninfo_tmp.substr(0, regioninfo_tmp.find(";"));
regioninfo_tmp = regioninfo_tmp.substr(regioninfo_tmp.find(";") + 1);
-
+
endkey = regioninfo_tmp.substr(0, regioninfo_tmp.find(";"));
if(!first_entry)