lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject [01/50] lucene-solr:jira/solr-9858: Merge branch 'master' into jira/solr-9858
Date Thu, 09 Feb 2017 20:09:18 GMT
Repository: lucene-solr
Updated Branches:
  refs/heads/jira/solr-9858 100ee7ed6 -> 32ab5aa4e


Merge branch 'master' into jira/solr-9858


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/243a006d
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/243a006d
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/243a006d

Branch: refs/heads/jira/solr-9858
Commit: 243a006d2e33795c4dc4981a529c4710977ea9a6
Parents: 100ee7e bef725a
Author: Andrzej Bialecki <ab@apache.org>
Authored: Wed Feb 1 17:54:11 2017 +0100
Committer: Andrzej Bialecki <ab@apache.org>
Committed: Wed Feb 1 17:54:11 2017 +0100

----------------------------------------------------------------------
 lucene/CHANGES.txt                              |   55 +
 .../miscellaneous/WordDelimiterGraphFilter.java |    2 -
 .../TestWordDelimiterGraphFilter.java           |   15 +-
 lucene/common-build.xml                         |    2 +
 .../CompressingStoredFieldsWriter.java          |    5 +-
 .../codecs/compressing/CompressionMode.java     |   49 +-
 .../lucene/codecs/compressing/Compressor.java   |    3 +-
 .../org/apache/lucene/geo/GeoEncodingUtils.java |  233 ++++
 .../java/org/apache/lucene/geo/GeoUtils.java    |   50 +
 .../org/apache/lucene/index/FieldInfos.java     |    6 +
 .../apache/lucene/index/IndexReaderContext.java |    7 +-
 .../org/apache/lucene/index/IndexWriter.java    |   16 +
 .../org/apache/lucene/index/TermContext.java    |   21 +-
 .../apache/lucene/search/BlendedTermQuery.java  |   12 +-
 .../org/apache/lucene/search/TermQuery.java     |    6 +-
 .../lucene/search/spans/SpanTermQuery.java      |    4 +-
 .../java/org/apache/lucene/util/Version.java    |    7 +
 .../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/LatLonDocValuesBoxQuery.java       |  145 +++
 .../document/LatLonDocValuesDistanceQuery.java  |  132 +++
 .../lucene/document/LatLonDocValuesField.java   |   46 +
 .../document/LatLonPointDistanceQuery.java      |   71 +-
 .../document/LatLonPointInPolygonQuery.java     |    6 +-
 .../lucene/search/TermAutomatonQuery.java       |    2 +-
 .../search/TestLatLonDocValuesQueries.java      |   62 +
 lucene/site/changes/changes2html.pl             |    7 +-
 .../analyzing/AnalyzingInfixSuggester.java      |    4 +-
 .../analyzing/AnalyzingInfixSuggesterTest.java  |   13 +-
 .../lucene/analysis/CannedTokenStream.java      |   28 +-
 .../dummy/DummyCompressingCodec.java            |    3 +
 .../apache/lucene/geo/BaseGeoPointTestCase.java |   29 +-
 solr/CHANGES.txt                                |   53 +-
 solr/bin/solr                                   |   13 +-
 solr/bin/solr.cmd                               |   44 +-
 .../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 +
 .../client/solrj/embedded/JettySolrRunner.java  |   58 +
 .../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 ++
 .../handler/component/RealTimeGetComponent.java |  369 +++++-
 .../handler/component/SpellCheckComponent.java  |   12 +-
 .../solr/metrics/SolrCoreMetricManager.java     |    7 -
 .../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   |   61 +-
 .../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 +-
 .../apache/solr/update/AddUpdateCommand.java    |   36 +-
 .../solr/update/DirectUpdateHandler2.java       |   52 +-
 .../org/apache/solr/update/DocumentBuilder.java |  151 ++-
 .../java/org/apache/solr/update/PeerSync.java   |   10 +
 .../apache/solr/update/SolrCmdDistributor.java  |    4 +
 .../org/apache/solr/update/TransactionLog.java  |   43 +-
 .../java/org/apache/solr/update/UpdateLog.java  |  242 +++-
 .../org/apache/solr/update/VersionInfo.java     |    7 +
 .../processor/AtomicUpdateDocumentMerger.java   |  182 ++-
 .../processor/DistributedUpdateProcessor.java   |  258 +++-
 ...BasedVersionConstraintsProcessorFactory.java |    2 +-
 .../SkipExistingDocumentsProcessorFactory.java  |    5 +-
 .../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 +
 .../collection1/conf/schema-inplace-updates.xml |   67 ++
 .../test-files/solr/collection1/conf/schema.xml |   14 +-
 .../solr/collection1/conf/schema15.xml          |    7 +-
 .../conf/solrconfig-managed-schema.xml          |    2 +-
 .../solrconfig-sortingmergepolicyfactory.xml    |    3 +-
 .../test/org/apache/solr/api/TestPathTrie.java  |   61 +
 ...ConcurrentDeleteAndCreateCollectionTest.java |   33 +-
 .../org/apache/solr/cloud/MockZkController.java |   36 +
 .../cloud/SegmentTerminateEarlyTestState.java   |   14 +-
 .../apache/solr/cloud/TestSegmentSorting.java   |  165 ++-
 .../solr/cloud/TestStressInPlaceUpdates.java    |  612 ++++++++++
 .../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 ++
 .../component/SpellCheckComponentTest.java      |   79 +-
 .../solr/metrics/SolrMetricManagerTest.java     |   27 +-
 .../solr/rest/schema/TestBulkSchemaAPI.java     |   15 +
 .../schema/TestManagedSchemaThreadSafety.java   |   32 +-
 .../ApacheLuceneSolrNearQueryBuilder.java       |   12 +-
 .../solr/search/ChooseOneWordQueryBuilder.java  |   62 +
 .../apache/solr/search/HandyQueryBuilder.java   |   25 +-
 .../org/apache/solr/search/TestFiltering.java   |   58 +-
 .../org/apache/solr/search/TestRecovery.java    |  149 ++-
 .../apache/solr/search/TestSolrCoreParser.java  |  108 ++
 .../solr/security/BasicAuthIntegrationTest.java |    4 +
 .../TestRuleBasedAuthorizationPlugin.java       |    8 +-
 .../solr/servlet/SolrRequestParserTest.java     |    4 +-
 .../org/apache/solr/update/PeerSyncTest.java    |  152 ++-
 .../apache/solr/update/SolrIndexConfigTest.java |    4 +-
 .../solr/update/SolrIndexMetricsTest.java       |    2 +-
 .../solr/update/TestInPlaceUpdatesDistrib.java  | 1101 ++++++++++++++++++
 .../update/TestInPlaceUpdatesStandalone.java    | 1100 +++++++++++++++++
 .../test/org/apache/solr/update/TestUpdate.java |    2 +-
 .../org/apache/solr/update/UpdateLogTest.java   |  271 +++++
 .../update/processor/AtomicUpdatesTest.java     |  147 +++
 .../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 +
 .../apache/solr/common/util/JavaBinCodec.java   |   10 +-
 .../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 +
 .../web/js/angular/controllers/plugins.js       |    1 +
 248 files changed, 14407 insertions(+), 2171 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/243a006d/solr/core/src/java/org/apache/solr/core/CoreContainer.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/243a006d/solr/core/src/java/org/apache/solr/metrics/SolrCoreMetricManager.java
