You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nutch.apache.org by sn...@apache.org on 2018/06/01 17:47:13 UTC

[nutch] branch master updated (9d0f616 -> 02afd5b)

This is an automated email from the ASF dual-hosted git repository.

snagel pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/nutch.git.


    from 9d0f616  Merge pull request #333 from sebastian-nagel/NUTCH-2500-pull-request-template
     add e4a7f87  Fixes for NUTCH-1480: Multiple index writer instances with different configurations.
     add 86cd375  Fixes for NUTCH-1480: Some improvements based on reviewers feedback.
     add 84246a9  Fixes for NUTCH-1480: Sections for all indexer-* plugins, relaxed schema, copy to the same field is not allowed and IndexWriterParams class to facilitate the process of obtaining values from  index-writers.xml file.
     add a674df5  Merge branch 'master' into NUTCH-1480
     add e125379  Merge branch 'master' into NUTCH-1480
     add 5cd48d8  Adapt defaults of index-writers.xml to work out-of-the-box: - Solr:   - do not copy fields to target not contained in default schema.xml   - use "nutch" as default core name - indexer-dummy: file in working directory (write permissions should be granted)
     add ca5d242  Improve log messages of indexer-dummy
     add 7e9d1df  Fixes for NUTCH-1480: Changes: - Logs for IndexerOutputFormat class to show the description of writers on the terminal. - IndexWriters instance, describe() method call and commit() call, moved from IndexingJob to IndexerOutputFormat. - The key of CACHE on ObjectCache.java:32 is now the UUID.
     add 54b7fa8  Merge branch 'master' into NUTCH-1480
     add d45510c  Fixes for NUTCH-1480: Support for NUTCH-2484 and NUTCH-2380.
     add 9fdb727  Merge branch 'master' into NUTCH-1480
     add b4e5393  Fixes for NUTCH-1480: Merge branch 'master' into NUTCH-1480
     add 041927a  Fixes for NUTCH-1480: Changes: - Internal cache. - Fixed the unit test of the Elastic index writer.
     new 02afd5b  Merge pull request #218 from r0ann3l/NUTCH-1480

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 conf/index-writers.xml.template                    | 144 ++++++++++
 conf/index-writers.xsd                             | 179 +++++++++++++
 conf/log4j.properties                              |   1 +
 src/java/org/apache/nutch/indexer/CleaningJob.java |   4 +-
 src/java/org/apache/nutch/indexer/IndexWriter.java |  23 +-
 .../apache/nutch/indexer/IndexWriterConfig.java    | 113 ++++++++
 .../apache/nutch/indexer/IndexWriterParams.java    |  58 ++++
 .../org/apache/nutch/indexer/IndexWriters.java     | 293 +++++++++++++++------
 .../org/apache/nutch/indexer/IndexerMapReduce.java |   1 +
 .../apache/nutch/indexer/IndexerOutputFormat.java  |  12 +-
 .../nutch/indexer/IndexingFiltersChecker.java      |   2 +-
 src/java/org/apache/nutch/indexer/IndexingJob.java |  27 +-
 .../org/apache/nutch/indexer/MappingReader.java    |  97 +++++++
 .../org/apache/nutch/indexer/NutchDocument.java    |  17 +-
 src/java/org/apache/nutch/indexer/NutchField.java  |   8 +-
 .../cloudsearch/CloudSearchConstants.java          |  10 +-
 .../cloudsearch/CloudSearchIndexWriter.java        |  41 +--
 .../nutch/indexwriter/dummy/DummyConstants.java    |   7 +
 .../nutch/indexwriter/dummy/DummyIndexWriter.java  |  51 +++-
 .../elasticrest/ElasticRestConstants.java          |  28 +-
 .../elasticrest/ElasticRestIndexWriter.java        | 151 ++++++-----
 .../indexwriter/elastic/ElasticConstants.java      |  20 +-
 .../indexwriter/elastic/ElasticIndexWriter.java    | 121 +++++----
 .../elastic/TestElasticIndexWriter.java            |  25 +-
 .../indexwriter/rabbit/RabbitIndexWriter.java      |  91 ++++---
 .../indexwriter/rabbit/RabbitMQConstants.java      |  24 +-
 .../nutch/indexwriter/solr/SolrConstants.java      |  19 +-
 .../nutch/indexwriter/solr/SolrIndexWriter.java    | 126 ++++++---
 .../nutch/indexwriter/solr/SolrMappingReader.java  | 149 -----------
 .../apache/nutch/indexwriter/solr/SolrUtils.java   |  21 +-
 30 files changed, 1311 insertions(+), 552 deletions(-)
 create mode 100644 conf/index-writers.xml.template
 create mode 100644 conf/index-writers.xsd
 create mode 100644 src/java/org/apache/nutch/indexer/IndexWriterConfig.java
 create mode 100644 src/java/org/apache/nutch/indexer/IndexWriterParams.java
 create mode 100644 src/java/org/apache/nutch/indexer/MappingReader.java
 create mode 100644 src/plugin/indexer-dummy/src/java/org/apache/nutch/indexwriter/dummy/DummyConstants.java
 delete mode 100644 src/plugin/indexer-solr/src/java/org/apache/nutch/indexwriter/solr/SolrMappingReader.java

