Updated Branches: refs/heads/cassandra-2.0 ebd50ff2a -> e30810ebb
add windows bat files for shell commands patch by sdelmas reviewed by dbrosius for CASSANDRA-6145 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/de526610 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/de526610 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/de526610 Branch: refs/heads/cassandra-2.0 Commit: de526610b37eab55d49c6f7f5ffab07a406d0064 Parents: dbca6d6 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Tue Oct 22 21:12:35 2013 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Tue Oct 22 21:12:35 2013 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh.bat | 5 ++++ bin/debug-cql.bat | 61 ++++++++++++++++++++++++++++++++++++++++++++ bin/sstableloader.bat | 61 ++++++++++++++++++++++++++++++++++++++++++++ bin/sstablemetadata.bat | 33 ++++++++++++++++++++++++ bin/sstablescrub.bat | 61 ++++++++++++++++++++++++++++++++++++++++++++ bin/sstablesplit.bat | 61 ++++++++++++++++++++++++++++++++++++++++++++ bin/sstableupgrade.bat | 61 ++++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 344 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/de526610/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 9e150b8..bb40dff 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -2,6 +2,7 @@ * (Hadoop) Require CFRR batchSize to be at least 2 (CASSANDRA-6114) * Fix altering column types (CASSANDRA-6185) * cqlsh: fix CREATE/ALTER WITH completion (CASSANDRA-6196) + * add windows bat files for shell commands (CASSANDRA-6145) 1.2.11 http://git-wip-us.apache.org/repos/asf/cassandra/blob/de526610/bin/cqlsh.bat ---------------------------------------------------------------------- diff --git a/bin/cqlsh.bat b/bin/cqlsh.bat new file mode 100644 index 0000000..e54aebf --- /dev/null +++ b/bin/cqlsh.bat @@ -0,0 +1,5 @@ +@echo off + +set DSDIR=%~dp0.. + +"%DSDIR%\python\python.exe" "%DSDIR%\apache-cassandra\bin\cqlsh" %* \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cassandra/blob/de526610/bin/debug-cql.bat ---------------------------------------------------------------------- diff --git a/bin/debug-cql.bat b/bin/debug-cql.bat new file mode 100644 index 0000000..d936f0a --- /dev/null +++ b/bin/debug-cql.bat @@ -0,0 +1,61 @@ +@REM +@REM Licensed to the Apache Software Foundation (ASF) under one or more +@REM contributor license agreements. See the NOTICE file distributed with +@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 "License"); you may not use this file except in compliance with +@REM the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@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 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@REM See the License for the specific language governing permissions and +@REM limitations under the License. + +@echo off +if "%OS%" == "Windows_NT" setlocal + +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.transport.Client +if NOT DEFINED JAVA_HOME goto :err + +REM ***** JAVA options ***** +set JAVA_OPTS=^ + -Dlog4j.configuration=log4j-tools.properties + +REM ***** CLASSPATH library setting ***** + +REM Ensure that any user defined CLASSPATH variables are not used on startup +set CLASSPATH="%CASSANDRA_HOME%\conf" + +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 "%%i" +goto okClasspath + +:append +set CLASSPATH=%CLASSPATH%;%1 +goto :eof + +:okClasspath +REM Include the build\classes\main directory so it works in development +set CASSANDRA_CLASSPATH=%CLASSPATH%;"%CASSANDRA_HOME%\build\classes\main";%CASSANDRA_CONF%;"%CASSANDRA_HOME%\build\classes\thrift" + +set CASSANDRA_PARAMS= +set TOOLS_PARAMS= + +goto runTool + +:runTool +"%JAVA_HOME%\bin\java" %JAVA_OPTS% %CASSANDRA_PARAMS% -cp %CASSANDRA_CLASSPATH% "%CASSANDRA_MAIN%" %* +goto finally + +:err +echo JAVA_HOME environment variable must be set! +pause + +:finally + +ENDLOCAL http://git-wip-us.apache.org/repos/asf/cassandra/blob/de526610/bin/sstableloader.bat ---------------------------------------------------------------------- diff --git a/bin/sstableloader.bat b/bin/sstableloader.bat new file mode 100644 index 0000000..5678693 --- /dev/null +++ b/bin/sstableloader.bat @@ -0,0 +1,61 @@ +@REM +@REM Licensed to the Apache Software Foundation (ASF) under one or more +@REM contributor license agreements. See the NOTICE file distributed with +@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 "License"); you may not use this file except in compliance with +@REM the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@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 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@REM See the License for the specific language governing permissions and +@REM limitations under the License. + +@echo off +if "%OS%" == "Windows_NT" setlocal + +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.tools.BulkLoader +if NOT DEFINED JAVA_HOME goto :err + +REM ***** JAVA options ***** +set JAVA_OPTS=^ + -Dlog4j.configuration=log4j-tools.properties + +REM ***** CLASSPATH library setting ***** + +REM Ensure that any user defined CLASSPATH variables are not used on startup +set CLASSPATH="%CASSANDRA_HOME%\conf" + +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 "%%i" +goto okClasspath + +:append +set CLASSPATH=%CLASSPATH%;%1 +goto :eof + +:okClasspath +REM Include the build\classes\main directory so it works in development +set CASSANDRA_CLASSPATH=%CLASSPATH%;"%CASSANDRA_HOME%\build\classes\main";%CASSANDRA_CONF%;"%CASSANDRA_HOME%\build\classes\thrift" + +set CASSANDRA_PARAMS= +set TOOLS_PARAMS= + +goto runTool + +:runTool +"%JAVA_HOME%\bin\java" %JAVA_OPTS% %CASSANDRA_PARAMS% -cp %CASSANDRA_CLASSPATH% "%CASSANDRA_MAIN%" %* +goto finally + +:err +echo JAVA_HOME environment variable must be set! +pause + +:finally + +ENDLOCAL http://git-wip-us.apache.org/repos/asf/cassandra/blob/de526610/bin/sstablemetadata.bat ---------------------------------------------------------------------- diff --git a/bin/sstablemetadata.bat b/bin/sstablemetadata.bat new file mode 100644 index 0000000..72e6506 --- /dev/null +++ b/bin/sstablemetadata.bat @@ -0,0 +1,33 @@ +@REM Licensed to the Apache Software Foundation (ASF) under one or more +@REM contributor license agreements. See the NOTICE file distributed with +@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 "License"); you may not use this file except in compliance with +@REM the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@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 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@REM See the License for the specific language governing permissions and +@REM limitations under the License. + +@echo off + +setlocal + +if NOT DEFINED CASSANDRA_HOME set CASSANDRA_HOME=%CD%\..\.. +if NOT DEFINED JAVA_HOME goto :err + +set CLASSPATH="" +for %%i in ("%CASSANDRA_HOME%\build\*.jar") do call :append "%%i" +for %%i in ("%CASSANDRA_HOME%\lib\*.jar") do call :append "%%i" +goto start + +:append +set CLASSPATH=%CLASSPATH%;%1 +goto :eof + +:start +"%JAVA_HOME%\bin\java" -cp %CLASSPATH% org.apache.cassandra.tools.SSTableMetadataViewer %* http://git-wip-us.apache.org/repos/asf/cassandra/blob/de526610/bin/sstablescrub.bat ---------------------------------------------------------------------- diff --git a/bin/sstablescrub.bat b/bin/sstablescrub.bat new file mode 100644 index 0000000..06f4c84 --- /dev/null +++ b/bin/sstablescrub.bat @@ -0,0 +1,61 @@ +@REM +@REM Licensed to the Apache Software Foundation (ASF) under one or more +@REM contributor license agreements. See the NOTICE file distributed with +@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 "License"); you may not use this file except in compliance with +@REM the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@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 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@REM See the License for the specific language governing permissions and +@REM limitations under the License. + +@echo off +if "%OS%" == "Windows_NT" setlocal + +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.tools.StandaloneScrubber +if NOT DEFINED JAVA_HOME goto :err + +REM ***** JAVA options ***** +set JAVA_OPTS=^ + -Dlog4j.configuration=log4j-tools.properties + +REM ***** CLASSPATH library setting ***** + +REM Ensure that any user defined CLASSPATH variables are not used on startup +set CLASSPATH="%CASSANDRA_HOME%\conf" + +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 "%%i" +goto okClasspath + +:append +set CLASSPATH=%CLASSPATH%;%1 +goto :eof + +:okClasspath +REM Include the build\classes\main directory so it works in development +set CASSANDRA_CLASSPATH=%CLASSPATH%;"%CASSANDRA_HOME%\build\classes\main";%CASSANDRA_CONF%;"%CASSANDRA_HOME%\build\classes\thrift" + +set CASSANDRA_PARAMS= +set TOOLS_PARAMS= + +goto runTool + +:runTool +"%JAVA_HOME%\bin\java" %JAVA_OPTS% %CASSANDRA_PARAMS% -cp %CASSANDRA_CLASSPATH% "%CASSANDRA_MAIN%" %* +goto finally + +:err +echo JAVA_HOME environment variable must be set! +pause + +:finally + +ENDLOCAL http://git-wip-us.apache.org/repos/asf/cassandra/blob/de526610/bin/sstablesplit.bat ---------------------------------------------------------------------- diff --git a/bin/sstablesplit.bat b/bin/sstablesplit.bat new file mode 100644 index 0000000..ef88670 --- /dev/null +++ b/bin/sstablesplit.bat @@ -0,0 +1,61 @@ +@REM +@REM Licensed to the Apache Software Foundation (ASF) under one or more +@REM contributor license agreements. See the NOTICE file distributed with +@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 "License"); you may not use this file except in compliance with +@REM the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@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 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@REM See the License for the specific language governing permissions and +@REM limitations under the License. + +@echo off +if "%OS%" == "Windows_NT" setlocal + +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.tools.StandaloneSplitter +if NOT DEFINED JAVA_HOME goto :err + +REM ***** JAVA options ***** +set JAVA_OPTS=^ + -Dlog4j.configuration=log4j-tools.properties + +REM ***** CLASSPATH library setting ***** + +REM Ensure that any user defined CLASSPATH variables are not used on startup +set CLASSPATH="%CASSANDRA_HOME%\conf" + +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 "%%i" +goto okClasspath + +:append +set CLASSPATH=%CLASSPATH%;%1 +goto :eof + +:okClasspath +REM Include the build\classes\main directory so it works in development +set CASSANDRA_CLASSPATH=%CLASSPATH%;"%CASSANDRA_HOME%\build\classes\main";%CASSANDRA_CONF%;"%CASSANDRA_HOME%\build\classes\thrift" + +set CASSANDRA_PARAMS= +set TOOLS_PARAMS= + +goto runTool + +:runTool +"%JAVA_HOME%\bin\java" %JAVA_OPTS% %CASSANDRA_PARAMS% -cp %CASSANDRA_CLASSPATH% "%CASSANDRA_MAIN%" %* +goto finally + +:err +echo JAVA_HOME environment variable must be set! +pause + +:finally + +ENDLOCAL http://git-wip-us.apache.org/repos/asf/cassandra/blob/de526610/bin/sstableupgrade.bat ---------------------------------------------------------------------- diff --git a/bin/sstableupgrade.bat b/bin/sstableupgrade.bat new file mode 100644 index 0000000..8c7892d --- /dev/null +++ b/bin/sstableupgrade.bat @@ -0,0 +1,61 @@ +@REM +@REM Licensed to the Apache Software Foundation (ASF) under one or more +@REM contributor license agreements. See the NOTICE file distributed with +@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 "License"); you may not use this file except in compliance with +@REM the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@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 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@REM See the License for the specific language governing permissions and +@REM limitations under the License. + +@echo off +if "%OS%" == "Windows_NT" setlocal + +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.tools.StandaloneUpgrader +if NOT DEFINED JAVA_HOME goto :err + +REM ***** JAVA options ***** +set JAVA_OPTS=^ + -Dlog4j.configuration=log4j-tools.properties + +REM ***** CLASSPATH library setting ***** + +REM Ensure that any user defined CLASSPATH variables are not used on startup +set CLASSPATH="%CASSANDRA_HOME%\conf" + +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 "%%i" +goto okClasspath + +:append +set CLASSPATH=%CLASSPATH%;%1 +goto :eof + +:okClasspath +REM Include the build\classes\main directory so it works in development +set CASSANDRA_CLASSPATH=%CLASSPATH%;"%CASSANDRA_HOME%\build\classes\main";%CASSANDRA_CONF%;"%CASSANDRA_HOME%\build\classes\thrift" + +set CASSANDRA_PARAMS= +set TOOLS_PARAMS= + +goto runTool + +:runTool +"%JAVA_HOME%\bin\java" %JAVA_OPTS% %CASSANDRA_PARAMS% -cp %CASSANDRA_CLASSPATH% "%CASSANDRA_MAIN%" %* +goto finally + +:err +echo JAVA_HOME environment variable must be set! +pause + +:finally + +ENDLOCAL