You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jm...@apache.org on 2015/07/23 19:25:10 UTC
[1/2] cassandra git commit: Fix handling of incorrect %z cqlshlib
output on Windows
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 51ff49975 -> 9ad133097
Fix handling of incorrect %z cqlshlib output on Windows
Patch by jmckenzie; reviewed by aweisberg for CASSANDRA-9418
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/99decd8e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/99decd8e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/99decd8e
Branch: refs/heads/cassandra-2.2
Commit: 99decd8eface9cd38ddd70542aa28a2773810526
Parents: 51ff499
Author: Joshua McKenzie <jm...@apache.org>
Authored: Thu Jul 23 13:21:10 2015 -0400
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Thu Jul 23 13:21:10 2015 -0400
----------------------------------------------------------------------
bin/cqlsh.py | 2 +-
pylib/cqlshlib/formatting.py | 17 +++++++++++++++--
2 files changed, 16 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/99decd8e/bin/cqlsh.py
----------------------------------------------------------------------
diff --git a/bin/cqlsh.py b/bin/cqlsh.py
index 999ddc4..6df1d75 100644
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@ -945,7 +945,7 @@ class Shell(cmd.Cmd):
try:
import readline
except ImportError:
- if platform.system() == 'Windows':
+ if myplatform == 'Windows':
print "WARNING: pyreadline dependency missing. Install to enable tab completion."
pass
else:
http://git-wip-us.apache.org/repos/asf/cassandra/blob/99decd8e/pylib/cqlshlib/formatting.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/formatting.py b/pylib/cqlshlib/formatting.py
index ff5b118..00d5b40 100644
--- a/pylib/cqlshlib/formatting.py
+++ b/pylib/cqlshlib/formatting.py
@@ -16,16 +16,20 @@
import calendar
import math
+import platform
import re
import sys
import platform
import time
from collections import defaultdict
+
from . import wcwidth
from .displaying import colorme, FormattedValue, DEFAULT_VALUE_COLORS
from datetime import datetime, timedelta
from cassandra.cqltypes import EMPTY
+is_win = platform.system() == 'Windows'
+
unicode_controlchars_re = re.compile(r'[\x00-\x31\x7f-\xa0]')
controlchars_re = re.compile(r'[\x00-\x31\x7f-\xff]')
@@ -193,15 +197,24 @@ def strftime(time_format, seconds):
offset = -time.altzone
else:
offset = -time.timezone
- if formatted[-4:] != '0000' or time_format[-2:] != '%z' or offset == 0:
+ if not is_win and (formatted[-4:] != '0000' or time_format[-2:] != '%z' or offset == 0):
return formatted
+ elif is_win and time_format[-2:] != '%z':
+ return formatted
+
# deal with %z on platforms where it isn't supported. see CASSANDRA-4746.
if offset < 0:
sign = '-'
else:
sign = '+'
hours, minutes = divmod(abs(offset) / 60, 60)
- return formatted[:-5] + sign + '{0:0=2}{1:0=2}'.format(hours, minutes)
+ # Need to strip out invalid %z output on Windows. C libs give us 'Eastern Standard Time' instead of +/- GMT
+ if is_win and time_format[-2:] == '%z':
+ # Remove chars and strip trailing spaces left behind
+ formatted = re.sub('[A-Za-z]', '', formatted).rstrip()
+ return formatted + sign + '{0:0=2}{1:0=2}'.format(hours, minutes)
+ else:
+ return formatted[:-5] + sign + '{0:0=2}{1:0=2}'.format(hours, minutes)
@formatter_for('Date')
def format_value_date(val, colormap, **_):
[2/2] cassandra git commit: Add logdir and storagedir to nodetool.bat
Posted by jm...@apache.org.
Add logdir and storagedir to nodetool.bat
Patch by jmckenzie; reviewed by pthompson for CASSANDRA-9696
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9ad13309
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9ad13309
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9ad13309
Branch: refs/heads/cassandra-2.2
Commit: 9ad133097b5120fc6838b62f649c4d058639215e
Parents: 99decd8
Author: Joshua McKenzie <jm...@apache.org>
Authored: Thu Jul 23 13:23:55 2015 -0400
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Thu Jul 23 13:23:55 2015 -0400
----------------------------------------------------------------------
bin/nodetool.bat | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9ad13309/bin/nodetool.bat
----------------------------------------------------------------------
diff --git a/bin/nodetool.bat b/bin/nodetool.bat
index ec64db0..92d5c05 100644
--- a/bin/nodetool.bat
+++ b/bin/nodetool.bat
@@ -23,8 +23,11 @@ call cassandra.in.bat
if NOT DEFINED CASSANDRA_HOME set CASSANDRA_HOME=%~dp0..
if NOT DEFINED JAVA_HOME goto :err
+set CASSANDRA_PARAMS=%CASSANDRA_PARAMS% -Dcassandra.logdir="%CASSANDRA_HOME%\logs"
+set CASSANDRA_PARAMS=%CASSANDRA_PARAMS% -Dcassandra.storagedir="%CASSANDRA_HOME%\data"
+
echo Starting NodeTool
-"%JAVA_HOME%\bin\java" -cp %CASSANDRA_CLASSPATH% -Dlogback.configurationFile=logback-tools.xml org.apache.cassandra.tools.NodeTool %*
+"%JAVA_HOME%\bin\java" -cp %CASSANDRA_CLASSPATH% %CASSANDRA_PARAMS% -Dlogback.configurationFile=logback-tools.xml org.apache.cassandra.tools.NodeTool %*
goto finally
:err