Author: gdusbabek
Date: Wed May 19 18:03:12 2010
New Revision: 946316
URL: http://svn.apache.org/viewvc?rev=946316&view=rev
Log:
Windows scripts for SSTableImport/Export. patch by dopson, reviewed by
gdusbabek. CASSANDRA-1051
Added:
cassandra/branches/cassandra-0.6/bin/json2sstable.bat
cassandra/branches/cassandra-0.6/bin/sstable2json.bat
Modified:
cassandra/branches/cassandra-0.6/CHANGES.txt
Modified: cassandra/branches/cassandra-0.6/CHANGES.txt
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/CHANGES.txt?rev=946316&r1=946315&r2=946316&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.6/CHANGES.txt Wed May 19 18:03:12 2010
@@ -22,6 +22,7 @@
modified (CASSANDRA-1079)
* better defaults for flush sorter + writer executor queue sizes
(CASSANDRA-1100)
+ * windows scripts for SSTableImport/Export (CASSANDRA-1051)
0.6.1
Added: cassandra/branches/cassandra-0.6/bin/json2sstable.bat
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/bin/json2sstable.bat?rev=946316&view=auto
==============================================================================
--- cassandra/branches/cassandra-0.6/bin/json2sstable.bat (added)
+++ cassandra/branches/cassandra-0.6/bin/json2sstable.bat Wed May 19 18:03:12
2010
@@ -0,0 +1,68 @@
+...@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=%CD%
+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 JAVA_HOME goto err
+
+REM ***** JAVA options *****
+set JAVA_OPTS=^
+ -Dlog4j.configuration=log4j-tools.properties^
+ -Dstorage-config=storage-conf.xml
+
+REM ***** CLASSPATH library setting *****
+
+REM Ensure that any user defined CLASSPATH variables are not used on startup
+set CLASSPATH=
+
+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
+goto okClasspath
+
+:append
+set CLASSPATH=%CLASSPATH%;%1%2
+goto :eof
+
+:okClasspath
+REM Include the build\classes directory so it works in development
+set
CASSANDRA_CLASSPATH=%CLASSPATH%;%CASSANDRA_HOME%\build\classes;%CASSANDRA_CONF%
+
+set CASSANDRA_PARAMS=
+set TOOLS_PARAMS=
+
+FOR %%A IN (%*) DO call :appendToolsParams %%A
+
+goto runTool
+
+:appendToolsParams
+set TOOLS_PARAMS=%TOOLS_PARAMS% %1
+goto :eof
+
+:runTool
+"%JAVA_HOME%\bin\java" %JAVA_OPTS% %CASSANDRA_PARAMS% -cp
"%CASSANDRA_CLASSPATH%" "%CASSANDRA_MAIN%" %TOOLS_PARAMS%
+goto finally
+
+:err
+echo JAVA_HOME environment variable must be set!
+pause
+
+:finally
+
+ENDLOCAL
Added: cassandra/branches/cassandra-0.6/bin/sstable2json.bat
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/bin/sstable2json.bat?rev=946316&view=auto
==============================================================================
--- cassandra/branches/cassandra-0.6/bin/sstable2json.bat (added)
+++ cassandra/branches/cassandra-0.6/bin/sstable2json.bat Wed May 19 18:03:12
2010
@@ -0,0 +1,69 @@
+...@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=%CD%
+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 JAVA_HOME goto err
+
+REM ***** JAVA options *****
+set JAVA_OPTS=^
+ -Dlog4j.configuration=log4j-tools.properties^
+ -Dstorage-config=storage-conf.xml
+
+REM ***** CLASSPATH library setting *****
+
+REM Ensure that any user defined CLASSPATH variables are not used on startup
+set CLASSPATH=
+
+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
+goto okClasspath
+
+:append
+set CLASSPATH=%CLASSPATH%;%1%2
+goto :eof
+
+:okClasspath
+REM Include the build\classes directory so it works in development
+set
CASSANDRA_CLASSPATH=%CLASSPATH%;%CASSANDRA_HOME%\build\classes;%CASSANDRA_CONF%
+
+set CASSANDRA_PARAMS=
+set TOOLS_PARAMS=
+
+FOR %%A IN (%*) DO call :appendToolsParams %%A
+
+goto runTool
+
+:appendToolsParams
+set TOOLS_PARAMS=%TOOLS_PARAMS% %1
+goto :eof
+
+: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%
+goto finally
+
+:err
+echo JAVA_HOME environment variable must be set!
+pause
+
+:finally
+
+ENDLOCAL
