Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
121 commits
Select commit Hold shift + click to select a range
1142433
changes to python scripts, addition of modules
polandll Jul 9, 2020
3c9001b
small makefile change
polandll Jul 9, 2020
1d0da88
slight changes to yaml files
polandll Jul 9, 2020
72e766c
cleanup yaml convert script
polandll Jul 9, 2020
cb80379
cleanup NODETOOL TEXT include file location
polandll Jul 9, 2020
bfb8f3a
test tab
polandll Jul 10, 2020
e7515c7
updates
polandll Jul 10, 2020
2ab7340
move non-adoc files to examples/YAML
polandll Jul 10, 2020
f7ca6b7
edits
polandll Jul 16, 2020
00232ea
reorder items
polandll Jul 16, 2020
412e2d8
fix formatting
polandll Jul 22, 2020
2c726a0
add tabs, fix text
polandll Jul 23, 2020
6f8561a
convert dml file
polandll Jul 24, 2020
423cd06
more adoc conversion
polandll Jul 27, 2020
a9344af
last of cql conversions
polandll Jul 27, 2020
daf575c
more conversion
polandll Jul 28, 2020
00c2733
more conversion and cleanup
polandll Jul 29, 2020
f8cbd02
conversion
polandll Jul 29, 2020
2d47c4c
change prelease #
polandll Jul 29, 2020
36e4376
change location of source files
polandll Jul 29, 2020
4ffb91e
remove sphinx stuff from Makefile
polandll Jul 29, 2020
0c3845b
changes for antora
polandll Jul 29, 2020
0d3c7ac
working on dockerfile
polandll Jul 30, 2020
ca8881c
make edits per Ekaterina
polandll Jul 31, 2020
8cb26c6
convert new fql page to adoc
polandll Jul 31, 2020
15c0189
remove unused file
polandll Jul 31, 2020
603372b
nodetool text page gen'd
polandll Jul 31, 2020
ca9aa26
rewrite audit logging
polandll Jul 31, 2020
561dad5
rewrite audit logging to match fql
polandll Aug 1, 2020
e7829ab
more rewrites of New features
polandll Aug 1, 2020
4bfc5dd
fix a couple of errors
polandll Aug 3, 2020
0c1b999
more virt table rewrite
polandll Aug 4, 2020
415ab2a
some config changes
polandll Aug 5, 2020
7f9cc72
testing
polandll Aug 5, 2020
c6bfc0b
partial fix for docker files
polandll Aug 5, 2020
48e2283
more docker changes
polandll Aug 5, 2020
919629f
remove unused files
polandll Aug 5, 2020
8168d24
tests
polandll Aug 6, 2020
ac8cccf
saving to switch
polandll Aug 7, 2020
b4f3527
revise per dcapwell's review
polandll Aug 7, 2020
f69ecb4
new edits
polandll Aug 11, 2020
73f7054
add perms
polandll Aug 11, 2020
45016ef
change dockerfile back
polandll Aug 11, 2020
5babbfd
add work
polandll Aug 11, 2020
dc3a120
add add commit
polandll Aug 12, 2020
7c5d983
fix antora
polandll Aug 12, 2020
a8ee3d6
fix antora
polandll Aug 12, 2020
dfe12a0
change ui bundle location
polandll Aug 12, 2020
7e07e6b
locate ui in tree
polandll Aug 12, 2020
13bb0b1
change content url
polandll Aug 12, 2020
c3f247b
fix missing quote
polandll Aug 12, 2020
7008c46
took out unneccesary steps
polandll Aug 12, 2020
b615eac
change jdk from 11 to 8
polandll Aug 12, 2020
2b5db41
jdk 8 -> 11
polandll Aug 12, 2020
cf363cb
jdk change
polandll Aug 12, 2020
10db414
more changes
polandll Aug 12, 2020
f46b22d
changes to files
polandll Aug 12, 2020
2306ffc
make sure the ui bundle is picked up
polandll Aug 12, 2020
4511624
Anthony's additions to the docker files added
polandll Aug 12, 2020
831128c
add http-server
polandll Aug 12, 2020
a850ad0
add npm i -g antora-site-generator-lunr
polandll Aug 13, 2020
fd462c0
Added skip nodetool and config file generation flag. Fixed missing lu…
ossarga Aug 13, 2020
d363796
testing rest of website
polandll Aug 13, 2020
ac88255
test 2
polandll Aug 13, 2020
e9a811d
test 3
polandll Aug 13, 2020
40161c0
sitestuff
polandll Aug 13, 2020
b10fd2d
switch back to container urls
polandll Aug 14, 2020
423673d
rewrite new ui-bundle
polandll Aug 18, 2020
06191b3
change ui-bundle url
polandll Aug 18, 2020
964e62a
change ui-bundle url again
polandll Aug 18, 2020
e78e42e
fix ian's url
polandll Aug 18, 2020
9e2c336
change ui-bundle url again for test
polandll Aug 18, 2020
b0de92a
rezip ui-bundle.zip
polandll Aug 19, 2020
a539ce3
Updates to document generation
ossarga Aug 19, 2020
ba72612
zip bundle with search.css
polandll Aug 19, 2020
f3f114c
add supplemental_ui
polandll Aug 19, 2020
75749b1
comment out ui.yml
polandll Aug 19, 2020
9477253
exchange ui-bundle
polandll Aug 20, 2020
5aa2a54
get bundle from ian repo
polandll Aug 20, 2020
3f0665f
change ui-bundle url
polandll Aug 20, 2020
7f754c5
cleanup, remove supplemental_ui directory
polandll Aug 20, 2020
59d72e4
convert some add'l files to adoc
polandll Aug 21, 2020
0af1b18
add module to xref
polandll Aug 21, 2020
39a945a
fix url
polandll Aug 26, 2020
5b18e2e
combine nav.adoc files
polandll Aug 26, 2020
bdd568b
fix website nav items
polandll Aug 26, 2020
4f8847f
add misc files to source
polandll Aug 26, 2020
a7a7689
remove py scripts, they are moved, and hold file
polandll Sep 2, 2020
1e8324d
delete unneeded cql textile file
polandll Sep 2, 2020
e0bd48b
converted SASI.md to adoc and moved to cql
polandll Sep 2, 2020
f19b941
add docker to installing
polandll Dec 21, 2020
1baa432
fix sentence
polandll Dec 21, 2020
17a7d1c
improvements to writing
polandll Dec 23, 2020
5498397
fix index
polandll Jan 21, 2021
05f61ee
changes due to CASS tickets
polandll Jan 21, 2021
2af3dbf
fix merge conflicts
polandll Jun 24, 2021
fb5e215
Merge branch 'doc_redo_asciidoc' into trunk
polandll Jun 24, 2021
51b7737
remove one more rst file
polandll Jun 24, 2021
48b8b25
remove new from 4.0 docs to create 3.11
polandll Jun 24, 2021
f0529d6
Merge pull request #2 from polandll/3.11_adoc
polandll Jun 24, 2021
95698ff
Merge branch 'trunk' of github.com:apache/cassandra into trunk
polandll Jun 25, 2021
84d73df
Revert "remove new from 4.0 docs to create 3.11"
polandll Jun 25, 2021
7f56a83
Merge pull request #3 from polandll/revert-2-3.11_adoc
polandll Jun 25, 2021
a89e4f2
remove legacy docker files
polandll Jun 28, 2021
fbcf757
remove sitestuff, redirect development to cass-website site-content
polandll Jun 28, 2021
b315e07
more cleanup
polandll Jun 28, 2021
b9f00bc
remove sitestuff from nav.adoc
polandll Jun 28, 2021
1e8d32d
remove all but antora.yml and modules
polandll Jun 29, 2021
194fdb9
fix py scripts
polandll Jun 29, 2021
350b79e
change prelease version
polandll Jun 29, 2021
0c80645
change to 4.0
polandll Jun 30, 2021
3f77a68
change Website to _
polandll Jul 14, 2021
3e2202f
change Website to _
polandll Jul 14, 2021
ce048b5
change http://cassandra.apache.org to use antora variable {cass_url}
polandll Jul 14, 2021
fb00093
change http://cassandra.apache.org to use antora variable {cass_url}
polandll Jul 14, 2021
61f874a
change Website to _
polandll Jul 14, 2021
70ffa19
remove bold
polandll Jul 16, 2021
e7f80a7
add display version for 4.0
polandll Jul 26, 2021
6af0762
Merge branch 'trunk' of github.com:apache/cassandra into trunk
polandll Aug 9, 2021
21613f5
fix
polandll Aug 9, 2021
fa59b29
Update data_modeling_rdbms.adoc
ashtonmendes Sep 8, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
33 changes: 33 additions & 0 deletions .rat-excludes
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
**/*.avpr
debian/**
.classpath
.rat-excludes
**/.project
**/.pydevproject
CHANGES.txt
README.asc
.git/**
**/*.json
**/*.patch
interface/*/gen-*/**
src/gen-java/**
build/**
lib/licenses/*.txt
.settings/**
**/cassandra.yaml
**/cassandra-topology.yaml
**/metrics-reporter-config-sample.yaml
**/*.db
.externalToolBuilders/**
test/data/serialization/*/*
**/*.wpr
doc/**
build.properties.default
test/data/**
examples/triggers/build.xml
examples/triggers/conf/*
examples/hadoop_word_count/conf/log4j.properties
pylib/cqlshlib/test/**
src/resources/org/apache/cassandra/config/version.properties
conf/hotspot_compiler
**/*-example.yaml
184 changes: 184 additions & 0 deletions bin/cassandra.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,184 @@
@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