-- 
To stop receiving notification emails like this one, please contact
snagel@apache.org.

[nutch] 01/01: Merge pull request #218 from r0ann3l/NUTCH-1480

Posted by sn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

snagel pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nutch.git

commit 02afd5b4d5b6196aabb535e7dd9dfe6dd018697d
Merge: 9d0f616 041927a
Author: Sebastian Nagel <sn...@apache.org>
AuthorDate: Fri Jun 1 19:47:08 2018 +0200

    Merge pull request #218 from r0ann3l/NUTCH-1480
    
    fix for NUTCH-1480 contributed by r0ann3l

 conf/index-writers.xml.template                    | 144 ++++++++++
 conf/index-writers.xsd                             | 179 +++++++++++++
 conf/log4j.properties                              |   1 +
 src/java/org/apache/nutch/indexer/CleaningJob.java |   4 +-
 src/java/org/apache/nutch/indexer/IndexWriter.java |  23 +-
 .../apache/nutch/indexer/IndexWriterConfig.java    | 113 ++++++++
 .../apache/nutch/indexer/IndexWriterParams.java    |  58 ++++
 .../org/apache/nutch/indexer/IndexWriters.java     | 293 +++++++++++++++------
 .../org/apache/nutch/indexer/IndexerMapReduce.java |   1 +
 .../apache/nutch/indexer/IndexerOutputFormat.java  |  12 +-
 .../nutch/indexer/IndexingFiltersChecker.java      |   2 +-
 src/java/org/apache/nutch/indexer/IndexingJob.java |  27 +-
 .../org/apache/nutch/indexer/MappingReader.java    |  97 +++++++
 .../org/apache/nutch/indexer/NutchDocument.java    |  17 +-
 src/java/org/apache/nutch/indexer/NutchField.java  |   8 +-
 .../cloudsearch/CloudSearchConstants.java          |  10 +-
 .../cloudsearch/CloudSearchIndexWriter.java        |  41 +--
 .../nutch/indexwriter/dummy/DummyConstants.java    |   7 +
 .../nutch/indexwriter/dummy/DummyIndexWriter.java  |  51 +++-
 .../elasticrest/ElasticRestConstants.java          |  28 +-
 .../elasticrest/ElasticRestIndexWriter.java        | 151 ++++++-----
 .../indexwriter/elastic/ElasticConstants.java      |  20 +-
 .../indexwriter/elastic/ElasticIndexWriter.java    | 121 +++++----
 .../elastic/TestElasticIndexWriter.java            |  25 +-
 .../indexwriter/rabbit/RabbitIndexWriter.java      |  91 ++++---
 .../indexwriter/rabbit/RabbitMQConstants.java      |  24 +-
 .../nutch/indexwriter/solr/SolrConstants.java      |  19 +-
 .../nutch/indexwriter/solr/SolrIndexWriter.java    | 126 ++++++---
 .../nutch/indexwriter/solr/SolrMappingReader.java  | 149 -----------
 .../apache/nutch/indexwriter/solr/SolrUtils.java   |  21 +-
 30 files changed, 1311 insertions(+), 552 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
snagel@apache.org.