You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2016/08/11 06:44:18 UTC
[2/2] lucene-solr:master: Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Conflicts:
solr/CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/92b5a76b
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/92b5a76b
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/92b5a76b
Branch: refs/heads/master
Commit: 92b5a76b543087a219d3d5dbcd7c93f84edafbf7
Parents: ae60c74 bc25a56
Author: Noble Paul <no...@apache.org>
Authored: Thu Aug 11 12:13:38 2016 +0530
Committer: Noble Paul <no...@apache.org>
Committed: Thu Aug 11 12:13:38 2016 +0530
----------------------------------------------------------------------
lucene/CHANGES.txt | 16 +-
.../lucene/analysis/minhash/MinHashFilter.java | 1 +
.../icu/src/data/uax29/MyanmarSyllable.rbbi | 50 ++
.../segmentation/DefaultICUTokenizerConfig.java | 14 +-
.../analysis/icu/segmentation/ICUTokenizer.java | 2 +-
.../icu/segmentation/ICUTokenizerFactory.java | 6 +-
.../icu/segmentation/MyanmarSyllable.brk | Bin 0 -> 19776 bytes
.../icu/segmentation/TestICUTokenizer.java | 6 +-
.../icu/segmentation/TestICUTokenizerCJK.java | 2 +-
.../icu/segmentation/TestMyanmarSyllable.java | 156 +++++
.../segmentation/TestWithCJKBigramFilter.java | 4 +-
.../classification/utils/DatasetSplitter.java | 14 +-
.../simpletext/SimpleTextPointsWriter.java | 4 +-
.../lucene/codecs/MutablePointsReader.java | 41 ++
.../org/apache/lucene/codecs/PointsWriter.java | 11 +-
.../codecs/lucene60/Lucene60PointsWriter.java | 24 +-
.../java/org/apache/lucene/document/Field.java | 6 +-
.../lucene/index/DocumentsWriterPerThread.java | 2 +-
.../org/apache/lucene/index/IndexWriter.java | 2 +-
.../lucene/index/LiveIndexWriterConfig.java | 19 +-
.../apache/lucene/index/PointValuesWriter.java | 172 +++--
.../org/apache/lucene/search/LRUQueryCache.java | 1 +
.../org/apache/lucene/search/PrefixQuery.java | 5 +-
.../java/org/apache/lucene/util/ArrayUtil.java | 71 +-
.../org/apache/lucene/util/ByteBlockPool.java | 29 +
.../apache/lucene/util/InPlaceMergeSorter.java | 4 +-
.../org/apache/lucene/util/IntroSelector.java | 128 ++++
.../org/apache/lucene/util/IntroSorter.java | 20 +-
.../org/apache/lucene/util/MSBRadixSorter.java | 109 ++-
.../org/apache/lucene/util/RadixSelector.java | 278 ++++++++
.../java/org/apache/lucene/util/Selector.java | 41 ++
.../src/java/org/apache/lucene/util/Sorter.java | 59 +-
.../apache/lucene/util/automaton/Automaton.java | 4 +-
.../org/apache/lucene/util/bkd/BKDWriter.java | 491 ++++++++++----
.../util/bkd/MutablePointsReaderUtils.java | 186 ++++++
.../lucene60/TestLucene60PointsFormat.java | 5 +-
.../apache/lucene/search/TestPointQueries.java | 5 +-
.../apache/lucene/util/TestByteBlockPool.java | 21 +-
.../apache/lucene/util/TestIntroSelector.java | 86 +++
.../apache/lucene/util/TestMSBRadixSorter.java | 68 ++
.../apache/lucene/util/TestRadixSelector.java | 106 +++
.../util/bkd/TestMutablePointsReaderUtils.java | 270 ++++++++
lucene/ivy-versions.properties | 1 +
.../valuesource/ComparisonBoolFunction.java | 105 +++
.../lucene/replicator/nrt/FileMetaData.java | 5 +
.../lucene/replicator/nrt/SimpleCopyJob.java | 2 +
.../apache/lucene/spatial3d/geom/Bounds.java | 7 +
.../lucene/spatial3d/geom/LatLonBounds.java | 5 +
.../org/apache/lucene/spatial3d/geom/Plane.java | 101 +--
.../apache/lucene/spatial3d/geom/XYZBounds.java | 11 +
.../apache/lucene/spatial3d/TestGeo3DPoint.java | 5 +-
.../lucene/spatial3d/geom/GeoBBoxTest.java | 15 +
.../lucene/spatial3d/geom/GeoCircleTest.java | 14 +
.../codecs/asserting/AssertingPointsFormat.java | 5 +-
.../codecs/cranky/CrankyPointsFormat.java | 4 +-
.../apache/lucene/geo/BaseGeoPointTestCase.java | 3 +-
.../org/apache/lucene/index/RandomCodec.java | 9 +-
.../lucene/store/MockDirectoryWrapper.java | 2 +-
.../lucene/store/MockIndexInputWrapper.java | 27 +-
.../store/SlowClosingMockIndexInputWrapper.java | 2 +-
.../store/SlowOpeningMockIndexInputWrapper.java | 2 +-
.../lucene/store/TestMockDirectoryWrapper.java | 36 +
solr/CHANGES.txt | 58 ++
.../accumulator/FacetingAccumulator.java | 2 +-
.../solr/handler/dataimport/JdbcDataSource.java | 6 +-
.../handler/dataimport/TestJdbcDataSource.java | 39 ++
.../apache/solr/hadoop/ZooKeeperInspector.java | 21 +-
solr/core/ivy.xml | 4 +
.../solr/core/IndexDeletionPolicyWrapper.java | 27 +-
.../java/org/apache/solr/core/SolrConfig.java | 29 +-
.../src/java/org/apache/solr/core/SolrCore.java | 36 +-
.../repository/LocalFileSystemRepository.java | 15 +-
.../core/snapshots/SolrSnapshotManager.java | 134 ++++
.../snapshots/SolrSnapshotMetaDataManager.java | 416 ++++++++++++
.../solr/core/snapshots/package-info.java | 22 +
.../org/apache/solr/handler/BlobHandler.java | 2 +-
.../org/apache/solr/handler/CdcrParams.java | 10 +-
.../org/apache/solr/handler/CdcrReplicator.java | 8 +-
.../solr/handler/CdcrReplicatorManager.java | 242 ++++++-
.../solr/handler/CdcrReplicatorScheduler.java | 6 +-
.../solr/handler/CdcrReplicatorState.java | 23 +
.../apache/solr/handler/CdcrRequestHandler.java | 233 ++++++-
.../org/apache/solr/handler/IndexFetcher.java | 26 +-
.../solr/handler/MoreLikeThisHandler.java | 2 +-
.../apache/solr/handler/ReplicationHandler.java | 41 +-
.../apache/solr/handler/RequestHandlerBase.java | 26 +-
.../org/apache/solr/handler/RestoreCore.java | 18 +-
.../org/apache/solr/handler/SchemaHandler.java | 2 +-
.../org/apache/solr/handler/SnapShooter.java | 39 +-
.../org/apache/solr/handler/StreamHandler.java | 2 +
.../solr/handler/admin/CollectionsHandler.java | 8 +-
.../solr/handler/admin/CoreAdminOperation.java | 125 +++-
.../solr/handler/component/ExpandComponent.java | 4 +-
.../solr/handler/component/QueryComponent.java | 2 +-
.../handler/component/RealTimeGetComponent.java | 49 +-
.../handler/component/SpellCheckComponent.java | 3 +-
.../org/apache/solr/request/SimpleFacets.java | 2 +-
.../transform/ChildDocTransformerFactory.java | 4 +-
.../transform/SubQueryAugmenterFactory.java | 17 +
.../org/apache/solr/schema/IndexSchema.java | 6 +-
.../org/apache/solr/search/CacheConfig.java | 24 +-
.../java/org/apache/solr/search/Grouping.java | 2 +-
.../solr/search/IGainTermsQParserPlugin.java | 240 +++++++
.../apache/solr/search/JoinQParserPlugin.java | 2 +-
.../java/org/apache/solr/search/LRUCache.java | 34 +-
.../java/org/apache/solr/search/QParser.java | 11 +
.../org/apache/solr/search/QParserPlugin.java | 12 +-
.../apache/solr/search/ReRankQParserPlugin.java | 108 ++-
.../apache/solr/search/SolrIndexSearcher.java | 69 +-
.../TextLogisticRegressionQParserPlugin.java | 283 ++++++++
.../apache/solr/search/ValueSourceParser.java | 52 ++
.../apache/solr/search/facet/FacetField.java | 10 +-
.../solr/search/facet/FacetProcessor.java | 2 +-
.../apache/solr/search/facet/FacetRequest.java | 2 +-
.../function/SolrComparisonBoolFunction.java | 58 ++
.../distributed/command/QueryCommand.java | 2 +-
.../search/join/ScoreJoinQParserPlugin.java | 2 +-
.../solr/security/AuthenticationPlugin.java | 29 +-
.../apache/solr/security/BasicAuthPlugin.java | 5 +-
.../security/DelegationTokenKerberosFilter.java | 215 ++++++
.../apache/solr/security/KerberosFilter.java | 14 +
.../apache/solr/security/KerberosPlugin.java | 288 ++++++--
.../solr/security/PKIAuthenticationPlugin.java | 13 +-
.../solr/security/PrintWriterWrapper.java | 215 ++++++
.../apache/solr/servlet/SolrDispatchFilter.java | 12 +-
.../org/apache/solr/update/CdcrUpdateLog.java | 7 +-
.../solr/update/DefaultSolrCoreState.java | 6 +-
.../solr/update/DirectUpdateHandler2.java | 117 ++--
.../org/apache/solr/update/SolrCoreState.java | 2 +
.../update/processor/CdcrUpdateProcessor.java | 10 +-
.../processor/DistributedUpdateProcessor.java | 2 +-
.../apache/solr/util/ConcurrentLRUCache.java | 33 +-
.../org/apache/solr/util/SolrPluginUtils.java | 4 +-
.../org/apache/solr/util/TestInjection.java | 95 ++-
.../collection1/conf/schema-psuedo-fields.xml | 3 +
.../configsets/cdcr-source-disabled/schema.xml | 29 +
.../cdcr-source-disabled/solrconfig.xml | 60 ++
.../solr/configsets/cdcr-source/schema.xml | 29 +
.../solr/configsets/cdcr-source/solrconfig.xml | 76 +++
.../solr/configsets/cdcr-target/schema.xml | 29 +
.../solr/configsets/cdcr-target/solrconfig.xml | 63 ++
.../TestReversedWildcardFilterFactory.java | 2 +-
.../solr/cloud/BaseCdcrDistributedZkTest.java | 25 +
.../apache/solr/cloud/CdcrBootstrapTest.java | 396 +++++++++++
.../cloud/CdcrReplicationDistributedZkTest.java | 31 +
.../solr/cloud/ChaosMonkeyShardSplitTest.java | 13 +-
.../apache/solr/cloud/KerberosTestServices.java | 229 +++++++
.../org/apache/solr/cloud/KerberosTestUtil.java | 147 -----
.../apache/solr/cloud/LeaderElectionTest.java | 1 +
...utOfBoxZkACLAndCredentialsProvidersTest.java | 7 +-
...rriddenZkACLAndCredentialsProvidersTest.java | 71 +-
.../org/apache/solr/cloud/OverseerTest.java | 1 +
.../solr/cloud/SaslZkACLProviderTest.java | 39 +-
.../solr/cloud/TestAuthenticationFramework.java | 10 +-
.../solr/cloud/TestCloudPseudoReturnFields.java | 91 +--
.../cloud/TestMiniSolrCloudClusterKerberos.java | 29 +-
.../apache/solr/cloud/TestRandomFlRTGCloud.java | 447 +++++++++++--
.../TestSolrCloudWithDelegationTokens.java | 402 ++++++++++++
.../cloud/TestSolrCloudWithKerberosAlt.java | 37 +-
.../TestSolrCloudWithSecureImpersonation.java | 357 ++++++++++
.../TestStressCloudBlindAtomicUpdates.java | 25 +-
...MParamsZkACLAndCredentialsProvidersTest.java | 25 +-
.../solr/cloud/overseer/ZkStateWriterTest.java | 393 +++++------
.../apache/solr/core/TestSolrConfigHandler.java | 56 +-
.../core/snapshots/TestSolrCoreSnapshots.java | 419 ++++++++++++
.../apache/solr/handler/BackupRestoreUtils.java | 37 ++
.../solr/handler/TestHdfsBackupRestoreCore.java | 46 +-
.../solr/handler/TestReplicationHandler.java | 20 +-
.../apache/solr/search/QueryEqualityTest.java | 45 +-
...OverriddenPrefixQueryForCustomFieldType.java | 2 +-
.../solr/search/TestPseudoReturnFields.java | 25 +-
.../org/apache/solr/search/TestSearchPerf.java | 8 +-
.../apache/solr/search/TestSolrQueryParser.java | 4 +-
.../solr/search/TestStandardQParsers.java | 9 +
.../solr/search/function/TestFunctionQuery.java | 69 +-
.../search/join/TestScoreJoinQPNoScore.java | 4 +-
.../solr/search/join/TestScoreJoinQPScore.java | 2 +-
.../HttpParamDelegationTokenPlugin.java | 272 ++++++++
.../solr/security/MockAuthenticationPlugin.java | 32 +-
.../solr/update/DirectUpdateHandlerTest.java | 48 +-
.../org/apache/solr/util/TestTestInjection.java | 4 +
solr/licenses/curator-recipes-2.8.0.jar.sha1 | 1 +
solr/licenses/curator-recipes-LICENSE-ASL.txt | 202 ++++++
solr/licenses/curator-recipes-NOTICE.txt | 5 +
solr/solrj/ivy.xml | 5 +
.../solr/client/solrj/impl/HttpSolrClient.java | 57 +-
.../solrj/impl/Krb5HttpClientBuilder.java | 18 +-
.../solrj/io/ClassificationEvaluation.java | 85 +++
.../io/stream/FeaturesSelectionStream.java | 436 ++++++++++++
.../client/solrj/io/stream/TextLogitStream.java | 656 +++++++++++++++++++
.../solrj/io/stream/expr/Explanation.java | 1 +
.../client/solrj/request/CoreAdminRequest.java | 57 ++
.../solrj/request/DelegationTokenRequest.java | 152 +++++
.../solrj/response/DelegationTokenResponse.java | 108 +++
.../solr/common/cloud/ConnectionManager.java | 15 +-
.../common/cloud/DefaultConnectionStrategy.java | 4 +-
.../solr/common/cloud/SaslZkACLProvider.java | 21 +-
.../cloud/SecurityAwareZkACLProvider.java | 79 +++
.../apache/solr/common/cloud/SolrZkClient.java | 2 +-
...ParamsAllAndReadonlyDigestZkACLProvider.java | 52 +-
.../cloud/ZkClientConnectionStrategy.java | 4 +-
.../apache/solr/common/cloud/ZkStateReader.java | 29 +-
.../solr/common/params/CoreAdminParams.java | 10 +-
.../solrj/solr/configsets/ml/conf/schema.xml | 77 +++
.../solr/configsets/ml/conf/solrconfig.xml | 51 ++
.../solrj/io/stream/StreamExpressionTest.java | 180 ++++-
.../stream/StreamExpressionToExpessionTest.java | 37 +-
.../StreamExpressionToExplanationTest.java | 1 -
.../request/TestDelegationTokenRequest.java | 70 ++
.../response/TestDelegationTokenResponse.java | 138 ++++
solr/webapp/web/css/angular/cloud.css | 14 +
solr/webapp/web/js/angular/app.js | 2 +-
solr/webapp/web/js/angular/controllers/cloud.js | 5 +
.../web/js/angular/controllers/dataimport.js | 18 +-
solr/webapp/web/js/angular/controllers/query.js | 10 +-
solr/webapp/web/partials/cloud.html | 3 +-
solr/webapp/web/partials/dataimport.html | 8 +-
217 files changed, 11744 insertions(+), 1627 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/92b5a76b/solr/CHANGES.txt
----------------------------------------------------------------------
diff --cc solr/CHANGES.txt
index 889611f,6755b70..518f63a
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@@ -100,11 -100,25 +100,30 @@@ New Feature
* SOLR-9275: XML QueryParser support (defType=xmlparser) now extensible via configuration.
(Christine Poerschke)
+ * SOLR-9200: Add Delegation Token Support to Solr.
+ (Gregory Chanan)
+
+ * SOLR-9038: Solr core snapshots: The current commit can be snapshotted which retains the commit and associates it with
+ a name. The core admin API can create snapshots, list them, and delete them. Snapshot names can be referenced in
+ doing a core backup, and in replication. Snapshot metadata is stored in a new snapshot_metadata/ dir.
+ (Hrishikesh Gadre via David Smiley)
+
+ * SOLR-9279: New boolean comparison function queries comparing numeric arguments: gt, gte, lt, lte, eq
+ (Doug Turnbull, David Smiley)
+
+ * SOLR-9324: Support Secure Impersonation / Proxy User for solr authentication
+ (Gregory Chanan)
+
+ * SOLR-9252: Feature selection and logistic regression on text (Cao Manh Dat, Joel Bernstein)
+
+ * SOLR-6465: CDCR: fall back to whole-index replication when tlogs are insufficient.
+ (Noble Paul, Renaud Delbru, shalin)
+
+* SOLR-9320: A REPLACENODE command to decommission an existing node with another new node
+ (noble, Nitin Sharma, Varun Thacker)
+
+* SOLR-9318: A DELETENODE command to delete all replicas in that node (noble, Nitin Sharma, Varun Thacker)
+
Bug Fixes
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/92b5a76b/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
----------------------------------------------------------------------