set ARG=%1
set INSTALL="INSTALL"
set UNINSTALL="UNINSTALL"

pushd %~dp0..
if NOT DEFINED CASSANDRA_HOME set CASSANDRA_HOME=%CD%
popd

if /i "%ARG%" == "LEGACY" goto runLegacy
REM -----------------------------------------------------------------------------
REM See if we have access to run unsigned powershell scripts
for /F "delims=" %%i in ('powershell Get-ExecutionPolicy') do set PERMISSION=%%i
if "%PERMISSION%" == "Unrestricted" goto runPowerShell
goto runLegacy

REM -----------------------------------------------------------------------------
:runPowerShell
echo Detected powershell execution permissions. Running with enhanced startup scripts.
set errorlevel=
powershell /file "%CASSANDRA_HOME%\bin\cassandra.ps1" %*
exit /b %errorlevel%

REM -----------------------------------------------------------------------------
:runLegacy
echo WARNING! Powershell script execution unavailable.
echo Please use 'powershell Set-ExecutionPolicy Unrestricted'
echo on this user-account to run cassandra with fully featured
echo functionality on this platform.

echo Starting with legacy startup options

if NOT DEFINED CASSANDRA_MAIN set CASSANDRA_MAIN=org.apache.cassandra.service.CassandraDaemon
if NOT DEFINED JAVA_HOME goto :err

