Merge branch 'master' into feature/query-refactoring
This commit is contained in:
javanna
Luca Cavanna
commit
9a50944679
|
|
@ -37,4 +37,4 @@ eclipse-build
|
|||
nb-configuration.xml
|
||||
nbactions.xml
|
||||
|
||||
/dependency-reduced-pom.xml
|
||||
dependency-reduced-pom.xml
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@
|
|||
# Maven will replace the project.name with elasticsearch below. If that
|
||||
# hasn't been done, we assume that this is not a packaged version and the
|
||||
# user has forgotten to run Maven to create a package.
|
||||
IS_PACKAGED_VERSION='${project.name}'
|
||||
IS_PACKAGED_VERSION='${project.artifactId}'
|
||||
if [ "$IS_PACKAGED_VERSION" != "elasticsearch" ]; then
|
||||
cat >&2 << EOF
|
||||
Error: You must build the project with Maven or download a pre-built package
|
||||
|
|
|
|||
|
|
@ -4,6 +4,10 @@ rootLogger: ${es.logger.level}, console, file
|
|||
logger:
|
||||
# log action execution errors for easier debugging
|
||||
action: DEBUG
|
||||
|
||||
# deprecation logging, turn to DEBUG to see them
|
||||
deprecation: INFO, deprecation_log_file
|
||||
|
||||
# reduce the logging for aws, too much is logged under the default INFO
|
||||
com.amazonaws: WARN
|
||||
org.apache.http: INFO
|
||||
|
|
@ -24,6 +28,7 @@ logger:
|
|||
additivity:
|
||||
index.search.slowlog: false
|
||||
index.indexing.slowlog: false
|
||||
deprecation: false
|
||||
|
||||
appender:
|
||||
console:
|
||||
|
|
@ -51,6 +56,14 @@ appender:
|
|||
#type: pattern
|
||||
#conversionPattern: "[%d{ISO8601}][%-5p][%-25c] %m%n"
|
||||
|
||||
deprecation_log_file:
|
||||
type: dailyRollingFile
|
||||
file: ${path.logs}/${cluster.name}_deprecation.log
|
||||
datePattern: "'.'yyyy-MM-dd"
|
||||
layout:
|
||||
type: pattern
|
||||
conversionPattern: "[%d{ISO8601}][%-5p][%-25c] %m%n"
|
||||
|
||||
index_search_slow_log_file:
|
||||
type: dailyRollingFile
|
||||
file: ${path.logs}/${cluster.name}_index_search_slowlog.log
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@ import socket
|
|||
import urllib.request
|
||||
import subprocess
|
||||
|
||||
from functools import partial
|
||||
from http.client import HTTPConnection
|
||||
from http.client import HTTPSConnection
|
||||
|
||||
|
|
@ -72,6 +73,11 @@ PLUGINS = [('license', 'elasticsearch/license/latest'),
|
|||
|
||||
LOG = env.get('ES_RELEASE_LOG', '/tmp/elasticsearch_release.log')
|
||||
|
||||
# console colors
|
||||
COLOR_OK = '\033[92m'
|
||||
COLOR_END = '\033[0m'
|
||||
COLOR_FAIL = '\033[91m'
|
||||
|
||||
def log(msg):
|
||||
log_plain('\n%s' % msg)
|
||||
|
||||
|
|
@ -137,9 +143,6 @@ def get_tag_hash(tag):
|
|||
def get_current_branch():
|
||||
return os.popen('git rev-parse --abbrev-ref HEAD 2>&1').read().strip()
|
||||
|
||||
verify_java_version('1.7') # we require to build with 1.7
|
||||
verify_mvn_java_version('1.7', MVN)
|
||||
|
||||
# Utility that returns the name of the release branch for a given version
|
||||
def release_branch(version):
|
||||
return 'release_branch_%s' % version
|
||||
|
|
@ -545,14 +548,6 @@ def print_sonatype_notice():
|
|||
</settings>
|
||||
""")
|
||||
|
||||
def check_s3_credentials():
|
||||
if not env.get('AWS_ACCESS_KEY_ID', None) or not env.get('AWS_SECRET_ACCESS_KEY', None):
|
||||
raise RuntimeError('Could not find "AWS_ACCESS_KEY_ID" / "AWS_SECRET_ACCESS_KEY" in the env variables please export in order to upload to S3')
|
||||
|
||||
def check_gpg_credentials():
|
||||
if not env.get('GPG_KEY_ID', None) or not env.get('GPG_PASSPHRASE', None):
|
||||
raise RuntimeError('Could not find "GPG_KEY_ID" / "GPG_PASSPHRASE" in the env variables please export in order to sign the packages (also make sure that GPG_KEYRING is set when not in ~/.gnupg)')
|
||||
|
||||
def check_command_exists(name, cmd):
|
||||
try:
|
||||
subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT)
|
||||
|
|
@ -562,9 +557,6 @@ def check_command_exists(name, cmd):
|
|||
VERSION_FILE = 'src/main/java/org/elasticsearch/Version.java'
|
||||
POM_FILE = 'pom.xml'
|
||||
|
||||
# we print a notice if we can not find the relevant infos in the ~/.m2/settings.xml
|
||||
print_sonatype_notice()
|
||||
|
||||
# finds the highest available bwc version to test against
|
||||
def find_bwc_version(release_version, bwc_dir='backwards'):
|
||||
log(' Lookup bwc version in directory [%s]' % bwc_dir)
|
||||
|
|
@ -618,6 +610,60 @@ def check_norelease(path='src'):
|
|||
if pattern.search(line):
|
||||
raise RuntimeError('Found //norelease comment in %s line %s' % (full_path, line_number))
|
||||
|
||||
def run_and_print(text, run_function):
|
||||
try:
|
||||
print(text, end='')
|
||||
run_function()
|
||||
print(COLOR_OK + 'OK' + COLOR_END)
|
||||
return True
|
||||
except RuntimeError:
|
||||
print(COLOR_FAIL + 'NOT OK' + COLOR_END)
|
||||
return False
|
||||
|
||||
def check_env_var(text, env_var):
|
||||
try:
|
||||
print(text, end='')
|
||||
env[env_var]
|
||||
print(COLOR_OK + 'OK' + COLOR_END)
|
||||
return True
|
||||
except KeyError:
|
||||
print(COLOR_FAIL + 'NOT OK' + COLOR_END)
|
||||
return False
|
||||
|
||||
def check_environment_and_commandline_tools(check_only):
|
||||
checks = list()
|
||||
checks.append(check_env_var('Checking for AWS env configuration AWS_SECRET_ACCESS_KEY_ID... ', 'AWS_SECRET_ACCESS_KEY'))
|
||||
checks.append(check_env_var('Checking for AWS env configuration AWS_ACCESS_KEY_ID... ', 'AWS_ACCESS_KEY_ID'))
|
||||
checks.append(check_env_var('Checking for SONATYPE env configuration SONATYPE_USERNAME... ', 'SONATYPE_USERNAME'))
|
||||
checks.append(check_env_var('Checking for SONATYPE env configuration SONATYPE_PASSWORD... ', 'SONATYPE_PASSWORD'))
|
||||
checks.append(check_env_var('Checking for GPG env configuration GPG_KEY_ID... ', 'GPG_KEY_ID'))
|
||||
checks.append(check_env_var('Checking for GPG env configuration GPG_PASSPHRASE... ', 'GPG_PASSPHRASE'))
|
||||
checks.append(check_env_var('Checking for S3 repo upload env configuration S3_BUCKET_SYNC_TO... ', 'S3_BUCKET_SYNC_TO'))
|
||||
checks.append(check_env_var('Checking for git env configuration GIT_AUTHOR_NAME... ', 'GIT_AUTHOR_NAME'))
|
||||
checks.append(check_env_var('Checking for git env configuration GIT_AUTHOR_EMAIL... ', 'GIT_AUTHOR_EMAIL'))
|
||||
|
||||
checks.append(run_and_print('Checking command: rpm... ', partial(check_command_exists, 'rpm', 'rpm --version')))
|
||||
checks.append(run_and_print('Checking command: dpkg... ', partial(check_command_exists, 'dpkg', 'dpkg --version')))
|
||||
checks.append(run_and_print('Checking command: gpg... ', partial(check_command_exists, 'gpg', 'gpg --version')))
|
||||
checks.append(run_and_print('Checking command: expect... ', partial(check_command_exists, 'expect', 'expect -v')))
|
||||
checks.append(run_and_print('Checking command: createrepo... ', partial(check_command_exists, 'createrepo', 'createrepo --version')))
|
||||
checks.append(run_and_print('Checking command: s3cmd... ', partial(check_command_exists, 's3cmd', 's3cmd --version')))
|
||||
checks.append(run_and_print('Checking command: apt-ftparchive... ', partial(check_command_exists, 'apt-ftparchive', 'apt-ftparchive --version')))
|
||||
|
||||
# boto, check error code being returned
|
||||
location = os.path.dirname(os.path.realpath(__file__))
|
||||
command = 'python %s/upload-s3.py -h' % (location)
|
||||
checks.append(run_and_print('Testing boto python dependency... ', partial(check_command_exists, 'python-boto', command)))
|
||||
|
||||
checks.append(run_and_print('Checking java version... ', partial(verify_java_version, '1.7')))
|
||||
checks.append(run_and_print('Checking java mvn version... ', partial(verify_mvn_java_version, '1.7', MVN)))
|
||||
|
||||
if check_only:
|
||||
sys.exit(0)
|
||||
|
||||
if False in checks:
|
||||
print("Exiting due to failing checks")
|
||||
sys.exit(0)
|
||||
|
||||
if __name__ == '__main__':
|
||||
parser = argparse.ArgumentParser(description='Builds and publishes a Elasticsearch Release')
|
||||
|
|
@ -636,9 +682,12 @@ if __name__ == '__main__':
|
|||
help='Smoke tests the given release')
|
||||
parser.add_argument('--bwc', '-w', dest='bwc', metavar='backwards', default='backwards',
|
||||
help='Backwards compatibility version path to use to run compatibility tests against')
|
||||
parser.add_argument('--check-only', dest='check_only', action='store_true',
|
||||
help='Checks and reports for all requirements and then exits')
|
||||
|
||||
parser.set_defaults(dryrun=True)
|
||||
parser.set_defaults(smoke=None)
|
||||
parser.set_defaults(check_only=False)
|
||||
args = parser.parse_args()
|
||||
bwc_path = args.bwc
|
||||
src_branch = args.branch
|
||||
|
|
@ -649,18 +698,19 @@ if __name__ == '__main__':
|
|||
build = not args.smoke
|
||||
smoke_test_version = args.smoke
|
||||
|
||||
check_environment_and_commandline_tools(args.check_only)
|
||||
|
||||
# we print a notice if we can not find the relevant infos in the ~/.m2/settings.xml
|
||||
print_sonatype_notice()
|
||||
|
||||
# we require to build with 1.7
|
||||
verify_java_version('1.7')
|
||||
verify_mvn_java_version('1.7', MVN)
|
||||
|
||||
if os.path.exists(LOG):
|
||||
raise RuntimeError('please remove old release log %s first' % LOG)
|
||||
|
||||
check_gpg_credentials()
|
||||
check_command_exists('gpg', 'gpg --version')
|
||||
check_command_exists('expect', 'expect -v')
|
||||
|
||||
if not dry_run:
|
||||
check_s3_credentials()
|
||||
check_command_exists('createrepo', 'createrepo --version')
|
||||
check_command_exists('s3cmd', 's3cmd --version')
|
||||
check_command_exists('apt-ftparchive', 'apt-ftparchive --version')
|
||||
print('WARNING: dryrun is set to "false" - this will push and publish the release')
|
||||
input('Press Enter to continue...')
|
||||
|
||||
|
|
|
|||
|
|
@ -180,11 +180,11 @@ The default value of `alpha` is `0.5`, and the setting accepts any float from 0-
|
|||
|
||||
|
||||
[[single_0.2alpha]]
|
||||
.Single Exponential moving average with window of size 10, alpha = 0.2
|
||||
.EWMA with window of size 10, alpha = 0.2
|
||||
image::images/pipeline_movavg/single_0.2alpha.png[]
|
||||
|
||||
[[single_0.7alpha]]
|
||||
.Single Exponential moving average with window of size 10, alpha = 0.7
|
||||
.EWMA with window of size 10, alpha = 0.7
|
||||
image::images/pipeline_movavg/single_0.7alpha.png[]
|
||||
|
||||
==== Holt-Linear
|
||||
|
|
@ -223,13 +223,111 @@ to see. Small values emphasize long-term trends (such as a constant linear tren
|
|||
values emphasize short-term trends. This will become more apparently when you are predicting values.
|
||||
|
||||
[[double_0.2beta]]
|
||||
.Double Exponential moving average with window of size 100, alpha = 0.5, beta = 0.2
|
||||
.Holt-Linear moving average with window of size 100, alpha = 0.5, beta = 0.2
|
||||
image::images/pipeline_movavg/double_0.2beta.png[]
|
||||
|
||||
[[double_0.7beta]]
|
||||
.Double Exponential moving average with window of size 100, alpha = 0.5, beta = 0.7
|
||||
.Holt-Linear moving average with window of size 100, alpha = 0.5, beta = 0.7
|
||||
image::images/pipeline_movavg/double_0.7beta.png[]
|
||||
|
||||
==== Holt-Winters
|
||||
|
||||
The `holt_winters` model (aka "triple exponential") incorporates a third exponential term which
|
||||
tracks the seasonal aspect of your data. This aggregation therefore smooths based on three components: "level", "trend"
|
||||
and "seasonality".
|
||||
|
||||
The level and trend calculation is identical to `holt` The seasonal calculation looks at the difference between
|
||||
the current point, and the point one period earlier.
|
||||
|
||||
Holt-Winters requires a little more handholding than the other moving averages. You need to specify the "periodicity"
|
||||
of your data: e.g. if your data has cyclic trends every 7 days, you would set `period: 7`. Similarly if there was
|
||||
a monthly trend, you would set it to `30`. There is currently no periodicity detection, although that is planned
|
||||
for future enhancements.
|
||||
|
||||
There are two varieties of Holt-Winters: additive and multiplicative.
|
||||
|
||||
===== "Cold Start"
|
||||
|
||||
Unfortunately, due to the nature of Holt-Winters, it requires two periods of data to "bootstrap" the algorithm. This
|
||||
means that your `window` must always be *at least* twice the size of your period. An exception will be thrown if it
|
||||
isn't. It also means that Holt-Winters will not emit a value for the first `2 * period` buckets; the current algorithm
|
||||
does not backcast.
|
||||
|
||||
[[holt_winters_cold_start]]
|
||||
.Holt-Winters showing a "cold" start where no values are emitted
|
||||
image::images/pipeline_movavg/triple_untruncated.png[]
|
||||
|
||||
Because the "cold start" obscures what the moving average looks like, the rest of the Holt-Winters images are truncated
|
||||
to not show the "cold start". Just be aware this will always be present at the beginning of your moving averages!
|
||||
|
||||
===== Additive Holt-Winters
|
||||
|
||||
Additive seasonality is the default; it can also be specified by setting `"type": "add"`. This variety is preferred
|
||||
when the seasonal affect is additive to your data. E.g. you could simply subtract the seasonal effect to "de-seasonalize"
|
||||
your data into a flat trend.
|
||||
|
||||
The default value of `alpha`, `beta` and `gamma` is `0.5`, and the settings accept any float from 0-1 inclusive.
|
||||
The default value of `period` is `1`.
|
||||
|
||||
[source,js]
|
||||
--------------------------------------------------
|
||||
{
|
||||
"the_movavg":{
|
||||
"moving_avg":{
|
||||
"buckets_path": "the_sum",
|
||||
"model" : "holt_winters",
|
||||
"settings" : {
|
||||
"type" : "add",
|
||||
"alpha" : 0.5,
|
||||
"beta" : 0.5,
|
||||
"gamma" : 0.5,
|
||||
"period" : 7
|
||||
}
|
||||
}
|
||||
}
|
||||
--------------------------------------------------
|
||||
|
||||
|
||||
[[holt_winters_add]]
|
||||
.Holt-Winters moving average with window of size 120, alpha = 0.5, beta = 0.7, gamma = 0.3, period = 30
|
||||
image::images/pipeline_movavg/triple.png[]
|
||||
|
||||
===== Multiplicative Holt-Winters
|
||||
|
||||
Multiplicative is specified by setting `"type": "mult"`. This variety is preferred when the seasonal affect is
|
||||
multiplied against your data. E.g. if the seasonal affect is x5 the data, rather than simply adding to it.
|
||||
|
||||
The default value of `alpha`, `beta` and `gamma` is `0.5`, and the settings accept any float from 0-1 inclusive.
|
||||
The default value of `period` is `1`.
|
||||
|
||||
[WARNING]
|
||||
======
|
||||
Multiplicative Holt-Winters works by dividing each data point by the seasonal value. This is problematic if any of
|
||||
your data is zero, or if there are gaps in the data (since this results in a divid-by-zero). To combat this, the
|
||||
`mult` Holt-Winters pads all values by a very small amount (1*10^-10^) so that all values are non-zero. This affects
|
||||
the result, but only minimally. If your data is non-zero, or you prefer to see `NaN` when zero's are encountered,
|
||||
you can disable this behavior with `pad: false`
|
||||
======
|
||||
|
||||
[source,js]
|
||||
--------------------------------------------------
|
||||
{
|
||||
"the_movavg":{
|
||||
"moving_avg":{
|
||||
"buckets_path": "the_sum",
|
||||
"model" : "holt_winters",
|
||||
"settings" : {
|
||||
"type" : "mult",
|
||||
"alpha" : 0.5,
|
||||
"beta" : 0.5,
|
||||
"gamma" : 0.5,
|
||||
"period" : 7,
|
||||
"pad" : true
|
||||
}
|
||||
}
|
||||
}
|
||||
--------------------------------------------------
|
||||
|
||||
==== Prediction
|
||||
|
||||
All the moving average model support a "prediction" mode, which will attempt to extrapolate into the future given the
|
||||
|
|
@ -263,7 +361,7 @@ value, we can extrapolate based on local constant trends (in this case the predi
|
|||
of the series was heading in a downward direction):
|
||||
|
||||
[[double_prediction_local]]
|
||||
.Double Exponential moving average with window of size 100, predict = 20, alpha = 0.5, beta = 0.8
|
||||
.Holt-Linear moving average with window of size 100, predict = 20, alpha = 0.5, beta = 0.8
|
||||
image::images/pipeline_movavg/double_prediction_local.png[]
|
||||
|
||||
In contrast, if we choose a small `beta`, the predictions are based on the global constant trend. In this series, the
|
||||
|
|
@ -272,3 +370,10 @@ global trend is slightly positive, so the prediction makes a sharp u-turn and be
|
|||
[[double_prediction_global]]
|
||||
.Double Exponential moving average with window of size 100, predict = 20, alpha = 0.5, beta = 0.1
|
||||
image::images/pipeline_movavg/double_prediction_global.png[]
|
||||
|
||||
The `holt_winters` model has the potential to deliver the best predictions, since it also incorporates seasonal
|
||||
fluctuations into the model:
|
||||
|
||||
[[holt_winters_prediction_global]]
|
||||
.Holt-Winters moving average with window of size 120, predict = 25, alpha = 0.8, beta = 0.2, gamma = 0.7, period = 30
|
||||
image::images/pipeline_movavg/triple_prediction.png[]
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ An analyzer of type `custom` that allows to combine a `Tokenizer` with
|
|||
zero or more `Token Filters`, and zero or more `Char Filters`. The
|
||||
custom analyzer accepts a logical/registered name of the tokenizer to
|
||||
use, and a list of logical/registered names of token filters.
|
||||
The name of the custom analyzer must not start with "_".
|
||||
|
||||
The following are settings that can be set for a `custom` analyzer type:
|
||||
|
||||
|
|
|
|||
|
|
@ -81,6 +81,113 @@ being consumed by a monitoring tool, rather than intended for human
|
|||
consumption. The default for the `human` flag is
|
||||
`false`.
|
||||
|
||||
[float]
|
||||
=== Response Filtering
|
||||
|
||||
All REST APIs accept a `filter_path` parameter that can be used to reduce
|
||||
the response returned by elasticsearch. This parameter takes a comma
|
||||
separated list of filters expressed with the dot notation:
|
||||
|
||||
[source,sh]
|
||||
--------------------------------------------------
|
||||
curl -XGET 'localhost:9200/_search?pretty&filter_path=took,hits.hits._id,hits.hits._score'
|
||||
{
|
||||
"took" : 3,
|
||||
"hits" : {
|
||||
"hits" : [
|
||||
{
|
||||
"_id" : "3640",
|
||||
"_score" : 1.0
|
||||
},
|
||||
{
|
||||
"_id" : "3642",
|
||||
"_score" : 1.0
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
--------------------------------------------------
|
||||
|
||||
It also supports the `*` wildcard character to match any field or part
|
||||
of a field's name:
|
||||
|
||||
[source,sh]
|
||||
--------------------------------------------------
|
||||
curl -XGET 'localhost:9200/_nodes/stats?filter_path=nodes.*.ho*'
|
||||
{
|
||||
"nodes" : {
|
||||
"lvJHed8uQQu4brS-SXKsNA" : {
|
||||
"host" : "portable"
|
||||
}
|
||||
}
|
||||
}
|
||||
--------------------------------------------------
|
||||
|
||||
And the `**` wildcard can be used to include fields without knowing the
|
||||
exact path of the field. For example, we can return the Lucene version
|
||||
of every segment with this request:
|
||||
|
||||
[source,sh]
|
||||
--------------------------------------------------
|
||||
curl 'localhost:9200/_segments?pretty&filter_path=indices.**.version'
|
||||
{
|
||||
"indices" : {
|
||||
"movies" : {
|
||||
"shards" : {
|
||||
"0" : [ {
|
||||
"segments" : {
|
||||
"_0" : {
|
||||
"version" : "5.2.0"
|
||||
}
|
||||
}
|
||||
} ],
|
||||
"2" : [ {
|
||||
"segments" : {
|
||||
"_0" : {
|
||||
"version" : "5.2.0"
|
||||
}
|
||||
}
|
||||
} ]
|
||||
}
|
||||
},
|
||||
"books" : {
|
||||
"shards" : {
|
||||
"0" : [ {
|
||||
"segments" : {
|
||||
"_0" : {
|
||||
"version" : "5.2.0"
|
||||
}
|
||||
}
|
||||
} ]
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
--------------------------------------------------
|
||||
|
||||
Note that elasticsearch sometimes returns directly the raw value of a field,
|
||||
like the `_source` field. If you want to filter _source fields, you should
|
||||
consider combining the already existing `_source` parameter (see
|
||||
<<get-source-filtering,Get API>> for more details) with the `filter_path`
|
||||
parameter like this:
|
||||
|
||||
[source,sh]
|
||||
--------------------------------------------------
|
||||
curl -XGET 'localhost:9200/_search?pretty&filter_path=hits.hits._source&_source=title'
|
||||
{
|
||||
"hits" : {
|
||||
"hits" : [ {
|
||||
"_source":{"title":"Book #2"}
|
||||
}, {
|
||||
"_source":{"title":"Book #1"}
|
||||
}, {
|
||||
"_source":{"title":"Book #3"}
|
||||
} ]
|
||||
}
|
||||
}
|
||||
--------------------------------------------------
|
||||
|
||||
|
||||
[float]
|
||||
=== Flat Settings
|
||||
|
||||
|
|
|
|||
|
|
@ -66,6 +66,10 @@ only those columns to appear.
|
|||
192.168.56.30 9300 43.9 Ramsey, Doug
|
||||
--------------------------------------------------
|
||||
|
||||
You can also request multiple columns using simple wildcards like
|
||||
`/_cat/thread_pool?h=ip,bulk.*` to get all headers (or aliases) starting
|
||||
with `bulk.`.
|
||||
|
||||
[float]
|
||||
[[numeric-formats]]
|
||||
=== Numeric formats
|
||||
|
|
@ -120,4 +124,4 @@ include::cat/thread_pool.asciidoc[]
|
|||
|
||||
include::cat/shards.asciidoc[]
|
||||
|
||||
include::cat/segments.asciidoc[]
|
||||
include::cat/segments.asciidoc[]
|
||||
|
|
|
|||
|
|
@ -228,5 +228,7 @@ it's current version is equal to the specified one. This behavior is the same
|
|||
for all version types with the exception of version type `FORCE` which always
|
||||
retrieves the document.
|
||||
|
||||
Note that Elasticsearch do not store older versions of documents. Only the current version can be retrieved.
|
||||
|
||||
Internally, Elasticsearch has marked the old document as deleted and added an
|
||||
entirely new document. The old version of the document doesn’t disappear
|
||||
immediately, although you won’t be able to access it. Elasticsearch cleans up
|
||||
deleted documents in the background as you continue to index more data.
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 96 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 91 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 48 KiB |
|
|
@ -404,6 +404,12 @@ The `count` search type has been deprecated. All benefits from this search type
|
|||
now be achieved by using the `query_then_fetch` search type (which is the
|
||||
default) and setting `size` to `0`.
|
||||
|
||||
=== The count api internally uses the search api
|
||||
|
||||
The count api is now a shortcut to the search api with `size` set to 0. As a
|
||||
result, a total failure will result in an exception being returned rather
|
||||
than a normal response with `count` set to `0` and shard failures.
|
||||
|
||||
=== JSONP support
|
||||
|
||||
JSONP callback support has now been removed. CORS should be used to access Elasticsearch
|
||||
|
|
|
|||
|
|
@ -293,6 +293,7 @@ deprecated[1.5.0,Rivers have been deprecated. See https://www.elastic.co/blog/d
|
|||
* https://github.com/karmi/elasticsearch-paramedic[Paramedic Plugin] (by Karel Minařík)
|
||||
* https://github.com/polyfractal/elasticsearch-segmentspy[SegmentSpy Plugin] (by Zachary Tong)
|
||||
* https://github.com/xyu/elasticsearch-whatson[Whatson Plugin] (by Xiao Yu)
|
||||
* https://github.com/lmenezes/elasticsearch-kopf[Kopf Plugin] (by lmenezes)
|
||||
|
||||
[float]
|
||||
[[repository-plugins]]
|
||||
|
|
|
|||
|
|
@ -337,3 +337,22 @@ the http://logging.apache.org/log4j/1.2/manual.html[log4j documentation].
|
|||
Additional Appenders and other logging classes provided by
|
||||
http://logging.apache.org/log4j/extras/[log4j-extras] are also available,
|
||||
out of the box.
|
||||
|
||||
[float]
|
||||
[[deprecation-logging]]
|
||||
==== Deprecation logging
|
||||
|
||||
In addition to regular logging, Elasticsearch allows you to enable logging
|
||||
of deprecated actions. For example this allows you to determine early, if
|
||||
you need to migrate certain functionality in the future. By default,
|
||||
deprecation logging is disabled. You can enable it in the `config/logging.yml`
|
||||
file by setting the deprecation log level to `DEBUG`.
|
||||
|
||||
[source,yaml]
|
||||
--------------------------------------------------
|
||||
deprecation: DEBUG, deprecation_log_file
|
||||
--------------------------------------------------
|
||||
|
||||
This will create a daily rolling deprecation log file in your log directory.
|
||||
Check this file regularly, especially when you intend to upgrade to a new
|
||||
major version.
|
||||
|
|
|
|||
|
|
@ -51,13 +51,22 @@ Run apt-get update and the repository is ready for use. You can install it with:
|
|||
sudo apt-get update && sudo apt-get install elasticsearch
|
||||
--------------------------------------------------
|
||||
|
||||
Configure Elasticsearch to automatically start during bootup:
|
||||
Configure Elasticsearch to automatically start during bootup. If your
|
||||
distribution is using SysV init, then you will need to run:
|
||||
|
||||
[source,sh]
|
||||
--------------------------------------------------
|
||||
sudo update-rc.d elasticsearch defaults 95 10
|
||||
--------------------------------------------------
|
||||
|
||||
Otherwise if your distribution is using systemd:
|
||||
|
||||
[source,sh]
|
||||
--------------------------------------------------
|
||||
sudo /bin/systemctl daemon-reload
|
||||
sudo /bin/systemctl enable elasticsearch.service
|
||||
--------------------------------------------------
|
||||
|
||||
[float]
|
||||
=== YUM
|
||||
|
||||
|
|
|
|||
68
pom.xml
68
pom.xml
|
|
@ -2,12 +2,12 @@
|
|||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<name>elasticsearch</name>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>org.elasticsearch</groupId>
|
||||
<artifactId>elasticsearch</artifactId>
|
||||
<version>2.0.0-SNAPSHOT</version>
|
||||
<packaging>jar</packaging>
|
||||
<name>Elasticsearch core</name>
|
||||
<description>Elasticsearch - Open Source, Distributed, RESTful Search Engine</description>
|
||||
<inceptionYear>2009</inceptionYear>
|
||||
<licenses>
|
||||
|
|
@ -43,6 +43,9 @@
|
|||
<packaging.elasticsearch.log.dir>/var/log/elasticsearch</packaging.elasticsearch.log.dir>
|
||||
<packaging.elasticsearch.plugins.dir>${packaging.elasticsearch.home.dir}/plugins</packaging.elasticsearch.plugins.dir>
|
||||
<packaging.elasticsearch.pid.dir>/var/run/elasticsearch</packaging.elasticsearch.pid.dir>
|
||||
<packaging.elasticsearch.systemd.dir>/usr/lib/systemd/system</packaging.elasticsearch.systemd.dir>
|
||||
<packaging.elasticsearch.systemd.sysctl.dir>/usr/lib/sysctl.d</packaging.elasticsearch.systemd.sysctl.dir>
|
||||
<packaging.elasticsearch.tmpfilesd.dir>/usr/lib/tmpfiles.d</packaging.elasticsearch.tmpfilesd.dir>
|
||||
<deb.sign>false</deb.sign>
|
||||
<deb.sign.method>dpkg-sig</deb.sign.method>
|
||||
</properties>
|
||||
|
|
@ -291,7 +294,7 @@
|
|||
<groupId>sigar</groupId>
|
||||
<artifactId>sigar</artifactId>
|
||||
<scope>system</scope>
|
||||
<systemPath>${basedir}/lib/sigar/sigar-1.6.4.jar</systemPath>
|
||||
<systemPath>${project.basedir}/lib/sigar/sigar-1.6.4.jar</systemPath>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
-->
|
||||
|
|
@ -302,19 +305,19 @@
|
|||
<!-- This file contains all the common properties used to build
|
||||
the different packages (tar.gz, deb, rpm) using Maven resources plugin -->
|
||||
<filters>
|
||||
<filter>src/packaging/common/packaging.properties</filter>
|
||||
<filter>${project.basedir}/src/packaging/common/packaging.properties</filter>
|
||||
</filters>
|
||||
|
||||
<resources>
|
||||
<resource>
|
||||
<directory>${basedir}/src/main/java</directory>
|
||||
<directory>${project.basedir}/src/main/java</directory>
|
||||
<includes>
|
||||
<include>**/*.json</include>
|
||||
<include>**/*.yml</include>
|
||||
</includes>
|
||||
</resource>
|
||||
<resource>
|
||||
<directory>${basedir}/src/main/resources</directory>
|
||||
<directory>${project.basedir}/src/main/resources</directory>
|
||||
<includes>
|
||||
<include>**/*.*</include>
|
||||
</includes>
|
||||
|
|
@ -324,7 +327,7 @@
|
|||
|
||||
<testResources>
|
||||
<testResource>
|
||||
<directory>${basedir}/src/test/java</directory>
|
||||
<directory>${project.basedir}/src/test/java</directory>
|
||||
<includes>
|
||||
<include>**/*.json</include>
|
||||
<include>**/*.yml</include>
|
||||
|
|
@ -334,19 +337,19 @@
|
|||
<filtering>true</filtering>
|
||||
</testResource>
|
||||
<testResource>
|
||||
<directory>${basedir}/src/test/java</directory>
|
||||
<directory>${project.basedir}/src/test/java</directory>
|
||||
<includes>
|
||||
<include>**/*.gz</include>
|
||||
</includes>
|
||||
</testResource>
|
||||
<testResource>
|
||||
<directory>${basedir}/src/test/resources</directory>
|
||||
<directory>${project.basedir}/src/test/resources</directory>
|
||||
<includes>
|
||||
<include>**/*.*</include>
|
||||
</includes>
|
||||
</testResource>
|
||||
<testResource>
|
||||
<directory>${basedir}/rest-api-spec</directory>
|
||||
<directory>${project.basedir}/rest-api-spec</directory>
|
||||
<targetPath>rest-api-spec</targetPath>
|
||||
<includes>
|
||||
<include>api/*.json</include>
|
||||
|
|
@ -543,14 +546,14 @@
|
|||
<outputDirectory>${project.build.directory}/bin</outputDirectory>
|
||||
<resources>
|
||||
<resource>
|
||||
<directory>${basedir}/bin</directory>
|
||||
<directory>${project.basedir}/bin</directory>
|
||||
<filtering>true</filtering>
|
||||
<excludes>
|
||||
<exclude>*.exe</exclude>
|
||||
</excludes>
|
||||
</resource>
|
||||
<resource>
|
||||
<directory>${basedir}/bin</directory>
|
||||
<directory>${project.basedir}/bin</directory>
|
||||
<filtering>false</filtering>
|
||||
<includes>
|
||||
<include>*.exe</include>
|
||||
|
|
@ -569,12 +572,12 @@
|
|||
<configuration>
|
||||
<outputDirectory>${project.build.directory}/generated-packaging/deb/</outputDirectory>
|
||||
<filters>
|
||||
<filter>src/packaging/common/packaging.properties</filter>
|
||||
<filter>src/packaging/deb/packaging.properties</filter>
|
||||
<filter>${project.basedir}/src/packaging/common/packaging.properties</filter>
|
||||
<filter>${project.basedir}/src/packaging/deb/packaging.properties</filter>
|
||||
</filters>
|
||||
<resources>
|
||||
<resource>
|
||||
<directory>src/packaging/common/</directory>
|
||||
<directory>${project.basedir}/src/packaging/common/</directory>
|
||||
<filtering>true</filtering>
|
||||
<includes>
|
||||
<include>**/*</include>
|
||||
|
|
@ -584,7 +587,7 @@
|
|||
</excludes>
|
||||
</resource>
|
||||
<resource>
|
||||
<directory>src/packaging/deb/</directory>
|
||||
<directory>${project.basedir}/src/packaging/deb/</directory>
|
||||
<filtering>true</filtering>
|
||||
<includes>
|
||||
<include>**/*</include>
|
||||
|
|
@ -615,8 +618,8 @@
|
|||
<configuration>
|
||||
<outputDirectory>${project.build.directory}/generated-packaging/rpm/</outputDirectory>
|
||||
<filters>
|
||||
<filter>src/packaging/common/packaging.properties</filter>
|
||||
<filter>src/packaging/rpm/packaging.properties</filter>
|
||||
<filter>${project.basedir}/src/packaging/common/packaging.properties</filter>
|
||||
<filter>${project.basedir}/src/packaging/rpm/packaging.properties</filter>
|
||||
</filters>
|
||||
<resources>
|
||||
<resource>
|
||||
|
|
@ -660,8 +663,8 @@
|
|||
<appendAssemblyId>false</appendAssemblyId>
|
||||
<outputDirectory>${project.build.directory}/releases/</outputDirectory>
|
||||
<descriptors>
|
||||
<descriptor>${basedir}/src/main/assemblies/targz-bin.xml</descriptor>
|
||||
<descriptor>${basedir}/src/main/assemblies/zip-bin.xml</descriptor>
|
||||
<descriptor>${project.basedir}/src/main/assemblies/targz-bin.xml</descriptor>
|
||||
<descriptor>${project.basedir}/src/main/assemblies/zip-bin.xml</descriptor>
|
||||
</descriptors>
|
||||
</configuration>
|
||||
<executions>
|
||||
|
|
@ -800,7 +803,19 @@
|
|||
<!-- Adds systemd file -->
|
||||
<data>
|
||||
<src>${project.build.directory}/generated-packaging/deb/systemd/elasticsearch.service</src>
|
||||
<dst>/usr/lib/systemd/system/elasticsearch.service</dst>
|
||||
<dst>${packaging.elasticsearch.systemd.dir}/elasticsearch.service</dst>
|
||||
<type>file</type>
|
||||
</data>
|
||||
<!-- Adds systemd/sysctl.d configuration file -->
|
||||
<data>
|
||||
<src>${project.build.directory}/generated-packaging/deb/systemd/sysctl/elasticsearch.conf</src>
|
||||
<dst>${packaging.elasticsearch.systemd.sysctl.dir}/elasticsearch.conf</dst>
|
||||
<type>file</type>
|
||||
</data>
|
||||
<!-- Adds systemd/tmpfiles.d configuration file -->
|
||||
<data>
|
||||
<src>${project.build.directory}/generated-packaging/deb/systemd/elasticsearch.conf</src>
|
||||
<dst>${packaging.elasticsearch.tmpfilesd.dir}/elasticsearch.conf</dst>
|
||||
<type>file</type>
|
||||
</data>
|
||||
<!-- Add lintian files -->
|
||||
|
|
@ -978,8 +993,8 @@
|
|||
</mapping>
|
||||
<!-- Adds systemd file -->
|
||||
<mapping>
|
||||
<directory>/usr/lib/systemd/system/</directory>
|
||||
<filemode>755</filemode>
|
||||
<directory>${packaging.elasticsearch.systemd.dir}</directory>
|
||||
<directoryIncluded>false</directoryIncluded>
|
||||
<configuration>true</configuration>
|
||||
<sources>
|
||||
<source>
|
||||
|
|
@ -990,21 +1005,22 @@
|
|||
</source>
|
||||
</sources>
|
||||
</mapping>
|
||||
<!-- Adds systemd/sysctl.d configuration file -->
|
||||
<mapping>
|
||||
<directory>/usr/lib/sysctl.d/</directory>
|
||||
<filemode>755</filemode>
|
||||
<directory>${packaging.elasticsearch.systemd.sysctl.dir}</directory>
|
||||
<configuration>true</configuration>
|
||||
<sources>
|
||||
<source>
|
||||
<location>${project.build.directory}/generated-packaging/rpm/systemd/sysctl.d</location>
|
||||
<location>${project.build.directory}/generated-packaging/rpm/systemd/sysctl</location>
|
||||
<includes>
|
||||
<include>elasticsearch.conf</include>
|
||||
</includes>
|
||||
</source>
|
||||
</sources>
|
||||
</mapping>
|
||||
<!-- Adds systemd/tmpfiles.d configuration file -->
|
||||
<mapping>
|
||||
<directory>/usr/lib/tmpfiles.d/</directory>
|
||||
<directory>${packaging.elasticsearch.tmpfilesd.dir}</directory>
|
||||
<configuration>true</configuration>
|
||||
<sources>
|
||||
<source>
|
||||
|
|
|
|||
|
|
@ -29,6 +29,18 @@
|
|||
/ #pid id host ip port
|
||||
^ (\d+ \s+ \S{4} \s+ \S+ \s+ (\d{1,3}\.){3}\d{1,3} \s+ (\d+|-) \s+ \n)+ $/
|
||||
|
||||
|
||||
- do:
|
||||
cat.thread_pool:
|
||||
h: bulk.m*
|
||||
|
||||
- match:
|
||||
$body: |
|
||||
/^ bulk.min \s+ bulk.max \s+ \n
|
||||
(\s+ \d+ \s+ \d+ \s+ \n)+ $/
|
||||
|
||||
#(\s+ \d+ \s+ \d+ \n)+ $/
|
||||
|
||||
- do:
|
||||
cat.thread_pool:
|
||||
h: id,ba,fa,gea,ga,ia,maa,ma,oa,pa
|
||||
|
|
|
|||
|
|
@ -0,0 +1,154 @@
|
|||
---
|
||||
"Nodes Stats with response filtering":
|
||||
- do:
|
||||
cluster.state: {}
|
||||
|
||||
# Get master node id
|
||||
- set: { master_node: master }
|
||||
|
||||
# Nodes Stats with no filtering
|
||||
- do:
|
||||
nodes.stats: {}
|
||||
|
||||
- is_true: cluster_name
|
||||
- is_true: nodes
|
||||
- is_true: nodes.$master.name
|
||||
- is_true: nodes.$master.indices
|
||||
- is_true: nodes.$master.indices.docs
|
||||
- gte: { nodes.$master.indices.docs.count: 0 }
|
||||
- is_true: nodes.$master.indices.segments
|
||||
- gte: { nodes.$master.indices.segments.count: 0 }
|
||||
- is_true: nodes.$master.jvm
|
||||
- is_true: nodes.$master.jvm.threads
|
||||
- gte: { nodes.$master.jvm.threads.count: 0 }
|
||||
- is_true: nodes.$master.jvm.buffer_pools.direct
|
||||
- gte: { nodes.$master.jvm.buffer_pools.direct.count: 0 }
|
||||
- gte: { nodes.$master.jvm.buffer_pools.direct.used_in_bytes: 0 }
|
||||
|
||||
# Nodes Stats with only "cluster_name" field
|
||||
- do:
|
||||
nodes.stats:
|
||||
filter_path: cluster_name
|
||||
|
||||
- is_true: cluster_name
|
||||
- is_false: nodes
|
||||
- is_false: nodes.$master.name
|
||||
- is_false: nodes.$master.indices
|
||||
- is_false: nodes.$master.jvm
|
||||
|
||||
# Nodes Stats with "nodes" field and sub-fields
|
||||
- do:
|
||||
nodes.stats:
|
||||
filter_path: nodes.*
|
||||
|
||||
- is_false: cluster_name
|
||||
- is_true: nodes
|
||||
- is_true: nodes.$master.name
|
||||
- is_true: nodes.$master.indices
|
||||
- is_true: nodes.$master.indices.docs
|
||||
- gte: { nodes.$master.indices.docs.count: 0 }
|
||||
- is_true: nodes.$master.indices.segments
|
||||
- gte: { nodes.$master.indices.segments.count: 0 }
|
||||
- is_true: nodes.$master.jvm
|
||||
- is_true: nodes.$master.jvm.threads
|
||||
- gte: { nodes.$master.jvm.threads.count: 0 }
|
||||
- is_true: nodes.$master.jvm.buffer_pools.direct
|
||||
- gte: { nodes.$master.jvm.buffer_pools.direct.count: 0 }
|
||||
- gte: { nodes.$master.jvm.buffer_pools.direct.used_in_bytes: 0 }
|
||||
|
||||
# Nodes Stats with "nodes.*.indices" field and sub-fields
|
||||
- do:
|
||||
nodes.stats:
|
||||
filter_path: nodes.*.indices
|
||||
|
||||
- is_false: cluster_name
|
||||
- is_true: nodes
|
||||
- is_false: nodes.$master.name
|
||||
- is_true: nodes.$master.indices
|
||||
- is_true: nodes.$master.indices.docs
|
||||
- gte: { nodes.$master.indices.docs.count: 0 }
|
||||
- is_true: nodes.$master.indices.segments
|
||||
- gte: { nodes.$master.indices.segments.count: 0 }
|
||||
- is_false: nodes.$master.jvm
|
||||
|
||||
# Nodes Stats with "nodes.*.name" and "nodes.*.indices.docs.count" fields
|
||||
- do:
|
||||
nodes.stats:
|
||||
filter_path: [ "nodes.*.name", "nodes.*.indices.docs.count" ]
|
||||
|
||||
- is_false: cluster_name
|
||||
- is_true: nodes
|
||||
- is_true: nodes.$master.name
|
||||
- is_true: nodes.$master.indices
|
||||
- is_true: nodes.$master.indices.docs
|
||||
- gte: { nodes.$master.indices.docs.count: 0 }
|
||||
- is_false: nodes.$master.indices.segments
|
||||
- is_false: nodes.$master.jvm
|
||||
|
||||
# Nodes Stats with all "count" fields
|
||||
- do:
|
||||
nodes.stats:
|
||||
filter_path: "nodes.**.count"
|
||||
|
||||
- is_false: cluster_name
|
||||
- is_true: nodes
|
||||
- is_false: nodes.$master.name
|
||||
- is_true: nodes.$master.indices
|
||||
- is_true: nodes.$master.indices.docs
|
||||
- gte: { nodes.$master.indices.docs.count: 0 }
|
||||
- is_true: nodes.$master.indices.segments
|
||||
- gte: { nodes.$master.indices.segments.count: 0 }
|
||||
- is_true: nodes.$master.jvm
|
||||
- is_true: nodes.$master.jvm.threads
|
||||
- gte: { nodes.$master.jvm.threads.count: 0 }
|
||||
- is_true: nodes.$master.jvm.buffer_pools.direct
|
||||
- gte: { nodes.$master.jvm.buffer_pools.direct.count: 0 }
|
||||
- is_false: nodes.$master.jvm.buffer_pools.direct.used_in_bytes
|
||||
|
||||
# Nodes Stats with all "count" fields in sub-fields of "jvm" field
|
||||
- do:
|
||||
nodes.stats:
|
||||
filter_path: "nodes.**.jvm.**.count"
|
||||
|
||||
- is_false: cluster_name
|
||||
- is_true: nodes
|
||||
- is_false: nodes.$master.name
|
||||
- is_false: nodes.$master.indices
|
||||
- is_false: nodes.$master.indices.docs.count
|
||||
- is_false: nodes.$master.indices.segments.count
|
||||
- is_true: nodes.$master.jvm
|
||||
- is_true: nodes.$master.jvm.threads
|
||||
- gte: { nodes.$master.jvm.threads.count: 0 }
|
||||
- is_true: nodes.$master.jvm.buffer_pools.direct
|
||||
- gte: { nodes.$master.jvm.buffer_pools.direct.count: 0 }
|
||||
- is_false: nodes.$master.jvm.buffer_pools.direct.used_in_bytes
|
||||
|
||||
# Nodes Stats with "nodes.*.fs.data" fields
|
||||
- do:
|
||||
nodes.stats:
|
||||
filter_path: "nodes.*.fs.data"
|
||||
|
||||
- is_false: cluster_name
|
||||
- is_true: nodes
|
||||
- is_false: nodes.$master.name
|
||||
- is_false: nodes.$master.indices
|
||||
- is_false: nodes.$master.jvm
|
||||
- is_true: nodes.$master.fs.data
|
||||
- is_true: nodes.$master.fs.data.0.path
|
||||
- is_true: nodes.$master.fs.data.0.type
|
||||
- is_true: nodes.$master.fs.data.0.total_in_bytes
|
||||
|
||||
# Nodes Stats with "nodes.*.fs.data.t*" fields
|
||||
- do:
|
||||
nodes.stats:
|
||||
filter_path: "nodes.*.fs.data.t*"
|
||||
|
||||
- is_false: cluster_name
|
||||
- is_true: nodes
|
||||
- is_false: nodes.$master.name
|
||||
- is_false: nodes.$master.indices
|
||||
- is_false: nodes.$master.jvm
|
||||
- is_true: nodes.$master.fs.data
|
||||
- is_false: nodes.$master.fs.data.0.path
|
||||
- is_true: nodes.$master.fs.data.0.type
|
||||
- is_true: nodes.$master.fs.data.0.total_in_bytes
|
||||
|
|
@ -90,3 +90,9 @@
|
|||
- match: { hits.hits.0.fields: { include.field2 : [v2] }}
|
||||
- is_true: hits.hits.0._source
|
||||
|
||||
|
||||
- do:
|
||||
search:
|
||||
fielddata_fields: [ "count" ]
|
||||
- match: { hits.hits.0.fields.count: [1] }
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,87 @@
|
|||
---
|
||||
"Search with response filtering":
|
||||
- do:
|
||||
indices.create:
|
||||
index: test
|
||||
- do:
|
||||
index:
|
||||
index: test
|
||||
type: test
|
||||
id: 1
|
||||
body: { foo: bar }
|
||||
|
||||
- do:
|
||||
index:
|
||||
index: test
|
||||
type: test
|
||||
id: 2
|
||||
body: { foo: bar }
|
||||
|
||||
- do:
|
||||
indices.refresh:
|
||||
index: [test]
|
||||
|
||||
- do:
|
||||
search:
|
||||
index: test
|
||||
filter_path: "*"
|
||||
body: "{ query: { match_all: {} } }"
|
||||
|
||||
- is_true: took
|
||||
- is_true: _shards.total
|
||||
- is_true: hits.total
|
||||
- is_true: hits.hits.0._index
|
||||
- is_true: hits.hits.0._type
|
||||
- is_true: hits.hits.0._id
|
||||
- is_true: hits.hits.1._index
|
||||
- is_true: hits.hits.1._type
|
||||
- is_true: hits.hits.1._id
|
||||
|
||||
- do:
|
||||
search:
|
||||
index: test
|
||||
filter_path: "took"
|
||||
body: "{ query: { match_all: {} } }"
|
||||
|
||||
- is_true: took
|
||||
- is_false: _shards.total
|
||||
- is_false: hits.total
|
||||
- is_false: hits.hits.0._index
|
||||
- is_false: hits.hits.0._type
|
||||
- is_false: hits.hits.0._id
|
||||
- is_false: hits.hits.1._index
|
||||
- is_false: hits.hits.1._type
|
||||
- is_false: hits.hits.1._id
|
||||
|
||||
- do:
|
||||
search:
|
||||
index: test
|
||||
filter_path: "_shards.*"
|
||||
body: "{ query: { match_all: {} } }"
|
||||
|
||||
- is_false: took
|
||||
- is_true: _shards.total
|
||||
- is_false: hits.total
|
||||
- is_false: hits.hits.0._index
|
||||
- is_false: hits.hits.0._type
|
||||
- is_false: hits.hits.0._id
|
||||
- is_false: hits.hits.1._index
|
||||
- is_false: hits.hits.1._type
|
||||
- is_false: hits.hits.1._id
|
||||
|
||||
- do:
|
||||
search:
|
||||
index: test
|
||||
filter_path: [ "hits.**._i*", "**.total" ]
|
||||
body: "{ query: { match_all: {} } }"
|
||||
|
||||
- is_false: took
|
||||
- is_true: _shards.total
|
||||
- is_true: hits.total
|
||||
- is_true: hits.hits.0._index
|
||||
- is_false: hits.hits.0._type
|
||||
- is_true: hits.hits.0._id
|
||||
- is_true: hits.hits.1._index
|
||||
- is_false: hits.hits.1._type
|
||||
- is_true: hits.hits.1._id
|
||||
|
||||
|
|
@ -74,15 +74,15 @@
|
|||
<files>
|
||||
<file>
|
||||
<source>README.textile</source>
|
||||
<outputDirectory>/</outputDirectory>
|
||||
<outputDirectory></outputDirectory>
|
||||
</file>
|
||||
<file>
|
||||
<source>LICENSE.txt</source>
|
||||
<outputDirectory>/</outputDirectory>
|
||||
<outputDirectory></outputDirectory>
|
||||
</file>
|
||||
<file>
|
||||
<source>NOTICE.txt</source>
|
||||
<outputDirectory>/</outputDirectory>
|
||||
<outputDirectory></outputDirectory>
|
||||
</file>
|
||||
</files>
|
||||
</component>
|
||||
|
|
|
|||
|
|
@ -122,8 +122,6 @@ import org.elasticsearch.action.admin.indices.warmer.put.TransportPutWarmerActio
|
|||
import org.elasticsearch.action.bulk.BulkAction;
|
||||
import org.elasticsearch.action.bulk.TransportBulkAction;
|
||||
import org.elasticsearch.action.bulk.TransportShardBulkAction;
|
||||
import org.elasticsearch.action.count.CountAction;
|
||||
import org.elasticsearch.action.count.TransportCountAction;
|
||||
import org.elasticsearch.action.delete.DeleteAction;
|
||||
import org.elasticsearch.action.delete.TransportDeleteAction;
|
||||
import org.elasticsearch.action.exists.ExistsAction;
|
||||
|
|
@ -273,7 +271,6 @@ public class ActionModule extends AbstractModule {
|
|||
registerAction(MultiTermVectorsAction.INSTANCE, TransportMultiTermVectorsAction.class,
|
||||
TransportShardMultiTermsVectorAction.class);
|
||||
registerAction(DeleteAction.INSTANCE, TransportDeleteAction.class);
|
||||
registerAction(CountAction.INSTANCE, TransportCountAction.class);
|
||||
registerAction(ExistsAction.INSTANCE, TransportExistsAction.class);
|
||||
registerAction(SuggestAction.INSTANCE, TransportSuggestAction.class);
|
||||
registerAction(UpdateAction.INSTANCE, TransportUpdateAction.class);
|
||||
|
|
|
|||
|
|
@ -20,15 +20,9 @@
|
|||
package org.elasticsearch.action;
|
||||
|
||||
import com.google.common.base.Preconditions;
|
||||
|
||||
import org.elasticsearch.ElasticsearchException;
|
||||
import org.elasticsearch.action.support.PlainListenableActionFuture;
|
||||
import org.elasticsearch.client.Client;
|
||||
import org.elasticsearch.client.ClusterAdminClient;
|
||||
import org.elasticsearch.client.ElasticsearchClient;
|
||||
import org.elasticsearch.client.IndicesAdminClient;
|
||||
import org.elasticsearch.common.unit.TimeValue;
|
||||
import org.elasticsearch.search.aggregations.pipeline.PipelineAggregatorBuilder;
|
||||
import org.elasticsearch.threadpool.ThreadPool;
|
||||
|
||||
/**
|
||||
|
|
@ -87,7 +81,7 @@ public abstract class ActionRequestBuilder<Request extends ActionRequest, Respon
|
|||
return execute().actionGet(timeout);
|
||||
}
|
||||
|
||||
public final void execute(ActionListener<Response> listener) {
|
||||
public void execute(ActionListener<Response> listener) {
|
||||
client.execute(action, beforeExecute(request), listener);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ package org.elasticsearch.action.admin.cluster.health;
|
|||
import org.elasticsearch.action.ActionRequestValidationException;
|
||||
import org.elasticsearch.action.IndicesRequest;
|
||||
import org.elasticsearch.action.support.IndicesOptions;
|
||||
import org.elasticsearch.action.support.master.MasterNodeReadOperationRequest;
|
||||
import org.elasticsearch.action.support.master.MasterNodeReadRequest;
|
||||
import org.elasticsearch.common.Priority;
|
||||
import org.elasticsearch.common.Strings;
|
||||
import org.elasticsearch.common.io.stream.StreamInput;
|
||||
|
|
@ -37,7 +37,7 @@ import static org.elasticsearch.common.unit.TimeValue.readTimeValue;
|
|||
/**
|
||||
*
|
||||
*/
|
||||
public class ClusterHealthRequest extends MasterNodeReadOperationRequest<ClusterHealthRequest> implements IndicesRequest.Replaceable {
|
||||
public class ClusterHealthRequest extends MasterNodeReadRequest<ClusterHealthRequest> implements IndicesRequest.Replaceable {
|
||||
|
||||
private String[] indices;
|
||||
private TimeValue timeout = new TimeValue(30, TimeUnit.SECONDS);
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ package org.elasticsearch.action.admin.cluster.health;
|
|||
import org.elasticsearch.action.ActionListener;
|
||||
import org.elasticsearch.action.support.ActionFilters;
|
||||
import org.elasticsearch.action.support.IndicesOptions;
|
||||
import org.elasticsearch.action.support.master.TransportMasterNodeReadOperationAction;
|
||||
import org.elasticsearch.action.support.master.TransportMasterNodeReadAction;
|
||||
import org.elasticsearch.cluster.*;
|
||||
import org.elasticsearch.cluster.block.ClusterBlockException;
|
||||
import org.elasticsearch.common.Strings;
|
||||
|
|
@ -37,7 +37,7 @@ import org.elasticsearch.transport.TransportService;
|
|||
/**
|
||||
*
|
||||
*/
|
||||
public class TransportClusterHealthAction extends TransportMasterNodeReadOperationAction<ClusterHealthRequest, ClusterHealthResponse> {
|
||||
public class TransportClusterHealthAction extends TransportMasterNodeReadAction<ClusterHealthRequest, ClusterHealthResponse> {
|
||||
|
||||
private final ClusterName clusterName;
|
||||
private final GatewayAllocator gatewayAllocator;
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
package org.elasticsearch.action.admin.cluster.node.hotthreads;
|
||||
|
||||
import org.elasticsearch.action.support.nodes.NodeOperationResponse;
|
||||
import org.elasticsearch.action.support.nodes.BaseNodeResponse;
|
||||
import org.elasticsearch.cluster.node.DiscoveryNode;
|
||||
import org.elasticsearch.common.io.stream.StreamInput;
|
||||
import org.elasticsearch.common.io.stream.StreamOutput;
|
||||
|
|
@ -28,7 +28,7 @@ import java.io.IOException;
|
|||
|
||||
/**
|
||||
*/
|
||||
public class NodeHotThreads extends NodeOperationResponse {
|
||||
public class NodeHotThreads extends BaseNodeResponse {
|
||||
|
||||
private String hotThreads;
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
package org.elasticsearch.action.admin.cluster.node.hotthreads;
|
||||
|
||||
import org.elasticsearch.Version;
|
||||
import org.elasticsearch.action.support.nodes.NodesOperationRequest;
|
||||
import org.elasticsearch.action.support.nodes.BaseNodesRequest;
|
||||
import org.elasticsearch.common.io.stream.StreamInput;
|
||||
import org.elasticsearch.common.io.stream.StreamOutput;
|
||||
import org.elasticsearch.common.unit.TimeValue;
|
||||
|
|
@ -30,7 +30,7 @@ import java.util.concurrent.TimeUnit;
|
|||
|
||||
/**
|
||||
*/
|
||||
public class NodesHotThreadsRequest extends NodesOperationRequest<NodesHotThreadsRequest> {
|
||||
public class NodesHotThreadsRequest extends BaseNodesRequest<NodesHotThreadsRequest> {
|
||||
|
||||
int threads = 3;
|
||||
String type = "cpu";
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
package org.elasticsearch.action.admin.cluster.node.hotthreads;
|
||||
|
||||
import org.elasticsearch.action.support.nodes.NodesOperationResponse;
|
||||
import org.elasticsearch.action.support.nodes.BaseNodesResponse;
|
||||
import org.elasticsearch.cluster.ClusterName;
|
||||
import org.elasticsearch.common.io.stream.StreamInput;
|
||||
import org.elasticsearch.common.io.stream.StreamOutput;
|
||||
|
|
@ -28,7 +28,7 @@ import java.io.IOException;
|
|||
|
||||
/**
|
||||
*/
|
||||
public class NodesHotThreadsResponse extends NodesOperationResponse<NodeHotThreads> {
|
||||
public class NodesHotThreadsResponse extends BaseNodesResponse<NodeHotThreads> {
|
||||
|
||||
NodesHotThreadsResponse() {
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,8 +22,8 @@ package org.elasticsearch.action.admin.cluster.node.hotthreads;
|
|||
import com.google.common.collect.Lists;
|
||||
import org.elasticsearch.ElasticsearchException;
|
||||
import org.elasticsearch.action.support.ActionFilters;
|
||||
import org.elasticsearch.action.support.nodes.NodeOperationRequest;
|
||||
import org.elasticsearch.action.support.nodes.TransportNodesOperationAction;
|
||||
import org.elasticsearch.action.support.nodes.BaseNodeRequest;
|
||||
import org.elasticsearch.action.support.nodes.TransportNodesAction;
|
||||
import org.elasticsearch.cluster.ClusterName;
|
||||
import org.elasticsearch.cluster.ClusterService;
|
||||
import org.elasticsearch.common.inject.Inject;
|
||||
|
|
@ -41,7 +41,7 @@ import java.util.concurrent.atomic.AtomicReferenceArray;
|
|||
/**
|
||||
*
|
||||
*/
|
||||
public class TransportNodesHotThreadsAction extends TransportNodesOperationAction<NodesHotThreadsRequest, NodesHotThreadsResponse, TransportNodesHotThreadsAction.NodeRequest, NodeHotThreads> {
|
||||
public class TransportNodesHotThreadsAction extends TransportNodesAction<NodesHotThreadsRequest, NodesHotThreadsResponse, TransportNodesHotThreadsAction.NodeRequest, NodeHotThreads> {
|
||||
|
||||
@Inject
|
||||
public TransportNodesHotThreadsAction(Settings settings, ClusterName clusterName, ThreadPool threadPool,
|
||||
|
|
@ -92,7 +92,7 @@ public class TransportNodesHotThreadsAction extends TransportNodesOperationActio
|
|||
return false;
|
||||
}
|
||||
|
||||
static class NodeRequest extends NodeOperationRequest {
|
||||
static class NodeRequest extends BaseNodeRequest {
|
||||
|
||||
NodesHotThreadsRequest request;
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ package org.elasticsearch.action.admin.cluster.node.info;
|
|||
import com.google.common.collect.ImmutableMap;
|
||||
import org.elasticsearch.Build;
|
||||
import org.elasticsearch.Version;
|
||||
import org.elasticsearch.action.support.nodes.NodeOperationResponse;
|
||||
import org.elasticsearch.action.support.nodes.BaseNodeResponse;
|
||||
import org.elasticsearch.cluster.node.DiscoveryNode;
|
||||
import org.elasticsearch.common.Nullable;
|
||||
import org.elasticsearch.common.io.stream.StreamInput;
|
||||
|
|
@ -42,7 +42,7 @@ import java.util.Map;
|
|||
/**
|
||||
* Node information (static, does not change over time).
|
||||
*/
|
||||
public class NodeInfo extends NodeOperationResponse {
|
||||
public class NodeInfo extends BaseNodeResponse {
|
||||
|
||||
@Nullable
|
||||
private ImmutableMap<String, String> serviceAttributes;
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
package org.elasticsearch.action.admin.cluster.node.info;
|
||||
|
||||
import org.elasticsearch.action.support.nodes.NodesOperationRequest;
|
||||
import org.elasticsearch.action.support.nodes.BaseNodesRequest;
|
||||
import org.elasticsearch.common.io.stream.StreamInput;
|
||||
import org.elasticsearch.common.io.stream.StreamOutput;
|
||||
|
||||
|
|
@ -28,7 +28,7 @@ import java.io.IOException;
|
|||
/**
|
||||
* A request to get node (cluster) level information.
|
||||
*/
|
||||
public class NodesInfoRequest extends NodesOperationRequest<NodesInfoRequest> {
|
||||
public class NodesInfoRequest extends BaseNodesRequest<NodesInfoRequest> {
|
||||
|
||||
private boolean settings = true;
|
||||
private boolean os = true;
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
package org.elasticsearch.action.admin.cluster.node.info;
|
||||
|
||||
import org.elasticsearch.action.support.nodes.NodesOperationResponse;
|
||||
import org.elasticsearch.action.support.nodes.BaseNodesResponse;
|
||||
import org.elasticsearch.cluster.ClusterName;
|
||||
import org.elasticsearch.common.io.stream.StreamInput;
|
||||
import org.elasticsearch.common.io.stream.StreamOutput;
|
||||
|
|
@ -34,7 +34,7 @@ import java.util.Map;
|
|||
/**
|
||||
*
|
||||
*/
|
||||
public class NodesInfoResponse extends NodesOperationResponse<NodeInfo> implements ToXContent {
|
||||
public class NodesInfoResponse extends BaseNodesResponse<NodeInfo> implements ToXContent {
|
||||
|
||||
public NodesInfoResponse() {
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,8 +20,8 @@
|
|||
package org.elasticsearch.action.admin.cluster.node.info;
|
||||
|
||||
import org.elasticsearch.action.support.ActionFilters;
|
||||
import org.elasticsearch.action.support.nodes.NodeOperationRequest;
|
||||
import org.elasticsearch.action.support.nodes.TransportNodesOperationAction;
|
||||
import org.elasticsearch.action.support.nodes.BaseNodeRequest;
|
||||
import org.elasticsearch.action.support.nodes.TransportNodesAction;
|
||||
import org.elasticsearch.cluster.ClusterName;
|
||||
import org.elasticsearch.cluster.ClusterService;
|
||||
import org.elasticsearch.common.inject.Inject;
|
||||
|
|
@ -40,7 +40,7 @@ import java.util.concurrent.atomic.AtomicReferenceArray;
|
|||
/**
|
||||
*
|
||||
*/
|
||||
public class TransportNodesInfoAction extends TransportNodesOperationAction<NodesInfoRequest, NodesInfoResponse, TransportNodesInfoAction.NodeInfoRequest, NodeInfo> {
|
||||
public class TransportNodesInfoAction extends TransportNodesAction<NodesInfoRequest, NodesInfoResponse, TransportNodesInfoAction.NodeInfoRequest, NodeInfo> {
|
||||
|
||||
private final NodeService nodeService;
|
||||
|
||||
|
|
@ -87,7 +87,7 @@ public class TransportNodesInfoAction extends TransportNodesOperationAction<Node
|
|||
return false;
|
||||
}
|
||||
|
||||
static class NodeInfoRequest extends NodeOperationRequest {
|
||||
static class NodeInfoRequest extends BaseNodeRequest {
|
||||
|
||||
NodesInfoRequest request;
|
||||
|
||||
|
|
|
|||
|
|
@ -19,11 +19,9 @@
|
|||
|
||||
package org.elasticsearch.action.admin.cluster.node.stats;
|
||||
|
||||
import org.elasticsearch.Version;
|
||||
import org.elasticsearch.action.support.nodes.NodeOperationResponse;
|
||||
import org.elasticsearch.action.support.nodes.BaseNodeResponse;
|
||||
import org.elasticsearch.cluster.node.DiscoveryNode;
|
||||
import org.elasticsearch.common.Nullable;
|
||||
import org.elasticsearch.common.breaker.CircuitBreaker;
|
||||
import org.elasticsearch.common.io.stream.StreamInput;
|
||||
import org.elasticsearch.common.io.stream.StreamOutput;
|
||||
import org.elasticsearch.common.xcontent.ToXContent;
|
||||
|
|
@ -31,7 +29,6 @@ import org.elasticsearch.common.xcontent.XContentBuilder;
|
|||
import org.elasticsearch.http.HttpStats;
|
||||
import org.elasticsearch.indices.NodeIndicesStats;
|
||||
import org.elasticsearch.indices.breaker.AllCircuitBreakerStats;
|
||||
import org.elasticsearch.indices.breaker.CircuitBreakerStats;
|
||||
import org.elasticsearch.monitor.fs.FsStats;
|
||||
import org.elasticsearch.monitor.jvm.JvmStats;
|
||||
import org.elasticsearch.monitor.network.NetworkStats;
|
||||
|
|
@ -46,7 +43,7 @@ import java.util.Map;
|
|||
/**
|
||||
* Node statistics (dynamic, changes depending on when created).
|
||||
*/
|
||||
public class NodeStats extends NodeOperationResponse implements ToXContent {
|
||||
public class NodeStats extends BaseNodeResponse implements ToXContent {
|
||||
|
||||
private long timestamp;
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
package org.elasticsearch.action.admin.cluster.node.stats;
|
||||
|
||||
import org.elasticsearch.action.admin.indices.stats.CommonStatsFlags;
|
||||
import org.elasticsearch.action.support.nodes.NodesOperationRequest;
|
||||
import org.elasticsearch.action.support.nodes.BaseNodesRequest;
|
||||
import org.elasticsearch.common.io.stream.StreamInput;
|
||||
import org.elasticsearch.common.io.stream.StreamOutput;
|
||||
|
||||
|
|
@ -29,7 +29,7 @@ import java.io.IOException;
|
|||
/**
|
||||
* A request to get node (cluster) level stats.
|
||||
*/
|
||||
public class NodesStatsRequest extends NodesOperationRequest<NodesStatsRequest> {
|
||||
public class NodesStatsRequest extends BaseNodesRequest<NodesStatsRequest> {
|
||||
|
||||
private CommonStatsFlags indices = new CommonStatsFlags();
|
||||
private boolean os;
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
package org.elasticsearch.action.admin.cluster.node.stats;
|
||||
|
||||
import org.elasticsearch.action.support.nodes.NodesOperationResponse;
|
||||
import org.elasticsearch.action.support.nodes.BaseNodesResponse;
|
||||
import org.elasticsearch.cluster.ClusterName;
|
||||
import org.elasticsearch.common.io.stream.StreamInput;
|
||||
import org.elasticsearch.common.io.stream.StreamOutput;
|
||||
|
|
@ -32,7 +32,7 @@ import java.io.IOException;
|
|||
/**
|
||||
*
|
||||
*/
|
||||
public class NodesStatsResponse extends NodesOperationResponse<NodeStats> implements ToXContent {
|
||||
public class NodesStatsResponse extends BaseNodesResponse<NodeStats> implements ToXContent {
|
||||
|
||||
NodesStatsResponse() {
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,8 +21,8 @@ package org.elasticsearch.action.admin.cluster.node.stats;
|
|||
|
||||
import com.google.common.collect.Lists;
|
||||
import org.elasticsearch.action.support.ActionFilters;
|
||||
import org.elasticsearch.action.support.nodes.NodeOperationRequest;
|
||||
import org.elasticsearch.action.support.nodes.TransportNodesOperationAction;
|
||||
import org.elasticsearch.action.support.nodes.BaseNodeRequest;
|
||||
import org.elasticsearch.action.support.nodes.TransportNodesAction;
|
||||
import org.elasticsearch.cluster.ClusterName;
|
||||
import org.elasticsearch.cluster.ClusterService;
|
||||
import org.elasticsearch.common.inject.Inject;
|
||||
|
|
@ -40,7 +40,7 @@ import java.util.concurrent.atomic.AtomicReferenceArray;
|
|||
/**
|
||||
*
|
||||
*/
|
||||
public class TransportNodesStatsAction extends TransportNodesOperationAction<NodesStatsRequest, NodesStatsResponse, TransportNodesStatsAction.NodeStatsRequest, NodeStats> {
|
||||
public class TransportNodesStatsAction extends TransportNodesAction<NodesStatsRequest, NodesStatsResponse, TransportNodesStatsAction.NodeStatsRequest, NodeStats> {
|
||||
|
||||
private final NodeService nodeService;
|
||||
|
||||
|
|
@ -87,7 +87,7 @@ public class TransportNodesStatsAction extends TransportNodesOperationAction<Nod
|
|||
return false;
|
||||
}
|
||||
|
||||
static class NodeStatsRequest extends NodeOperationRequest {
|
||||
static class NodeStatsRequest extends BaseNodeRequest {
|
||||
|
||||
NodesStatsRequest request;
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ package org.elasticsearch.action.admin.cluster.repositories.delete;
|
|||
|
||||
import org.elasticsearch.action.ActionListener;
|
||||
import org.elasticsearch.action.support.ActionFilters;
|
||||
import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction;
|
||||
import org.elasticsearch.action.support.master.TransportMasterNodeAction;
|
||||
import org.elasticsearch.cluster.ClusterService;
|
||||
import org.elasticsearch.cluster.ClusterState;
|
||||
import org.elasticsearch.cluster.ack.ClusterStateUpdateResponse;
|
||||
|
|
@ -36,7 +36,7 @@ import org.elasticsearch.transport.TransportService;
|
|||
/**
|
||||
* Transport action for unregister repository operation
|
||||
*/
|
||||
public class TransportDeleteRepositoryAction extends TransportMasterNodeOperationAction<DeleteRepositoryRequest, DeleteRepositoryResponse> {
|
||||
public class TransportDeleteRepositoryAction extends TransportMasterNodeAction<DeleteRepositoryRequest, DeleteRepositoryResponse> {
|
||||
|
||||
private final RepositoriesService repositoriesService;
|
||||
|
||||
|
|
|
|||
|
|
@ -19,9 +19,8 @@
|
|||
|
||||
package org.elasticsearch.action.admin.cluster.repositories.get;
|
||||
|
||||
import org.elasticsearch.Version;
|
||||
import org.elasticsearch.action.ActionRequestValidationException;
|
||||
import org.elasticsearch.action.support.master.MasterNodeReadOperationRequest;
|
||||
import org.elasticsearch.action.support.master.MasterNodeReadRequest;
|
||||
import org.elasticsearch.common.Strings;
|
||||
import org.elasticsearch.common.io.stream.StreamInput;
|
||||
import org.elasticsearch.common.io.stream.StreamOutput;
|
||||
|
|
@ -33,7 +32,7 @@ import static org.elasticsearch.action.ValidateActions.addValidationError;
|
|||
/**
|
||||
* Get repository request
|
||||
*/
|
||||
public class GetRepositoriesRequest extends MasterNodeReadOperationRequest<GetRepositoriesRequest> {
|
||||
public class GetRepositoriesRequest extends MasterNodeReadRequest<GetRepositoriesRequest> {
|
||||
|
||||
private String[] repositories = Strings.EMPTY_ARRAY;
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ package org.elasticsearch.action.admin.cluster.repositories.get;
|
|||
import com.google.common.collect.ImmutableList;
|
||||
import org.elasticsearch.action.ActionListener;
|
||||
import org.elasticsearch.action.support.ActionFilters;
|
||||
import org.elasticsearch.action.support.master.TransportMasterNodeReadOperationAction;
|
||||
import org.elasticsearch.action.support.master.TransportMasterNodeReadAction;
|
||||
import org.elasticsearch.cluster.ClusterService;
|
||||
import org.elasticsearch.cluster.ClusterState;
|
||||
import org.elasticsearch.cluster.block.ClusterBlockException;
|
||||
|
|
@ -39,7 +39,7 @@ import org.elasticsearch.transport.TransportService;
|
|||
/**
|
||||
* Transport action for get repositories operation
|
||||
*/
|
||||
public class TransportGetRepositoriesAction extends TransportMasterNodeReadOperationAction<GetRepositoriesRequest, GetRepositoriesResponse> {
|
||||
public class TransportGetRepositoriesAction extends TransportMasterNodeReadAction<GetRepositoriesRequest, GetRepositoriesResponse> {
|
||||
|
||||
@Inject
|
||||
public TransportGetRepositoriesAction(Settings settings, TransportService transportService, ClusterService clusterService,
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ package org.elasticsearch.action.admin.cluster.repositories.put;
|
|||
|
||||
import org.elasticsearch.action.ActionListener;
|
||||
import org.elasticsearch.action.support.ActionFilters;
|
||||
import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction;
|
||||
import org.elasticsearch.action.support.master.TransportMasterNodeAction;
|
||||
import org.elasticsearch.cluster.ClusterService;
|
||||
import org.elasticsearch.cluster.ClusterState;
|
||||
import org.elasticsearch.cluster.ack.ClusterStateUpdateResponse;
|
||||
|
|
@ -36,7 +36,7 @@ import org.elasticsearch.transport.TransportService;
|
|||
/**
|
||||
* Transport action for register repository operation
|
||||
*/
|
||||
public class TransportPutRepositoryAction extends TransportMasterNodeOperationAction<PutRepositoryRequest, PutRepositoryResponse> {
|
||||
public class TransportPutRepositoryAction extends TransportMasterNodeAction<PutRepositoryRequest, PutRepositoryResponse> {
|
||||
|
||||
private final RepositoriesService repositoriesService;
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ package org.elasticsearch.action.admin.cluster.repositories.verify;
|
|||
|
||||
import org.elasticsearch.action.ActionListener;
|
||||
import org.elasticsearch.action.support.ActionFilters;
|
||||
import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction;
|
||||
import org.elasticsearch.action.support.master.TransportMasterNodeAction;
|
||||
import org.elasticsearch.cluster.ClusterName;
|
||||
import org.elasticsearch.cluster.ClusterService;
|
||||
import org.elasticsearch.cluster.ClusterState;
|
||||
|
|
@ -37,7 +37,7 @@ import org.elasticsearch.transport.TransportService;
|
|||
/**
|
||||
* Transport action for verifying repository operation
|
||||
*/
|
||||
public class TransportVerifyRepositoryAction extends TransportMasterNodeOperationAction<VerifyRepositoryRequest, VerifyRepositoryResponse> {
|
||||
public class TransportVerifyRepositoryAction extends TransportMasterNodeAction<VerifyRepositoryRequest, VerifyRepositoryResponse> {
|
||||
|
||||
private final RepositoriesService repositoriesService;
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ package org.elasticsearch.action.admin.cluster.reroute;
|
|||
|
||||
import org.elasticsearch.action.ActionListener;
|
||||
import org.elasticsearch.action.support.ActionFilters;
|
||||
import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction;
|
||||
import org.elasticsearch.action.support.master.TransportMasterNodeAction;
|
||||
import org.elasticsearch.cluster.AckedClusterStateUpdateTask;
|
||||
import org.elasticsearch.cluster.ClusterService;
|
||||
import org.elasticsearch.cluster.ClusterState;
|
||||
|
|
@ -38,7 +38,7 @@ import org.elasticsearch.transport.TransportService;
|
|||
|
||||
/**
|
||||
*/
|
||||
public class TransportClusterRerouteAction extends TransportMasterNodeOperationAction<ClusterRerouteRequest, ClusterRerouteResponse> {
|
||||
public class TransportClusterRerouteAction extends TransportMasterNodeAction<ClusterRerouteRequest, ClusterRerouteResponse> {
|
||||
|
||||
private final AllocationService allocationService;
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ package org.elasticsearch.action.admin.cluster.settings;
|
|||
import org.elasticsearch.ElasticsearchException;
|
||||
import org.elasticsearch.action.ActionListener;
|
||||
import org.elasticsearch.action.support.ActionFilters;
|
||||
import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction;
|
||||
import org.elasticsearch.action.support.master.TransportMasterNodeAction;
|
||||
import org.elasticsearch.cluster.AckedClusterStateUpdateTask;
|
||||
import org.elasticsearch.cluster.ClusterService;
|
||||
import org.elasticsearch.cluster.ClusterState;
|
||||
|
|
@ -49,7 +49,7 @@ import static org.elasticsearch.cluster.ClusterState.builder;
|
|||
/**
|
||||
*
|
||||
*/
|
||||
public class TransportClusterUpdateSettingsAction extends TransportMasterNodeOperationAction<ClusterUpdateSettingsRequest, ClusterUpdateSettingsResponse> {
|
||||
public class TransportClusterUpdateSettingsAction extends TransportMasterNodeAction<ClusterUpdateSettingsRequest, ClusterUpdateSettingsResponse> {
|
||||
|
||||
private final AllocationService allocationService;
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ package org.elasticsearch.action.admin.cluster.shards;
|
|||
import org.elasticsearch.action.ActionRequestValidationException;
|
||||
import org.elasticsearch.action.IndicesRequest;
|
||||
import org.elasticsearch.action.support.IndicesOptions;
|
||||
import org.elasticsearch.action.support.master.MasterNodeReadOperationRequest;
|
||||
import org.elasticsearch.action.support.master.MasterNodeReadRequest;
|
||||
import org.elasticsearch.common.Nullable;
|
||||
import org.elasticsearch.common.Strings;
|
||||
import org.elasticsearch.common.io.stream.StreamInput;
|
||||
|
|
@ -32,7 +32,7 @@ import java.io.IOException;
|
|||
|
||||
/**
|
||||
*/
|
||||
public class ClusterSearchShardsRequest extends MasterNodeReadOperationRequest<ClusterSearchShardsRequest> implements IndicesRequest.Replaceable {
|
||||
public class ClusterSearchShardsRequest extends MasterNodeReadRequest<ClusterSearchShardsRequest> implements IndicesRequest.Replaceable {
|
||||
private String[] indices;
|
||||
@Nullable
|
||||
private String routing;
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ package org.elasticsearch.action.admin.cluster.shards;
|
|||
|
||||
import org.elasticsearch.action.ActionListener;
|
||||
import org.elasticsearch.action.support.ActionFilters;
|
||||
import org.elasticsearch.action.support.master.TransportMasterNodeReadOperationAction;
|
||||
import org.elasticsearch.action.support.master.TransportMasterNodeReadAction;
|
||||
import org.elasticsearch.cluster.ClusterService;
|
||||
import org.elasticsearch.cluster.ClusterState;
|
||||
import org.elasticsearch.cluster.block.ClusterBlockException;
|
||||
|
|
@ -42,7 +42,7 @@ import static com.google.common.collect.Sets.newHashSet;
|
|||
|
||||
/**
|
||||
*/
|
||||
public class TransportClusterSearchShardsAction extends TransportMasterNodeReadOperationAction<ClusterSearchShardsRequest, ClusterSearchShardsResponse> {
|
||||
public class TransportClusterSearchShardsAction extends TransportMasterNodeReadAction<ClusterSearchShardsRequest, ClusterSearchShardsResponse> {
|
||||
|
||||
@Inject
|
||||
public TransportClusterSearchShardsAction(Settings settings, TransportService transportService, ClusterService clusterService, ThreadPool threadPool, ActionFilters actionFilters) {
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ import org.elasticsearch.ElasticsearchGenerationException;
|
|||
import org.elasticsearch.action.ActionRequestValidationException;
|
||||
import org.elasticsearch.action.IndicesRequest;
|
||||
import org.elasticsearch.action.support.IndicesOptions;
|
||||
import org.elasticsearch.action.support.master.MasterNodeOperationRequest;
|
||||
import org.elasticsearch.action.support.master.MasterNodeRequest;
|
||||
import org.elasticsearch.common.Strings;
|
||||
import org.elasticsearch.common.bytes.BytesReference;
|
||||
import org.elasticsearch.common.io.stream.StreamInput;
|
||||
|
|
@ -60,7 +60,7 @@ import static org.elasticsearch.common.xcontent.support.XContentMapValues.nodeBo
|
|||
* <li>must not contain invalid file name characters {@link org.elasticsearch.common.Strings#INVALID_FILENAME_CHARS} </li>
|
||||
* </ul>
|
||||
*/
|
||||
public class CreateSnapshotRequest extends MasterNodeOperationRequest<CreateSnapshotRequest> implements IndicesRequest.Replaceable {
|
||||
public class CreateSnapshotRequest extends MasterNodeRequest<CreateSnapshotRequest> implements IndicesRequest.Replaceable {
|
||||
|
||||
private String snapshot;
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ package org.elasticsearch.action.admin.cluster.snapshots.create;
|
|||
|
||||
import org.elasticsearch.action.ActionListener;
|
||||
import org.elasticsearch.action.support.ActionFilters;
|
||||
import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction;
|
||||
import org.elasticsearch.action.support.master.TransportMasterNodeAction;
|
||||
import org.elasticsearch.cluster.ClusterService;
|
||||
import org.elasticsearch.cluster.ClusterState;
|
||||
import org.elasticsearch.cluster.block.ClusterBlockException;
|
||||
|
|
@ -37,7 +37,7 @@ import org.elasticsearch.transport.TransportService;
|
|||
/**
|
||||
* Transport action for create snapshot operation
|
||||
*/
|
||||
public class TransportCreateSnapshotAction extends TransportMasterNodeOperationAction<CreateSnapshotRequest, CreateSnapshotResponse> {
|
||||
public class TransportCreateSnapshotAction extends TransportMasterNodeAction<CreateSnapshotRequest, CreateSnapshotResponse> {
|
||||
private final SnapshotsService snapshotsService;
|
||||
|
||||
@Inject
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
package org.elasticsearch.action.admin.cluster.snapshots.delete;
|
||||
|
||||
import org.elasticsearch.action.ActionRequestValidationException;
|
||||
import org.elasticsearch.action.support.master.MasterNodeOperationRequest;
|
||||
import org.elasticsearch.action.support.master.MasterNodeRequest;
|
||||
import org.elasticsearch.common.io.stream.StreamInput;
|
||||
import org.elasticsearch.common.io.stream.StreamOutput;
|
||||
|
||||
|
|
@ -35,7 +35,7 @@ import static org.elasticsearch.action.ValidateActions.addValidationError;
|
|||
* files that are associated with this particular snapshot. All files that are shared with
|
||||
* at least one other existing snapshot are left intact.
|
||||
*/
|
||||
public class DeleteSnapshotRequest extends MasterNodeOperationRequest<DeleteSnapshotRequest> {
|
||||
public class DeleteSnapshotRequest extends MasterNodeRequest<DeleteSnapshotRequest> {
|
||||
|
||||
private String repository;
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ package org.elasticsearch.action.admin.cluster.snapshots.delete;
|
|||
|
||||
import org.elasticsearch.action.ActionListener;
|
||||
import org.elasticsearch.action.support.ActionFilters;
|
||||
import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction;
|
||||
import org.elasticsearch.action.support.master.TransportMasterNodeAction;
|
||||
import org.elasticsearch.cluster.ClusterService;
|
||||
import org.elasticsearch.cluster.ClusterState;
|
||||
import org.elasticsearch.cluster.block.ClusterBlockException;
|
||||
|
|
@ -36,7 +36,7 @@ import org.elasticsearch.transport.TransportService;
|
|||
/**
|
||||
* Transport action for delete snapshot operation
|
||||
*/
|
||||
public class TransportDeleteSnapshotAction extends TransportMasterNodeOperationAction<DeleteSnapshotRequest, DeleteSnapshotResponse> {
|
||||
public class TransportDeleteSnapshotAction extends TransportMasterNodeAction<DeleteSnapshotRequest, DeleteSnapshotResponse> {
|
||||
private final SnapshotsService snapshotsService;
|
||||
|
||||
@Inject
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
package org.elasticsearch.action.admin.cluster.snapshots.get;
|
||||
|
||||
import org.elasticsearch.action.ActionRequestValidationException;
|
||||
import org.elasticsearch.action.support.master.MasterNodeOperationRequest;
|
||||
import org.elasticsearch.action.support.master.MasterNodeRequest;
|
||||
import org.elasticsearch.common.Strings;
|
||||
import org.elasticsearch.common.io.stream.StreamInput;
|
||||
import org.elasticsearch.common.io.stream.StreamOutput;
|
||||
|
|
@ -32,7 +32,7 @@ import static org.elasticsearch.action.ValidateActions.addValidationError;
|
|||
/**
|
||||
* Get snapshot request
|
||||
*/
|
||||
public class GetSnapshotsRequest extends MasterNodeOperationRequest<GetSnapshotsRequest> {
|
||||
public class GetSnapshotsRequest extends MasterNodeRequest<GetSnapshotsRequest> {
|
||||
|
||||
public static final String ALL_SNAPSHOTS = "_all";
|
||||
public static final String CURRENT_SNAPSHOT = "_current";
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ package org.elasticsearch.action.admin.cluster.snapshots.get;
|
|||
import com.google.common.collect.ImmutableList;
|
||||
import org.elasticsearch.action.ActionListener;
|
||||
import org.elasticsearch.action.support.ActionFilters;
|
||||
import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction;
|
||||
import org.elasticsearch.action.support.master.TransportMasterNodeAction;
|
||||
import org.elasticsearch.cluster.ClusterService;
|
||||
import org.elasticsearch.cluster.ClusterState;
|
||||
import org.elasticsearch.cluster.block.ClusterBlockException;
|
||||
|
|
@ -39,7 +39,7 @@ import org.elasticsearch.transport.TransportService;
|
|||
/**
|
||||
* Transport Action for get snapshots operation
|
||||
*/
|
||||
public class TransportGetSnapshotsAction extends TransportMasterNodeOperationAction<GetSnapshotsRequest, GetSnapshotsResponse> {
|
||||
public class TransportGetSnapshotsAction extends TransportMasterNodeAction<GetSnapshotsRequest, GetSnapshotsResponse> {
|
||||
private final SnapshotsService snapshotsService;
|
||||
|
||||
@Inject
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ import org.elasticsearch.ElasticsearchGenerationException;
|
|||
import org.elasticsearch.Version;
|
||||
import org.elasticsearch.action.ActionRequestValidationException;
|
||||
import org.elasticsearch.action.support.IndicesOptions;
|
||||
import org.elasticsearch.action.support.master.MasterNodeOperationRequest;
|
||||
import org.elasticsearch.action.support.master.MasterNodeRequest;
|
||||
import org.elasticsearch.common.Strings;
|
||||
import org.elasticsearch.common.bytes.BytesReference;
|
||||
import org.elasticsearch.common.io.stream.StreamInput;
|
||||
|
|
@ -48,7 +48,7 @@ import static org.elasticsearch.common.xcontent.support.XContentMapValues.nodeBo
|
|||
/**
|
||||
* Restore snapshot request
|
||||
*/
|
||||
public class RestoreSnapshotRequest extends MasterNodeOperationRequest<RestoreSnapshotRequest> {
|
||||
public class RestoreSnapshotRequest extends MasterNodeRequest<RestoreSnapshotRequest> {
|
||||
|
||||
private String snapshot;
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ package org.elasticsearch.action.admin.cluster.snapshots.restore;
|
|||
|
||||
import org.elasticsearch.action.ActionListener;
|
||||
import org.elasticsearch.action.support.ActionFilters;
|
||||
import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction;
|
||||
import org.elasticsearch.action.support.master.TransportMasterNodeAction;
|
||||
import org.elasticsearch.cluster.ClusterService;
|
||||
import org.elasticsearch.cluster.ClusterState;
|
||||
import org.elasticsearch.cluster.block.ClusterBlockException;
|
||||
|
|
@ -37,7 +37,7 @@ import org.elasticsearch.transport.TransportService;
|
|||
/**
|
||||
* Transport action for restore snapshot operation
|
||||
*/
|
||||
public class TransportRestoreSnapshotAction extends TransportMasterNodeOperationAction<RestoreSnapshotRequest, RestoreSnapshotResponse> {
|
||||
public class TransportRestoreSnapshotAction extends TransportMasterNodeAction<RestoreSnapshotRequest, RestoreSnapshotResponse> {
|
||||
private final RestoreService restoreService;
|
||||
|
||||
@Inject
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
package org.elasticsearch.action.admin.cluster.snapshots.status;
|
||||
|
||||
import org.elasticsearch.action.support.broadcast.BroadcastShardOperationResponse;
|
||||
import org.elasticsearch.action.support.broadcast.BroadcastShardResponse;
|
||||
import org.elasticsearch.common.io.stream.StreamInput;
|
||||
import org.elasticsearch.common.io.stream.StreamOutput;
|
||||
import org.elasticsearch.common.xcontent.ToXContent;
|
||||
|
|
@ -32,7 +32,7 @@ import java.io.IOException;
|
|||
|
||||
/**
|
||||
*/
|
||||
public class SnapshotIndexShardStatus extends BroadcastShardOperationResponse implements ToXContent {
|
||||
public class SnapshotIndexShardStatus extends BroadcastShardResponse implements ToXContent {
|
||||
|
||||
private SnapshotIndexShardStage stage = SnapshotIndexShardStage.INIT;
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
package org.elasticsearch.action.admin.cluster.snapshots.status;
|
||||
|
||||
import org.elasticsearch.action.ActionRequestValidationException;
|
||||
import org.elasticsearch.action.support.master.MasterNodeOperationRequest;
|
||||
import org.elasticsearch.action.support.master.MasterNodeRequest;
|
||||
import org.elasticsearch.common.Strings;
|
||||
import org.elasticsearch.common.io.stream.StreamInput;
|
||||
import org.elasticsearch.common.io.stream.StreamOutput;
|
||||
|
|
@ -32,7 +32,7 @@ import static org.elasticsearch.action.ValidateActions.addValidationError;
|
|||
/**
|
||||
* Get snapshot status request
|
||||
*/
|
||||
public class SnapshotsStatusRequest extends MasterNodeOperationRequest<SnapshotsStatusRequest> {
|
||||
public class SnapshotsStatusRequest extends MasterNodeRequest<SnapshotsStatusRequest> {
|
||||
|
||||
private String repository = "_all";
|
||||
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ import java.util.concurrent.atomic.AtomicReferenceArray;
|
|||
/**
|
||||
* Transport client that collects snapshot shard statuses from data nodes
|
||||
*/
|
||||
public class TransportNodesSnapshotsStatus extends TransportNodesOperationAction<TransportNodesSnapshotsStatus.Request, TransportNodesSnapshotsStatus.NodesSnapshotStatus, TransportNodesSnapshotsStatus.NodeRequest, TransportNodesSnapshotsStatus.NodeSnapshotStatus> {
|
||||
public class TransportNodesSnapshotsStatus extends TransportNodesAction<TransportNodesSnapshotsStatus.Request, TransportNodesSnapshotsStatus.NodesSnapshotStatus, TransportNodesSnapshotsStatus.NodeRequest, TransportNodesSnapshotsStatus.NodeSnapshotStatus> {
|
||||
|
||||
public static final String ACTION_NAME = SnapshotsStatusAction.NAME + "[nodes]";
|
||||
|
||||
|
|
@ -128,7 +128,7 @@ public class TransportNodesSnapshotsStatus extends TransportNodesOperationAction
|
|||
return true;
|
||||
}
|
||||
|
||||
static class Request extends NodesOperationRequest<Request> {
|
||||
static class Request extends BaseNodesRequest<Request> {
|
||||
|
||||
private SnapshotId[] snapshotIds;
|
||||
|
||||
|
|
@ -157,7 +157,7 @@ public class TransportNodesSnapshotsStatus extends TransportNodesOperationAction
|
|||
}
|
||||
}
|
||||
|
||||
public static class NodesSnapshotStatus extends NodesOperationResponse<NodeSnapshotStatus> {
|
||||
public static class NodesSnapshotStatus extends BaseNodesResponse<NodeSnapshotStatus> {
|
||||
|
||||
private FailedNodeException[] failures;
|
||||
|
||||
|
|
@ -194,7 +194,7 @@ public class TransportNodesSnapshotsStatus extends TransportNodesOperationAction
|
|||
}
|
||||
|
||||
|
||||
static class NodeRequest extends NodeOperationRequest {
|
||||
static class NodeRequest extends BaseNodeRequest {
|
||||
|
||||
private SnapshotId[] snapshotIds;
|
||||
|
||||
|
|
@ -230,7 +230,7 @@ public class TransportNodesSnapshotsStatus extends TransportNodesOperationAction
|
|||
}
|
||||
}
|
||||
|
||||
public static class NodeSnapshotStatus extends NodeOperationResponse {
|
||||
public static class NodeSnapshotStatus extends BaseNodeResponse {
|
||||
|
||||
private ImmutableMap<SnapshotId, ImmutableMap<ShardId, SnapshotIndexShardStatus>> status;
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ import com.google.common.collect.ImmutableList;
|
|||
import com.google.common.collect.ImmutableMap;
|
||||
import org.elasticsearch.action.ActionListener;
|
||||
import org.elasticsearch.action.support.ActionFilters;
|
||||
import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction;
|
||||
import org.elasticsearch.action.support.master.TransportMasterNodeAction;
|
||||
import org.elasticsearch.cluster.ClusterService;
|
||||
import org.elasticsearch.cluster.ClusterState;
|
||||
import org.elasticsearch.cluster.block.ClusterBlockException;
|
||||
|
|
@ -49,7 +49,7 @@ import static com.google.common.collect.Sets.newHashSet;
|
|||
|
||||
/**
|
||||
*/
|
||||
public class TransportSnapshotsStatusAction extends TransportMasterNodeOperationAction<SnapshotsStatusRequest, SnapshotsStatusResponse> {
|
||||
public class TransportSnapshotsStatusAction extends TransportMasterNodeAction<SnapshotsStatusRequest, SnapshotsStatusResponse> {
|
||||
|
||||
private final SnapshotsService snapshotsService;
|
||||
|
||||
|
|
|
|||
|
|
@ -19,11 +19,10 @@
|
|||
|
||||
package org.elasticsearch.action.admin.cluster.state;
|
||||
|
||||
import org.elasticsearch.Version;
|
||||
import org.elasticsearch.action.ActionRequestValidationException;
|
||||
import org.elasticsearch.action.IndicesRequest;
|
||||
import org.elasticsearch.action.support.IndicesOptions;
|
||||
import org.elasticsearch.action.support.master.MasterNodeReadOperationRequest;
|
||||
import org.elasticsearch.action.support.master.MasterNodeReadRequest;
|
||||
import org.elasticsearch.common.Strings;
|
||||
import org.elasticsearch.common.io.stream.StreamInput;
|
||||
import org.elasticsearch.common.io.stream.StreamOutput;
|
||||
|
|
@ -33,7 +32,7 @@ import java.io.IOException;
|
|||
/**
|
||||
*
|
||||
*/
|
||||
public class ClusterStateRequest extends MasterNodeReadOperationRequest<ClusterStateRequest> implements IndicesRequest.Replaceable {
|
||||
public class ClusterStateRequest extends MasterNodeReadRequest<ClusterStateRequest> implements IndicesRequest.Replaceable {
|
||||
|
||||
private boolean routingTable = true;
|
||||
private boolean nodes = true;
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ package org.elasticsearch.action.admin.cluster.state;
|
|||
import com.carrotsearch.hppc.cursors.ObjectObjectCursor;
|
||||
import org.elasticsearch.action.ActionListener;
|
||||
import org.elasticsearch.action.support.ActionFilters;
|
||||
import org.elasticsearch.action.support.master.TransportMasterNodeReadOperationAction;
|
||||
import org.elasticsearch.action.support.master.TransportMasterNodeReadAction;
|
||||
import org.elasticsearch.cluster.ClusterName;
|
||||
import org.elasticsearch.cluster.ClusterService;
|
||||
import org.elasticsearch.cluster.ClusterState;
|
||||
|
|
@ -39,7 +39,7 @@ import org.elasticsearch.transport.TransportService;
|
|||
/**
|
||||
*
|
||||
*/
|
||||
public class TransportClusterStateAction extends TransportMasterNodeReadOperationAction<ClusterStateRequest, ClusterStateResponse> {
|
||||
public class TransportClusterStateAction extends TransportMasterNodeReadAction<ClusterStateRequest, ClusterStateResponse> {
|
||||
|
||||
private final ClusterName clusterName;
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ import org.elasticsearch.action.admin.cluster.health.ClusterHealthStatus;
|
|||
import org.elasticsearch.action.admin.cluster.node.info.NodeInfo;
|
||||
import org.elasticsearch.action.admin.cluster.node.stats.NodeStats;
|
||||
import org.elasticsearch.action.admin.indices.stats.ShardStats;
|
||||
import org.elasticsearch.action.support.nodes.NodeOperationResponse;
|
||||
import org.elasticsearch.action.support.nodes.BaseNodeResponse;
|
||||
import org.elasticsearch.cluster.node.DiscoveryNode;
|
||||
import org.elasticsearch.common.Nullable;
|
||||
import org.elasticsearch.common.io.stream.StreamInput;
|
||||
|
|
@ -31,7 +31,7 @@ import org.elasticsearch.common.io.stream.StreamOutput;
|
|||
|
||||
import java.io.IOException;
|
||||
|
||||
public class ClusterStatsNodeResponse extends NodeOperationResponse {
|
||||
public class ClusterStatsNodeResponse extends BaseNodeResponse {
|
||||
|
||||
private NodeInfo nodeInfo;
|
||||
private NodeStats nodeStats;
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
package org.elasticsearch.action.admin.cluster.stats;
|
||||
|
||||
import org.elasticsearch.action.support.nodes.NodesOperationRequest;
|
||||
import org.elasticsearch.action.support.nodes.BaseNodesRequest;
|
||||
import org.elasticsearch.common.io.stream.StreamInput;
|
||||
import org.elasticsearch.common.io.stream.StreamOutput;
|
||||
|
||||
|
|
@ -28,7 +28,7 @@ import java.io.IOException;
|
|||
/**
|
||||
* A request to get cluster level stats.
|
||||
*/
|
||||
public class ClusterStatsRequest extends NodesOperationRequest<ClusterStatsRequest> {
|
||||
public class ClusterStatsRequest extends BaseNodesRequest<ClusterStatsRequest> {
|
||||
|
||||
ClusterStatsRequest() {
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
package org.elasticsearch.action.admin.cluster.stats;
|
||||
|
||||
import org.elasticsearch.action.admin.cluster.health.ClusterHealthStatus;
|
||||
import org.elasticsearch.action.support.nodes.NodesOperationResponse;
|
||||
import org.elasticsearch.action.support.nodes.BaseNodesResponse;
|
||||
import org.elasticsearch.cluster.ClusterName;
|
||||
import org.elasticsearch.common.io.stream.StreamInput;
|
||||
import org.elasticsearch.common.io.stream.StreamOutput;
|
||||
|
|
@ -37,7 +37,7 @@ import java.util.Map;
|
|||
/**
|
||||
*
|
||||
*/
|
||||
public class ClusterStatsResponse extends NodesOperationResponse<ClusterStatsNodeResponse> implements ToXContent {
|
||||
public class ClusterStatsResponse extends BaseNodesResponse<ClusterStatsNodeResponse> implements ToXContent {
|
||||
|
||||
ClusterStatsNodes nodesStats;
|
||||
ClusterStatsIndices indicesStats;
|
||||
|
|
|
|||
|
|
@ -26,8 +26,8 @@ import org.elasticsearch.action.admin.cluster.node.stats.NodeStats;
|
|||
import org.elasticsearch.action.admin.indices.stats.CommonStatsFlags;
|
||||
import org.elasticsearch.action.admin.indices.stats.ShardStats;
|
||||
import org.elasticsearch.action.support.ActionFilters;
|
||||
import org.elasticsearch.action.support.nodes.NodeOperationRequest;
|
||||
import org.elasticsearch.action.support.nodes.TransportNodesOperationAction;
|
||||
import org.elasticsearch.action.support.nodes.BaseNodeRequest;
|
||||
import org.elasticsearch.action.support.nodes.TransportNodesAction;
|
||||
import org.elasticsearch.cluster.ClusterName;
|
||||
import org.elasticsearch.cluster.ClusterService;
|
||||
import org.elasticsearch.cluster.metadata.IndexMetaData;
|
||||
|
|
@ -51,7 +51,7 @@ import java.util.concurrent.atomic.AtomicReferenceArray;
|
|||
/**
|
||||
*
|
||||
*/
|
||||
public class TransportClusterStatsAction extends TransportNodesOperationAction<ClusterStatsRequest, ClusterStatsResponse,
|
||||
public class TransportClusterStatsAction extends TransportNodesAction<ClusterStatsRequest, ClusterStatsResponse,
|
||||
TransportClusterStatsAction.ClusterStatsNodeRequest, ClusterStatsNodeResponse> {
|
||||
|
||||
private static final CommonStatsFlags SHARD_STATS_FLAGS = new CommonStatsFlags(CommonStatsFlags.Flag.Docs, CommonStatsFlags.Flag.Store,
|
||||
|
|
@ -142,7 +142,7 @@ public class TransportClusterStatsAction extends TransportNodesOperationAction<C
|
|||
return false;
|
||||
}
|
||||
|
||||
static class ClusterStatsNodeRequest extends NodeOperationRequest {
|
||||
static class ClusterStatsNodeRequest extends BaseNodeRequest {
|
||||
|
||||
ClusterStatsRequest request;
|
||||
|
||||
|
|
|
|||
|
|
@ -19,17 +19,12 @@
|
|||
|
||||
package org.elasticsearch.action.admin.cluster.tasks;
|
||||
|
||||
import org.elasticsearch.Version;
|
||||
import org.elasticsearch.action.ActionRequestValidationException;
|
||||
import org.elasticsearch.action.support.master.MasterNodeReadOperationRequest;
|
||||
import org.elasticsearch.common.io.stream.StreamInput;
|
||||
import org.elasticsearch.common.io.stream.StreamOutput;
|
||||
|
||||
import java.io.IOException;
|
||||
import org.elasticsearch.action.support.master.MasterNodeReadRequest;
|
||||
|
||||
/**
|
||||
*/
|
||||
public class PendingClusterTasksRequest extends MasterNodeReadOperationRequest<PendingClusterTasksRequest> {
|
||||
public class PendingClusterTasksRequest extends MasterNodeReadRequest<PendingClusterTasksRequest> {
|
||||
|
||||
@Override
|
||||
public ActionRequestValidationException validate() {
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ package org.elasticsearch.action.admin.cluster.tasks;
|
|||
|
||||
import org.elasticsearch.action.ActionListener;
|
||||
import org.elasticsearch.action.support.ActionFilters;
|
||||
import org.elasticsearch.action.support.master.TransportMasterNodeReadOperationAction;
|
||||
import org.elasticsearch.action.support.master.TransportMasterNodeReadAction;
|
||||
import org.elasticsearch.cluster.ClusterService;
|
||||
import org.elasticsearch.cluster.ClusterState;
|
||||
import org.elasticsearch.cluster.block.ClusterBlockException;
|
||||
|
|
@ -33,7 +33,7 @@ import org.elasticsearch.transport.TransportService;
|
|||
|
||||
/**
|
||||
*/
|
||||
public class TransportPendingClusterTasksAction extends TransportMasterNodeReadOperationAction<PendingClusterTasksRequest, PendingClusterTasksResponse> {
|
||||
public class TransportPendingClusterTasksAction extends TransportMasterNodeReadAction<PendingClusterTasksRequest, PendingClusterTasksResponse> {
|
||||
|
||||
private final ClusterService clusterService;
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ import com.google.common.collect.Sets;
|
|||
import org.elasticsearch.action.ActionListener;
|
||||
import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequest.AliasActions;
|
||||
import org.elasticsearch.action.support.ActionFilters;
|
||||
import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction;
|
||||
import org.elasticsearch.action.support.master.TransportMasterNodeAction;
|
||||
import org.elasticsearch.cluster.ClusterService;
|
||||
import org.elasticsearch.cluster.ClusterState;
|
||||
import org.elasticsearch.cluster.ack.ClusterStateUpdateResponse;
|
||||
|
|
@ -42,7 +42,7 @@ import java.util.*;
|
|||
/**
|
||||
* Add/remove aliases action
|
||||
*/
|
||||
public class TransportIndicesAliasesAction extends TransportMasterNodeOperationAction<IndicesAliasesRequest, IndicesAliasesResponse> {
|
||||
public class TransportIndicesAliasesAction extends TransportMasterNodeAction<IndicesAliasesRequest, IndicesAliasesResponse> {
|
||||
|
||||
private final MetaDataIndexAliasesService indexAliasesService;
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ package org.elasticsearch.action.admin.indices.alias.exists;
|
|||
import org.elasticsearch.action.ActionListener;
|
||||
import org.elasticsearch.action.admin.indices.alias.get.GetAliasesRequest;
|
||||
import org.elasticsearch.action.support.ActionFilters;
|
||||
import org.elasticsearch.action.support.master.TransportMasterNodeReadOperationAction;
|
||||
import org.elasticsearch.action.support.master.TransportMasterNodeReadAction;
|
||||
import org.elasticsearch.cluster.ClusterService;
|
||||
import org.elasticsearch.cluster.ClusterState;
|
||||
import org.elasticsearch.cluster.block.ClusterBlockException;
|
||||
|
|
@ -33,7 +33,7 @@ import org.elasticsearch.transport.TransportService;
|
|||
|
||||
/**
|
||||
*/
|
||||
public class TransportAliasesExistAction extends TransportMasterNodeReadOperationAction<GetAliasesRequest, AliasesExistResponse> {
|
||||
public class TransportAliasesExistAction extends TransportMasterNodeReadAction<GetAliasesRequest, AliasesExistResponse> {
|
||||
|
||||
@Inject
|
||||
public TransportAliasesExistAction(Settings settings, TransportService transportService, ClusterService clusterService, ThreadPool threadPool, ActionFilters actionFilters) {
|
||||
|
|
|
|||
|
|
@ -18,11 +18,10 @@
|
|||
*/
|
||||
package org.elasticsearch.action.admin.indices.alias.get;
|
||||
|
||||
import org.elasticsearch.Version;
|
||||
import org.elasticsearch.action.ActionRequestValidationException;
|
||||
import org.elasticsearch.action.AliasesRequest;
|
||||
import org.elasticsearch.action.support.IndicesOptions;
|
||||
import org.elasticsearch.action.support.master.MasterNodeReadOperationRequest;
|
||||
import org.elasticsearch.action.support.master.MasterNodeReadRequest;
|
||||
import org.elasticsearch.common.Strings;
|
||||
import org.elasticsearch.common.io.stream.StreamInput;
|
||||
import org.elasticsearch.common.io.stream.StreamOutput;
|
||||
|
|
@ -31,7 +30,7 @@ import java.io.IOException;
|
|||
|
||||
/**
|
||||
*/
|
||||
public class GetAliasesRequest extends MasterNodeReadOperationRequest<GetAliasesRequest> implements AliasesRequest {
|
||||
public class GetAliasesRequest extends MasterNodeReadRequest<GetAliasesRequest> implements AliasesRequest {
|
||||
|
||||
private String[] indices = Strings.EMPTY_ARRAY;
|
||||
private String[] aliases = Strings.EMPTY_ARRAY;
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ package org.elasticsearch.action.admin.indices.alias.get;
|
|||
|
||||
import org.elasticsearch.action.ActionListener;
|
||||
import org.elasticsearch.action.support.ActionFilters;
|
||||
import org.elasticsearch.action.support.master.TransportMasterNodeReadOperationAction;
|
||||
import org.elasticsearch.action.support.master.TransportMasterNodeReadAction;
|
||||
import org.elasticsearch.cluster.ClusterService;
|
||||
import org.elasticsearch.cluster.ClusterState;
|
||||
import org.elasticsearch.cluster.block.ClusterBlockException;
|
||||
|
|
@ -36,7 +36,7 @@ import java.util.List;
|
|||
|
||||
/**
|
||||
*/
|
||||
public class TransportGetAliasesAction extends TransportMasterNodeReadOperationAction<GetAliasesRequest, GetAliasesResponse> {
|
||||
public class TransportGetAliasesAction extends TransportMasterNodeReadAction<GetAliasesRequest, GetAliasesResponse> {
|
||||
|
||||
@Inject
|
||||
public TransportGetAliasesAction(Settings settings, TransportService transportService, ClusterService clusterService, ThreadPool threadPool, ActionFilters actionFilters) {
|
||||
|
|
|
|||
|
|
@ -18,10 +18,8 @@
|
|||
*/
|
||||
package org.elasticsearch.action.admin.indices.analyze;
|
||||
|
||||
import org.elasticsearch.Version;
|
||||
import org.elasticsearch.action.ActionRequestValidationException;
|
||||
import org.elasticsearch.action.support.single.custom.SingleCustomOperationRequest;
|
||||
import org.elasticsearch.common.Nullable;
|
||||
import org.elasticsearch.common.Strings;
|
||||
import org.elasticsearch.common.io.stream.StreamInput;
|
||||
import org.elasticsearch.common.io.stream.StreamOutput;
|
||||
|
|
@ -48,8 +46,7 @@ public class AnalyzeRequest extends SingleCustomOperationRequest<AnalyzeRequest>
|
|||
|
||||
private String field;
|
||||
|
||||
AnalyzeRequest() {
|
||||
|
||||
public AnalyzeRequest() {
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -19,8 +19,7 @@
|
|||
|
||||
package org.elasticsearch.action.admin.indices.cache.clear;
|
||||
|
||||
import org.elasticsearch.Version;
|
||||
import org.elasticsearch.action.support.broadcast.BroadcastOperationRequest;
|
||||
import org.elasticsearch.action.support.broadcast.BroadcastRequest;
|
||||
import org.elasticsearch.common.io.stream.StreamInput;
|
||||
import org.elasticsearch.common.io.stream.StreamOutput;
|
||||
|
||||
|
|
@ -29,7 +28,7 @@ import java.io.IOException;
|
|||
/**
|
||||
*
|
||||
*/
|
||||
public class ClearIndicesCacheRequest extends BroadcastOperationRequest<ClearIndicesCacheRequest> {
|
||||
public class ClearIndicesCacheRequest extends BroadcastRequest<ClearIndicesCacheRequest> {
|
||||
|
||||
private boolean filterCache = false;
|
||||
private boolean fieldDataCache = false;
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
package org.elasticsearch.action.admin.indices.cache.clear;
|
||||
|
||||
import org.elasticsearch.action.ShardOperationFailedException;
|
||||
import org.elasticsearch.action.support.broadcast.BroadcastOperationResponse;
|
||||
import org.elasticsearch.action.support.broadcast.BroadcastResponse;
|
||||
import org.elasticsearch.common.io.stream.StreamInput;
|
||||
import org.elasticsearch.common.io.stream.StreamOutput;
|
||||
|
||||
|
|
@ -32,7 +32,7 @@ import java.util.List;
|
|||
*
|
||||
*
|
||||
*/
|
||||
public class ClearIndicesCacheResponse extends BroadcastOperationResponse {
|
||||
public class ClearIndicesCacheResponse extends BroadcastResponse {
|
||||
|
||||
ClearIndicesCacheResponse() {
|
||||
|
||||
|
|
|
|||
|
|
@ -19,8 +19,7 @@
|
|||
|
||||
package org.elasticsearch.action.admin.indices.cache.clear;
|
||||
|
||||
import org.elasticsearch.Version;
|
||||
import org.elasticsearch.action.support.broadcast.BroadcastShardOperationRequest;
|
||||
import org.elasticsearch.action.support.broadcast.BroadcastShardRequest;
|
||||
import org.elasticsearch.common.io.stream.StreamInput;
|
||||
import org.elasticsearch.common.io.stream.StreamOutput;
|
||||
import org.elasticsearch.index.shard.ShardId;
|
||||
|
|
@ -30,7 +29,7 @@ import java.io.IOException;
|
|||
/**
|
||||
*
|
||||
*/
|
||||
class ShardClearIndicesCacheRequest extends BroadcastShardOperationRequest {
|
||||
class ShardClearIndicesCacheRequest extends BroadcastShardRequest {
|
||||
|
||||
private boolean filterCache = false;
|
||||
private boolean fieldDataCache = false;
|
||||
|
|
|
|||
|
|
@ -19,13 +19,13 @@
|
|||
|
||||
package org.elasticsearch.action.admin.indices.cache.clear;
|
||||
|
||||
import org.elasticsearch.action.support.broadcast.BroadcastShardOperationResponse;
|
||||
import org.elasticsearch.action.support.broadcast.BroadcastShardResponse;
|
||||
import org.elasticsearch.index.shard.ShardId;
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
class ShardClearIndicesCacheResponse extends BroadcastShardOperationResponse {
|
||||
class ShardClearIndicesCacheResponse extends BroadcastShardResponse {
|
||||
|
||||
ShardClearIndicesCacheResponse() {
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ import org.elasticsearch.action.ShardOperationFailedException;
|
|||
import org.elasticsearch.action.support.ActionFilters;
|
||||
import org.elasticsearch.action.support.DefaultShardOperationFailedException;
|
||||
import org.elasticsearch.action.support.broadcast.BroadcastShardOperationFailedException;
|
||||
import org.elasticsearch.action.support.broadcast.TransportBroadcastOperationAction;
|
||||
import org.elasticsearch.action.support.broadcast.TransportBroadcastAction;
|
||||
import org.elasticsearch.cluster.ClusterService;
|
||||
import org.elasticsearch.cluster.ClusterState;
|
||||
import org.elasticsearch.cluster.block.ClusterBlockException;
|
||||
|
|
@ -47,7 +47,7 @@ import static com.google.common.collect.Lists.newArrayList;
|
|||
/**
|
||||
* Indices clear cache action.
|
||||
*/
|
||||
public class TransportClearIndicesCacheAction extends TransportBroadcastOperationAction<ClearIndicesCacheRequest, ClearIndicesCacheResponse, ShardClearIndicesCacheRequest, ShardClearIndicesCacheResponse> {
|
||||
public class TransportClearIndicesCacheAction extends TransportBroadcastAction<ClearIndicesCacheRequest, ClearIndicesCacheResponse, ShardClearIndicesCacheRequest, ShardClearIndicesCacheResponse> {
|
||||
|
||||
private final IndicesService indicesService;
|
||||
private final IndicesQueryCache indicesQueryCache;
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ package org.elasticsearch.action.admin.indices.close;
|
|||
import org.elasticsearch.action.ActionListener;
|
||||
import org.elasticsearch.action.support.ActionFilters;
|
||||
import org.elasticsearch.action.support.DestructiveOperations;
|
||||
import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction;
|
||||
import org.elasticsearch.action.support.master.TransportMasterNodeAction;
|
||||
import org.elasticsearch.cluster.ClusterService;
|
||||
import org.elasticsearch.cluster.ClusterState;
|
||||
import org.elasticsearch.cluster.ack.ClusterStateUpdateResponse;
|
||||
|
|
@ -38,7 +38,7 @@ import org.elasticsearch.transport.TransportService;
|
|||
/**
|
||||
* Close index action
|
||||
*/
|
||||
public class TransportCloseIndexAction extends TransportMasterNodeOperationAction<CloseIndexRequest, CloseIndexResponse> {
|
||||
public class TransportCloseIndexAction extends TransportMasterNodeAction<CloseIndexRequest, CloseIndexResponse> {
|
||||
|
||||
private final MetaDataIndexStateService indexStateService;
|
||||
private final DestructiveOperations destructiveOperations;
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ package org.elasticsearch.action.admin.indices.create;
|
|||
|
||||
import org.elasticsearch.action.ActionListener;
|
||||
import org.elasticsearch.action.support.ActionFilters;
|
||||
import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction;
|
||||
import org.elasticsearch.action.support.master.TransportMasterNodeAction;
|
||||
import org.elasticsearch.cluster.ClusterService;
|
||||
import org.elasticsearch.cluster.ClusterState;
|
||||
import org.elasticsearch.cluster.ack.ClusterStateUpdateResponse;
|
||||
|
|
@ -37,7 +37,7 @@ import org.elasticsearch.transport.TransportService;
|
|||
/**
|
||||
* Create index action.
|
||||
*/
|
||||
public class TransportCreateIndexAction extends TransportMasterNodeOperationAction<CreateIndexRequest, CreateIndexResponse> {
|
||||
public class TransportCreateIndexAction extends TransportMasterNodeAction<CreateIndexRequest, CreateIndexResponse> {
|
||||
|
||||
private final MetaDataCreateIndexService createIndexService;
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ import org.elasticsearch.action.ActionRequestValidationException;
|
|||
import org.elasticsearch.action.IndicesRequest;
|
||||
import org.elasticsearch.action.support.IndicesOptions;
|
||||
import org.elasticsearch.action.support.master.AcknowledgedRequest;
|
||||
import org.elasticsearch.action.support.master.MasterNodeOperationRequest;
|
||||
import org.elasticsearch.action.support.master.MasterNodeRequest;
|
||||
import org.elasticsearch.common.io.stream.StreamInput;
|
||||
import org.elasticsearch.common.io.stream.StreamOutput;
|
||||
import org.elasticsearch.common.unit.TimeValue;
|
||||
|
|
@ -37,7 +37,7 @@ import static org.elasticsearch.common.unit.TimeValue.readTimeValue;
|
|||
/**
|
||||
* A request to delete an index. Best created with {@link org.elasticsearch.client.Requests#deleteIndexRequest(String)}.
|
||||
*/
|
||||
public class DeleteIndexRequest extends MasterNodeOperationRequest<DeleteIndexRequest> implements IndicesRequest.Replaceable {
|
||||
public class DeleteIndexRequest extends MasterNodeRequest<DeleteIndexRequest> implements IndicesRequest.Replaceable {
|
||||
|
||||
private String[] indices;
|
||||
// Delete index should work by default on both open and closed indices.
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ package org.elasticsearch.action.admin.indices.delete;
|
|||
import org.elasticsearch.action.ActionListener;
|
||||
import org.elasticsearch.action.support.ActionFilters;
|
||||
import org.elasticsearch.action.support.DestructiveOperations;
|
||||
import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction;
|
||||
import org.elasticsearch.action.support.master.TransportMasterNodeAction;
|
||||
import org.elasticsearch.cluster.ClusterService;
|
||||
import org.elasticsearch.cluster.ClusterState;
|
||||
import org.elasticsearch.cluster.block.ClusterBlockException;
|
||||
|
|
@ -38,7 +38,7 @@ import org.elasticsearch.transport.TransportService;
|
|||
/**
|
||||
* Delete index action.
|
||||
*/
|
||||
public class TransportDeleteIndexAction extends TransportMasterNodeOperationAction<DeleteIndexRequest, DeleteIndexResponse> {
|
||||
public class TransportDeleteIndexAction extends TransportMasterNodeAction<DeleteIndexRequest, DeleteIndexResponse> {
|
||||
|
||||
private final MetaDataDeleteIndexService deleteIndexService;
|
||||
private final DestructiveOperations destructiveOperations;
|
||||
|
|
|
|||
|
|
@ -19,11 +19,10 @@
|
|||
|
||||
package org.elasticsearch.action.admin.indices.exists.indices;
|
||||
|
||||
import org.elasticsearch.Version;
|
||||
import org.elasticsearch.action.ActionRequestValidationException;
|
||||
import org.elasticsearch.action.IndicesRequest;
|
||||
import org.elasticsearch.action.support.IndicesOptions;
|
||||
import org.elasticsearch.action.support.master.MasterNodeReadOperationRequest;
|
||||
import org.elasticsearch.action.support.master.MasterNodeReadRequest;
|
||||
import org.elasticsearch.common.Strings;
|
||||
import org.elasticsearch.common.io.stream.StreamInput;
|
||||
import org.elasticsearch.common.io.stream.StreamOutput;
|
||||
|
|
@ -32,7 +31,7 @@ import java.io.IOException;
|
|||
|
||||
import static org.elasticsearch.action.ValidateActions.addValidationError;
|
||||
|
||||
public class IndicesExistsRequest extends MasterNodeReadOperationRequest<IndicesExistsRequest> implements IndicesRequest.Replaceable {
|
||||
public class IndicesExistsRequest extends MasterNodeReadRequest<IndicesExistsRequest> implements IndicesRequest.Replaceable {
|
||||
|
||||
private String[] indices = Strings.EMPTY_ARRAY;
|
||||
private IndicesOptions indicesOptions = IndicesOptions.fromOptions(false, false, true, true);
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ package org.elasticsearch.action.admin.indices.exists.indices;
|
|||
import org.elasticsearch.action.ActionListener;
|
||||
import org.elasticsearch.action.support.ActionFilters;
|
||||
import org.elasticsearch.action.support.IndicesOptions;
|
||||
import org.elasticsearch.action.support.master.TransportMasterNodeReadOperationAction;
|
||||
import org.elasticsearch.action.support.master.TransportMasterNodeReadAction;
|
||||
import org.elasticsearch.cluster.ClusterService;
|
||||
import org.elasticsearch.cluster.ClusterState;
|
||||
import org.elasticsearch.cluster.block.ClusterBlockException;
|
||||
|
|
@ -36,7 +36,7 @@ import org.elasticsearch.transport.TransportService;
|
|||
/**
|
||||
* Indices exists action.
|
||||
*/
|
||||
public class TransportIndicesExistsAction extends TransportMasterNodeReadOperationAction<IndicesExistsRequest, IndicesExistsResponse> {
|
||||
public class TransportIndicesExistsAction extends TransportMasterNodeReadAction<IndicesExistsRequest, IndicesExistsResponse> {
|
||||
|
||||
@Inject
|
||||
public TransportIndicesExistsAction(Settings settings, TransportService transportService, ClusterService clusterService,
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ package org.elasticsearch.action.admin.indices.exists.types;
|
|||
|
||||
import org.elasticsearch.action.ActionListener;
|
||||
import org.elasticsearch.action.support.ActionFilters;
|
||||
import org.elasticsearch.action.support.master.TransportMasterNodeReadOperationAction;
|
||||
import org.elasticsearch.action.support.master.TransportMasterNodeReadAction;
|
||||
import org.elasticsearch.cluster.ClusterService;
|
||||
import org.elasticsearch.cluster.ClusterState;
|
||||
import org.elasticsearch.cluster.block.ClusterBlockException;
|
||||
|
|
@ -35,7 +35,7 @@ import org.elasticsearch.transport.TransportService;
|
|||
/**
|
||||
* Types exists transport action.
|
||||
*/
|
||||
public class TransportTypesExistsAction extends TransportMasterNodeReadOperationAction<TypesExistsRequest, TypesExistsResponse> {
|
||||
public class TransportTypesExistsAction extends TransportMasterNodeReadAction<TypesExistsRequest, TypesExistsResponse> {
|
||||
|
||||
@Inject
|
||||
public TransportTypesExistsAction(Settings settings, TransportService transportService, ClusterService clusterService,
|
||||
|
|
|
|||
|
|
@ -18,11 +18,10 @@
|
|||
*/
|
||||
package org.elasticsearch.action.admin.indices.exists.types;
|
||||
|
||||
import org.elasticsearch.Version;
|
||||
import org.elasticsearch.action.ActionRequestValidationException;
|
||||
import org.elasticsearch.action.IndicesRequest;
|
||||
import org.elasticsearch.action.support.IndicesOptions;
|
||||
import org.elasticsearch.action.support.master.MasterNodeReadOperationRequest;
|
||||
import org.elasticsearch.action.support.master.MasterNodeReadRequest;
|
||||
import org.elasticsearch.common.io.stream.StreamInput;
|
||||
import org.elasticsearch.common.io.stream.StreamOutput;
|
||||
|
||||
|
|
@ -32,7 +31,7 @@ import static org.elasticsearch.action.ValidateActions.addValidationError;
|
|||
|
||||
/**
|
||||
*/
|
||||
public class TypesExistsRequest extends MasterNodeReadOperationRequest<TypesExistsRequest> implements IndicesRequest.Replaceable {
|
||||
public class TypesExistsRequest extends MasterNodeReadRequest<TypesExistsRequest> implements IndicesRequest.Replaceable {
|
||||
|
||||
private String[] indices;
|
||||
private String[] types;
|
||||
|
|
|
|||
|
|
@ -19,9 +19,8 @@
|
|||
|
||||
package org.elasticsearch.action.admin.indices.flush;
|
||||
|
||||
import org.elasticsearch.Version;
|
||||
import org.elasticsearch.action.ActionRequest;
|
||||
import org.elasticsearch.action.support.broadcast.BroadcastOperationRequest;
|
||||
import org.elasticsearch.action.support.broadcast.BroadcastRequest;
|
||||
import org.elasticsearch.common.io.stream.StreamInput;
|
||||
import org.elasticsearch.common.io.stream.StreamOutput;
|
||||
|
||||
|
|
@ -38,7 +37,7 @@ import java.io.IOException;
|
|||
* @see org.elasticsearch.client.IndicesAdminClient#flush(FlushRequest)
|
||||
* @see FlushResponse
|
||||
*/
|
||||
public class FlushRequest extends BroadcastOperationRequest<FlushRequest> {
|
||||
public class FlushRequest extends BroadcastRequest<FlushRequest> {
|
||||
|
||||
private boolean force = false;
|
||||
private boolean waitIfOngoing = false;
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
package org.elasticsearch.action.admin.indices.flush;
|
||||
|
||||
import org.elasticsearch.action.ShardOperationFailedException;
|
||||
import org.elasticsearch.action.support.broadcast.BroadcastOperationResponse;
|
||||
import org.elasticsearch.action.support.broadcast.BroadcastResponse;
|
||||
import org.elasticsearch.common.io.stream.StreamInput;
|
||||
import org.elasticsearch.common.io.stream.StreamOutput;
|
||||
|
||||
|
|
@ -32,7 +32,7 @@ import java.util.List;
|
|||
*
|
||||
*
|
||||
*/
|
||||
public class FlushResponse extends BroadcastOperationResponse {
|
||||
public class FlushResponse extends BroadcastResponse {
|
||||
|
||||
FlushResponse() {
|
||||
|
||||
|
|
|
|||
|
|
@ -19,8 +19,7 @@
|
|||
|
||||
package org.elasticsearch.action.admin.indices.flush;
|
||||
|
||||
import org.elasticsearch.Version;
|
||||
import org.elasticsearch.action.support.broadcast.BroadcastShardOperationRequest;
|
||||
import org.elasticsearch.action.support.broadcast.BroadcastShardRequest;
|
||||
import org.elasticsearch.common.io.stream.StreamInput;
|
||||
import org.elasticsearch.common.io.stream.StreamOutput;
|
||||
import org.elasticsearch.index.shard.ShardId;
|
||||
|
|
@ -30,7 +29,7 @@ import java.io.IOException;
|
|||
/**
|
||||
*
|
||||
*/
|
||||
class ShardFlushRequest extends BroadcastShardOperationRequest {
|
||||
class ShardFlushRequest extends BroadcastShardRequest {
|
||||
private FlushRequest request = new FlushRequest();
|
||||
|
||||
ShardFlushRequest() {
|
||||
|
|
|
|||
|
|
@ -19,13 +19,13 @@
|
|||
|
||||
package org.elasticsearch.action.admin.indices.flush;
|
||||
|
||||
import org.elasticsearch.action.support.broadcast.BroadcastShardOperationResponse;
|
||||
import org.elasticsearch.action.support.broadcast.BroadcastShardResponse;
|
||||
import org.elasticsearch.index.shard.ShardId;
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
class ShardFlushResponse extends BroadcastShardOperationResponse {
|
||||
class ShardFlushResponse extends BroadcastShardResponse {
|
||||
|
||||
ShardFlushResponse() {
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ import org.elasticsearch.action.ShardOperationFailedException;
|
|||
import org.elasticsearch.action.support.ActionFilters;
|
||||
import org.elasticsearch.action.support.DefaultShardOperationFailedException;
|
||||
import org.elasticsearch.action.support.broadcast.BroadcastShardOperationFailedException;
|
||||
import org.elasticsearch.action.support.broadcast.TransportBroadcastOperationAction;
|
||||
import org.elasticsearch.action.support.broadcast.TransportBroadcastAction;
|
||||
import org.elasticsearch.cluster.ClusterService;
|
||||
import org.elasticsearch.cluster.ClusterState;
|
||||
import org.elasticsearch.cluster.block.ClusterBlockException;
|
||||
|
|
@ -45,7 +45,7 @@ import static com.google.common.collect.Lists.newArrayList;
|
|||
/**
|
||||
* Flush Action.
|
||||
*/
|
||||
public class TransportFlushAction extends TransportBroadcastOperationAction<FlushRequest, FlushResponse, ShardFlushRequest, ShardFlushResponse> {
|
||||
public class TransportFlushAction extends TransportBroadcastAction<FlushRequest, FlushResponse, ShardFlushRequest, ShardFlushResponse> {
|
||||
|
||||
private final IndicesService indicesService;
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ package org.elasticsearch.action.admin.indices.mapping.put;
|
|||
|
||||
import org.elasticsearch.action.ActionListener;
|
||||
import org.elasticsearch.action.support.ActionFilters;
|
||||
import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction;
|
||||
import org.elasticsearch.action.support.master.TransportMasterNodeAction;
|
||||
import org.elasticsearch.cluster.ClusterService;
|
||||
import org.elasticsearch.cluster.ClusterState;
|
||||
import org.elasticsearch.cluster.ack.ClusterStateUpdateResponse;
|
||||
|
|
@ -36,7 +36,7 @@ import org.elasticsearch.transport.TransportService;
|
|||
/**
|
||||
* Put mapping action.
|
||||
*/
|
||||
public class TransportPutMappingAction extends TransportMasterNodeOperationAction<PutMappingRequest, PutMappingResponse> {
|
||||
public class TransportPutMappingAction extends TransportMasterNodeAction<PutMappingRequest, PutMappingResponse> {
|
||||
|
||||
private final MetaDataMappingService metaDataMappingService;
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ package org.elasticsearch.action.admin.indices.open;
|
|||
import org.elasticsearch.action.ActionListener;
|
||||
import org.elasticsearch.action.support.ActionFilters;
|
||||
import org.elasticsearch.action.support.DestructiveOperations;
|
||||
import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction;
|
||||
import org.elasticsearch.action.support.master.TransportMasterNodeAction;
|
||||
import org.elasticsearch.cluster.ClusterService;
|
||||
import org.elasticsearch.cluster.ClusterState;
|
||||
import org.elasticsearch.cluster.ack.ClusterStateUpdateResponse;
|
||||
|
|
@ -38,7 +38,7 @@ import org.elasticsearch.transport.TransportService;
|
|||
/**
|
||||
* Open index action
|
||||
*/
|
||||
public class TransportOpenIndexAction extends TransportMasterNodeOperationAction<OpenIndexRequest, OpenIndexResponse> {
|
||||
public class TransportOpenIndexAction extends TransportMasterNodeAction<OpenIndexRequest, OpenIndexResponse> {
|
||||
|
||||
private final MetaDataIndexStateService indexStateService;
|
||||
private final DestructiveOperations destructiveOperations;
|
||||
|
|
|
|||
|
|
@ -19,8 +19,7 @@
|
|||
|
||||
package org.elasticsearch.action.admin.indices.optimize;
|
||||
|
||||
import org.elasticsearch.Version;
|
||||
import org.elasticsearch.action.support.broadcast.BroadcastOperationRequest;
|
||||
import org.elasticsearch.action.support.broadcast.BroadcastRequest;
|
||||
import org.elasticsearch.common.io.stream.StreamInput;
|
||||
import org.elasticsearch.common.io.stream.StreamOutput;
|
||||
|
||||
|
|
@ -37,7 +36,7 @@ import java.io.IOException;
|
|||
* @see org.elasticsearch.client.IndicesAdminClient#optimize(OptimizeRequest)
|
||||
* @see OptimizeResponse
|
||||
*/
|
||||
public class OptimizeRequest extends BroadcastOperationRequest<OptimizeRequest> {
|
||||
public class OptimizeRequest extends BroadcastRequest<OptimizeRequest> {
|
||||
|
||||
public static final class Defaults {
|
||||
public static final int MAX_NUM_SEGMENTS = -1;
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
package org.elasticsearch.action.admin.indices.optimize;
|
||||
|
||||
import org.elasticsearch.action.ShardOperationFailedException;
|
||||
import org.elasticsearch.action.support.broadcast.BroadcastOperationResponse;
|
||||
import org.elasticsearch.action.support.broadcast.BroadcastResponse;
|
||||
import org.elasticsearch.common.io.stream.StreamInput;
|
||||
import org.elasticsearch.common.io.stream.StreamOutput;
|
||||
|
||||
|
|
@ -32,7 +32,7 @@ import java.util.List;
|
|||
*
|
||||
*
|
||||
*/
|
||||
public class OptimizeResponse extends BroadcastOperationResponse {
|
||||
public class OptimizeResponse extends BroadcastResponse {
|
||||
|
||||
OptimizeResponse() {
|
||||
|
||||
|
|
|
|||
|
|
@ -20,8 +20,7 @@
|
|||
package org.elasticsearch.action.admin.indices.optimize;
|
||||
|
||||
|
||||
import org.elasticsearch.Version;
|
||||
import org.elasticsearch.action.support.broadcast.BroadcastShardOperationRequest;
|
||||
import org.elasticsearch.action.support.broadcast.BroadcastShardRequest;
|
||||
import org.elasticsearch.common.io.stream.StreamInput;
|
||||
import org.elasticsearch.common.io.stream.StreamOutput;
|
||||
import org.elasticsearch.index.shard.ShardId;
|
||||
|
|
@ -31,7 +30,7 @@ import java.io.IOException;
|
|||
/**
|
||||
*
|
||||
*/
|
||||
final class ShardOptimizeRequest extends BroadcastShardOperationRequest {
|
||||
final class ShardOptimizeRequest extends BroadcastShardRequest {
|
||||
|
||||
private OptimizeRequest request = new OptimizeRequest();
|
||||
|
||||
|
|
|
|||
|
|
@ -19,13 +19,13 @@
|
|||
|
||||
package org.elasticsearch.action.admin.indices.optimize;
|
||||
|
||||
import org.elasticsearch.action.support.broadcast.BroadcastShardOperationResponse;
|
||||
import org.elasticsearch.action.support.broadcast.BroadcastShardResponse;
|
||||
import org.elasticsearch.index.shard.ShardId;
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
class ShardOptimizeResponse extends BroadcastShardOperationResponse {
|
||||
class ShardOptimizeResponse extends BroadcastShardResponse {
|
||||
|
||||
ShardOptimizeResponse() {
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ import org.elasticsearch.action.ShardOperationFailedException;
|
|||
import org.elasticsearch.action.support.ActionFilters;
|
||||
import org.elasticsearch.action.support.DefaultShardOperationFailedException;
|
||||
import org.elasticsearch.action.support.broadcast.BroadcastShardOperationFailedException;
|
||||
import org.elasticsearch.action.support.broadcast.TransportBroadcastOperationAction;
|
||||
import org.elasticsearch.action.support.broadcast.TransportBroadcastAction;
|
||||
import org.elasticsearch.cluster.ClusterService;
|
||||
import org.elasticsearch.cluster.ClusterState;
|
||||
import org.elasticsearch.cluster.block.ClusterBlockException;
|
||||
|
|
@ -45,7 +45,7 @@ import static com.google.common.collect.Lists.newArrayList;
|
|||
/**
|
||||
* Optimize index/indices action.
|
||||
*/
|
||||
public class TransportOptimizeAction extends TransportBroadcastOperationAction<OptimizeRequest, OptimizeResponse, ShardOptimizeRequest, ShardOptimizeResponse> {
|
||||
public class TransportOptimizeAction extends TransportBroadcastAction<OptimizeRequest, OptimizeResponse, ShardOptimizeRequest, ShardOptimizeResponse> {
|
||||
|
||||
private final IndicesService indicesService;
|
||||
|
||||
|
|
|
|||
|
|
@ -19,17 +19,17 @@
|
|||
|
||||
package org.elasticsearch.action.admin.indices.recovery;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
import org.elasticsearch.action.support.broadcast.BroadcastOperationRequest;
|
||||
import org.elasticsearch.action.support.broadcast.BroadcastRequest;
|
||||
import org.elasticsearch.common.Strings;
|
||||
import org.elasticsearch.common.io.stream.StreamInput;
|
||||
import org.elasticsearch.common.io.stream.StreamOutput;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
/**
|
||||
* Request for recovery information
|
||||
*/
|
||||
public class RecoveryRequest extends BroadcastOperationRequest<RecoveryRequest> {
|
||||
public class RecoveryRequest extends BroadcastRequest<RecoveryRequest> {
|
||||
|
||||
private boolean detailed = false; // Provides extra details in the response
|
||||
private boolean activeOnly = false; // Only reports on active recoveries
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
package org.elasticsearch.action.admin.indices.recovery;
|
||||
|
||||
import org.elasticsearch.action.ShardOperationFailedException;
|
||||
import org.elasticsearch.action.support.broadcast.BroadcastOperationResponse;
|
||||
import org.elasticsearch.action.support.broadcast.BroadcastResponse;
|
||||
import org.elasticsearch.common.io.stream.StreamInput;
|
||||
import org.elasticsearch.common.io.stream.StreamOutput;
|
||||
import org.elasticsearch.common.xcontent.ToXContent;
|
||||
|
|
@ -35,7 +35,7 @@ import java.util.Map;
|
|||
/**
|
||||
* Information regarding the recovery state of indices and their associated shards.
|
||||
*/
|
||||
public class RecoveryResponse extends BroadcastOperationResponse implements ToXContent {
|
||||
public class RecoveryResponse extends BroadcastResponse implements ToXContent {
|
||||
|
||||
private boolean detailed = false;
|
||||
private Map<String, List<ShardRecoveryResponse>> shardResponses = new HashMap<>();
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
package org.elasticsearch.action.admin.indices.recovery;
|
||||
|
||||
import org.elasticsearch.action.support.broadcast.BroadcastShardOperationResponse;
|
||||
import org.elasticsearch.action.support.broadcast.BroadcastShardResponse;
|
||||
import org.elasticsearch.common.Nullable;
|
||||
import org.elasticsearch.common.io.stream.StreamInput;
|
||||
import org.elasticsearch.common.io.stream.StreamOutput;
|
||||
|
|
@ -33,7 +33,7 @@ import java.io.IOException;
|
|||
/**
|
||||
* Information regarding the recovery state of a shard.
|
||||
*/
|
||||
public class ShardRecoveryResponse extends BroadcastShardOperationResponse implements ToXContent {
|
||||
public class ShardRecoveryResponse extends BroadcastShardResponse implements ToXContent {
|
||||
|
||||
RecoveryState recoveryState;
|
||||
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue