You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by kt...@apache.org on 2018/05/05 23:35:44 UTC
[accumulo] 01/01: Merge branch 'ACCUMULO-4813-fmt'
This is an automated email from the ASF dual-hosted git repository.
kturner pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 674499ffe5bd82142337b45aac0cc32d744f5843
Merge: 8dfbdd4 76c0cc1
Author: Keith Turner <kt...@apache.org>
AuthorDate: Sat May 5 19:34:42 2018 -0400
Merge branch 'ACCUMULO-4813-fmt'
core/pom.xml | 4 +
.../java/org/apache/accumulo/core/Constants.java | 2 +
.../core/client/admin/TableOperations.java | 68 +
.../org/apache/accumulo/core/client/impl/Bulk.java | 228 +++
.../accumulo/core/client/impl/BulkImport.java | 382 ++++
.../accumulo/core/client/impl/BulkSerialize.java | 206 +++
.../core/client/impl/TableOperationsImpl.java | 5 +
.../impl/thrift/TableOperationExceptionType.java | 5 +-
.../apache/accumulo/core/conf/ClientProperty.java | 6 +
.../core/conf/ConfigurationTypeHelper.java | 18 +
.../accumulo/core/master/thrift/FateOperation.java | 5 +-
.../core/metadata/schema/MetadataScanner.java | 9 +
.../core/metadata/schema/TabletMetadata.java | 16 +-
.../tabletserver/thrift/TabletClientService.java | 1935 ++++++++++++++++----
core/src/main/thrift/client.thrift | 3 +
core/src/main/thrift/master.thrift | 1 +
core/src/main/thrift/tabletserver.thrift | 2 +
.../core/client/impl/BulkSerializeTest.java | 149 ++
.../main/java/org/apache/accumulo/fate/Fate.java | 1 +
.../server/client/ClientServiceHandler.java | 1 +
.../client/{ => deprecated}/BulkImporter.java | 4 +-
.../org/apache/accumulo/server/util/FileUtil.java | 51 +-
.../client/{ => deprecated}/BulkImporterTest.java | 3 +-
.../apache/accumulo/master/FateServiceHandler.java | 30 +-
.../master/tableOps/{ => bulkVer1}/BulkImport.java | 5 +-
.../tableOps/{ => bulkVer1}/CleanUpBulkImport.java | 12 +-
.../{ => bulkVer1}/CompleteBulkImport.java | 5 +-
.../master/tableOps/{ => bulkVer1}/CopyFailed.java | 3 +-
.../master/tableOps/{ => bulkVer1}/LoadFiles.java | 3 +-
.../master/tableOps/bulkVer2/BulkImportMove.java | 136 ++
.../BulkInfo.java} | 35 +-
.../tableOps/{ => bulkVer2}/CleanUpBulkImport.java | 31 +-
.../{ => bulkVer2}/CompleteBulkImport.java | 11 +-
.../master/tableOps/bulkVer2/LoadFiles.java | 210 +++
.../master/tableOps/bulkVer2/PrepBulkImport.java | 256 +++
.../tableOps/bulkVer2/PrepBulkImportTest.java | 181 ++
.../org/apache/accumulo/tserver/TabletServer.java | 28 +
.../org/apache/accumulo/tserver/tablet/Tablet.java | 2 +-
.../apache/accumulo/test/functional/BulkIT.java | 34 +-
.../accumulo/test/functional/BulkLoadIT.java | 268 +++
.../org/apache/accumulo/test/functional/SslIT.java | 2 +-
.../accumulo/test/performance/NullTserver.java | 4 +
42 files changed, 3866 insertions(+), 494 deletions(-)
diff --cc test/src/main/java/org/apache/accumulo/test/functional/BulkIT.java
index 0455f6b,1301c09..2df258a
--- a/test/src/main/java/org/apache/accumulo/test/functional/BulkIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/BulkIT.java
@@@ -16,10 -16,14 +16,15 @@@
*/
package org.apache.accumulo.test.functional;
+ import java.io.IOException;
+
import org.apache.accumulo.core.cli.BatchWriterOpts;
import org.apache.accumulo.core.cli.ScannerOpts;
+ import org.apache.accumulo.core.client.AccumuloException;
+ import org.apache.accumulo.core.client.AccumuloSecurityException;
+import org.apache.accumulo.core.client.ConnectionInfo;
import org.apache.accumulo.core.client.Connector;
+ import org.apache.accumulo.core.client.TableNotFoundException;
import org.apache.accumulo.core.util.CachedConfiguration;
import org.apache.accumulo.harness.AccumuloClusterHarness;
import org.apache.accumulo.test.TestIngest;
@@@ -60,13 -64,20 +65,20 @@@ public class BulkIT extends AccumuloClu
@Test
public void test() throws Exception {
- runTest(getConnector(), getCluster().getFileSystem(), getCluster().getTemporaryPath(),
- getAdminPrincipal(), getUniqueNames(1)[0], this.getClass().getName(),
+ runTest(getConnector(), getConnectionInfo(), getCluster().getFileSystem(),
+ getCluster().getTemporaryPath(), getUniqueNames(1)[0], this.getClass().getName(),
- testName.getMethodName());
+ testName.getMethodName(), false);
+ }
+
+ @Test
+ public void testOld() throws Exception {
- runTest(getConnector(), getCluster().getFileSystem(), getCluster().getTemporaryPath(),
- getAdminPrincipal(), getUniqueNames(1)[0], this.getClass().getName(),
++ runTest(getConnector(), getConnectionInfo(), getCluster().getFileSystem(),
++ getCluster().getTemporaryPath(), getUniqueNames(1)[0], this.getClass().getName(),
+ testName.getMethodName(), true);
}
- static void runTest(Connector c, FileSystem fs, Path basePath, String principal, String tableName,
- String filePrefix, String dirSuffix, boolean useOld) throws Exception {
+ static void runTest(Connector c, ConnectionInfo info, FileSystem fs, Path basePath,
- String tableName, String filePrefix, String dirSuffix) throws Exception {
++ String tableName, String filePrefix, String dirSuffix, boolean useOld) throws Exception {
c.tableOperations().create(tableName);
Path base = new Path(basePath, "testBulkFail_" + dirSuffix);
diff --cc test/src/main/java/org/apache/accumulo/test/functional/SslIT.java
index 085a93e,def280b..0da54b8
--- a/test/src/main/java/org/apache/accumulo/test/functional/SslIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/SslIT.java
@@@ -61,9 -61,9 +61,9 @@@ public class SslIT extends Configurable
@Test
public void bulk() throws Exception {
- BulkIT.runTest(getConnector(), cluster.getFileSystem(),
- new Path(getCluster().getConfig().getDir().getAbsolutePath(), "tmp"), "root",
- getUniqueNames(1)[0], this.getClass().getName(), testName.getMethodName(), true);
+ BulkIT.runTest(getConnector(), getConnectionInfo(), cluster.getFileSystem(),
+ new Path(getCluster().getConfig().getDir().getAbsolutePath(), "tmp"), getUniqueNames(1)[0],
- this.getClass().getName(), testName.getMethodName());
++ this.getClass().getName(), testName.getMethodName(), true);
}
@Test
--
To stop receiving notification emails like this one, please contact
kturner@apache.org.