REM -----------------------------------------------------------------------------
REM JVM Opts we'll use in legacy run or installation
set JAVA_OPTS=-ea^
-javaagent:"%CASSANDRA_HOME%\lib\jamm-0.3.2"^
-Xms2G^
-Xmx2G^
-XX:+HeapDumpOnOutOfMemoryError^
-XX:+UseParNewGC^
-XX:+UseConcMarkSweepGC^
-XX:+CMSParallelRemarkEnabled^
-XX:SurvivorRatio=8^
-XX:MaxTenuringThreshold=1^
-XX:CMSInitiatingOccupancyFraction=75^
-XX:+UseCMSInitiatingOccupancyOnly^
-Dlogback.configurationFile=logback.xml^
-Djava.library.path="%CASSANDRA_HOME%\lib\sigar-bin"^
-Dcassandra.jmx.local.port=7199
REM **** JMX REMOTE ACCESS SETTINGS SEE: https://wiki.apache.org/cassandra/JmxSecurity ***
REM -Dcom.sun.management.jmxremote.port=7199^
REM -Dcom.sun.management.jmxremote.ssl=false^
REM -Dcom.sun.management.jmxremote.authenticate=true^
REM -Dcom.sun.management.jmxremote.password.file=C:\jmxremote.password

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

REM -----------------------------------------------------------------------------
:okClasspath

