You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jb...@apache.org on 2017/02/15 20:47:52 UTC
[40/50] lucene-solr:master: Merge branch 'apache-https-master' into
jira/solr-8593
Merge branch 'apache-https-master' into jira/solr-8593
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/7a3dd46b
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/7a3dd46b
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/7a3dd46b
Branch: refs/heads/master
Commit: 7a3dd46bbf4216d75dd57b51570d26f9e8929ded
Parents: 89b39e4 bef725a
Author: Kevin Risden <kr...@apache.org>
Authored: Wed Feb 1 12:00:22 2017 -0500
Committer: Kevin Risden <kr...@apache.org>
Committed: Wed Feb 1 12:00:22 2017 -0500
----------------------------------------------------------------------
lucene/CHANGES.txt | 31 +
.../miscellaneous/WordDelimiterGraphFilter.java | 2 -
.../TestWordDelimiterGraphFilter.java | 15 +-
lucene/common-build.xml | 2 +
.../org/apache/lucene/geo/GeoEncodingUtils.java | 145 ++++-
.../java/org/apache/lucene/geo/GeoUtils.java | 13 +-
.../lucene60/TestLucene60PointsFormat.java | 9 +-
.../org/apache/lucene/geo/TestGeoUtils.java | 12 +
lucene/join/build.xml | 21 -
.../join/ParentChildrenBlockJoinQuery.java | 199 +++++++
.../search/join/ToParentBlockJoinCollector.java | 507 ----------------
.../join/ToParentBlockJoinIndexSearcher.java | 73 ---
.../search/join/ToParentBlockJoinQuery.java | 428 ++++++--------
.../apache/lucene/search/join/package-info.java | 31 +-
.../lucene/search/join/TestBlockJoin.java | 591 ++++---------------
.../search/join/TestBlockJoinValidation.java | 19 -
.../apache/lucene/search/join/TestJoinUtil.java | 110 ++--
.../join/TestParentChildrenBlockJoinQuery.java | 104 ++++
.../lucene/queryparser/xml/CoreParser.java | 18 +-
.../lucene/queryparser/xml/TestCoreParser.java | 19 +-
.../document/LatLonDocValuesDistanceQuery.java | 2 +-
.../document/LatLonPointDistanceQuery.java | 2 +-
.../document/LatLonPointInPolygonQuery.java | 6 +-
.../analyzing/AnalyzingInfixSuggester.java | 4 +-
.../analyzing/AnalyzingInfixSuggesterTest.java | 13 +-
.../lucene/analysis/CannedTokenStream.java | 28 +-
solr/CHANGES.txt | 25 +-
solr/bin/solr | 13 +-
solr/bin/solr.cmd | 4 +-
.../dataimport/TestMailEntityProcessor.java | 1 +
.../apache/solr/hadoop/MorphlineMapperTest.java | 3 +-
.../solr/hadoop/MorphlineReducerTest.java | 2 +-
solr/core/src/java/org/apache/solr/api/Api.java | 67 +++
.../src/java/org/apache/solr/api/ApiBag.java | 354 +++++++++++
.../java/org/apache/solr/api/ApiSupport.java | 46 ++
.../java/org/apache/solr/api/SpecProvider.java | 25 +
.../java/org/apache/solr/api/V2HttpCall.java | 340 +++++++++++
.../java/org/apache/solr/api/package-info.java | 21 +
.../src/java/org/apache/solr/cloud/Assign.java | 10 +-
.../org/apache/solr/cloud/CreateShardCmd.java | 2 +-
.../apache/solr/cloud/DeleteCollectionCmd.java | 7 +
.../org/apache/solr/core/CoreContainer.java | 10 +-
.../java/org/apache/solr/core/PluginBag.java | 71 ++-
.../java/org/apache/solr/core/SolrCores.java | 4 +-
.../solr/core/snapshots/SolrSnapshotsTool.java | 15 +-
.../org/apache/solr/handler/BlobHandler.java | 14 +-
.../apache/solr/handler/DumpRequestHandler.java | 11 +
.../apache/solr/handler/PingRequestHandler.java | 5 +
.../apache/solr/handler/RealTimeGetHandler.java | 14 +
.../apache/solr/handler/ReplicationHandler.java | 25 +-
.../apache/solr/handler/RequestHandlerBase.java | 12 +-
.../org/apache/solr/handler/SchemaHandler.java | 35 +-
.../apache/solr/handler/SolrConfigHandler.java | 16 +
.../solr/handler/UpdateRequestHandler.java | 2 +
.../solr/handler/UpdateRequestHandlerApi.java | 73 +++
.../handler/admin/BaseHandlerApiSupport.java | 236 ++++++++
.../handler/admin/CollectionHandlerApi.java | 319 ++++++++++
.../solr/handler/admin/CollectionsHandler.java | 69 ++-
.../solr/handler/admin/ConfigSetsHandler.java | 47 +-
.../handler/admin/ConfigSetsHandlerApi.java | 112 ++++
.../solr/handler/admin/CoreAdminHandler.java | 14 +
.../solr/handler/admin/CoreAdminHandlerApi.java | 175 ++++++
.../apache/solr/handler/admin/InfoHandler.java | 78 +--
.../solr/handler/admin/SecurityConfHandler.java | 70 +++
.../solr/metrics/SolrCoreMetricManager.java | 3 -
.../apache/solr/metrics/SolrMetricManager.java | 85 ++-
.../org/apache/solr/query/SolrRangeQuery.java | 4 +-
.../apache/solr/request/SolrQueryRequest.java | 24 +
.../solr/request/SolrQueryRequestBase.java | 35 ++
.../org/apache/solr/schema/SchemaManager.java | 13 +-
.../java/org/apache/solr/search/BitDocSet.java | 2 +-
.../src/java/org/apache/solr/search/DocSet.java | 4 +-
.../java/org/apache/solr/search/DocSetBase.java | 21 +-
.../org/apache/solr/search/DocSetCollector.java | 7 +
.../java/org/apache/solr/search/DocSetUtil.java | 62 +-
.../java/org/apache/solr/search/DocSlice.java | 8 +-
.../java/org/apache/solr/search/HashDocSet.java | 2 +-
.../org/apache/solr/search/SolrCoreParser.java | 42 +-
.../apache/solr/search/SolrIndexSearcher.java | 55 +-
.../solr/search/SolrSpanQueryBuilder.java | 33 ++
.../org/apache/solr/search/SortedIntDocSet.java | 2 +-
.../solr/search/grouping/CommandHandler.java | 3 +-
.../search/join/BlockJoinFacetAccsHolder.java | 14 -
.../apache/solr/security/BasicAuthPlugin.java | 10 +-
.../security/RuleBasedAuthorizationPlugin.java | 11 +-
.../security/Sha256AuthenticationProvider.java | 8 +
.../org/apache/solr/servlet/HttpSolrCall.java | 115 +++-
.../org/apache/solr/servlet/ResponseUtils.java | 6 +
.../apache/solr/servlet/SolrDispatchFilter.java | 18 +-
.../apache/solr/servlet/SolrRequestParsers.java | 27 +-
.../org/apache/solr/util/CommandOperation.java | 4 +
.../apache/solr/util/JsonSchemaValidator.java | 370 ++++++++++++
.../src/java/org/apache/solr/util/PathTrie.java | 195 ++++++
solr/core/src/resources/ImplicitPlugins.json | 6 +-
.../src/resources/apispec/cluster.Commands.json | 74 +++
.../apispec/cluster.commandstatus.delete.json | 10 +
.../apispec/cluster.commandstatus.json | 20 +
.../apispec/cluster.configs.Commands.json | 34 ++
.../apispec/cluster.configs.delete.json | 12 +
.../src/resources/apispec/cluster.configs.json | 12 +
solr/core/src/resources/apispec/cluster.json | 14 +
.../src/resources/apispec/cluster.nodes.json | 12 +
.../cluster.security.BasicAuth.Commands.json | 23 +
...cluster.security.RuleBasedAuthorization.json | 129 ++++
...luster.security.authentication.Commands.json | 12 +
.../cluster.security.authentication.json | 12 +
...cluster.security.authorization.Commands.json | 13 +
.../apispec/cluster.security.authorization.json | 13 +
.../resources/apispec/collections.Commands.json | 206 +++++++
.../collections.collection.Commands.json | 137 +++++
.../collections.collection.Commands.modify.json | 36 ++
.../collections.collection.Commands.reload.json | 11 +
.../apispec/collections.collection.delete.json | 13 +
.../apispec/collections.collection.json | 19 +
.../collections.collection.shards.Commands.json | 109 ++++
...ctions.collection.shards.shard.Commands.json | 24 +
...lections.collection.shards.shard.delete.json | 27 +
....collection.shards.shard.replica.delete.json | 39 ++
.../core/src/resources/apispec/collections.json | 13 +
.../src/resources/apispec/core.RealtimeGet.json | 26 +
.../apispec/core.SchemaEdit.addCopyField.json | 27 +
.../apispec/core.SchemaEdit.addField.json | 98 +++
.../core.SchemaEdit.addFieldType.analyzers.json | 51 ++
.../apispec/core.SchemaEdit.addFieldType.json | 53 ++
.../core.SchemaEdit.deleteCopyField.json | 19 +
.../core.SchemaEdit.deleteDynamicField.json | 12 +
.../apispec/core.SchemaEdit.deleteField.json | 12 +
.../core.SchemaEdit.deleteFieldType.json | 14 +
.../src/resources/apispec/core.SchemaEdit.json | 47 ++
.../apispec/core.SchemaRead.copyFields.json | 26 +
...ore.SchemaRead.dynamicFields_fieldTypes.json | 20 +
.../apispec/core.SchemaRead.fields.json | 34 ++
.../src/resources/apispec/core.SchemaRead.json | 18 +
.../core/src/resources/apispec/core.Update.json | 17 +
...g.Commands.addRequestHandler.properties.json | 25 +
.../apispec/core.config.Commands.generic.json | 19 +
.../resources/apispec/core.config.Commands.json | 215 +++++++
.../core.config.Commands.runtimeLib.json | 23 +
.../apispec/core.config.Params.Commands.json | 31 +
.../resources/apispec/core.config.Params.json | 13 +
.../core/src/resources/apispec/core.config.json | 18 +
.../src/resources/apispec/core.system.blob.json | 20 +
.../apispec/core.system.blob.upload.json | 12 +
.../src/resources/apispec/cores.Commands.json | 85 +++
.../src/resources/apispec/cores.Status.json | 20 +
.../resources/apispec/cores.core.Commands.json | 136 +++++
.../apispec/cores.core.Commands.split.json | 34 ++
solr/core/src/resources/apispec/emptySpec.json | 11 +
.../src/resources/apispec/node.Commands.json | 24 +
solr/core/src/resources/apispec/node.Info.json | 11 +
.../core/src/resources/apispec/node.invoke.json | 16 +
.../conf/solrconfig-managed-schema.xml | 2 +-
.../test/org/apache/solr/api/TestPathTrie.java | 61 ++
...ConcurrentDeleteAndCreateCollectionTest.java | 33 +-
.../cloud/hdfs/HdfsBasicDistributedZkTest.java | 2 +
.../apache/solr/cloud/hdfs/HdfsTestUtil.java | 2 +-
.../org/apache/solr/cloud/rule/RulesTest.java | 18 +
.../solr/core/BlobStoreTestRequestHandler.java | 1 +
.../test/org/apache/solr/core/SolrCoreTest.java | 1 +
.../apache/solr/core/TestDynamicLoading.java | 2 +-
.../org/apache/solr/core/TestLazyCores.java | 75 +++
.../apache/solr/core/TestSolrConfigHandler.java | 97 ++-
.../core/snapshots/TestSolrCloudSnapshots.java | 18 +
.../solr/handler/TestReplicationHandler.java | 16 +
.../solr/handler/V2ApiIntegrationTest.java | 98 +++
.../solr/handler/admin/TestApiFramework.java | 219 +++++++
.../solr/handler/admin/TestCollectionAPIs.java | 231 ++++++++
.../solr/handler/admin/TestConfigsApi.java | 59 ++
.../solr/handler/admin/TestCoreAdminApis.java | 115 ++++
.../solr/metrics/SolrMetricManagerTest.java | 27 +-
.../solr/rest/schema/TestBulkSchemaAPI.java | 15 +
.../ApacheLuceneSolrNearQueryBuilder.java | 12 +-
.../solr/search/ChooseOneWordQueryBuilder.java | 62 ++
.../apache/solr/search/HandyQueryBuilder.java | 25 +-
.../org/apache/solr/search/TestFiltering.java | 58 +-
.../apache/solr/search/TestSolrCoreParser.java | 108 ++++
.../solr/security/BasicAuthIntegrationTest.java | 4 +
.../TestRuleBasedAuthorizationPlugin.java | 8 +-
.../solr/servlet/SolrRequestParserTest.java | 4 +-
.../solr/update/SolrIndexMetricsTest.java | 2 +-
.../org/apache/solr/util/JsonValidatorTest.java | 189 ++++++
.../conf/solrconfig.xml | 8 +-
.../apache/solr/client/solrj/SolrRequest.java | 13 +-
.../solr/client/solrj/impl/CloudSolrClient.java | 16 +-
.../client/solrj/request/CoreAdminRequest.java | 18 +
.../org/apache/solr/common/cloud/Replica.java | 3 +
.../org/apache/solr/common/util/StrUtils.java | 10 +-
.../java/org/apache/solr/common/util/Utils.java | 5 +-
.../solr/common/util/ValidatingJsonMap.java | 349 +++++++++++
.../AbstractEmbeddedSolrServerTestCase.java | 22 +-
.../solrj/embedded/SolrExampleJettyTest.java | 9 +-
.../client/solrj/request/TestCoreAdmin.java | 95 +++
.../solr/common/util/TestValidatingJsonMap.java | 52 ++
.../org/apache/solr/util/ExternalPaths.java | 2 +-
.../org/apache/solr/util/RestTestHarness.java | 8 +
195 files changed, 8512 insertions(+), 1813 deletions(-)
----------------------------------------------------------------------