----------------------------------------------------------------------
diff --cc solr/core/src/java/org/apache/solr/metrics/SolrCoreMetricManager.java
index da901e2,eb5b687..249173a
--- a/solr/core/src/java/org/apache/solr/metrics/SolrCoreMetricManager.java
+++ b/solr/core/src/java/org/apache/solr/metrics/SolrCoreMetricManager.java
@@@ -97,16 -73,6 +97,9 @@@ public class SolrCoreMetricManager impl
      }
      // close old reporters
      metricManager.closeReporters(oldRegistryName);
-     metricManager.moveMetrics(oldRegistryName, registryName, null);
-     // old registry is no longer used - we have moved the metrics
-     metricManager.removeRegistry(oldRegistryName);
 +    if (oldLeaderRegistryName != null) {
 +      metricManager.closeReporters(oldLeaderRegistryName);
-       if (leaderRegistryName != null) {
-         metricManager.moveMetrics(oldLeaderRegistryName, leaderRegistryName, null);
-         metricManager.removeRegistry(oldLeaderRegistryName);
-       }
 +    }
      // load reporters again, using the new core name
      loadReporters();
    }

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/243a006d/solr/core/src/java/org/apache/solr/metrics/SolrMetricManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/243a006d/solr/core/src/java/org/apache/solr/update/PeerSync.java
----------------------------------------------------------------------


Mime
View raw message