[accumulo] branch master updated (97c6c06 -> 47fea01)
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git. from 97c6c06 Merge branch '2.0' new 87da062 Fix spotbugs when building on Java 11 new 129e8ec Merge branch '1.9' into 2.0 new 47fea01 Merge branch '2.0' The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[accumulo] branch 1.9 updated: Fix spotbugs when building on Java 11
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch 1.9 in repository https://gitbox.apache.org/repos/asf/accumulo.git The following commit(s) were added to refs/heads/1.9 by this push: new 87da062 Fix spotbugs when building on Java 11 87da062 is described below commit 87da0627c9c595a6fc7f942d390adfe17d22086d Author: Christopher Tubbs AuthorDate: Thu Jul 25 15:33:37 2019 -0400 Fix spotbugs when building on Java 11 Also remove NOOP `@Deprecated` tag that does nothing on package elements (which now generates a warning in JDK9 and later) --- .../main/java/org/apache/accumulo/core/client/mock/package-info.java | 1 - core/src/main/spotbugs/exclude-filter.xml| 5 + examples/simple/src/main/spotbugs/exclude-filter.xml | 5 + minicluster/src/main/spotbugs/exclude-filter.xml | 5 + pom.xml | 2 +- server/base/src/main/spotbugs/exclude-filter.xml | 5 + server/tserver/src/main/spotbugs/exclude-filter.xml | 5 + test/src/main/spotbugs/exclude-filter.xml| 5 + 8 files changed, 31 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/org/apache/accumulo/core/client/mock/package-info.java b/core/src/main/java/org/apache/accumulo/core/client/mock/package-info.java index 08e4251..e29a7de 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/mock/package-info.java +++ b/core/src/main/java/org/apache/accumulo/core/client/mock/package-info.java @@ -20,5 +20,4 @@ * * Deprecated since 1.8.0; use MiniAccumuloCluster or a standard mock framework instead. */ -@Deprecated package org.apache.accumulo.core.client.mock; diff --git a/core/src/main/spotbugs/exclude-filter.xml b/core/src/main/spotbugs/exclude-filter.xml index 58d7a12..2b6cb2d 100644 --- a/core/src/main/spotbugs/exclude-filter.xml +++ b/core/src/main/spotbugs/exclude-filter.xml @@ -105,4 +105,9 @@ + + + + + diff --git a/examples/simple/src/main/spotbugs/exclude-filter.xml b/examples/simple/src/main/spotbugs/exclude-filter.xml index 0ce1597..1b68b74 100644 --- a/examples/simple/src/main/spotbugs/exclude-filter.xml +++ b/examples/simple/src/main/spotbugs/exclude-filter.xml @@ -20,4 +20,9 @@ + + + + + diff --git a/minicluster/src/main/spotbugs/exclude-filter.xml b/minicluster/src/main/spotbugs/exclude-filter.xml index bf850ec..b04879d 100644 --- a/minicluster/src/main/spotbugs/exclude-filter.xml +++ b/minicluster/src/main/spotbugs/exclude-filter.xml @@ -27,4 +27,9 @@ + + + + + diff --git a/pom.xml b/pom.xml index 2240d84..78dbdd3 100644 --- a/pom.xml +++ b/pom.xml @@ -567,7 +567,7 @@ com.github.spotbugs spotbugs-maven-plugin - 3.1.6 + 3.1.12.1 true Max diff --git a/server/base/src/main/spotbugs/exclude-filter.xml b/server/base/src/main/spotbugs/exclude-filter.xml index 26aa119..04b8fe8 100644 --- a/server/base/src/main/spotbugs/exclude-filter.xml +++ b/server/base/src/main/spotbugs/exclude-filter.xml @@ -35,4 +35,9 @@ + + + + + diff --git a/server/tserver/src/main/spotbugs/exclude-filter.xml b/server/tserver/src/main/spotbugs/exclude-filter.xml index a334163..2c8a66d 100644 --- a/server/tserver/src/main/spotbugs/exclude-filter.xml +++ b/server/tserver/src/main/spotbugs/exclude-filter.xml @@ -27,4 +27,9 @@ + + + + + diff --git a/test/src/main/spotbugs/exclude-filter.xml b/test/src/main/spotbugs/exclude-filter.xml index 3c3e596..a53d038 100644 --- a/test/src/main/spotbugs/exclude-filter.xml +++ b/test/src/main/spotbugs/exclude-filter.xml @@ -48,4 +48,9 @@ + + + + +
[accumulo] branch 2.0 updated (3a4a4d6 -> 129e8ec)
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a change to branch 2.0 in repository https://gitbox.apache.org/repos/asf/accumulo.git. from 3a4a4d6 fix #1286 throw exception on empty bulk import (#1292) new 87da062 Fix spotbugs when building on Java 11 new 129e8ec Merge branch '1.9' into 2.0 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[accumulo] 01/01: Merge branch '1.9' into 2.0
This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch 2.0
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 129e8ec4abf5f94d7163dcf761df3e6687a49f59
Merge: 3a4a4d6 87da062
Author: Christopher Tubbs
AuthorDate: Thu Jul 25 17:52:38 2019 -0400
Merge branch '1.9' into 2.0
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --cc pom.xml
index 97cc195,78dbdd3..c08d56c
--- a/pom.xml
+++ b/pom.xml
@@@ -785,7 -567,7 +785,7 @@@
com.github.spotbugs
spotbugs-maven-plugin
- ${spotbugs.version}
- 3.1.12.1
++ ${spotbugs.version}.1
true
Max
[accumulo] 01/01: Merge branch '2.0'
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git commit 47fea01d5e98713d2385adfd9f1ec9b234a9fc28 Merge: 97c6c06 129e8ec Author: Christopher Tubbs AuthorDate: Thu Jul 25 17:52:47 2019 -0400 Merge branch '2.0' pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[accumulo] 01/01: Merge branch '2.0'
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.git commit 97c6c06fe4f7c81523d7ec0f5da9128cb6d16f8d Merge: 75e4255 3a4a4d6 Author: Mike Miller AuthorDate: Thu Jul 25 16:41:03 2019 -0400 Merge branch '2.0' .../accumulo/core/clientImpl/bulk/BulkImport.java | 26 +++-- .../apache/accumulo/core/file/FileOperations.java | 13 +++ .../bulk/BulkImportFilterInvalidTest.java | 114 + server/master/pom.xml | 4 + .../master/tableOps/bulkVer2/PrepBulkImport.java | 34 ++ .../apache/accumulo/test/functional/BulkNewIT.java | 10 ++ 6 files changed, 164 insertions(+), 37 deletions(-)
[accumulo] branch master updated (75e4255 -> 97c6c06)
This is an automated email from the ASF dual-hosted git repository. mmiller pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git. from 75e4255 Merge branch '2.0' add 5650335 Fix #1273 Fix Bulk Messages (#1287) add 3a4a4d6 fix #1286 throw exception on empty bulk import (#1292) new 97c6c06 Merge branch '2.0' The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../accumulo/core/clientImpl/bulk/BulkImport.java | 26 +++-- .../apache/accumulo/core/file/FileOperations.java | 13 +++ .../bulk/BulkImportFilterInvalidTest.java | 114 + server/master/pom.xml | 4 + .../master/tableOps/bulkVer2/PrepBulkImport.java | 34 ++ .../apache/accumulo/test/functional/BulkNewIT.java | 10 ++ 6 files changed, 164 insertions(+), 37 deletions(-) create mode 100644 core/src/test/java/org/apache/accumulo/core/clientImpl/bulk/BulkImportFilterInvalidTest.java
[accumulo] branch 2.0 updated: fix #1286 throw exception on empty bulk import (#1292)
This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch 2.0
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/2.0 by this push:
new 3a4a4d6 fix #1286 throw exception on empty bulk import (#1292)
3a4a4d6 is described below
commit 3a4a4d6dbb60803b269139f2f20814c96481187e
Author: Keith Turner
AuthorDate: Thu Jul 25 16:39:42 2019 -0400
fix #1286 throw exception on empty bulk import (#1292)
---
.../org/apache/accumulo/core/clientImpl/bulk/BulkImport.java | 5 -
.../java/org/apache/accumulo/test/functional/BulkNewIT.java| 10 ++
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git
a/core/src/main/java/org/apache/accumulo/core/clientImpl/bulk/BulkImport.java
b/core/src/main/java/org/apache/accumulo/core/clientImpl/bulk/BulkImport.java
index 7635b21..48a7f93 100644
---
a/core/src/main/java/org/apache/accumulo/core/clientImpl/bulk/BulkImport.java
+++
b/core/src/main/java/org/apache/accumulo/core/clientImpl/bulk/BulkImport.java
@@ -131,6 +131,9 @@ public class BulkImport implements
ImportDestinationArguments, ImportMappingOpti
mappings = computeMappingFromPlan(fs, tableId, srcPath);
}
+if (mappings.isEmpty())
+ throw new IllegalArgumentException("Attempted to import zero files from
" + srcPath);
+
BulkSerialize.writeLoadMapping(mappings, srcPath.toString(), fs::create);
List args =
Arrays.asList(ByteBuffer.wrap(tableId.canonical().getBytes(UTF_8)),
@@ -186,7 +189,7 @@ public class BulkImport implements
ImportDestinationArguments, ImportMappingOpti
@Override
public ImportMappingOptions plan(LoadPlan plan) {
-this.plan = plan;
+this.plan = Objects.requireNonNull(plan);
return this;
}
diff --git
a/test/src/main/java/org/apache/accumulo/test/functional/BulkNewIT.java
b/test/src/main/java/org/apache/accumulo/test/functional/BulkNewIT.java
index ddcabf9..95e9b2f 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/BulkNewIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/BulkNewIT.java
@@ -367,6 +367,16 @@ public class BulkNewIT extends SharedMiniClusterBase {
}
}
+ @Test(expected = IllegalArgumentException.class)
+ public void testEmptyDir() throws Exception {
+try (AccumuloClient c =
Accumulo.newClient().from(getClientProps()).build()) {
+ String dir = getDir("/testBulkFile-");
+ FileSystem fs = getCluster().getFileSystem();
+ fs.mkdirs(new Path(dir));
+ c.tableOperations().importDirectory(dir).to(tableName).load();
+}
+ }
+
private void addSplits(AccumuloClient client, String tableName, String
splitString)
throws Exception {
SortedSet splits = new TreeSet<>();
[accumulo] branch 2.0 updated (40d954f -> 5650335)
This is an automated email from the ASF dual-hosted git repository. mmiller pushed a change to branch 2.0 in repository https://gitbox.apache.org/repos/asf/accumulo.git. from 40d954f Merge branch '1.9' into 2.0 add 5650335 Fix #1273 Fix Bulk Messages (#1287) No new revisions were added by this update. Summary of changes: .../accumulo/core/clientImpl/bulk/BulkImport.java | 21 ++-- .../apache/accumulo/core/file/FileOperations.java | 13 +++ .../bulk/BulkImportFilterInvalidTest.java | 114 + server/master/pom.xml | 4 + .../master/tableOps/bulkVer2/PrepBulkImport.java | 34 ++ 5 files changed, 150 insertions(+), 36 deletions(-) create mode 100644 core/src/test/java/org/apache/accumulo/core/clientImpl/bulk/BulkImportFilterInvalidTest.java
[accumulo] branch master updated (5f03328 -> 75e4255)
This is an automated email from the ASF dual-hosted git repository. kturner pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git. from 5f03328 Merge branch '2.0' add 48c6b2c Support builds with JDK9 and later add 60f8119 Add logging of top tablets to enable better hot spot detection add 8d6aae5 Improved logging of busiest tablets. add 83429b6 Merge pull request #1291 from keith-turner/accumulo-1187 add 40d954f Merge branch '1.9' into 2.0 new 75e4255 Merge branch '2.0' The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../org/apache/accumulo/core/conf/Property.java| 5 + .../apache/accumulo/tserver/BusiestTracker.java| 92 +++ .../org/apache/accumulo/tserver/TabletServer.java | 35 + .../org/apache/accumulo/tserver/tablet/Tablet.java | 4 + .../accumulo/tserver/BusiestTrackerTest.java | 168 + 5 files changed, 304 insertions(+) create mode 100644 server/tserver/src/main/java/org/apache/accumulo/tserver/BusiestTracker.java create mode 100644 server/tserver/src/test/java/org/apache/accumulo/tserver/BusiestTrackerTest.java
[accumulo] 01/01: Merge branch '1.9' into 2.0
This is an automated email from the ASF dual-hosted git repository.
kturner pushed a commit to branch 2.0
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 40d954f22b22ff437b938c6bf3607298b30e1088
Merge: d6dfee4 83429b6
Author: Keith Turner
AuthorDate: Thu Jul 25 14:36:59 2019 -0400
Merge branch '1.9' into 2.0
.../org/apache/accumulo/core/conf/Property.java| 5 +
.../apache/accumulo/tserver/BusiestTracker.java| 92 +++
.../org/apache/accumulo/tserver/TabletServer.java | 35 +
.../org/apache/accumulo/tserver/tablet/Tablet.java | 4 +
.../accumulo/tserver/BusiestTrackerTest.java | 168 +
5 files changed, 304 insertions(+)
diff --cc core/src/main/java/org/apache/accumulo/core/conf/Property.java
index 7879ae4,494f6b2..302ce06
--- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
@@@ -444,8 -483,13 +444,13 @@@ public enum Property
"The minimum number of threads to use to handle incoming requests."),
TSERV_THREADCHECK("tserver.server.threadcheck.time", "1s",
PropertyType.TIMEDURATION,
"The time between adjustments of the server thread pool."),
- TSERV_MAX_MESSAGE_SIZE("tserver.server.message.size.max", "1G",
PropertyType.MEMORY,
+ TSERV_MAX_MESSAGE_SIZE("tserver.server.message.size.max", "1G",
PropertyType.BYTES,
"The maximum size of a message that can be sent to a tablet server."),
+ TSERV_LOG_BUSY_TABLETS_COUNT("tserver.log.busy.tablets.count", "0",
PropertyType.COUNT,
+ "Number of busiest tablets to log. Logged at interval controlled by "
+ + "tserver.log.busy.tablets.interval. If <= 0, logging of busy
tablets is disabled"),
+ TSERV_LOG_BUSY_TABLETS_INTERVAL("tserver.log.busy.tablets.interval", "1h",
+ PropertyType.TIMEDURATION, "Time interval between logging out busy
tablets information."),
TSERV_HOLD_TIME_SUICIDE("tserver.hold.time.max", "5m",
PropertyType.TIMEDURATION,
"The maximum time for a tablet server to be in the \"memory full\"
state."
+ " If the tablet server cannot write out memory in this much time,
it will"
diff --cc
server/tserver/src/main/java/org/apache/accumulo/tserver/BusiestTracker.java
index 000,ea60cad..1eaa1d6
mode 00,100644..100644
---
a/server/tserver/src/main/java/org/apache/accumulo/tserver/BusiestTracker.java
+++
b/server/tserver/src/main/java/org/apache/accumulo/tserver/BusiestTracker.java
@@@ -1,0 -1,96 +1,92 @@@
+ /*
+ * 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.tserver;
+
+ import java.util.ArrayList;
+ import java.util.Collection;
+ import java.util.Collections;
+ import java.util.HashMap;
+ import java.util.List;
+ import java.util.Map;
+
-import org.apache.accumulo.core.data.impl.KeyExtent;
++import org.apache.accumulo.core.dataImpl.KeyExtent;
+ import org.apache.accumulo.core.util.ComparablePair;
+ import org.apache.accumulo.tserver.tablet.Tablet;
+
+ import com.google.common.collect.Ordering;
+
+ /**
+ * Computes the N tablets that have the highest deltas for a given
monotonically increasing counter.
+ */
+ public abstract class BusiestTracker {
+
+ private Map lastCounts = Collections.emptyMap();
+ private final int numBusiestTabletsToLog;
+
+ BusiestTracker(int numBusiestTabletsToLog) {
+ this.numBusiestTabletsToLog = numBusiestTabletsToLog;
+ }
+
+ protected abstract long extractCount(Tablet tablet);
+
+ public List>
computeBusiest(Collection tablets) {
+
+ HashMap counts = new HashMap<>();
+
+ ArrayList> tabletsWithDelta = new
ArrayList<>();
+
+ for (Tablet tablet : tablets) {
+ KeyExtent extent = tablet.getExtent();
+
+ // only get the count once to ensure consistency in the case of
multiple threads
+ long count = extractCount(tablet);
+
+ if (count == 0)
+ continue;
+
+ counts.put(extent, count);
+
- Long lastCount = lastCounts.get(extent);
- if (lastCount == null)
-lastCount = 0L;
-
- long delta = count - lastCount;
++ long delta = count - lastCounts.getOrDefault(extent, 0L);
+
+
[accumulo] branch 2.0 updated (d6dfee4 -> 40d954f)
This is an automated email from the ASF dual-hosted git repository. kturner pushed a change to branch 2.0 in repository https://gitbox.apache.org/repos/asf/accumulo.git. from d6dfee4 Rename Bulk ITs to be less confusing (#1290) add 48c6b2c Support builds with JDK9 and later add 60f8119 Add logging of top tablets to enable better hot spot detection add 8d6aae5 Improved logging of busiest tablets. add 83429b6 Merge pull request #1291 from keith-turner/accumulo-1187 new 40d954f Merge branch '1.9' into 2.0 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../org/apache/accumulo/core/conf/Property.java| 5 + .../apache/accumulo/tserver/BusiestTracker.java| 92 +++ .../org/apache/accumulo/tserver/TabletServer.java | 35 + .../org/apache/accumulo/tserver/tablet/Tablet.java | 4 + .../accumulo/tserver/BusiestTrackerTest.java | 168 + 5 files changed, 304 insertions(+) create mode 100644 server/tserver/src/main/java/org/apache/accumulo/tserver/BusiestTracker.java create mode 100644 server/tserver/src/test/java/org/apache/accumulo/tserver/BusiestTrackerTest.java
[accumulo] branch 1.9 updated (48c6b2c -> 83429b6)
This is an automated email from the ASF dual-hosted git repository. kturner pushed a change to branch 1.9 in repository https://gitbox.apache.org/repos/asf/accumulo.git. from 48c6b2c Support builds with JDK9 and later new 60f8119 Add logging of top tablets to enable better hot spot detection new 8d6aae5 Improved logging of busiest tablets. new 83429b6 Merge pull request #1291 from keith-turner/accumulo-1187 The 8835 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../org/apache/accumulo/core/conf/Property.java| 5 + .../apache/accumulo/tserver/BusiestTracker.java| 96 .../org/apache/accumulo/tserver/TabletServer.java | 39 + .../org/apache/accumulo/tserver/tablet/Tablet.java | 4 + .../accumulo/tserver/BusiestTrackerTest.java | 166 + 5 files changed, 310 insertions(+) create mode 100644 server/tserver/src/main/java/org/apache/accumulo/tserver/BusiestTracker.java create mode 100644 server/tserver/src/test/java/org/apache/accumulo/tserver/BusiestTrackerTest.java
[accumulo] branch 1.9 updated: Support builds with JDK9 and later
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch 1.9 in repository https://gitbox.apache.org/repos/asf/accumulo.git The following commit(s) were added to refs/heads/1.9 by this push: new 48c6b2c Support builds with JDK9 and later 48c6b2c is described below commit 48c6b2ca4e68c38040095234fd81dae4803be1dd Author: Christopher Tubbs AuthorDate: Thu Jul 25 14:02:41 2019 -0400 Support builds with JDK9 and later --- pom.xml | 10 ++ 1 file changed, 10 insertions(+) diff --git a/pom.xml b/pom.xml index 9b0f9e3..2240d84 100644 --- a/pom.xml +++ b/pom.xml @@ -627,6 +627,7 @@ org.apache.maven.plugins maven-compiler-plugin + 3.8.1 true true @@ -1423,5 +1424,14 @@ 3.0.0 + + jdk-release-flag + +[9,) + + +7 + +
[accumulo] 01/01: Merge branch '2.0'
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.git
commit 5f03328e7f1b55bd1f24e72ddc54d5d9dc1cc20a
Merge: 2ca12d9 d6dfee4
Author: Mike Miller
AuthorDate: Thu Jul 25 10:17:03 2019 -0400
Merge branch '2.0'
.../java/org/apache/accumulo/core/client/admin/TableOperations.java | 6 +++---
test/src/main/java/org/apache/accumulo/test/functional/BulkIT.java | 3 +++
.../accumulo/test/functional/{BulkLoadIT.java => BulkNewIT.java}| 5 ++---
.../accumulo/test/functional/{BulkFileIT.java => BulkOldIT.java}| 4 ++--
4 files changed, 10 insertions(+), 8 deletions(-)
[accumulo] branch master updated (2ca12d9 -> 5f03328)
This is an automated email from the ASF dual-hosted git repository.
mmiller pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git.
from 2ca12d9 Merge branch '2.0'
add 58a72f8 Improve exception javadoc in TableOperations (#1289)
add d6dfee4 Rename Bulk ITs to be less confusing (#1290)
new 5f03328 Merge branch '2.0'
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/accumulo/core/client/admin/TableOperations.java | 6 +++---
test/src/main/java/org/apache/accumulo/test/functional/BulkIT.java | 3 +++
.../accumulo/test/functional/{BulkLoadIT.java => BulkNewIT.java}| 5 ++---
.../accumulo/test/functional/{BulkFileIT.java => BulkOldIT.java}| 4 ++--
4 files changed, 10 insertions(+), 8 deletions(-)
rename test/src/main/java/org/apache/accumulo/test/functional/{BulkLoadIT.java
=> BulkNewIT.java} (98%)
rename test/src/main/java/org/apache/accumulo/test/functional/{BulkFileIT.java
=> BulkOldIT.java} (98%)
[accumulo] branch 2.0 updated: Rename Bulk ITs to be less confusing (#1290)
This is an automated email from the ASF dual-hosted git repository.
mmiller pushed a commit to branch 2.0
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/2.0 by this push:
new d6dfee4 Rename Bulk ITs to be less confusing (#1290)
d6dfee4 is described below
commit d6dfee452ddb448a4f700696a0cb491edf359f7a
Author: Mike Miller
AuthorDate: Thu Jul 25 10:15:05 2019 -0400
Rename Bulk ITs to be less confusing (#1290)
---
test/src/main/java/org/apache/accumulo/test/functional/BulkIT.java | 3 +++
.../accumulo/test/functional/{BulkLoadIT.java => BulkNewIT.java} | 5 ++---
.../accumulo/test/functional/{BulkFileIT.java => BulkOldIT.java} | 4 ++--
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/BulkIT.java
b/test/src/main/java/org/apache/accumulo/test/functional/BulkIT.java
index ec7fcf7..9f19235 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/BulkIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/BulkIT.java
@@ -33,6 +33,9 @@ import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.junit.Test;
+/**
+ * Tests Old and New Bulk import
+ */
public class BulkIT extends AccumuloClusterHarness {
private static final int N = 10;
diff --git
a/test/src/main/java/org/apache/accumulo/test/functional/BulkLoadIT.java
b/test/src/main/java/org/apache/accumulo/test/functional/BulkNewIT.java
similarity index 98%
rename from
test/src/main/java/org/apache/accumulo/test/functional/BulkLoadIT.java
rename to test/src/main/java/org/apache/accumulo/test/functional/BulkNewIT.java
index dd8ecbb..ddcabf9 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/BulkLoadIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/BulkNewIT.java
@@ -81,12 +81,11 @@ import com.google.common.collect.ImmutableSet;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
/**
- * Tests new bulk import technique. If the old technique ever gets removed
this will replace
- * {@link BulkFileIT}
+ * Tests new bulk import technique. For the old technique see {@link BulkOldIT}
*
* @since 2.0
*/
-public class BulkLoadIT extends SharedMiniClusterBase {
+public class BulkNewIT extends SharedMiniClusterBase {
@BeforeClass
public static void setup() throws Exception {
diff --git
a/test/src/main/java/org/apache/accumulo/test/functional/BulkFileIT.java
b/test/src/main/java/org/apache/accumulo/test/functional/BulkOldIT.java
similarity index 98%
rename from
test/src/main/java/org/apache/accumulo/test/functional/BulkFileIT.java
rename to test/src/main/java/org/apache/accumulo/test/functional/BulkOldIT.java
index 53d08e9..b29a6dc 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/BulkFileIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/BulkOldIT.java
@@ -46,9 +46,9 @@ import org.apache.hadoop.io.Text;
import org.junit.Test;
/**
- * Tests old bulk import technique. For new bulk import see {@link BulkLoadIT}
+ * Tests old bulk import technique. For new bulk import see {@link BulkNewIT}
*/
-public class BulkFileIT extends AccumuloClusterHarness {
+public class BulkOldIT extends AccumuloClusterHarness {
@Override
public void configureMiniCluster(MiniAccumuloConfigImpl cfg, Configuration
conf) {