REM JSR223 - collect all JSR223 engines' jars
for /D %%P in ("%CASSANDRA_HOME%\lib\jsr223\*.*") do (
for %%i in ("%%P\*.jar") do call :append "%%i"
)

REM JSR223/JRuby - set ruby lib directory
if EXIST "%CASSANDRA_HOME%\lib\jsr223\jruby\ruby" (
set JAVA_OPTS=%JAVA_OPTS% "-Djruby.lib=%CASSANDRA_HOME%\lib\jsr223\jruby"
)
REM JSR223/JRuby - set ruby JNI libraries root directory
if EXIST "%CASSANDRA_HOME%\lib\jsr223\jruby\jni" (
set JAVA_OPTS=%JAVA_OPTS% "-Djffi.boot.library.path=%CASSANDRA_HOME%\lib\jsr223\jruby\jni"
)
REM JSR223/Jython - set python.home system property
if EXIST "%CASSANDRA_HOME%\lib\jsr223\jython\jython.jar" (
set JAVA_OPTS=%JAVA_OPTS% "-Dpython.home=%CASSANDRA_HOME%\lib\jsr223\jython"
)
REM JSR223/Scala - necessary system property
if EXIST "%CASSANDRA_HOME%\lib\jsr223\scala\scala-compiler.jar" (
set JAVA_OPTS=%JAVA_OPTS% "-Dscala.usejavacp=true"
)

REM Include the build\classes\main directory so it works in development
set CASSANDRA_CLASSPATH=%CLASSPATH%;"%CASSANDRA_HOME%\build\classes\main"
set CASSANDRA_PARAMS=-Dcassandra -Dcassandra-foreground=yes
set CASSANDRA_PARAMS=%CASSANDRA_PARAMS% -Dcassandra.logdir="%CASSANDRA_HOME%\logs"
set CASSANDRA_PARAMS=%CASSANDRA_PARAMS% -Dcassandra.storagedir="%CASSANDRA_HOME%\data"

if /i "%ARG%" == "INSTALL" goto doInstallOperation
if /i "%ARG%" == "UNINSTALL" goto doInstallOperation

echo Starting Cassandra Server
"%JAVA_HOME%\bin\java" %JAVA_OPTS% %CASSANDRA_PARAMS% -cp %CASSANDRA_CLASSPATH% "%CASSANDRA_MAIN%"
goto finally

REM -----------------------------------------------------------------------------
:doInstallOperation
set SERVICE_JVM="cassandra"
rem location of Prunsrv
set PATH_PRUNSRV=%CASSANDRA_HOME%\bin\daemon\
set PR_LOGPATH=%PATH_PRUNSRV%

rem Allow prunsrv to be overridden
if "%PRUNSRV%" == "" set PRUNSRV=%PATH_PRUNSRV%prunsrv

echo trying to delete service if it has been created already
"%PRUNSRV%" //DS//%SERVICE_JVM%
rem quit if we're just going to uninstall
if /i "%ARG%" == "UNINSTALL" goto finally

echo Installing %SERVICE_JVM%. If you get registry warnings, re-run as an Administrator
"%PRUNSRV%" //IS//%SERVICE_JVM%

