Merge branch '1.7'
diff --git a/.gitignore b/.gitignore
index 98fdcca..5def651 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,4 +26,3 @@
# python ignores
*.pyc
-/bin/
diff --git a/pom.xml b/pom.xml
index 1b3f122..2173ec0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.7.1-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
</parent>
<artifactId>accumulo-proxy</artifactId>
<name>Proxy</name>
diff --git a/src/main/java/org/apache/accumulo/proxy/TestProxyClient.java b/src/main/java/org/apache/accumulo/proxy/TestProxyClient.java
deleted file mode 100644
index 4894f13..0000000
--- a/src/main/java/org/apache/accumulo/proxy/TestProxyClient.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * 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.accumulo.proxy;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
-
-import java.nio.ByteBuffer;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-
-import javax.security.sasl.SaslException;
-
-import org.apache.accumulo.core.client.IteratorSetting;
-import org.apache.accumulo.core.iterators.user.RegExFilter;
-import org.apache.accumulo.core.rpc.UGIAssumingTransport;
-import org.apache.accumulo.proxy.thrift.AccumuloProxy;
-import org.apache.accumulo.proxy.thrift.ColumnUpdate;
-import org.apache.accumulo.proxy.thrift.Key;
-import org.apache.accumulo.proxy.thrift.ScanResult;
-import org.apache.accumulo.proxy.thrift.TimeType;
-import org.apache.hadoop.security.UserGroupInformation;
-import org.apache.thrift.protocol.TCompactProtocol;
-import org.apache.thrift.protocol.TProtocol;
-import org.apache.thrift.protocol.TProtocolFactory;
-import org.apache.thrift.transport.TFramedTransport;
-import org.apache.thrift.transport.TSaslClientTransport;
-import org.apache.thrift.transport.TSocket;
-import org.apache.thrift.transport.TTransport;
-import org.apache.thrift.transport.TTransportException;
-
-public class TestProxyClient {
-
- protected AccumuloProxy.Client proxy;
- protected TTransport transport;
-
- public TestProxyClient(String host, int port) throws TTransportException {
- this(host, port, new TCompactProtocol.Factory());
- }
-
- public TestProxyClient(String host, int port, TProtocolFactory protoFactory) throws TTransportException {
- final TSocket socket = new TSocket(host, port);
- socket.setTimeout(600000);
- transport = new TFramedTransport(socket);
- final TProtocol protocol = protoFactory.getProtocol(transport);
- proxy = new AccumuloProxy.Client(protocol);
- transport.open();
- }
-
- public TestProxyClient(String host, int port, TProtocolFactory protoFactory, String proxyPrimary, UserGroupInformation ugi) throws SaslException,
- TTransportException {
- TSocket socket = new TSocket(host, port);
- TSaslClientTransport saslTransport = new TSaslClientTransport("GSSAPI", null, proxyPrimary, host, Collections.singletonMap("javax.security.sasl.qop",
- "auth"), null, socket);
-
- transport = new UGIAssumingTransport(saslTransport, ugi);
-
- // UGI transport will perform the doAs for us
- transport.open();
-
- AccumuloProxy.Client.Factory factory = new AccumuloProxy.Client.Factory();
- final TProtocol protocol = protoFactory.getProtocol(transport);
- proxy = factory.getClient(protocol);
- }
-
- public synchronized void close() {
- if (null != transport) {
- transport.close();
- transport = null;
- }
- }
-
- public AccumuloProxy.Client proxy() {
- return proxy;
- }
-
- public static void main(String[] args) throws Exception {
-
- TestProxyClient tpc = new TestProxyClient("localhost", 42424);
- String principal = "root";
- Map<String,String> props = new TreeMap<String,String>();
- props.put("password", "secret");
-
- System.out.println("Logging in");
- ByteBuffer login = tpc.proxy.login(principal, props);
-
- System.out.println("Creating user: ");
- if (!tpc.proxy().listLocalUsers(login).contains("testuser")) {
- tpc.proxy().createLocalUser(login, "testuser", ByteBuffer.wrap("testpass".getBytes(UTF_8)));
- }
- System.out.println("UserList: " + tpc.proxy().listLocalUsers(login));
-
- System.out.println("Listing: " + tpc.proxy().listTables(login));
-
- System.out.println("Deleting: ");
- String testTable = "testtableOMGOMGOMG";
-
- System.out.println("Creating: ");
-
- if (tpc.proxy().tableExists(login, testTable))
- tpc.proxy().deleteTable(login, testTable);
-
- tpc.proxy().createTable(login, testTable, true, TimeType.MILLIS);
-
- System.out.println("Listing: " + tpc.proxy().listTables(login));
-
- System.out.println("Writing: ");
- Date start = new Date();
- Date then = new Date();
- int maxInserts = 1000000;
- String format = "%1$05d";
- Map<ByteBuffer,List<ColumnUpdate>> mutations = new HashMap<ByteBuffer,List<ColumnUpdate>>();
- for (int i = 0; i < maxInserts; i++) {
- String result = String.format(format, i);
- ColumnUpdate update = new ColumnUpdate(ByteBuffer.wrap(("cf" + i).getBytes(UTF_8)), ByteBuffer.wrap(("cq" + i).getBytes(UTF_8)));
- update.setValue(Util.randStringBuffer(10));
- mutations.put(ByteBuffer.wrap(result.getBytes(UTF_8)), Collections.singletonList(update));
-
- if (i % 1000 == 0) {
- tpc.proxy().updateAndFlush(login, testTable, mutations);
- mutations.clear();
- }
- }
- tpc.proxy().updateAndFlush(login, testTable, mutations);
- Date end = new Date();
- System.out.println(" End of writing: " + (end.getTime() - start.getTime()));
-
- tpc.proxy().deleteTable(login, testTable);
- tpc.proxy().createTable(login, testTable, true, TimeType.MILLIS);
-
- // Thread.sleep(1000);
-
- System.out.println("Writing async: ");
- start = new Date();
- then = new Date();
- mutations.clear();
- String writer = tpc.proxy().createWriter(login, testTable, null);
- for (int i = 0; i < maxInserts; i++) {
- String result = String.format(format, i);
- Key pkey = new Key();
- pkey.setRow(result.getBytes(UTF_8));
- ColumnUpdate update = new ColumnUpdate(ByteBuffer.wrap(("cf" + i).getBytes(UTF_8)), ByteBuffer.wrap(("cq" + i).getBytes(UTF_8)));
- update.setValue(Util.randStringBuffer(10));
- mutations.put(ByteBuffer.wrap(result.getBytes(UTF_8)), Collections.singletonList(update));
- tpc.proxy().update(writer, mutations);
- mutations.clear();
- }
-
- end = new Date();
- System.out.println(" End of writing: " + (end.getTime() - start.getTime()));
- start = end;
- System.out.println("Closing...");
- tpc.proxy().closeWriter(writer);
- end = new Date();
- System.out.println(" End of closing: " + (end.getTime() - start.getTime()));
-
- System.out.println("Reading: ");
-
- String regex = "cf1.*";
-
- IteratorSetting is = new IteratorSetting(50, regex, RegExFilter.class);
- RegExFilter.setRegexs(is, null, regex, null, null, false);
-
- String cookie = tpc.proxy().createScanner(login, testTable, null);
-
- int i = 0;
- start = new Date();
- then = new Date();
- boolean hasNext = true;
-
- int k = 1000;
- while (hasNext) {
- ScanResult kvList = tpc.proxy().nextK(cookie, k);
-
- Date now = new Date();
- System.out.println(i + " " + (now.getTime() - then.getTime()));
- then = now;
-
- i += kvList.getResultsSize();
- // for (TKeyValue kv:kvList.getResults()) System.out.println(new Key(kv.getKey()));
- hasNext = kvList.isMore();
- }
- end = new Date();
- System.out.println("Total entries: " + i + " total time " + (end.getTime() - start.getTime()));
- }
-}
