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

merge from 0.6 

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1033046 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jonathan Ellis 2010-11-09 15:58:26 +00:00
parent 6879422aae
commit 204aa5ee72
7 changed files with 126 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGES.txt
View File

@ -1,4 +1,9 @@
dev 0.6.7
* Update windows .bat files to work outside of main Cassandra
directory (CASSANDRA-1713)
0.6.7
* log threshold causing memtable flush (CASSANDRA-1675) * log threshold causing memtable flush (CASSANDRA-1675)
* log type of dropped messages (CASSANDRA-1677) * log type of dropped messages (CASSANDRA-1677)
* upgrade to SLF4J 1.6.1 * upgrade to SLF4J 1.6.1

2
bin/cassandra-cli.bat
View File

@ -18,7 +18,7 @@
@echo off @echo off
if "%OS%" == "Windows_NT" setlocal if "%OS%" == "Windows_NT" setlocal
if NOT DEFINED CASSANDRA_HOME set CASSANDRA_HOME=%CD% if NOT DEFINED CASSANDRA_HOME set CASSANDRA_HOME=%~dp0..
if NOT DEFINED JAVA_HOME goto err if NOT DEFINED JAVA_HOME goto err
REM Ensure that any user defined CLASSPATH variables are not used on startup REM Ensure that any user defined CLASSPATH variables are not used on startup

1
bin/cassandra.bat
View File

@ -18,7 +18,6 @@
if "%OS%" == "Windows_NT" setlocal if "%OS%" == "Windows_NT" setlocal
if NOT DEFINED CASSANDRA_HOME set CASSANDRA_HOME=%~dp0.. if NOT DEFINED CASSANDRA_HOME set CASSANDRA_HOME=%~dp0..
if NOT DEFINED CASSANDRA_CONF set CASSANDRA_CONF=%CASSANDRA_HOME%\conf
if NOT DEFINED CASSANDRA_MAIN set CASSANDRA_MAIN=org.apache.cassandra.thrift.CassandraDaemon if NOT DEFINED CASSANDRA_MAIN set CASSANDRA_MAIN=org.apache.cassandra.thrift.CassandraDaemon
if NOT DEFINED JAVA_HOME goto err if NOT DEFINED JAVA_HOME goto err

100
bin/json2sstable
View File

@ -1,50 +1,50 @@
#!/bin/sh #!/bin/sh
# Licensed to the Apache Software Foundation (ASF) under one # Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file # or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information # distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file # regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the # to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance # "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at # with the License. You may obtain a copy of the License at
# #
# http://www.apache.org/licenses/LICENSE-2.0 # http://www.apache.org/licenses/LICENSE-2.0
# #
# Unless required by applicable law or agreed to in writing, software # Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, # distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
if [ "x$CASSANDRA_INCLUDE" = "x" ]; then if [ "x$CASSANDRA_INCLUDE" = "x" ]; then
for include in /usr/share/cassandra/cassandra.in.sh \ for include in /usr/share/cassandra/cassandra.in.sh \
/usr/local/share/cassandra/cassandra.in.sh \ /usr/local/share/cassandra/cassandra.in.sh \
/opt/cassandra/cassandra.in.sh \ /opt/cassandra/cassandra.in.sh \
~/.cassandra.in.sh \ ~/.cassandra.in.sh \
`dirname $0`/cassandra.in.sh; do `dirname $0`/cassandra.in.sh; do
if [ -r $include ]; then if [ -r $include ]; then
. $include . $include
break break
fi fi
done done
elif [ -r $CASSANDRA_INCLUDE ]; then elif [ -r $CASSANDRA_INCLUDE ]; then
. $CASSANDRA_INCLUDE . $CASSANDRA_INCLUDE
fi fi
# Use JAVA_HOME if set, otherwise look for java in PATH # Use JAVA_HOME if set, otherwise look for java in PATH
if [ -x $JAVA_HOME/bin/java ]; then if [ -x $JAVA_HOME/bin/java ]; then
JAVA=$JAVA_HOME/bin/java JAVA=$JAVA_HOME/bin/java
else else
JAVA=`which java` JAVA=`which java`
fi fi
if [ -z $CLASSPATH ]; then if [ -z $CLASSPATH ]; then
echo "You must set the CLASSPATH var" >&2 echo "You must set the CLASSPATH var" >&2
exit 1 exit 1
fi fi
$JAVA -cp $CLASSPATH -Dstorage-config=$CASSANDRA_CONF \ $JAVA -cp $CLASSPATH -Dstorage-config=$CASSANDRA_CONF \
-Dlog4j.configuration=log4j-tools.properties \ -Dlog4j.configuration=log4j-tools.properties \
org.apache.cassandra.tools.SSTableImport "$@" org.apache.cassandra.tools.SSTableImport "$@"
# vi:ai sw=4 ts=4 tw=0 et # vi:ai sw=4 ts=4 tw=0 et

