diff --git a/contrib/dataimporthandler/CHANGES.txt b/contrib/dataimporthandler/CHANGES.txt index a7293c89921..9952456c0e8 100644 --- a/contrib/dataimporthandler/CHANGES.txt +++ b/contrib/dataimporthandler/CHANGES.txt @@ -35,6 +35,8 @@ New Features * SOLR-1678 : Move onError handling to DIH framework (noble) +* SOLR-1352 : Multi-threaded implementation of DIH (noble) + Optimizations ---------------------- diff --git a/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/ThreadedContext.java b/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/ThreadedContext.java index 0b72ecd3cc6..66fab3e107b 100644 --- a/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/ThreadedContext.java +++ b/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/ThreadedContext.java @@ -1,7 +1,27 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.apache.solr.handler.dataimport; - +/**Context implementation used when run multi threaded. + * + * @since Solr 1.5 + * + */ public class ThreadedContext extends ContextImpl{ private DocBuilder.EntityRunner entityRunner; private boolean limitedContext = false; diff --git a/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/ThreadedEntityProcessorWrapper.java b/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/ThreadedEntityProcessorWrapper.java index 823da9d3faa..7c82843ab12 100644 --- a/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/ThreadedEntityProcessorWrapper.java +++ b/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/ThreadedEntityProcessorWrapper.java @@ -1,3 +1,19 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.apache.solr.handler.dataimport; import static org.apache.solr.handler.dataimport.EntityProcessorBase.ON_ERROR; @@ -14,6 +30,7 @@ import java.util.Collections; /** * Each Entity may have only a single EntityProcessor . But the same entity can be run by * multiple EntityProcessorWrapper (1 per thread) . thhis helps running transformations in multiple threads + * @since Solr 1.5 */ public class ThreadedEntityProcessorWrapper extends EntityProcessorWrapper { diff --git a/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestThreaded.java b/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestThreaded.java index 1fdbe47377f..daa6f6e80fc 100644 --- a/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestThreaded.java +++ b/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestThreaded.java @@ -1,3 +1,19 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.apache.solr.handler.dataimport; import org.junit.Test;