Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 2D365200B68 for ; Thu, 4 Aug 2016 08:53:46 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 2A285160AAB; Thu, 4 Aug 2016 06:53:46 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 53E00160A7C for ; Thu, 4 Aug 2016 08:53:45 +0200 (CEST) Received: (qmail 77555 invoked by uid 500); 4 Aug 2016 06:53:44 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 77545 invoked by uid 99); 4 Aug 2016 06:53:44 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Aug 2016 06:53:44 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 57654EEE19; Thu, 4 Aug 2016 06:53:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: noble@apache.org To: commits@lucene.apache.org Date: Thu, 04 Aug 2016 06:53:45 -0000 Message-Id: <7cbf35ce36f14f59b324932a2f21e8d9@git.apache.org> In-Reply-To: <50e8773a98ee4e769b0fb88aba7f1fa7@git.apache.org> References: <50e8773a98ee4e769b0fb88aba7f1fa7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] lucene-solr:branch_6x: Merge remote-tracking branch 'origin/branch_6x' into branch_6x archived-at: Thu, 04 Aug 2016 06:53:46 -0000 Merge remote-tracking branch 'origin/branch_6x' into branch_6x Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/74653e9d Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/74653e9d Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/74653e9d Branch: refs/heads/branch_6x Commit: 74653e9dbff88ea658823c76ede8a0c1dfe54edb Parents: 750bb36 f8cf9a7 Author: Noble Paul Authored: Thu Aug 4 12:23:24 2016 +0530 Committer: Noble Paul Committed: Thu Aug 4 12:23:24 2016 +0530 ---------------------------------------------------------------------- lucene/CHANGES.txt | 21 +- .../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 +- .../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 +++-- .../similarities/PerFieldSimilarityWrapper.java | 54 +- .../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 +- .../org/apache/lucene/util/bkd/BKDWriter.java | 491 ++++++++++---- .../util/bkd/MutablePointsReaderUtils.java | 186 ++++++ .../lucene60/TestLucene60PointsFormat.java | 5 +- .../apache/lucene/index/TestCustomNorms.java | 14 +- .../test/org/apache/lucene/index/TestNorms.java | 15 +- .../lucene/search/TestDocValuesScoring.java | 12 +- .../apache/lucene/search/TestPointQueries.java | 5 +- .../lucene/search/TestSimilarityProvider.java | 8 +- .../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 ++++++++ .../facet/taxonomy/TestTaxonomyFacetCounts.java | 6 +- lucene/ivy-versions.properties | 1 + .../lucene/misc/SweetSpotSimilarityTest.java | 2 +- .../valuesource/ComparisonBoolFunction.java | 105 +++ .../lucene/replicator/nrt/FileMetaData.java | 5 + .../lucene/replicator/nrt/SimpleCopyJob.java | 2 + .../apache/lucene/spatial3d/TestGeo3DPoint.java | 5 +- .../codecs/asserting/AssertingPointsFormat.java | 5 +- .../codecs/cranky/CrankyPointsFormat.java | 4 +- .../apache/lucene/geo/BaseGeoPointTestCase.java | 3 +- .../org/apache/lucene/index/RandomCodec.java | 9 +- .../search/similarities/RandomSimilarity.java | 75 ++- solr/CHANGES.txt | 34 + .../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 +- .../src/java/org/apache/solr/core/SolrCore.java | 36 +- .../core/snapshots/SolrSnapshotManager.java | 134 ++++ .../snapshots/SolrSnapshotMetaDataManager.java | 416 ++++++++++++ .../solr/core/snapshots/package-info.java | 22 + .../org/apache/solr/handler/IndexFetcher.java | 16 +- .../apache/solr/handler/ReplicationHandler.java | 24 +- .../apache/solr/handler/RequestHandlerBase.java | 26 +- .../org/apache/solr/handler/RestoreCore.java | 18 +- .../org/apache/solr/handler/SnapShooter.java | 39 +- .../org/apache/solr/handler/StreamHandler.java | 3 + .../solr/handler/admin/CoreAdminOperation.java | 125 +++- .../handler/component/RealTimeGetComponent.java | 47 +- .../solr/search/IGainTermsQParserPlugin.java | 240 +++++++ .../java/org/apache/solr/search/LRUCache.java | 34 +- .../org/apache/solr/search/QParserPlugin.java | 12 +- .../TextLogisticRegressionQParserPlugin.java | 283 ++++++++ .../apache/solr/search/ValueSourceParser.java | 52 ++ .../function/SolrComparisonBoolFunction.java | 58 ++ .../similarities/SchemaSimilarityFactory.java | 7 +- .../solr/security/AuthenticationPlugin.java | 29 +- .../apache/solr/security/BasicAuthPlugin.java | 5 +- .../security/DelegationTokenKerberosFilter.java | 171 +++++ .../apache/solr/security/KerberosFilter.java | 14 + .../apache/solr/security/KerberosPlugin.java | 196 +++++- .../solr/security/PKIAuthenticationPlugin.java | 13 +- .../solr/security/PrintWriterWrapper.java | 215 ++++++ .../apache/solr/servlet/SolrDispatchFilter.java | 12 +- .../solr/update/DirectUpdateHandler2.java | 115 ++-- .../apache/solr/util/ConcurrentLRUCache.java | 33 +- .../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/TestLocalFSCloudBackupRestore.java | 2 + .../cloud/TestMiniSolrCloudClusterKerberos.java | 29 +- .../apache/solr/cloud/TestRandomFlRTGCloud.java | 35 +- .../TestSolrCloudWithDelegationTokens.java | 406 ++++++++++++ .../cloud/TestSolrCloudWithKerberosAlt.java | 36 +- .../TestStressCloudBlindAtomicUpdates.java | 25 +- ...MParamsZkACLAndCredentialsProvidersTest.java | 25 +- .../solr/cloud/overseer/ZkStateWriterTest.java | 393 +++++------ .../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 +- .../solr/search/TestPseudoReturnFields.java | 25 +- .../solr/search/function/TestFunctionQuery.java | 69 +- ...ramDelegationTokenAuthenticationHandler.java | 109 +++ .../solr/security/MockAuthenticationPlugin.java | 32 +- .../solr/update/DirectUpdateHandlerTest.java | 48 +- 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/CloudSolrClient.java | 2 +- .../solr/client/solrj/impl/HttpSolrClient.java | 57 +- .../solrj/impl/Krb5HttpClientConfigurer.java | 12 +- .../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 | 21 + .../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 + solr/webapp/web/js/angular/controllers/query.js | 10 +- solr/webapp/web/partials/cloud.html | 3 +- 153 files changed, 9042 insertions(+), 1314 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/74653e9d/solr/CHANGES.txt ---------------------------------------------------------------------- diff --cc solr/CHANGES.txt index 7118075,58741e2..ae79cca --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@@ -132,9 -145,16 +145,18 @@@ Bug Fixe * SOLR-9334: CloudSolrClient.collectionStateCache is unbounded (noble) + * SOLR-9339: NPE in CloudSolrClient when the response is null (noble) + + * SOLR-8596: Web UI doesn't correctly generate queries which include local parameters (Alexandre Rafalovitch, janhoy) + + * SOLR-8645: managed-schema is now syntax highlighted in cloud->Tree view (Alexandre Rafalovitch via janhoy) + + * SOLR-8379: UI Cloud->Tree view now shows .txt files correctly (Alexandre Rafalovitch via janhoy) + + * SOLR-9308: Fix distributed RTG to forward request params, fixes fq and non-default fl params (hossman) +* SOLR-9179: NPE in IndexSchema using IBM JDK (noble, Colvin Cowie) + Optimizations ----------------------