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

merge from 2.1.0

This commit is contained in:
Jonathan Ellis 2014-06-27 11:08:37 -05:00
parent c148e2ada9 b8ee9da1e8
commit e7dbdd8940
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGES.txt
View File

@ -1,6 +1,10 @@
2.1.0 2.1.1
* Improve schema merge performance (CASSANDRA-7444) * Improve schema merge performance (CASSANDRA-7444)
* Fix NPE when unknown prepared statement ID is used (CASSANDRA-7454) * Fix NPE when unknown prepared statement ID is used (CASSANDRA-7454)
2.1.0
* (Windows) handle spaces in path names (CASSANDRA-7451)
Merged from 2.0: Merged from 2.0:
* Fix CC#collectTimeOrderedData() tombstone optimisations (CASSANDRA-7394) * Fix CC#collectTimeOrderedData() tombstone optimisations (CASSANDRA-7394)
* Support DISTINCT for static columns and fix behaviour when DISTINC is * Support DISTINCT for static columns and fix behaviour when DISTINC is

2
bin/cassandra.bat
View File

@ -35,7 +35,7 @@ goto runLegacy
REM ----------------------------------------------------------------------------- REM -----------------------------------------------------------------------------
:runPowerShell :runPowerShell
echo Detected powershell execution permissions. Running with enhanced startup scripts. echo Detected powershell execution permissions. Running with enhanced startup scripts.
powershell /file %CASSANDRA_HOME%\bin\cassandra.ps1 %* powershell /file "%CASSANDRA_HOME%\bin\cassandra.ps1" %*
goto finally goto finally
REM ----------------------------------------------------------------------------- REM -----------------------------------------------------------------------------

2
bin/cassandra.ps1
View File

@ -79,7 +79,7 @@ Function Main
$logdir = "$env:CASSANDRA_HOME/logs" $logdir = "$env:CASSANDRA_HOME/logs"
$storagedir = "$env:CASSANDRA_HOME/data" $storagedir = "$env:CASSANDRA_HOME/data"
$env:CASSANDRA_PARAMS = $env:CASSANDRA_PARAMS + " -Dcassandra.logdir=$logdir -Dcassandra.storagedir=$storagedir" $env:CASSANDRA_PARAMS = $env:CASSANDRA_PARAMS + " -Dcassandra.logdir=""$logdir"" -Dcassandra.storagedir=""$storagedir"""
# Other command line params # Other command line params
if ($H) if ($H)

4
conf/cassandra-env.ps1
View File

@ -39,7 +39,7 @@ Function SetCassandraMain()
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
Function BuildClassPath Function BuildClassPath
{ {
$cp = "$env:CASSANDRA_HOME\conf" $cp = """$env:CASSANDRA_HOME\conf"""
foreach ($file in Get-ChildItem "$env:CASSANDRA_HOME\lib\*.jar") foreach ($file in Get-ChildItem "$env:CASSANDRA_HOME\lib\*.jar")
{ {
$file = $file -replace "\\", "/" $file = $file -replace "\\", "/"
@ -47,7 +47,7 @@ Function BuildClassPath
} }
# Add build/classes/main so it works in development # Add build/classes/main so it works in development
$cp = $cp + ";" + "$env:CASSANDRA_HOME\build\classes\main;$env:CASSANDRA_HOME\build\classes\thrift" $cp = $cp + ";" + """$env:CASSANDRA_HOME\build\classes\main"";""$env:CASSANDRA_HOME\build\classes\thrift"""
$env:CLASSPATH=$cp $env:CLASSPATH=$cp
} }