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 8BA1E9F7C for ; Wed, 14 Dec 2011 16:40:45 +0000 (UTC) Received: (qmail 25644 invoked by uid 500); 14 Dec 2011 16:40:45 -0000 Delivered-To: apmail-incubator-accumulo-commits-archive@incubator.apache.org Received: (qmail 25622 invoked by uid 500); 14 Dec 2011 16:40:45 -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 25615 invoked by uid 99); 14 Dec 2011 16:40:45 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Dec 2011 16:40:45 +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; Wed, 14 Dec 2011 16:40:44 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 817C423889C5; Wed, 14 Dec 2011 16:40:23 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1214328 - /incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/dirlist/Ingest.java Date: Wed, 14 Dec 2011 16:40:23 -0000 To: accumulo-commits@incubator.apache.org From: billie@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111214164023.817C423889C5@eris.apache.org> Author: billie Date: Wed Dec 14 16:40:23 2011 New Revision: 1214328 URL: http://svn.apache.org/viewvc?rev=1214328&view=rev Log: ACCUMULO-145 merged to trunk Modified: incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/dirlist/Ingest.java Modified: incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/dirlist/Ingest.java URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/dirlist/Ingest.java?rev=1214328&r1=1214327&r2=1214328&view=diff ============================================================================== --- incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/dirlist/Ingest.java (original) +++ incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/dirlist/Ingest.java Wed Dec 14 16:40:23 2011 @@ -18,8 +18,6 @@ package org.apache.accumulo.examples.dir import java.io.File; import java.io.IOException; -import java.util.ArrayList; -import java.util.List; import org.apache.accumulo.core.client.BatchWriter; import org.apache.accumulo.core.client.Connector; @@ -28,7 +26,6 @@ import org.apache.accumulo.core.data.Mut import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.iterators.LongCombiner; import org.apache.accumulo.core.iterators.TypedValueCombiner.Encoder; -import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.security.ColumnVisibility; import org.apache.accumulo.examples.filedata.FileDataIngest; import org.apache.hadoop.io.Text; @@ -126,7 +123,6 @@ public class Ingest { String nameTable = args[4]; String indexTable = args[5]; String dataTable = args[6]; - byte[] visibility = args[7].getBytes(); ColumnVisibility colvis = new ColumnVisibility(args[7]); int chunkSize = Integer.parseInt(args[8]); @@ -137,17 +133,7 @@ public class Ingest { conn.tableOperations().create(indexTable); if (!conn.tableOperations().exists(dataTable)) conn.tableOperations().create(dataTable); - Authorizations auths = conn.securityOperations().getUserAuthorizations(user); - if (!auths.contains(visibility)) { - List copy = new ArrayList(auths.getAuthorizations()); - copy.add(visibility); - try { - conn.securityOperations().changeUserAuthorizations(user, new Authorizations(copy)); - } catch (Exception ex) { - System.out.println("Unable to add visiblity to user " + user + ": " + ex); - System.exit(1); - } - } + BatchWriter dirBW = conn.createBatchWriter(nameTable, 50000000, 300000l, 4); BatchWriter indexBW = conn.createBatchWriter(indexTable, 50000000, 300000l, 4); BatchWriter dataBW = conn.createBatchWriter(dataTable, 50000000, 300000l, 4);