trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ansha...@apache.org
Subject [1/2] incubator-trafodion git commit: jira TRAFODION-2731 Corrected a problem related to phandle
Date Tue, 12 Dec 2017 14:40:49 GMT
Repository: incubator-trafodion
Updated Branches:
  refs/heads/master d0cdf6a1a -> c8761499b


jira TRAFODION-2731 Corrected a problem related to phandle

A previous change checked in for code cleanup
was causing incorrect phandle to be generated.
That has been fixed.


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/9e5fef0f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/9e5fef0f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/9e5fef0f

Branch: refs/heads/master
Commit: 9e5fef0f08595142c9bbb4794a7435871b3e9d3b
Parents: 890ec60
Author: Anoop Sharma <anoop.sharma@esgyn.com>
Authored: Tue Dec 12 02:07:13 2017 +0000
Committer: Anoop Sharma <anoop.sharma@esgyn.com>
Committed: Tue Dec 12 02:07:13 2017 +0000

----------------------------------------------------------------------
 core/sql/porting_layer/PortProcessCalls.cpp | 5 ++---
 core/sql/porting_layer/PortProcessCalls.h   | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9e5fef0f/core/sql/porting_layer/PortProcessCalls.cpp
----------------------------------------------------------------------
diff --git a/core/sql/porting_layer/PortProcessCalls.cpp b/core/sql/porting_layer/PortProcessCalls.cpp
index aee6eb5..ddf9c97 100755
--- a/core/sql/porting_layer/PortProcessCalls.cpp
+++ b/core/sql/porting_layer/PortProcessCalls.cpp
@@ -117,10 +117,9 @@ short NAProcessHandle::decompose()
                                    ,(SB_Int64_Type *)&this->seqNum_
                                   );
   processName[processNameLen] = '\0';
-  this->phandleStringLen_ = strlen(processName);
-  strcpy(this->phandleString_, processName);
-  this->phandleString_[this->phandleStringLen_] = '\0';
 
+  this->phandleStringLen_ = sprintf(this->phandleString_, "%s:%ld",		
+                                    processName, this->seqNum_);
   return err;
 }
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9e5fef0f/core/sql/porting_layer/PortProcessCalls.h
----------------------------------------------------------------------
diff --git a/core/sql/porting_layer/PortProcessCalls.h b/core/sql/porting_layer/PortProcessCalls.h
index 5c70e33..bd97d70 100755
--- a/core/sql/porting_layer/PortProcessCalls.h
+++ b/core/sql/porting_layer/PortProcessCalls.h
@@ -44,7 +44,7 @@
 #include "seabed/fs.h"
 
 #define PhandleSize 64
-#define PhandleStringLen (MS_MON_MAX_PROCESS_NAME + 1)
+#define PhandleStringLen (MS_MON_MAX_PROCESS_NAME + 1 + 20 + 1)
 #define NodeNameLen 9
 
 //


Mime
View raw message