natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix cqlsh copy methods and timestamp format issues on windows 

patch by tjake; reviewed by Josh McKenzie for CASSANDRA-9795
This commit is contained in:
T Jake Luciani 2015-07-13 09:41:18 -04:00
parent f60e4ad429
commit 9dc8c21980
6 changed files with 2698 additions and 2633 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -1,4 +1,5 @@
2.2.0-rc3
* Fix cqlsh copy methods and other windows specific issues (CASSANDRA-9795)
* Don't wrap byte arrays in SequentialWriter (CASSANDRA-9797)
* sum() and avg() functions missing for smallint and tinyint types (CASSANDRA-9671)
* Revert CASSANDRA-9542 (allow native functions in UDA) (CASSANDRA-9771)

2632
bin/cqlsh
View File

File diff suppressed because it is too large Load Diff

2
bin/cqlsh.bat
View File

@ -22,7 +22,7 @@ if "%OS%" == "Windows_NT" setlocal
python -V >nul 2>&1
if ERRORLEVEL 1 goto err
python "%~dp0\cqlsh" %*
python "%~dp0\cqlsh.py" %*
goto finally
:err

2668
bin/cqlsh.py Normal file
View File

File diff suppressed because it is too large Load Diff

4
pylib/cqlshlib/formatting.py
View File

@ -18,6 +18,7 @@ import calendar
import math
import re
import sys
import platform
import time
from collections import defaultdict
from . import wcwidth
@ -91,6 +92,9 @@ DEFAULT_NANOTIME_FORMAT = '%H:%M:%S.%N'
DEFAULT_DATE_FORMAT = '%Y-%m-%d'
DEFAULT_TIMESTAMP_FORMAT = '%Y-%m-%d %H:%M:%S%z'
if platform.system() == 'Windows':
DEFAULT_TIME_FORMAT = '%Y-%m-%d %H:%M:%S %Z'
class DateTimeFormat():
def __init__(self, timestamp_format=DEFAULT_TIMESTAMP_FORMAT, date_format=DEFAULT_DATE_FORMAT, nanotime_format=DEFAULT_NANOTIME_FORMAT):
self.timestamp_format=timestamp_format

24
src/java/org/apache/cassandra/serializers/TimestampSerializer.java
View File

@ -32,29 +32,51 @@ public class TimestampSerializer implements TypeSerializer<Date>
private static final String[] dateStringPatterns = new String[] {
"yyyy-MM-dd HH:mm",
"yyyy-MM-dd HH:mm:ss",
"yyyy-MM-dd HH:mm z",
"yyyy-MM-dd HH:mm zz",
"yyyy-MM-dd HH:mm zzz",
"yyyy-MM-dd HH:mmX",
"yyyy-MM-dd HH:mmXX", // DEFAULT_FORMAT
"yyyy-MM-dd HH:mmXXX",
"yyyy-MM-dd HH:mm:ss",
"yyyy-MM-dd HH:mm:ss z",
"yyyy-MM-dd HH:mm:ss zz",
"yyyy-MM-dd HH:mm:ss zzz",
"yyyy-MM-dd HH:mm:ssX",
"yyyy-MM-dd HH:mm:ssXX",
"yyyy-MM-dd HH:mm:ssXXX",
"yyyy-MM-dd HH:mm:ss.SSS", // TO_JSON_FORMAT
"yyyy-MM-dd HH:mm:ss.SSS", // TO_JSON_FORMAT
"yyyy-MM-dd HH:mm:ss.SSS z",
"yyyy-MM-dd HH:mm:ss.SSS zz",
"yyyy-MM-dd HH:mm:ss.SSS zzz",
"yyyy-MM-dd HH:mm:ss.SSSX",
"yyyy-MM-dd HH:mm:ss.SSSXX",
"yyyy-MM-dd HH:mm:ss.SSSXXX",
"yyyy-MM-dd'T'HH:mm",
"yyyy-MM-dd'T'HH:mm z",
"yyyy-MM-dd'T'HH:mm zz",
"yyyy-MM-dd'T'HH:mm zzz",
"yyyy-MM-dd'T'HH:mmX",
"yyyy-MM-dd'T'HH:mmXX",
"yyyy-MM-dd'T'HH:mmXXX",
"yyyy-MM-dd'T'HH:mm:ss",
"yyyy-MM-dd'T'HH:mm:ss z",
"yyyy-MM-dd'T'HH:mm:ss zz",
"yyyy-MM-dd'T'HH:mm:ss zzz",
"yyyy-MM-dd'T'HH:mm:ssX",
"yyyy-MM-dd'T'HH:mm:ssXX",
"yyyy-MM-dd'T'HH:mm:ssXXX",
"yyyy-MM-dd'T'HH:mm:ss.SSS",
"yyyy-MM-dd'T'HH:mm:ss.SSS z",
"yyyy-MM-dd'T'HH:mm:ss.SSS zz",
"yyyy-MM-dd'T'HH:mm:ss.SSS zzz",
"yyyy-MM-dd'T'HH:mm:ss.SSSX",
"yyyy-MM-dd'T'HH:mm:ss.SSSXX",
"yyyy-MM-dd'T'HH:mm:ss.SSSXXX",
"yyyy-MM-dd",
"yyyy-MM-dd z",
"yyyy-MM-dd zz",
"yyyy-MM-dd zzz",
"yyyy-MM-ddX",
"yyyy-MM-ddXX",
"yyyy-MM-ddXXX"