Return-Path: X-Original-To: apmail-incubator-accumulo-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-accumulo-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 31A21733F for ; Fri, 28 Oct 2011 16:30:18 +0000 (UTC) Received: (qmail 43860 invoked by uid 500); 28 Oct 2011 16:30:18 -0000 Delivered-To: apmail-incubator-accumulo-commits-archive@incubator.apache.org Received: (qmail 43838 invoked by uid 500); 28 Oct 2011 16:30:18 -0000 Mailing-List: contact accumulo-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: accumulo-dev@incubator.apache.org Delivered-To: mailing list accumulo-commits@incubator.apache.org Received: (qmail 43831 invoked by uid 99); 28 Oct 2011 16:30:18 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Oct 2011 16:30:18 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Oct 2011 16:30:15 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id AADF12388978; Fri, 28 Oct 2011 16:29:54 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1190429 - in /incubator/accumulo/trunk: ./ src/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java Date: Fri, 28 Oct 2011 16:29:54 -0000 To: accumulo-commits@incubator.apache.org From: ecn@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111028162954.AADF12388978@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ecn Date: Fri Oct 28 16:29:54 2011 New Revision: 1190429 URL: http://svn.apache.org/viewvc?rev=1190429&view=rev Log: ACCUMULO-95: merge from trunk Modified: incubator/accumulo/trunk/ (props changed) incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java Propchange: incubator/accumulo/trunk/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Oct 28 16:29:54 2011 @@ -1 +1 @@ -/incubator/accumulo/branches/1.3:1190280,1190413,1190420 +/incubator/accumulo/branches/1.3:1190280,1190413,1190420,1190427 Modified: incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java?rev=1190429&r1=1190428&r2=1190429&view=diff ============================================================================== --- incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java (original) +++ incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java Fri Oct 28 16:29:54 2011 @@ -31,6 +31,7 @@ import org.apache.accumulo.core.client.B import org.apache.accumulo.core.client.BatchWriter; import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.IteratorSetting; +import org.apache.accumulo.core.client.MultiTableBatchWriter; import org.apache.accumulo.core.client.Scanner; import org.apache.accumulo.core.data.Key; import org.apache.accumulo.core.data.Mutation; @@ -268,4 +269,34 @@ public class MockConnectorTest { assertEquals(value, next.getValue().toString()); } + public void testMockMultiTableBatchWriter() throws Exception { + Connector c = new MockConnector("root"); + c.tableOperations().create("a"); + c.tableOperations().create("b"); + MultiTableBatchWriter bw = c.createMultiTableBatchWriter(10000L, 1000L, 4); + Mutation m1 = new Mutation("r1"); + m1.put("cf1", "cq1", 1, "v1"); + BatchWriter b = bw.getBatchWriter("a"); + b.addMutation(m1); + b.flush(); + b = bw.getBatchWriter("b"); + b.addMutation(m1); + b.flush(); + + Scanner scanner = c.createScanner("a", Constants.NO_AUTHS); + int count = 0; + for (@SuppressWarnings("unused") + Entry entry : scanner) { + count++; + } + assertEquals(1, count); + scanner = c.createScanner("b", Constants.NO_AUTHS); + for (@SuppressWarnings("unused") + Entry entry : scanner) { + count++; + } + assertEquals(1, count); + + } + }