134
bin/json2sstable.bat
View File

@ -1,67 +1,67 @@
@REM @REM
@REM Licensed to the Apache Software Foundation (ASF) under one or more @REM Licensed to the Apache Software Foundation (ASF) under one or more
@REM contributor license agreements. See the NOTICE file distributed with @REM contributor license agreements. See the NOTICE file distributed with
@REM this work for additional information regarding copyright ownership. @REM this work for additional information regarding copyright ownership.
@REM The ASF licenses this file to You under the Apache License, Version 2.0 @REM The ASF licenses this file to You under the Apache License, Version 2.0
@REM (the "License"); you may not use this file except in compliance with @REM (the "License"); you may not use this file except in compliance with
@REM the License. You may obtain a copy of the License at @REM the License. You may obtain a copy of the License at
@REM @REM
@REM http://www.apache.org/licenses/LICENSE-2.0 @REM http://www.apache.org/licenses/LICENSE-2.0
@REM @REM
@REM Unless required by applicable law or agreed to in writing, software @REM Unless required by applicable law or agreed to in writing, software
@REM distributed under the License is distributed on an "AS IS" BASIS, @REM distributed under the License is distributed on an "AS IS" BASIS,
@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@REM See the License for the specific language governing permissions and @REM See the License for the specific language governing permissions and
@REM limitations under the License. @REM limitations under the License.
@echo off @echo off
if "%OS%" == "Windows_NT" setlocal if "%OS%" == "Windows_NT" setlocal
if NOT DEFINED CASSANDRA_HOME set CASSANDRA_HOME=%CD% if NOT DEFINED CASSANDRA_HOME set CASSANDRA_HOME=%~dp0..
if NOT DEFINED CASSANDRA_CONF set CASSANDRA_CONF=%CASSANDRA_HOME%\conf if NOT DEFINED CASSANDRA_CONF set CASSANDRA_CONF=%CASSANDRA_HOME%\conf
if NOT DEFINED CASSANDRA_MAIN set CASSANDRA_MAIN=org.apache.cassandra.tools.SSTableImport if NOT DEFINED CASSANDRA_MAIN set CASSANDRA_MAIN=org.apache.cassandra.tools.SSTableImport
if NOT DEFINED JAVA_HOME goto err if NOT DEFINED JAVA_HOME goto err
REM ***** JAVA options ***** REM ***** JAVA options *****
set JAVA_OPTS=^ set JAVA_OPTS=^
-Dlog4j.configuration=log4j-tools.properties -Dlog4j.configuration=log4j-tools.properties
REM ***** CLASSPATH library setting ***** REM ***** CLASSPATH library setting *****
REM Ensure that any user defined CLASSPATH variables are not used on startup REM Ensure that any user defined CLASSPATH variables are not used on startup
set CLASSPATH=%CASSANDRA_HOME%\conf set CLASSPATH=%CASSANDRA_HOME%\conf
REM For each jar in the CASSANDRA_HOME lib directory call append to build the CLASSPATH variable. REM For each jar in the CASSANDRA_HOME lib directory call append to build the CLASSPATH variable.
for %%i in (%CASSANDRA_HOME%\lib\*.jar) do call :append %%~fi for %%i in (%CASSANDRA_HOME%\lib\*.jar) do call :append %%~fi
goto okClasspath goto okClasspath
:append :append
set CLASSPATH=%CLASSPATH%;%1%2 set CLASSPATH=%CLASSPATH%;%1%2
goto :eof goto :eof
:okClasspath :okClasspath
REM Include the build\classes directory so it works in development REM Include the build\classes directory so it works in development
set CASSANDRA_CLASSPATH=%CLASSPATH%;%CASSANDRA_HOME%\build\classes;%CASSANDRA_CONF% set CASSANDRA_CLASSPATH=%CLASSPATH%;%CASSANDRA_HOME%\build\classes;%CASSANDRA_CONF%
set CASSANDRA_PARAMS= set CASSANDRA_PARAMS=
set TOOLS_PARAMS= set TOOLS_PARAMS=
FOR %%A IN (%*) DO call :appendToolsParams %%A FOR %%A IN (%*) DO call :appendToolsParams %%A
goto runTool goto runTool
:appendToolsParams :appendToolsParams
set TOOLS_PARAMS=%TOOLS_PARAMS% %1 set TOOLS_PARAMS=%TOOLS_PARAMS% %1
goto :eof goto :eof
:runTool :runTool
"%JAVA_HOME%\bin\java" %JAVA_OPTS% %CASSANDRA_PARAMS% -cp "%CASSANDRA_CLASSPATH%" "%CASSANDRA_MAIN%" %TOOLS_PARAMS% "%JAVA_HOME%\bin\java" %JAVA_OPTS% %CASSANDRA_PARAMS% -cp "%CASSANDRA_CLASSPATH%" "%CASSANDRA_MAIN%" %TOOLS_PARAMS%
goto finally goto finally
:err :err
echo JAVA_HOME environment variable must be set! echo JAVA_HOME environment variable must be set!
pause pause
:finally :finally
ENDLOCAL ENDLOCAL

