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 2018/01/04 21:39:09 UTC
[1/2] trafodion git commit: [TRAFODION-2875] Fix inaccuracies in text
comparison in analyzeMessageGuide.py
Repository: trafodion
Updated Branches:
refs/heads/master 9b53555e3 -> 7a5f3885d
[TRAFODION-2875] Fix inaccuracies in text comparison in analyzeMessageGuide.py
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/e349dea8
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/e349dea8
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/e349dea8
Branch: refs/heads/master
Commit: e349dea868a310679487d6b7a2244798107b35a4
Parents: db319b1
Author: Dave Birdsall <db...@apache.org>
Authored: Thu Jan 4 01:31:39 2018 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Thu Jan 4 01:31:39 2018 +0000
----------------------------------------------------------------------
core/sqf/sql/scripts/analyzeMessageGuide.py | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/e349dea8/core/sqf/sql/scripts/analyzeMessageGuide.py
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/analyzeMessageGuide.py b/core/sqf/sql/scripts/analyzeMessageGuide.py
index d903421..162d738 100644
--- a/core/sqf/sql/scripts/analyzeMessageGuide.py
+++ b/core/sqf/sql/scripts/analyzeMessageGuide.py
@@ -416,6 +416,7 @@ class MessagesTable:
elif state == 2:
if line[i] == '>':
state = 0
+ result = result + '.elided.'
else:
throwAway = throwAway + '>' + line[i]
i = i + 1
@@ -426,7 +427,7 @@ class MessagesTable:
result = result + ' <' + throwAway
#print "Before<: " + line
#print "After<: " + result
- return result
+ return result.rstrip() # ignore trailing spaces
def removeDollarTerms(self,line):
# removes text of the form $0~Datatype0 (where Datatype might
@@ -470,10 +471,11 @@ class MessagesTable:
if line[i].isalpha():
throwAway = throwAway + line[i]
elif line[i].isdigit():
- state = 0 # we reached the end of the dollar text
- else:
- result = result + line[i]
state = 0 # we reached the end of the dollar text
+ result = result + '.elided.'
+ else:
+ state = 0 # we reached the end of the dollar text
+ result = result + '.elided.' + line[i]
i = i + 1
# if we reached the end of the line then put the throwaway text
@@ -482,7 +484,7 @@ class MessagesTable:
result = result + throwAway
#print "Before$: " + line
#print "After$: " + result
- return result
+ return result.rstrip() # ignore trailing spaces
def compareText(self):
[2/2] trafodion git commit: Merge [TRAFODION-2875] PR 1367 Fix
comparison inaccuracy in msgs script
Posted by db...@apache.org.
Merge [TRAFODION-2875] PR 1367 Fix comparison inaccuracy in msgs script
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/7a5f3885
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/7a5f3885
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/7a5f3885
Branch: refs/heads/master
Commit: 7a5f3885d39dec6918c3a0759db0a12277380aff
Parents: 9b53555 e349dea
Author: Dave Birdsall <db...@apache.org>
Authored: Thu Jan 4 21:37:54 2018 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Thu Jan 4 21:37:54 2018 +0000
----------------------------------------------------------------------
core/sqf/sql/scripts/analyzeMessageGuide.py | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------