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 7C4E1200BFF for ; Tue, 17 Jan 2017 14:01:02 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 6ECF8160B55; Tue, 17 Jan 2017 13:00:32 +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 B62D4160B52 for ; Tue, 17 Jan 2017 14:00:31 +0100 (CET) Received: (qmail 28103 invoked by uid 500); 17 Jan 2017 13:00:30 -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 27834 invoked by uid 99); 17 Jan 2017 13:00:30 -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; Tue, 17 Jan 2017 13:00:30 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6339EDFBEC; Tue, 17 Jan 2017 13:00:30 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jimczi@apache.org To: commits@lucene.apache.org Date: Tue, 17 Jan 2017 13:00:32 -0000 Message-Id: <35bfc3762b054aaa900782aa69f65dcb@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] lucene-solr:branch_6x: LUCENE-7579: sort segments at flush too archived-at: Tue, 17 Jan 2017 13:01:02 -0000 LUCENE-7579: sort segments at flush too Segments are now also sorted during flush, and merging on a sorted index is substantially faster by using some of the same bulk merge optimizations that non-sorted merging uses (cherry picked from commit 4ccb9fb) Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/8f5b5a39 Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/8f5b5a39 Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/8f5b5a39 Branch: refs/heads/branch_6x Commit: 8f5b5a393d94500e6c7a8beff54e010c45c3b0e3 Parents: 5d0f90a 7d96f9f Author: Jim Ferenczi Authored: Tue Jan 17 14:00:09 2017 +0100 Committer: Jim Ferenczi Committed: Tue Jan 17 14:00:09 2017 +0100 ---------------------------------------------------------------------- lucene/CHANGES.txt | 5 + .../CompressingStoredFieldsWriter.java | 67 +++++- .../lucene50/Lucene50StoredFieldsFormat.java | 2 +- .../codecs/lucene60/Lucene60PointsWriter.java | 11 +- .../lucene/index/BinaryDocValuesWriter.java | 97 +++++++- .../lucene/index/DefaultIndexingChain.java | 125 ++++++---- .../org/apache/lucene/index/DocConsumer.java | 2 +- .../apache/lucene/index/DocValuesWriter.java | 4 +- .../lucene/index/DocumentsWriterPerThread.java | 31 ++- .../lucene/index/FreqProxTermsWriter.java | 8 +- .../org/apache/lucene/index/IndexWriter.java | 10 +- .../org/apache/lucene/index/MergeState.java | 8 +- .../apache/lucene/index/NormValuesWriter.java | 54 ++++- .../lucene/index/NumericDocValuesWriter.java | 142 +++++++++++- .../apache/lucene/index/PointValuesWriter.java | 110 ++++++++- .../lucene/index/SortedDocValuesWriter.java | 119 ++++++++-- .../index/SortedNumericDocValuesWriter.java | 163 ++++++++++++- .../lucene/index/SortedSetDocValuesWriter.java | 227 +++++++++++++++++-- .../java/org/apache/lucene/index/Sorter.java | 4 +- .../apache/lucene/index/SortingLeafReader.java | 6 +- .../index/SortingStoredFieldsConsumer.java | 206 +++++++++++++++++ .../index/SortingTermVectorsConsumer.java | 181 +++++++++++++++ .../lucene/index/StoredFieldsConsumer.java | 85 +++++++ .../lucene/index/TermVectorsConsumer.java | 7 +- .../java/org/apache/lucene/index/TermsHash.java | 4 +- .../TrackingTmpOutputDirectoryWrapper.java | 53 +++++ .../apache/lucene/index/TestIndexSorting.java | 2 - 27 files changed, 1570 insertions(+), 163 deletions(-) ----------------------------------------------------------------------