echo Setting startup parameters for %SERVICE_JVM%
set cmd="%PRUNSRV%" //US//%SERVICE_JVM% ^
--Jvm=auto --StdOutput auto --StdError auto ^
--Classpath=%CASSANDRA_CLASSPATH% ^
--StartMode=jvm --StartClass=%CASSANDRA_MAIN% --StartMethod=main ^
--StopMode=jvm --StopClass=%CASSANDRA_MAIN% --StopMethod=stop

REM convert ' -' into ';-' so we can tokenize on semicolon as we may have spaces in folder names
set tempOptions=%JAVA_OPTS: -=;-%
REM Append the JAVA_OPTS, each with independent ++JvmOptions as delimited list fails for some options
:optStrip
for /F "tokens=1* delims=;" %%a in ("%tempOptions%") do (
set JVMOPTIONS=%JVMOPTIONS% ++JvmOptions=%%a
set tempOptions=%%b
)
if defined tempOptions goto :optStrip

REM do the same for CASSANDRA_PARAMS
set tempOptions=%CASSANDRA_PARAMS: -=;-%

:paramStrip
for /F "tokens=1* delims=;" %%a in ("%tempOptions%") do (
set JVMOPTIONS=%JVMOPTIONS% ++JvmOptions=%%a
set tempOptions=%%b
)
if defined tempOptions goto :paramStrip

%cmd% %JVMOPTIONS%

echo Installation of %SERVICE_JVM% is complete
goto finally

:err
echo JAVA_HOME environment variable must be set!
pause

REM -----------------------------------------------------------------------------
:finally

ENDLOCAL
74 changes: 74 additions & 0 deletions bin/cassandra.in.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
@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
pushd %~dp0..
if NOT DEFINED CASSANDRA_HOME set CASSANDRA_HOME=%CD%
popd

if NOT DEFINED CASSANDRA_CONF set CASSANDRA_CONF="%CASSANDRA_HOME%\conf"

REM the default location for commitlogs, sstables, and saved caches
REM if not set in cassandra.yaml
set cassandra_storagedir="%CASSANDRA_HOME%\data"

REM JAVA_HOME can optionally be set here
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%

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%

REM Add the default storage location. Can be overridden in conf\cassandra.yaml
set CASSANDRA_PARAMS=%CASSANDRA_PARAMS% "-Dcassandra.storagedir=%CASSANDRA_HOME%\data"

REM JSR223 - collect all JSR223 engines' jars
for /r %%P in ("%CASSANDRA_HOME%\lib\jsr223\*.jar") do (
set CLASSPATH=%CLASSPATH%;%%~fP
)
REM JSR223/JRuby - set ruby lib directory
if EXIST "%CASSANDRA_HOME%\lib\jsr223\jruby\ruby" (
set JAVA_OPTS=%JAVA_OPTS% "-Djruby.lib=%CASSANDRA_HOME%\lib\jsr223\jruby"
)
REM JSR223/JRuby - set ruby JNI libraries root directory
if EXIST "%CASSANDRA_HOME%\lib\jsr223\jruby\jni" (
set JAVA_OPTS=%JAVA_OPTS% "-Djffi.boot.library.path=%CASSANDRA_HOME%\lib\jsr223\jruby\jni"
)
REM JSR223/Jython - set python.home system property
if EXIST "%$CASSANDRA_HOME%\lib\jsr223\jython\jython.jar" (
set JAVA_OPTS=%JAVA_OPTS% "-Dpython.home=%CASSANDRA_HOME%\lib\jsr223\jython"
)
REM JSR223/Scala - necessary system property
if EXIST "$CASSANDRA_HOME\lib\jsr223\scala\scala-compiler.jar" (
set JAVA_OPTS=%JAVA_OPTS% "-Dscala.usejavacp=true"
)

REM Add the sigar-bin path to the java.library.path CASSANDRA-7838
set JAVA_OPTS=%JAVA_OPTS% -Djava.library.path=%CASSANDRA_HOME%\lib\sigar-bin"
Loading