svn commit: r1437247 - in /accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell: Shell.java commands/AddAuthsCommand.java
Author: dlmarion
Date: Wed Jan 23 01:12:55 2013
New Revision: 1437247
URL: http://svn.apache.org/viewvc?rev=1437247&view=rev
Log:
re #ACCUMULO-967 - Add addAuths command
Added:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AddAuthsCommand.java
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java?rev=1437247&r1=1437246&r2=1437247&view=diff
==
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
Wed Jan 23 01:12:55 2013
@@ -62,6 +62,7 @@ import org.apache.accumulo.core.util.for
import org.apache.accumulo.core.util.format.Formatter;
import org.apache.accumulo.core.util.format.FormatterFactory;
import org.apache.accumulo.core.util.shell.commands.AboutCommand;
+import org.apache.accumulo.core.util.shell.commands.AddAuthsCommand;
import org.apache.accumulo.core.util.shell.commands.AddSplitsCommand;
import org.apache.accumulo.core.util.shell.commands.AuthenticateCommand;
import org.apache.accumulo.core.util.shell.commands.ByeCommand;
@@ -311,7 +312,7 @@ public class Shell extends ShellOptions
new TablesCommand()};
Command[] tableControlCommands = {new AddSplitsCommand(), new
CompactCommand(), new ConstraintCommand(), new FlushCommand(), new
GetGroupsCommand(),
new GetSplitsCommand(), new MergeCommand(), new SetGroupsCommand()};
-Command[] userCommands = {new CreateUserCommand(), new
DeleteUserCommand(), new DropUserCommand(), new GetAuthsCommand(), new
PasswdCommand(),
+Command[] userCommands = {new AddAuthsCommand(), new CreateUserCommand(),
new DeleteUserCommand(), new DropUserCommand(), new GetAuthsCommand(), new
PasswdCommand(),
new SetAuthsCommand(), new UsersCommand()};
commandGrouping.put("-- Writing, Reading, and Removing Data --",
dataCommands);
commandGrouping.put("-- Debugging Commands ---",
debuggingCommands);
Added:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AddAuthsCommand.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AddAuthsCommand.java?rev=1437247&view=auto
==
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AddAuthsCommand.java
(added)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AddAuthsCommand.java
Wed Jan 23 01:12:55 2013
@@ -0,0 +1,80 @@
+/*
+ * 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.core.util.shell.commands;
+
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.accumulo.core.client.AccumuloException;
+import org.apache.accumulo.core.client.AccumuloSecurityException;
+import org.apache.accumulo.core.security.Authorizations;
+import org.apache.accumulo.core.util.shell.Shell;
+import org.apache.accumulo.core.util.shell.Shell.Command;
+import org.apache.accumulo.core.util.shell.Token;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionGroup;
+import org.apache.commons.cli.Options;
+
+public class AddAuthsCommand extends Command {
+ private Option userOpt;
+ private Option scanOptAuths;
+
+ @Override
+ public int execute(final String fullCommand, final CommandLine cl, final
Shell shellState) throws AccumuloException, AccumuloSecurityException {
+final String user = cl.getOptionValue(userOpt.getOpt(),
shellState.getConnector().whoami());
+final String scanOpts = cl.getOptionValue(scanOptAuths.getOpt());
+Authorizations auths =
shellState.getConnector().securityOperations().getUserAuthorizations(user);
+StringBuilder userAuths = new StringBuilder();
+userAuths.append(auths.
svn commit: r1437239 - in /accumulo/trunk: core/src/main/java/org/apache/accumulo/core/client/admin/ proxy/src/main/java/org/apache/accumulo/proxy/
Author: ctubbsii
Date: Tue Jan 22 23:57:07 2013
New Revision: 1437239
URL: http://svn.apache.org/viewvc?rev=1437239&view=rev
Log:
ACCUMULO-973 Removed unused import warnings.
ACCUMULO-971 Fixed minor javadoc errors on return tags.
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveScan.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperations.java
accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/TestProxyClient.java
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveScan.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveScan.java?rev=1437239&r1=1437238&r2=1437239&view=diff
==
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveScan.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveScan.java
Tue Jan 22 23:57:07 2013
@@ -163,14 +163,13 @@ public class ActiveScan {
/**
* @return the authorizations being used for this scan
*/
-
+
public Authorizations getAuthorizations() {
return authorizations;
}
/**
* @return the time this scan has been idle in the tablet server
- * @return
*/
public long getIdleTime() {
return idle;
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperations.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperations.java?rev=1437239&r1=1437238&r2=1437239&view=diff
==
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperations.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperations.java
Tue Jan 22 23:57:07 2013
@@ -82,13 +82,13 @@ public interface InstanceOperations {
*
* @param tserver
* The tablet server address should be of the form :
- * @return
+ * @return the list of active compactions
* @throws AccumuloException
* @throws AccumuloSecurityException
*/
-
+
public List getActiveCompactions(String tserver) throws
AccumuloException, AccumuloSecurityException;
-
+
/**
* Throws an exception if a tablet server can not be contacted.
*
Modified:
accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/TestProxyClient.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/TestProxyClient.java?rev=1437239&r1=1437238&r2=1437239&view=diff
==
---
accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/TestProxyClient.java
(original)
+++
accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/TestProxyClient.java
Tue Jan 22 23:57:07 2013
@@ -20,10 +20,8 @@ import java.nio.ByteBuffer;
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import org.apache.accumulo.core.client.IteratorSetting;
import org.apache.accumulo.core.iterators.user.RegExFilter;
@@ -31,7 +29,6 @@ import org.apache.accumulo.proxy.thrift.
import org.apache.accumulo.proxy.thrift.PColumnUpdate;
import org.apache.accumulo.proxy.thrift.PKey;
import org.apache.accumulo.proxy.thrift.PScanResult;
-import org.apache.accumulo.proxy.thrift.PTablePermission;
import org.apache.accumulo.proxy.thrift.PTimeType;
import org.apache.accumulo.proxy.thrift.UserPass;
import org.apache.thrift.protocol.TCompactProtocol;
svn commit: r1437167 [1/3] - in /accumulo/trunk/proxy/src: main/java/org/apache/accumulo/proxy/ main/java/org/apache/accumulo/proxy/thrift/ main/thrift/ test/java/org/apache/accumulo/
Author: ecn
Date: Tue Jan 22 21:03:05 2013
New Revision: 1437167
URL: http://svn.apache.org/viewvc?rev=1437167&view=rev
Log:
ACCUMULO-978 found a few things we still could not do via the proxy
Added:
accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/PTimeType.java
(with props)
Modified:
accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/TestProxyClient.java
accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java
accumulo/trunk/proxy/src/main/thrift/proxy.thrift
accumulo/trunk/proxy/src/test/java/org/apache/accumulo/TestProxyReadWrite.java
accumulo/trunk/proxy/src/test/java/org/apache/accumulo/TestProxySecurityOperations.java
accumulo/trunk/proxy/src/test/java/org/apache/accumulo/TestProxyTableOperations.java
Modified:
accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java?rev=1437167&r1=1437166&r2=1437167&view=diff
==
---
accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
(original)
+++
accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
Tue Jan 22 21:03:05 2013
@@ -45,6 +45,7 @@ import org.apache.accumulo.core.client.S
import org.apache.accumulo.core.client.ZooKeeperInstance;
import org.apache.accumulo.core.client.admin.ActiveCompaction;
import org.apache.accumulo.core.client.admin.ActiveScan;
+import org.apache.accumulo.core.client.admin.TimeType;
import org.apache.accumulo.core.client.mock.MockInstance;
import org.apache.accumulo.core.data.Column;
import org.apache.accumulo.core.data.Key;
@@ -84,6 +85,7 @@ import org.apache.accumulo.proxy.thrift.
import org.apache.accumulo.proxy.thrift.PScanType;
import org.apache.accumulo.proxy.thrift.PSystemPermission;
import org.apache.accumulo.proxy.thrift.PTablePermission;
+import org.apache.accumulo.proxy.thrift.PTimeType;
import org.apache.accumulo.proxy.thrift.TableExistsException;
import org.apache.accumulo.proxy.thrift.TableNotFoundException;
import org.apache.accumulo.proxy.thrift.UserPass;
@@ -162,19 +164,27 @@ public class ProxyServer implements Accu
}
@Override
- public void tableOperations_compact(UserPass userpass, String tableName,
ByteBuffer start, ByteBuffer end, boolean flush, boolean wait)
+ public void tableOperations_compact(UserPass userpass, String tableName,
ByteBuffer start, ByteBuffer end, List iterators, boolean
flush, boolean wait)
throws AccumuloSecurityException, TableNotFoundException,
AccumuloException, TException {
try {
- getConnector(userpass).tableOperations().compact(tableName,
ByteBufferUtil.toText(start), ByteBufferUtil.toText(end), flush, wait);
+ getConnector(userpass).tableOperations().compact(tableName,
ByteBufferUtil.toText(start), ByteBufferUtil.toText(end),
getPIteratorSettings(iterators), flush, wait);
} catch (Exception e) {
throw new TException(e);
}
}
+ private List getPIteratorSettings(List
iterators) {
+List result = new ArrayList();
+for (PIteratorSetting is : iterators) {
+ result.add(getIteratorSetting(is));
+}
+return result;
+ }
+
@Override
- public void tableOperations_create(UserPass userpass, String tableName)
throws AccumuloException, AccumuloSecurityException, TableExistsException,
TException {
+ public void tableOperations_create(UserPass userpass, String tableName,
boolean versioningIter, PTimeType timeType) throws AccumuloException,
AccumuloSecurityException, TableExistsException, TException {
try {
- getConnector(userpass).tableOperations().create(tableName);
+ getConnector(userpass).tableOperations().create(tableName,
versioningIter, TimeType.valueOf(timeType.toString()));
} catch (Exception e) {
e.printStackTrace();
throw new TException(e);
@@ -576,11 +586,10 @@ public class ProxyServer implements Accu
}
@Override
- public void securityOperations_createUser(UserPass userpass, String user,
ByteBuffer password, Set authorizations) throws AccumuloException,
+ public void securityOperations_createUser(UserPass userpass, String user,
ByteBuffer password) throws AccumuloException,
AccumuloSecurityException, TException {
try {
getConnector(userpass).securityOperations().createUser(user,
password.array());
-
getConnector(userpass).securityOperations().changeUserAuthorizations(user, new
Authorizations(authorizations.toArray(new String[] {})));
} catch (Exception e) {
throw new TException(e);
}
@@ -1087,5 +1096,14 @@ public class ProxyServer implements Accu
Key followingKey = key_.followingKey(part_);
return getPKey(followingKey);
}
+
+ @Override
+ publi
svn commit: r1437167 [3/3] - in /accumulo/trunk/proxy/src: main/java/org/apache/accumulo/proxy/ main/java/org/apache/accumulo/proxy/thrift/ main/thrift/ test/java/org/apache/accumulo/
Added:
accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/PTimeType.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/PTimeType.java?rev=1437167&view=auto
==
---
accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/PTimeType.java
(added)
+++
accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/PTimeType.java
Tue Jan 22 21:03:05 2013
@@ -0,0 +1,61 @@
+/*
+ * 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.
+ */
+/**
+ * Autogenerated by Thrift Compiler (0.9.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
+ */
+package org.apache.accumulo.proxy.thrift;
+
+
+import java.util.Map;
+import java.util.HashMap;
+import org.apache.thrift.TEnum;
+
+@SuppressWarnings("all") public enum PTimeType implements
org.apache.thrift.TEnum {
+ LOGICAL(0),
+ MILLIS(1);
+
+ private final int value;
+
+ private PTimeType(int value) {
+this.value = value;
+ }
+
+ /**
+ * Get the integer value of this enum value, as defined in the Thrift IDL.
+ */
+ public int getValue() {
+return value;
+ }
+
+ /**
+ * Find a the enum type by its integer value, as defined in the Thrift IDL.
+ * @return null if the value is not found.
+ */
+ public static PTimeType findByValue(int value) {
+switch (value) {
+ case 0:
+return LOGICAL;
+ case 1:
+return MILLIS;
+ default:
+return null;
+}
+ }
+}
Propchange:
accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/PTimeType.java
--
svn:eol-style = native
Modified: accumulo/trunk/proxy/src/main/thrift/proxy.thrift
URL:
http://svn.apache.org/viewvc/accumulo/trunk/proxy/src/main/thrift/proxy.thrift?rev=1437167&r1=1437166&r2=1437167&view=diff
==
--- accumulo/trunk/proxy/src/main/thrift/proxy.thrift (original)
+++ accumulo/trunk/proxy/src/main/thrift/proxy.thrift Tue Jan 22 21:03:05 2013
@@ -168,6 +168,11 @@ enum PIteratorScope {
SCAN
}
+enum PTimeType {
+ LOGICAL,
+ MILLIS
+}
+
exception NoMoreEntriesException
{
1:string msg;
@@ -200,34 +205,45 @@ service AccumuloProxy
{
bool ping (1:UserPass userpass);
- //table operations
-
+ // table operations
i32 tableOperations_addConstraint (1:UserPass userpass, 2:string tableName,
3:string constraintClassName) throws (1:AccumuloException ouch1,
2:AccumuloSecurityException ouch2, 3:TableNotFoundException ouch3);
void tableOperations_addSplits (1:UserPass userpass, 2:string tableName,
3:set splits) throws (1:TableNotFoundException ouch1,
2:AccumuloException ouch2, 3:AccumuloSecurityException ouch3);
+ void tableOperations_attachIterator (1:UserPass userpass, 2:string
tableName, 3:PIteratorSetting setting, 4:set scopes) throws
(1:AccumuloSecurityException ouch1, 2:AccumuloException ouch2,
3:TableNotFoundException ouch3);
+ void tableOperations_checkIteratorConflicts (1:UserPass userpass, 2:string
tableName, 3:PIteratorSetting setting, 4:set scopes) throws
(1:AccumuloException ouch1, 2:TableNotFoundException ouch2);
void tableOperations_clearLocatorCache (1:UserPass userpass, 2:string
tableName) throws (1:TableNotFoundException ouch1);
- void tableOperations_compact (1:UserPass userpass, 2:string tableName,
3:binary startRow, 4:binary endRow, 5:bool flush, 6:bool wait) throws
(1:AccumuloSecurityException ouch1, 2:TableNotFoundException ouch2,
3:AccumuloException ouch3);
- void tableOperations_create (1:UserPass userpass, 2:string tableName) throws
(1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2,
3:TableExistsException ouch3);
+ void tableOperations_clone (1:UserPass userpass, 2:string tableName,
3:string newTableName, 4:bool flush, 5:map propertiesToSet,
6:set propertiesToExclude) throws (1:AccumuloException ouch1,
2:AccumuloSecurityException ouch2, 3:TableNotFoundException ouch3,
4:TableExistsException ouch4);
+ void tableOperations_compact (1:UserPass userpass, 2:string tableName,
3:bin
svn commit: r1437135 [3/5] - in /accumulo/trunk: core/src/main/java/org/apache/accumulo/core/client/admin/ core/src/main/java/org/apache/accumulo/core/data/ core/src/test/java/org/apache/accumulo/core
Added:
accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/PActiveCompaction.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/PActiveCompaction.java?rev=1437135&view=auto
==
---
accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/PActiveCompaction.java
(added)
+++
accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/PActiveCompaction.java
Tue Jan 22 20:05:24 2013
@@ -0,0 +1,1431 @@
+/*
+ * 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.
+ */
+/**
+ * Autogenerated by Thrift Compiler (0.9.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
+ */
+package org.apache.accumulo.proxy.thrift;
+
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+import java.util.Collections;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@SuppressWarnings("all") public class PActiveCompaction implements
org.apache.thrift.TBase,
java.io.Serializable, Cloneable {
+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new
org.apache.thrift.protocol.TStruct("PActiveCompaction");
+
+ private static final org.apache.thrift.protocol.TField EXTENT_FIELD_DESC =
new org.apache.thrift.protocol.TField("extent",
org.apache.thrift.protocol.TType.STRUCT, (short)1);
+ private static final org.apache.thrift.protocol.TField AGE_FIELD_DESC = new
org.apache.thrift.protocol.TField("age", org.apache.thrift.protocol.TType.I64,
(short)2);
+ private static final org.apache.thrift.protocol.TField
INPUT_FILES_FIELD_DESC = new org.apache.thrift.protocol.TField("inputFiles",
org.apache.thrift.protocol.TType.LIST, (short)3);
+ private static final org.apache.thrift.protocol.TField
OUTPUT_FILE_FIELD_DESC = new org.apache.thrift.protocol.TField("outputFile",
org.apache.thrift.protocol.TType.STRING, (short)4);
+ private static final org.apache.thrift.protocol.TField TYPE_FIELD_DESC = new
org.apache.thrift.protocol.TField("type", org.apache.thrift.protocol.TType.I32,
(short)5);
+ private static final org.apache.thrift.protocol.TField REASON_FIELD_DESC =
new org.apache.thrift.protocol.TField("reason",
org.apache.thrift.protocol.TType.I32, (short)6);
+ private static final org.apache.thrift.protocol.TField
LOCALITY_GROUP_FIELD_DESC = new
org.apache.thrift.protocol.TField("localityGroup",
org.apache.thrift.protocol.TType.STRING, (short)7);
+ private static final org.apache.thrift.protocol.TField
ENTRIES_READ_FIELD_DESC = new org.apache.thrift.protocol.TField("entriesRead",
org.apache.thrift.protocol.TType.I64, (short)8);
+ private static final org.apache.thrift.protocol.TField
ENTRIES_WRITTEN_FIELD_DESC = new
org.apache.thrift.protocol.TField("entriesWritten",
org.apache.thrift.protocol.TType.I64, (short)9);
+ private static final org.apache.thrift.protocol.TField ITERATORS_FIELD_DESC
= new org.apache.thrift.protocol.TField("iterators",
org.apache.thrift.protocol.TType.LIST, (short)10);
+
+ private static final Map, SchemeFactory> schemes =
new HashMap, SchemeFactory>();
+ static {
+schemes.put(StandardScheme.class, new
PActiveCompactionStandardSchemeFactory());
+schemes.put(TupleScheme.class, new PActiveCompactionTupleSchemeFactory());
+ }
+
+ public PKeyExtent extent; // required
+ public long age; // required
+ public List inputFiles; // required
+ public String outputFile; // required
+ /**
+ *
+ * @see PCompactionType
+ */
+ public PCompactionType type; // required
+ /**
+ *
+ * @see PCompactionReason
svn commit: r1437135 [1/5] - in /accumulo/trunk: core/src/main/java/org/apache/accumulo/core/client/admin/ core/src/main/java/org/apache/accumulo/core/data/ core/src/test/java/org/apache/accumulo/core
Author: ecn
Date: Tue Jan 22 20:05:24 2013
New Revision: 1437135
URL: http://svn.apache.org/viewvc?rev=1437135&view=rev
Log:
ACCUMULO-978 add missing api calls
Added:
accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/PActiveCompaction.java
(with props)
accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/PActiveScan.java
(with props)
accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/PColumn.java
(with props)
accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/PCompactionReason.java
(with props)
accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/PCompactionType.java
(with props)
accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/PIteratorScope.java
(with props)
accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/PKeyExtent.java
(with props)
accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/PPartialKey.java
(with props)
accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/PScanState.java
(with props)
accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/PScanType.java
(with props)
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveCompaction.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveScan.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/PartialKey.java
accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormatTest.java
accumulo/trunk/proxy/examples/python/TestClient.py
accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java
accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/PRange.java
accumulo/trunk/proxy/src/main/thrift/proxy.thrift
accumulo/trunk/proxy/src/test/java/org/apache/accumulo/TestProxyReadWrite.java
accumulo/trunk/proxy/src/test/java/org/apache/accumulo/TestProxyTableOperations.java
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveCompaction.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveCompaction.java?rev=1437135&r1=1437134&r2=1437135&view=diff
==
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveCompaction.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveCompaction.java
Tue Jan 22 20:05:24 2013
@@ -41,7 +41,7 @@ public class ActiveCompaction {
this.instance = instance;
}
- static enum CompactionType {
+ public static enum CompactionType {
/**
* compaction to flush a tablets memory
*/
@@ -60,7 +60,7 @@ public class ActiveCompaction {
FULL
};
- static enum CompactionReason {
+ public static enum CompactionReason {
/**
* compaction initiated by user
*/
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveScan.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveScan.java?rev=1437135&r1=1437134&r2=1437135&view=diff
==
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveScan.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveScan.java
Tue Jan 22 20:05:24 2013
@@ -167,4 +167,12 @@ public class ActiveScan {
public Authorizations getAuthorizations() {
return authorizations;
}
+
+ /**
+ * @return the time this scan has been idle in the tablet server
+ * @return
+ */
+ public long getIdleTime() {
+return idle;
+ }
}
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/PartialKey.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/PartialKey.java?rev=1437135&r1=1437134&r2=1437135&view=diff
==
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/PartialKey.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/PartialKey.java
Tue Jan 22 20:05:24 2013
@@ -17,10 +17,9 @@
package org.apache.accumulo.core.data;
public enum PartialKey {
- ROW(1), ROW_COLFAM(2), ROW_COLFAM_COLQUAL(3), ROW_COLFAM_COLQUAL_COLVIS(4),
ROW_COLFAM_COLQUAL_COLVIS_TIME(5), ROW_COLFAM_COLQUAL_COLVIS_TIME_DEL(6) //
everything
-
svn commit: r1437074 - in /accumulo/contrib/bsp/trunk/src/test/java/org/apache/accumulo/core/client/mapreduce: AccumuloInputFormatIT.java AccumuloOutputFormatIT.java
Author: ctubbsii
Date: Tue Jan 22 18:08:30 2013
New Revision: 1437074
URL: http://svn.apache.org/viewvc?rev=1437074&view=rev
Log:
ACCUMULO-769 Fix bsp contrib build due to mapreduce changes in previous commit
Modified:
accumulo/contrib/bsp/trunk/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatIT.java
accumulo/contrib/bsp/trunk/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormatIT.java
Modified:
accumulo/contrib/bsp/trunk/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatIT.java
URL:
http://svn.apache.org/viewvc/accumulo/contrib/bsp/trunk/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatIT.java?rev=1437074&r1=1437073&r2=1437074&view=diff
==
---
accumulo/contrib/bsp/trunk/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatIT.java
(original)
+++
accumulo/contrib/bsp/trunk/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatIT.java
Tue Jan 22 18:08:30 2013
@@ -20,6 +20,7 @@ import static org.junit.Assert.assertEqu
import static org.junit.Assert.fail;
import java.io.IOException;
+import java.nio.charset.Charset;
import org.apache.accumulo.bsp.AccumuloInputFormat;
import org.apache.accumulo.bsp.MapreduceWrapper;
@@ -30,7 +31,6 @@ import org.apache.accumulo.core.client.m
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Mutation;
import org.apache.accumulo.core.data.Value;
-import org.apache.accumulo.core.security.Authorizations;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.io.Writable;
@@ -97,7 +97,8 @@ public class AccumuloInputFormatIT {
bspJob.setBspClass(InputFormatTestBSP.class);
bspJob.setInputPath(new Path("test"));
-AccumuloInputFormat.setInputInfo(job, "root", "".getBytes(), "testtable",
new Authorizations());
+AccumuloInputFormat.setConnectorInfo(job, "root",
"".getBytes(Charset.forName("UTF-8")));
+AccumuloInputFormat.setInputTableName(job, "testtable");
AccumuloInputFormat.setMockInstance(job, "testmapinstance");
AccumuloInputFormat input = new AccumuloInputFormat();
Modified:
accumulo/contrib/bsp/trunk/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormatIT.java
URL:
http://svn.apache.org/viewvc/accumulo/contrib/bsp/trunk/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormatIT.java?rev=1437074&r1=1437073&r2=1437074&view=diff
==
---
accumulo/contrib/bsp/trunk/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormatIT.java
(original)
+++
accumulo/contrib/bsp/trunk/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormatIT.java
Tue Jan 22 18:08:30 2013
@@ -22,6 +22,7 @@ import static org.junit.Assert.assertTru
import static org.junit.Assert.fail;
import java.io.IOException;
+import java.nio.charset.Charset;
import java.util.Iterator;
import java.util.Map.Entry;
@@ -124,9 +125,11 @@ public class AccumuloOutputFormatIT {
Job job = MapreduceWrapper.wrappedJob(bspJob);
-AccumuloInputFormat.setInputInfo(job, "root", "".getBytes(), "testtable1",
new Authorizations());
+AccumuloInputFormat.setConnectorInfo(job, "root",
"".getBytes(Charset.forName("UTF-8")));
+AccumuloInputFormat.setInputTableName(job, "testtable1");
AccumuloInputFormat.setMockInstance(job, "testmrinstance");
-AccumuloOutputFormat.setOutputInfo(job, "root", "".getBytes(), false,
"testtable2");
+AccumuloOutputFormat.setConnectorInfo(job, "root",
"".getBytes(Charset.forName("UTF-8")));
+AccumuloOutputFormat.setDefaultTableName(job, "testtable2");
AccumuloOutputFormat.setMockInstance(job, "testmrinstance");
AccumuloInputFormat input = new AccumuloInputFormat();
svn commit: r1437073 [1/3] - in /accumulo/trunk: core/src/main/java/org/apache/accumulo/core/cli/ core/src/main/java/org/apache/accumulo/core/client/mapreduce/ core/src/main/java/org/apache/accumulo/c
Author: ctubbsii
Date: Tue Jan 22 18:07:17 2013
New Revision: 1437073
URL: http://svn.apache.org/viewvc?rev=1437073&view=rev
Log:
ACCUMULO-769 Modify mapreduce API to use the Hadoop static configurator
conventions, but done in a way that allows us to standardize and reuse
configurator code to support multiple frameworks.
Added:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/util/
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/util/ConfiguratorBase.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/util/FileOutputConfigurator.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/util/InputConfigurator.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/util/OutputConfigurator.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/util/package-info.java
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/cli/ClientOnDefaultTable.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/cli/ClientOnRequiredTable.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormat.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormatTest.java
accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java
accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormatTest.java
accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormatTest.java
accumulo/trunk/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkInputFormatTest.java
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/metanalysis/IndexMeta.java
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/randomwalk/multitable/CopyTool.java
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/randomwalk/sequential/MapRedVerifyTool.java
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/cli/ClientOnDefaultTable.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/cli/ClientOnDefaultTable.java?rev=1437073&r1=1437072&r2=1437073&view=diff
==
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/cli/ClientOnDefaultTable.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/cli/ClientOnDefaultTable.java
Tue Jan 22 18:07:17 2013
@@ -41,8 +41,12 @@ public class ClientOnDefaultTable extend
@Override
public void setAccumuloConfigs(Job job) {
super.setAccumuloConfigs(job);
-AccumuloInputFormat.setInputInfo(job, user, getPassword(), getTableName(),
auths);
-AccumuloOutputFormat.setOutputInfo(job, user, getPassword(), true,
getTableName());
+AccumuloInputFormat.setConnectorInfo(job, user, getPassword());
+AccumuloInputFormat.setInputTableName(job, getTableName());
+AccumuloInputFormat.setScanAuthorizations(job, auths);
+AccumuloOutputFormat.setConnectorInfo(job, user, getPassword());
+AccumuloOutputFormat.setCreateTables(job, true);
+AccumuloOutputFormat.setDefaultTableName(job, getTableName());
}
}
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/cli/ClientOnRequiredTable.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/cli/ClientOnRequiredTable.java?rev=1437073&r1=1437072&r2=1437073&view=diff
==
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/cli/ClientOnRequiredTable.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/cli/ClientOnRequiredTable.java
Tue Jan 22 18:07:17 2013
@@ -30,7 +30,11 @@ public class ClientOnRequiredTable exten
@Override
public void setAccumuloConfigs(Job job) {
super.setAccumuloConfigs(job);
-AccumuloInputFormat.setInputInfo(job, user, getPassword(), tableName,
auths);
-AccumuloOutputFormat.setOutputInfo(job, user, getPassword(), true,
tableName);
+AccumuloInputFormat.setConnectorInfo(job, user, getPassword());
+AccumuloInputFormat.setInputTableName(job, tableName);
+AccumuloInputFormat.setScanAuthorizations(job, auths);
+Accumulo
svn commit: r1437073 [3/3] - in /accumulo/trunk: core/src/main/java/org/apache/accumulo/core/cli/ core/src/main/java/org/apache/accumulo/core/client/mapreduce/ core/src/main/java/org/apache/accumulo/c
Added:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/util/InputConfigurator.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/util/InputConfigurator.java?rev=1437073&view=auto
==
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/util/InputConfigurator.java
(added)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/util/InputConfigurator.java
Tue Jan 22 18:07:17 2013
@@ -0,0 +1,532 @@
+/**
+ * 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.core.client.mapreduce.util;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.StringTokenizer;
+
+import org.apache.accumulo.core.Constants;
+import org.apache.accumulo.core.client.AccumuloException;
+import org.apache.accumulo.core.client.AccumuloSecurityException;
+import org.apache.accumulo.core.client.ClientSideIteratorScanner;
+import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.Instance;
+import org.apache.accumulo.core.client.IsolatedScanner;
+import org.apache.accumulo.core.client.IteratorSetting;
+import org.apache.accumulo.core.client.Scanner;
+import org.apache.accumulo.core.client.TableNotFoundException;
+import org.apache.accumulo.core.client.impl.Tables;
+import org.apache.accumulo.core.client.impl.TabletLocator;
+import org.apache.accumulo.core.client.mock.MockTabletLocator;
+import org.apache.accumulo.core.data.Range;
+import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
+import org.apache.accumulo.core.security.Authorizations;
+import org.apache.accumulo.core.security.TablePermission;
+import org.apache.accumulo.core.security.thrift.AuthInfo;
+import org.apache.accumulo.core.util.ArgumentChecker;
+import org.apache.accumulo.core.util.Pair;
+import org.apache.accumulo.core.util.TextUtil;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.io.Text;
+import org.apache.hadoop.util.StringUtils;
+
+/**
+ * @since 1.5.0
+ */
+public class InputConfigurator extends ConfiguratorBase {
+
+ /**
+ * Configuration keys for {@link Scanner}.
+ *
+ * @since 1.5.0
+ */
+ public static enum ScanOpts {
+TABLE_NAME, AUTHORIZATIONS, RANGES, COLUMNS, ITERATORS
+ }
+
+ /**
+ * Configuration keys for various features.
+ *
+ * @since 1.5.0
+ */
+ public static enum Features {
+AUTO_ADJUST_RANGES, SCAN_ISOLATION, USE_LOCAL_ITERATORS, SCAN_OFFLINE
+ }
+
+ /**
+ * Sets the name of the input table, over which this job will scan.
+ *
+ * @param implementingClass
+ * the class whose name will be used as a prefix for the property
configuration key
+ * @param conf
+ * the Hadoop configuration object to configure
+ * @param tableName
+ * the table to use when the tablename is null in the write call
+ * @since 1.5.0
+ */
+ public static void setInputTableName(Class implementingClass,
Configuration conf, String tableName) {
+ArgumentChecker.notNull(tableName);
+conf.set(enumToConfKey(implementingClass, ScanOpts.TABLE_NAME), tableName);
+ }
+
+ /**
+ * Gets the table name from the configuration.
+ *
+ * @param implementingClass
+ * the class whose name will be used as a prefix for the property
configuration key
+ * @param conf
+ * the Hadoop configuration object to configure
+ * @return the table name
+ * @since 1.5.0
+ * @see #setInputTableName(Class, Configuration, String)
+ */
+ public static String getInputTableName(Class implementingClass,
Configuration conf) {
+return conf.get(enumToConfKey(implementingClass, ScanOpts.TABLE_NAME));
+ }
+
+ /**
+ * Sets the {@link Authorizations
svn commit: r1437054 - /accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java
Author: kturner
Date: Tue Jan 22 17:18:10 2013
New Revision: 1437054
URL: http://svn.apache.org/viewvc?rev=1437054&view=rev
Log:
ACCUMULO-977 modified listscans and listcompactions to not retry on a bad
tserver
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java?rev=1437054&r1=1437053&r2=1437054&view=diff
==
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java
Tue Jan 22 17:18:10 2013
@@ -36,7 +36,6 @@ import org.apache.accumulo.core.client.i
import org.apache.accumulo.core.master.thrift.MasterClientService;
import org.apache.accumulo.core.security.thrift.AuthInfo;
import org.apache.accumulo.core.security.thrift.ThriftSecurityException;
-import org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
import org.apache.accumulo.core.tabletserver.thrift.TabletClientService.Client;
import org.apache.accumulo.core.util.ArgumentChecker;
import org.apache.accumulo.core.util.ThriftUtil;
@@ -147,22 +146,29 @@ public class InstanceOperationsImpl impl
@Override
public List getActiveScans(String tserver) throws
AccumuloException, AccumuloSecurityException {
-List tas =
ThriftUtil.execute(tserver, instance.getConfiguration(),
-new
ClientExecReturn,TabletClientService.Client>()
{
- @Override
- public List
execute(TabletClientService.Client client) throws Exception {
-return client.getActiveScans(Tracer.traceInfo(), credentials);
- }
-});
-List as = new ArrayList();
-for (org.apache.accumulo.core.tabletserver.thrift.ActiveScan activeScan :
tas) {
- try {
-as.add(new ActiveScan(instance, activeScan));
- } catch (TableNotFoundException e) {
-throw new AccumuloException(e);
+Client client = null;
+try {
+ client = ThriftUtil.getTServerClient(tserver,
instance.getConfiguration());
+
+ List as = new ArrayList();
+ for (org.apache.accumulo.core.tabletserver.thrift.ActiveScan activeScan
: client.getActiveScans(Tracer.traceInfo(), credentials)) {
+try {
+ as.add(new ActiveScan(instance, activeScan));
+} catch (TableNotFoundException e) {
+ throw new AccumuloException(e);
+}
}
+ return as;
+} catch (TTransportException e) {
+ throw new AccumuloException(e);
+} catch (ThriftSecurityException e) {
+ throw new AccumuloSecurityException(e.user, e.code, e);
+} catch (TException e) {
+ throw new AccumuloException(e);
+} finally {
+ if (client != null)
+ThriftUtil.returnClient(client);
}
-return as;
}
/* (non-Javadoc)
@@ -185,18 +191,25 @@ public class InstanceOperationsImpl impl
*/
@Override
public List getActiveCompactions(String tserver) throws
AccumuloException, AccumuloSecurityException {
-List tas =
ThriftUtil.execute(tserver, instance.getConfiguration(),
-new
ClientExecReturn,TabletClientService.Client>()
{
- @Override
- public
List
execute(TabletClientService.Client client) throws Exception {
-return client.getActiveCompactions(Tracer.traceInfo(),
credentials);
- }
-});
-List as = new ArrayList();
-for (org.apache.accumulo.core.tabletserver.thrift.ActiveCompaction
activeCompaction : tas) {
- as.add(new ActiveCompaction(instance, activeCompaction));
+Client client = null;
+try {
+ client = ThriftUtil.getTServerClient(tserver,
instance.getConfiguration());
+
+ List as = new ArrayList();
+ for (org.apache.accumulo.core.tabletserver.thrift.ActiveCompaction
activeCompaction : client.getActiveCompactions(Tracer.traceInfo(),
credentials)) {
+as.add(new ActiveCompaction(instance, activeCompaction));
+ }
+ return as;
+} catch (TTransportException e) {
+ throw new AccumuloException(e);
+} catch (ThriftSecurityException e) {
+ throw new AccumuloSecurityException(e.user, e.code, e);
+} catch (TException e) {
+ throw new AccumuloException(e);
+} finally {
+ if (client != null)
+ThriftUtil.returnClient(client);
}
-return as;
}
/*
svn commit: r847553 - in /websites/production/accumulo/content: ./ 1.4/apidocs/
Author: elserj Date: Tue Jan 22 15:52:12 2013 New Revision: 847553 Log: Publishing organization and timezone changes for ujustgotbilld Added: websites/production/accumulo/content/ - copied from r847552, websites/staging/accumulo/trunk/content/ websites/production/accumulo/content/1.4/apidocs/ - copied from r847552, websites/production/accumulo/content/1.4/apidocs/
svn commit: r847552 - in /websites/staging/accumulo/trunk/content: ./ people.html
Author: buildbot
Date: Tue Jan 22 15:51:53 2013
New Revision: 847552
Log:
Staging update by buildbot for accumulo
Modified:
websites/staging/accumulo/trunk/content/ (props changed)
websites/staging/accumulo/trunk/content/people.html
Propchange: websites/staging/accumulo/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Jan 22 15:51:53 2013
@@ -1 +1 @@
-1436961
+1437006
Modified: websites/staging/accumulo/trunk/content/people.html
==
--- websites/staging/accumulo/trunk/content/people.html (original)
+++ websites/staging/accumulo/trunk/content/people.html Tue Jan 22 15:51:53 2013
@@ -128,7 +128,7 @@ tr.even {
vinesJohn Vineshttp://sqrrl.com/>sqrrlET (http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5
/ http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4)
elserjJosh Elserhttp://sra.com";>SRA International, IncET (http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5
/ http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4)
kturnerKeith Turnerhttp://www.ptech-llc.com/>Peterson TechnologiesET (http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5
/ http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4)
- ujustgotbilldWilliam
Slacum
+ ujustgotbilldWilliam Slacumhttp://www.atg-hq.com";>Agile Technology Group, IncET (http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5
/ http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4)
Contributors
svn commit: r1437006 - /accumulo/site/trunk/content/people.mdtext
Author: elserj Date: Tue Jan 22 15:51:48 2013 New Revision: 1437006 URL: http://svn.apache.org/viewvc?rev=1437006&view=rev Log: Adding organization and timezone information for ujustgotbilld Modified: accumulo/site/trunk/content/people.mdtext Modified: accumulo/site/trunk/content/people.mdtext URL: http://svn.apache.org/viewvc/accumulo/site/trunk/content/people.mdtext?rev=1437006&r1=1437005&r2=1437006&view=diff == --- accumulo/site/trunk/content/people.mdtext (original) +++ accumulo/site/trunk/content/people.mdtext Tue Jan 22 15:51:48 2013 @@ -58,7 +58,7 @@ PMC and Committers vinesJohn Vineshttp://sqrrl.com/>sqrrlET (http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5 / http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4) elserjJosh Elserhttp://sra.com";>SRA International, IncET (http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5 / http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4) kturnerKeith Turnerhttp://www.ptech-llc.com/>Peterson TechnologiesET (http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5 / http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4) - ujustgotbilldWilliam Slacum + ujustgotbilldWilliam Slacumhttp://www.atg-hq.com";>Agile Technology Group, IncET (http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5 / http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4) Contributors
svn commit: r1436995 [1/2] - in /accumulo/trunk: core/src/main/java/org/apache/accumulo/core/client/admin/ core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ core/src/main/java/org/apach
Author: kturner
Date: Tue Jan 22 15:32:31 2013
New Revision: 1436995
URL: http://svn.apache.org/viewvc?rev=1436995&view=rev
Log:
ACCUMULO-875 made list compactions API return files being compacted instead of
a count. Shell still shows a count
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveCompaction.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveCompaction.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/IteratorConfig.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ActiveCompactionIterator.java
accumulo/trunk/core/src/main/thrift/tabletserver.thrift
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/Compactor.java
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveCompaction.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveCompaction.java?rev=1436995&r1=1436994&r2=1436995&view=diff
==
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveCompaction.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveCompaction.java
Tue Jan 22 15:32:31 2013
@@ -110,10 +110,10 @@ public class ActiveCompaction {
}
/**
- * @return number of files compaction is reading
+ * @return the files the compaction is reading from
*/
- public int getInputFiles() {
+ public List getInputFiles() {
return tac.getInputFiles();
}
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveCompaction.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveCompaction.java?rev=1436995&r1=1436994&r2=1436995&view=diff
==
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveCompaction.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveCompaction.java
Tue Jan 22 15:32:31 2013
@@ -51,7 +51,7 @@ import org.slf4j.LoggerFactory;
private static final org.apache.thrift.protocol.TField EXTENT_FIELD_DESC =
new org.apache.thrift.protocol.TField("extent",
org.apache.thrift.protocol.TType.STRUCT, (short)1);
private static final org.apache.thrift.protocol.TField AGE_FIELD_DESC = new
org.apache.thrift.protocol.TField("age", org.apache.thrift.protocol.TType.I64,
(short)2);
- private static final org.apache.thrift.protocol.TField
INPUT_FILES_FIELD_DESC = new org.apache.thrift.protocol.TField("inputFiles",
org.apache.thrift.protocol.TType.I32, (short)3);
+ private static final org.apache.thrift.protocol.TField
INPUT_FILES_FIELD_DESC = new org.apache.thrift.protocol.TField("inputFiles",
org.apache.thrift.protocol.TType.LIST, (short)3);
private static final org.apache.thrift.protocol.TField
OUTPUT_FILE_FIELD_DESC = new org.apache.thrift.protocol.TField("outputFile",
org.apache.thrift.protocol.TType.STRING, (short)4);
private static final org.apache.thrift.protocol.TField TYPE_FIELD_DESC = new
org.apache.thrift.protocol.TField("type", org.apache.thrift.protocol.TType.I32,
(short)5);
private static final org.apache.thrift.protocol.TField REASON_FIELD_DESC =
new org.apache.thrift.protocol.TField("reason",
org.apache.thrift.protocol.TType.I32, (short)6);
@@ -69,7 +69,7 @@ import org.slf4j.LoggerFactory;
public org.apache.accumulo.core.data.thrift.TKeyExtent extent; // required
public long age; // required
- public int inputFiles; // required
+ public List inputFiles; // required
public String outputFile; // required
/**
*
@@ -185,9 +185,8 @@ import org.slf4j.LoggerFactory;
// isset id assignments
private static final int __AGE_ISSET_ID = 0;
- private static final int __INPUTFILES_ISSET_ID = 1;
- private static final int __ENTRIESREAD_ISSET_ID = 2;
- private static final int __ENTRIESWRITTEN_ISSET_ID = 3;
+ private static final int __ENTRIESREAD_ISSET_ID = 1;
+ private static final int __ENTRIESWRITTEN_ISSET_ID = 2;
private byte __isset_bitfield = 0;
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData>
metaDataMap;
static {
@@ -197,7 +196,8 @@ import org.slf4j.LoggerFactory;
tmpMap.put(_Fields.AGE, new
org.apache.thrift.meta_data.FieldMetaData("age",
org.apache.thrift.TFieldRequirementType.DEFAULT,
new
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol
svn commit: r847546 - in /websites/production/accumulo/content: ./ 1.4/apidocs/
Author: elserj Date: Tue Jan 22 14:39:11 2013 New Revision: 847546 Log: Publishing changes to organization and timezone for Drew Farris and Jim Klucar Added: websites/production/accumulo/content/ - copied from r847545, websites/staging/accumulo/trunk/content/ websites/production/accumulo/content/1.4/apidocs/ - copied from r847545, websites/production/accumulo/content/1.4/apidocs/
svn commit: r847545 - in /websites/staging/accumulo/trunk/content: ./ people.html
Author: buildbot
Date: Tue Jan 22 14:37:58 2013
New Revision: 847545
Log:
Staging update by buildbot for accumulo
Modified:
websites/staging/accumulo/trunk/content/ (props changed)
websites/staging/accumulo/trunk/content/people.html
Propchange: websites/staging/accumulo/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Jan 22 14:37:58 2013
@@ -1 +1 @@
-1436955
+1436961
Modified: websites/staging/accumulo/trunk/content/people.html
==
--- websites/staging/accumulo/trunk/content/people.html (original)
+++ websites/staging/accumulo/trunk/content/people.html Tue Jan 22 14:37:58 2013
@@ -122,7 +122,7 @@ tr.even {
http://people.apache.org/~ctubbsii/";>ctubbsiiChristopher
Tubbshttp://www.nsa.gov/";>NSAET (http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5
/ http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4)
dlmarionDave Marionhttp://www.objectivesolutions.com>Objective Solutions, Inc.ET
(http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5
/ http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4)
medinedDavid
Medinets
- drewDrew Farris
+ drewDrew Farrishttp://www.boozallen.com/>Booz Allen HamiltonET (http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5
/ http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4)
ecnEric Newtonhttp://swcomplete.com/>SW Complete Inc.ET (http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5
/ http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4)
jtrostJason Trosthttp://endgamesystems.com/>Endgame
vinesJohn Vineshttp://sqrrl.com/>sqrrlET (http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5
/ http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4)
@@ -139,11 +139,11 @@ tr.even {
Chris McCubbinhttp://sqrrl.com/>sqrrlET (http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5
/ http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4)
Christian Rohling
Dennis Patronehttp://www.jhuapl.edu/>The Johns Hopkins UniversityApplied Physics
LaboratoryET (http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5
/ http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4)
- Ed Kohlweyhttp://www.boozallen.com/>Booz Allen Hamilton
+ Ed Kohlweyhttp://www.boozallen.com/>Booz Allen Hamilton
edwardyoonEdward
Yoon
Jay Shipper
Jesse Yates
- Jim Klucar
+ Jim Klucarhttp://www.praxiseng.com/>Praxis EngineeringET (http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5
/ http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4)
Joe Skora
Laura Peaslee
Luke Brassardhttp://sqrrl.com/>sqrrlET (http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5
/ http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4)
svn commit: r1436961 - /accumulo/site/trunk/content/people.mdtext
Author: elserj Date: Tue Jan 22 14:37:54 2013 New Revision: 1436961 URL: http://svn.apache.org/viewvc?rev=1436961&view=rev Log: CMS commit to accumulo by elserj Modified: accumulo/site/trunk/content/people.mdtext Modified: accumulo/site/trunk/content/people.mdtext URL: http://svn.apache.org/viewvc/accumulo/site/trunk/content/people.mdtext?rev=1436961&r1=1436960&r2=1436961&view=diff == --- accumulo/site/trunk/content/people.mdtext (original) +++ accumulo/site/trunk/content/people.mdtext Tue Jan 22 14:37:54 2013 @@ -52,7 +52,7 @@ PMC and Committers http://people.apache.org/~ctubbsii/";>ctubbsiiChristopher Tubbshttp://www.nsa.gov/";>NSAET (http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5 / http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4) dlmarionDave Marionhttp://www.objectivesolutions.com>Objective Solutions, Inc.ET (http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5 / http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4) medinedDavid Medinets - drewDrew Farris + drewDrew Farrishttp://www.boozallen.com/>Booz Allen HamiltonET (http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5 / http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4) ecnEric Newtonhttp://swcomplete.com/>SW Complete Inc.ET (http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5 / http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4) jtrostJason Trosthttp://endgamesystems.com/>Endgame vinesJohn Vineshttp://sqrrl.com/>sqrrlET (http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5 / http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4) @@ -71,11 +71,11 @@ Contributors Chris McCubbinhttp://sqrrl.com/>sqrrlET (http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5 / http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4) Christian Rohling Dennis Patronehttp://www.jhuapl.edu/>The Johns Hopkins UniversityApplied Physics LaboratoryET (http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5 / http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4) - Ed Kohlweyhttp://www.boozallen.com/>Booz Allen Hamilton + Ed Kohlweyhttp://www.boozallen.com/>Booz Allen Hamilton edwardyoonEdward Yoon Jay Shipper Jesse Yates - Jim Klucar + Jim Klucarhttp://www.praxiseng.com/>Praxis EngineeringET (http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5 / http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4) Joe Skora Laura Peaslee Luke Brassardhttp://sqrrl.com/>sqrrlET (http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5 / http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4)
svn commit: r847544 - in /websites/production/accumulo/content: ./ 1.4/apidocs/
Author: elserj Date: Tue Jan 22 14:34:39 2013 New Revision: 847544 Log: Pushing changes to elserj's organization and timezone Added: websites/production/accumulo/content/ - copied from r847543, websites/staging/accumulo/trunk/content/ websites/production/accumulo/content/1.4/apidocs/ - copied from r847543, websites/production/accumulo/content/1.4/apidocs/
svn commit: r847543 - in /websites/staging/accumulo/trunk/content: ./ people.html
Author: buildbot
Date: Tue Jan 22 14:34:07 2013
New Revision: 847543
Log:
Staging update by buildbot for accumulo
Modified:
websites/staging/accumulo/trunk/content/ (props changed)
websites/staging/accumulo/trunk/content/people.html
Propchange: websites/staging/accumulo/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Jan 22 14:34:07 2013
@@ -1 +1 @@
-1436933
+1436955
Modified: websites/staging/accumulo/trunk/content/people.html
==
--- websites/staging/accumulo/trunk/content/people.html (original)
+++ websites/staging/accumulo/trunk/content/people.html Tue Jan 22 14:34:07 2013
@@ -126,7 +126,7 @@ tr.even {
ecnEric Newtonhttp://swcomplete.com/>SW Complete Inc.ET (http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5
/ http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4)
jtrostJason Trosthttp://endgamesystems.com/>Endgame
vinesJohn Vineshttp://sqrrl.com/>sqrrlET (http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5
/ http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4)
- elserjJosh Elser
+ elserjJosh Elserhttp://sra.com";>SRA International, IncET (http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5
/ http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4)
kturnerKeith Turnerhttp://www.ptech-llc.com/>Peterson TechnologiesET (http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5
/ http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4)
ujustgotbilldWilliam
Slacum
svn commit: r1436955 - /accumulo/site/trunk/content/people.mdtext
Author: elserj Date: Tue Jan 22 14:34:03 2013 New Revision: 1436955 URL: http://svn.apache.org/viewvc?rev=1436955&view=rev Log: Added timezone and organization for elserj Modified: accumulo/site/trunk/content/people.mdtext Modified: accumulo/site/trunk/content/people.mdtext URL: http://svn.apache.org/viewvc/accumulo/site/trunk/content/people.mdtext?rev=1436955&r1=1436954&r2=1436955&view=diff == --- accumulo/site/trunk/content/people.mdtext (original) +++ accumulo/site/trunk/content/people.mdtext Tue Jan 22 14:34:03 2013 @@ -56,7 +56,7 @@ PMC and Committers ecnEric Newtonhttp://swcomplete.com/>SW Complete Inc.ET (http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5 / http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4) jtrostJason Trosthttp://endgamesystems.com/>Endgame vinesJohn Vineshttp://sqrrl.com/>sqrrlET (http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5 / http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4) - elserjJosh Elser + elserjJosh Elserhttp://sra.com";>SRA International, IncET (http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5 / http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4) kturnerKeith Turnerhttp://www.ptech-llc.com/>Peterson TechnologiesET (http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5 / http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4) ujustgotbilldWilliam Slacum
svn commit: r847541 - in /websites/production/accumulo/content: ./ 1.4/apidocs/
Author: kturner Date: Tue Jan 22 14:05:50 2013 New Revision: 847541 Log: Publishing svnmucc operation to accumulo site by kturner Added: websites/production/accumulo/content/ - copied from r847540, websites/staging/accumulo/trunk/content/ websites/production/accumulo/content/1.4/apidocs/ - copied from r847540, websites/production/accumulo/content/1.4/apidocs/
svn commit: r847540 - in /websites/staging/accumulo/trunk/content: ./ people.html
Author: buildbot
Date: Tue Jan 22 14:04:59 2013
New Revision: 847540
Log:
Staging update by buildbot for accumulo
Modified:
websites/staging/accumulo/trunk/content/ (props changed)
websites/staging/accumulo/trunk/content/people.html
Propchange: websites/staging/accumulo/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Jan 22 14:04:59 2013
@@ -1 +1 @@
-1435405
+1436933
Modified: websites/staging/accumulo/trunk/content/people.html
==
--- websites/staging/accumulo/trunk/content/people.html (original)
+++ websites/staging/accumulo/trunk/content/people.html Tue Jan 22 14:04:59 2013
@@ -134,7 +134,7 @@ tr.even {
Contributors
usernamenameorganizationtimezone
- Brian Loss
+ Brian Losshttp://www.praxiseng.com/>Praxis EngineeringET (http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5
/ http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4)
Chris Bennight
Chris McCubbinhttp://sqrrl.com/>sqrrlET (http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5
/ http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4)
Christian Rohling
svn commit: r1436933 - /accumulo/site/trunk/content/people.mdtext
Author: kturner Date: Tue Jan 22 14:04:53 2013 New Revision: 1436933 URL: http://svn.apache.org/viewvc?rev=1436933&view=rev Log: CMS commit to accumulo by kturner Modified: accumulo/site/trunk/content/people.mdtext Modified: accumulo/site/trunk/content/people.mdtext URL: http://svn.apache.org/viewvc/accumulo/site/trunk/content/people.mdtext?rev=1436933&r1=1436932&r2=1436933&view=diff == --- accumulo/site/trunk/content/people.mdtext (original) +++ accumulo/site/trunk/content/people.mdtext Tue Jan 22 14:04:53 2013 @@ -66,7 +66,7 @@ Contributors usernamenameorganizationtimezone - Brian Loss + Brian Losshttp://www.praxiseng.com/>Praxis EngineeringET (http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5 / http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4) Chris Bennight Chris McCubbinhttp://sqrrl.com/>sqrrlET (http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5 / http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4) Christian Rohling
