accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mmil...@apache.org
Subject [accumulo-testing] branch master updated: Remove CachedConfiguration to fix build
Date Mon, 28 Jan 2019 16:06:27 GMT
This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo-testing.git


The following commit(s) were added to refs/heads/master by this push:
     new 3d747b0  Remove CachedConfiguration to fix build
3d747b0 is described below

commit 3d747b02139e181bac345701bf58c7abfa5f52b7
Author: Mike Miller <mmiller@apache.org>
AuthorDate: Mon Jan 28 11:05:44 2019 -0500

    Remove CachedConfiguration to fix build
---
 .../apache/accumulo/testing/continuous/ContinuousVerify.java  |  4 ++--
 .../java/org/apache/accumulo/testing/ingest/TestIngest.java   | 11 ++++++-----
 .../java/org/apache/accumulo/testing/scalability/Run.java     |  3 +--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/apache/accumulo/testing/continuous/ContinuousVerify.java b/src/main/java/org/apache/accumulo/testing/continuous/ContinuousVerify.java
index d94764e..7604dda 100644
--- a/src/main/java/org/apache/accumulo/testing/continuous/ContinuousVerify.java
+++ b/src/main/java/org/apache/accumulo/testing/continuous/ContinuousVerify.java
@@ -145,8 +145,8 @@ public class ContinuousVerify extends Configured implements Tool {
 
     String tableName = env.getAccumuloTableName();
 
-    Job job = Job.getInstance(getConf(),
-        this.getClass().getSimpleName() + "_"+ tableName + "_" + System.currentTimeMillis());
+    Job job = Job.getInstance(getConf(), this.getClass().getSimpleName() + "_" + tableName
+ "_"
+        + System.currentTimeMillis());
     job.setJarByClass(this.getClass());
 
     job.setInputFormatClass(AccumuloInputFormat.class);
diff --git a/src/main/java/org/apache/accumulo/testing/ingest/TestIngest.java b/src/main/java/org/apache/accumulo/testing/ingest/TestIngest.java
index 5ba2092..de3ccb4 100644
--- a/src/main/java/org/apache/accumulo/testing/ingest/TestIngest.java
+++ b/src/main/java/org/apache/accumulo/testing/ingest/TestIngest.java
@@ -33,8 +33,9 @@ import org.apache.accumulo.core.client.BatchWriter;
 import org.apache.accumulo.core.client.MutationsRejectedException;
 import org.apache.accumulo.core.client.TableExistsException;
 import org.apache.accumulo.core.client.TableNotFoundException;
-import org.apache.accumulo.core.clientImpl.TabletServerBatchWriter;
 import org.apache.accumulo.core.client.security.SecurityErrorCode;
+import org.apache.accumulo.core.clientImpl.ClientContext;
+import org.apache.accumulo.core.clientImpl.TabletServerBatchWriter;
 import org.apache.accumulo.core.conf.DefaultConfiguration;
 import org.apache.accumulo.core.crypto.CryptoServiceFactory;
 import org.apache.accumulo.core.data.ConstraintViolationSummary;
@@ -48,7 +49,6 @@ import org.apache.accumulo.core.file.rfile.RFile;
 import org.apache.accumulo.core.security.Authorizations;
 import org.apache.accumulo.core.security.ColumnVisibility;
 import org.apache.accumulo.core.trace.DistributedTrace;
-import org.apache.accumulo.core.util.CachedConfiguration;
 import org.apache.accumulo.core.util.FastFormat;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
@@ -226,11 +226,11 @@ public class TestIngest {
     FileSKVWriter writer = null;
 
     if (opts.outputFile != null) {
-      Configuration conf = CachedConfiguration.getInstance();
+      ClientContext cc = (ClientContext) client;
       writer = FileOperations
           .getInstance()
           .newWriterBuilder()
-          .forFile(opts.outputFile + "." + RFile.EXTENSION, fs, conf,
+          .forFile(opts.outputFile + "." + RFile.EXTENSION, fs, cc.getHadoopConf(),
               CryptoServiceFactory.newDefaultInstance())
           .withTableConfiguration(DefaultConfiguration.getInstance()).build();
       writer.startDefaultLocalityGroup();
@@ -359,6 +359,7 @@ public class TestIngest {
   public static void ingest(AccumuloClient c, Opts opts, BatchWriterOpts batchWriterOpts)
       throws MutationsRejectedException, IOException, AccumuloException, AccumuloSecurityException,
       TableNotFoundException, TableExistsException {
-    ingest(c, FileSystem.get(CachedConfiguration.getInstance()), opts, batchWriterOpts);
+    ClientContext cc = (ClientContext) c;
+    ingest(c, FileSystem.get(cc.getHadoopConf()), opts, batchWriterOpts);
   }
 }
diff --git a/src/main/java/org/apache/accumulo/testing/scalability/Run.java b/src/main/java/org/apache/accumulo/testing/scalability/Run.java
index 1df1d25..c82cbdc 100644
--- a/src/main/java/org/apache/accumulo/testing/scalability/Run.java
+++ b/src/main/java/org/apache/accumulo/testing/scalability/Run.java
@@ -21,7 +21,6 @@ import java.net.InetAddress;
 import java.util.Properties;
 
 import org.apache.accumulo.core.cli.Help;
-import org.apache.accumulo.core.util.CachedConfiguration;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
@@ -51,7 +50,7 @@ public class Run {
     Opts opts = new Opts();
     opts.parseArgs(Run.class.getName(), args);
 
-    Configuration conf = CachedConfiguration.getInstance();
+    Configuration conf = new Configuration();
     FileSystem fs;
     fs = FileSystem.get(conf);
 


Mime
View raw message