2
bin/nodetool.bat
View File

@ -17,7 +17,7 @@
@echo off @echo off
if "%OS%" == "Windows_NT" setlocal if "%OS%" == "Windows_NT" setlocal
if NOT DEFINED CASSANDRA_HOME set CASSANDRA_HOME=%CD% if NOT DEFINED CASSANDRA_HOME set CASSANDRA_HOME=%~dp0..
if NOT DEFINED JAVA_HOME goto err if NOT DEFINED JAVA_HOME goto err
REM Ensure that any user defined CLASSPATH variables are not used on startup REM Ensure that any user defined CLASSPATH variables are not used on startup

3
bin/sstable2json.bat
View File

@ -17,7 +17,7 @@
@echo off @echo off
if "%OS%" == "Windows_NT" setlocal if "%OS%" == "Windows_NT" setlocal
if NOT DEFINED CASSANDRA_HOME set CASSANDRA_HOME=%CD% if NOT DEFINED CASSANDRA_HOME set CASSANDRA_HOME=%~dp0..
if NOT DEFINED CASSANDRA_CONF set CASSANDRA_CONF=%CASSANDRA_HOME%\conf if NOT DEFINED CASSANDRA_CONF set CASSANDRA_CONF=%CASSANDRA_HOME%\conf
if NOT DEFINED CASSANDRA_MAIN set CASSANDRA_MAIN=org.apache.cassandra.tools.SSTableExport if NOT DEFINED CASSANDRA_MAIN set CASSANDRA_MAIN=org.apache.cassandra.tools.SSTableExport
if NOT DEFINED JAVA_HOME goto err if NOT DEFINED JAVA_HOME goto err
@ -55,7 +55,6 @@ set TOOLS_PARAMS=%TOOLS_PARAMS% %1
goto :eof goto :eof
:runTool :runTool
echo "%JAVA_HOME%\bin\java" %JAVA_OPTS% %CASSANDRA_PARAMS% -cp "%CASSANDRA_CLASSPATH%" "%CASSANDRA_MAIN%" %TOOLS_PARAMS%
"%JAVA_HOME%\bin\java" %JAVA_OPTS% %CASSANDRA_PARAMS% -cp "%CASSANDRA_CLASSPATH%" "%CASSANDRA_MAIN%" %TOOLS_PARAMS% "%JAVA_HOME%\bin\java" %JAVA_OPTS% %CASSANDRA_PARAMS% -cp "%CASSANDRA_CLASSPATH%" "%CASSANDRA_MAIN%" %TOOLS_PARAMS%
goto finally goto finally