svn commit: r1062884 - in /lucene/java/branches/lucene_3_0/contrib/benchmark: CHANGES.txt src/java/org/apache/lucene/benchmark/byTask/tasks/WaitForMergesTask.java src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java

[mi...@apache.org]

Author: mikemccand
Date: Mon Jan 24 17:13:34 2011
New Revision: 1062884

URL: http://svn.apache.org/viewvc?rev=1062884&view=rev
Log:
LUCENE-2885: add WaitForMerges tasks to benchmark

Added:
    lucene/java/branches/lucene_3_0/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WaitForMergesTask.java   (with props)
Modified:
    lucene/java/branches/lucene_3_0/contrib/benchmark/CHANGES.txt
    lucene/java/branches/lucene_3_0/contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java

Modified: lucene/java/branches/lucene_3_0/contrib/benchmark/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/java/branches/lucene_3_0/contrib/benchmark/CHANGES.txt?rev=1062884&r1=1062883&r2=1062884&view=diff
==============================================================================
--- lucene/java/branches/lucene_3_0/contrib/benchmark/CHANGES.txt (original)
+++ lucene/java/branches/lucene_3_0/contrib/benchmark/CHANGES.txt Mon Jan 24 17:13:34 2011
@@ -2,7 +2,9 @@ Lucene Benchmark Contrib Change Log
 
 The Benchmark contrib package contains code for benchmarking Lucene in a variety of ways.
 
-$Id:$
+01/24/2011
+  LUCENE-2885: Add WaitForMerges task (calls IndexWriter.waitForMerges()).
+  (Mike McCandless)
 
 12/07/2009
   LUCENE-2106: ReadTask does not close its Reader when 

Added: lucene/java/branches/lucene_3_0/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WaitForMergesTask.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/lucene_3_0/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WaitForMergesTask.java?rev=1062884&view=auto
==============================================================================
--- lucene/java/branches/lucene_3_0/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WaitForMergesTask.java (added)
+++ lucene/java/branches/lucene_3_0/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WaitForMergesTask.java Mon Jan 24 17:13:34 2011
@@ -0,0 +1,35 @@
+package org.apache.lucene.benchmark.byTask.tasks;
+/**
+ * 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.
+ */
+
+import org.apache.lucene.benchmark.byTask.PerfRunData;
+
+/**
+ * Waits for merges to finish.
+ */
+public class WaitForMergesTask extends PerfTask {
+
+  public WaitForMergesTask(PerfRunData runData) {
+    super(runData);
+  }
+  
+  @Override
+  public int doLogic() throws Exception {
+    getRunData().getIndexWriter().waitForMerges();
+    return 1;
+  }
+}

Propchange: lucene/java/branches/lucene_3_0/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WaitForMergesTask.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: lucene/java/branches/lucene_3_0/contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/lucene_3_0/contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java?rev=1062884&r1=1062883&r2=1062884&view=diff
==============================================================================
--- lucene/java/branches/lucene_3_0/contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java (original)
+++ lucene/java/branches/lucene_3_0/contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java Mon Jan 24 17:13:34 2011
@@ -473,6 +473,7 @@ public class TestPerfTasksLogic extends 
         "{ [ AddDoc]: 4} : * ",
         "ResetInputs ",
         "{ [ AddDoc]: 4} : * ",
+        "WaitForMerges",
         "CloseIndex",
     };
     
@@ -556,6 +557,7 @@ public class TestPerfTasksLogic extends 
         "  ResetSystemErase",
         "  CreateIndex",
         "  { \"AddDocs\"  AddDoc > : * ",
+        "  WaitForMerges",
         "  CloseIndex",
         "} : 2",
     };