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/08/03 20:53:52 UTC
[1/2] cassandra git commit: Add sstableofflinerelevel.bat and
sstablelevelreset.bat
Repository: cassandra
Updated Branches:
refs/heads/trunk 3d3628b1d -> 4d1b3d268
Add sstableofflinerelevel.bat and sstablelevelreset.bat
Patch by pmotta; reviewed by pthompson for CASSANDRA-9942
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4765cd6f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4765cd6f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4765cd6f
Branch: refs/heads/trunk
Commit: 4765cd6f170a842fac3896e4aec89b2d48d3e2ab
Parents: 31c1958
Author: Paulo Motta <pa...@gmail.com>
Authored: Mon Aug 3 14:52:23 2015 -0400
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Mon Aug 3 14:52:23 2015 -0400
----------------------------------------------------------------------
bin/cassandra.in.bat | 2 +-
tools/bin/cassandra.in.bat | 2 +-
tools/bin/sstablelevelreset.bat | 46 ++++++++++++++++++++++++++++++
tools/bin/sstableofflinerelevel.bat | 49 ++++++++++++++++++++++++++++++++
4 files changed, 97 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4765cd6f/bin/cassandra.in.bat
----------------------------------------------------------------------
diff --git a/bin/cassandra.in.bat b/bin/cassandra.in.bat
index 83b7472..5682f9d 100644
--- a/bin/cassandra.in.bat
+++ b/bin/cassandra.in.bat
@@ -31,7 +31,7 @@ REM set JAVA_HOME="<directory>"
REM ***** CLASSPATH library setting *****
REM Ensure that any user defined CLASSPATH variables are not used on startup
-set CLASSPATH="%CASSANDRA_CONF%"
+set CLASSPATH=%CASSANDRA_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"
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4765cd6f/tools/bin/cassandra.in.bat
----------------------------------------------------------------------
diff --git a/tools/bin/cassandra.in.bat b/tools/bin/cassandra.in.bat
index 889fa9b..0fdd31a 100644
--- a/tools/bin/cassandra.in.bat
+++ b/tools/bin/cassandra.in.bat
@@ -24,7 +24,7 @@ REM set JAVA_HOME="<directory>"
REM ***** CLASSPATH library setting *****
REM Ensure that any user defined CLASSPATH variables are not used on startup
-set CLASSPATH="%CASSANDRA_HOME%\conf"
+set CLASSPATH=%CASSANDRA_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"
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4765cd6f/tools/bin/sstablelevelreset.bat
----------------------------------------------------------------------
diff --git a/tools/bin/sstablelevelreset.bat b/tools/bin/sstablelevelreset.bat
new file mode 100644
index 0000000..b15cb48
--- /dev/null
+++ b/tools/bin/sstablelevelreset.bat
@@ -0,0 +1,46 @@
+@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
+
+pushd "%~dp0"
+call cassandra.in.bat
+
+if NOT DEFINED JAVA_HOME goto :err
+set TOOL_MAIN=org.apache.cassandra.tools.SSTableLevelResetter
+
+REM ***** JAVA options *****
+set JAVA_OPTS=^
+ -Dlogback.configurationFile=logback-tools.xml
+
+"%JAVA_HOME%\bin\java" %JAVA_OPTS% %CASSANDRA_PARAMS% -cp %CLASSPATH% %TOOL_MAIN% %*
+goto finally
+
+:err
+echo JAVA_HOME environment variable must be set!
+set ERRORLEVEL=1
+pause
+
+:finally
+ENDLOCAL & set RC=%ERRORLEVEL%
+goto :exit_with_code
+
+:returncode
+exit /B %RC%
+
+:exit_with_code
+call :returncode %RC%
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4765cd6f/tools/bin/sstableofflinerelevel.bat
----------------------------------------------------------------------
diff --git a/tools/bin/sstableofflinerelevel.bat b/tools/bin/sstableofflinerelevel.bat
new file mode 100644
index 0000000..3372bba
--- /dev/null
+++ b/tools/bin/sstableofflinerelevel.bat
@@ -0,0 +1,49 @@
+@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
+
+pushd "%~dp0"
+call cassandra.in.bat
+
+if NOT DEFINED JAVA_HOME goto :err
+if NOT DEFINED MAX_HEAP_SIZE set MAX_HEAP_SIZE="256M"
+set TOOL_MAIN=org.apache.cassandra.tools.SSTableOfflineRelevel
+
+REM ***** JAVA options *****
+set JAVA_OPTS=^
+ -ea ^
+ -Xmx%MAX_HEAP_SIZE% ^
+ -Dlogback.configurationFile=logback-tools.xml
+
+"%JAVA_HOME%\bin\java" %JAVA_OPTS% %CASSANDRA_PARAMS% -cp %CLASSPATH% %TOOL_MAIN% %*
+goto finally
+
+:err
+echo JAVA_HOME environment variable must be set!
+set ERRORLEVEL=1
+pause
+
+:finally
+ENDLOCAL & set RC=%ERRORLEVEL%
+goto :exit_with_code
+
+:returncode
+exit /B %RC%
+
+:exit_with_code
+call :returncode %RC%
\ No newline at end of file
[2/2] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
Posted by jm...@apache.org.
Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4d1b3d26
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4d1b3d26
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4d1b3d26
Branch: refs/heads/trunk
Commit: 4d1b3d2687aed2f0cfa33bdfe73e3e4dfe46865d
Parents: 3d3628b 4765cd6
Author: Joshua McKenzie <jm...@apache.org>
Authored: Mon Aug 3 14:53:21 2015 -0400
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Mon Aug 3 14:53:21 2015 -0400
----------------------------------------------------------------------
bin/cassandra.in.bat | 2 +-
tools/bin/cassandra.in.bat | 2 +-
tools/bin/sstablelevelreset.bat | 46 ++++++++++++++++++++++++++++++
tools/bin/sstableofflinerelevel.bat | 49 ++++++++++++++++++++++++++++++++
4 files changed, 97 insertions(+), 2 deletions(-)
----------------------------------------------------------------------