You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2014/09/26 20:01:17 UTC
[1/3] git commit: ACCUMULO-3175 Fix some findbugs warnings
Repository: accumulo
Updated Branches:
refs/heads/1.6.2-SNAPSHOT b9a0b27ef -> 43528d5c9
refs/heads/master f9993185d -> fa7e86647
ACCUMULO-3175 Fix some findbugs warnings
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/43528d5c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/43528d5c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/43528d5c
Branch: refs/heads/1.6.2-SNAPSHOT
Commit: 43528d5c96de6eb59abed6a01558737d56dfee1c
Parents: b9a0b27
Author: Josh Elser <el...@apache.org>
Authored: Fri Sep 26 14:00:22 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Fri Sep 26 14:00:22 2014 -0400
----------------------------------------------------------------------
test/src/test/java/org/apache/accumulo/test/Accumulo3047IT.java | 2 +-
.../test/java/org/apache/accumulo/test/functional/LargeRowIT.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/43528d5c/test/src/test/java/org/apache/accumulo/test/Accumulo3047IT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/Accumulo3047IT.java b/test/src/test/java/org/apache/accumulo/test/Accumulo3047IT.java
index 6066bf3..70e1c30 100644
--- a/test/src/test/java/org/apache/accumulo/test/Accumulo3047IT.java
+++ b/test/src/test/java/org/apache/accumulo/test/Accumulo3047IT.java
@@ -54,7 +54,7 @@ public class Accumulo3047IT extends ConfigurableMacIT {
private int timeoutFactor = 1;
@Before
- public void setup() {
+ public void getTimeoutFactor() {
try {
timeoutFactor = Integer.parseInt(System.getProperty("timeout.factor"));
} catch (NumberFormatException e) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/43528d5c/test/src/test/java/org/apache/accumulo/test/functional/LargeRowIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/LargeRowIT.java b/test/src/test/java/org/apache/accumulo/test/functional/LargeRowIT.java
index 32f8539..c07ed1c 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/LargeRowIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/LargeRowIT.java
@@ -68,7 +68,7 @@ public class LargeRowIT extends ConfigurableMacIT {
private int timeoutFactor = 1;
@Before
- public void setup() {
+ public void getTimeoutFactor() {
try {
timeoutFactor = Integer.parseInt(System.getProperty("timeout.factor"));
} catch (NumberFormatException e) {
[2/3] git commit: ACCUMULO-3175 Fix some findbugs warnings
Posted by el...@apache.org.
ACCUMULO-3175 Fix some findbugs warnings
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/43528d5c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/43528d5c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/43528d5c
Branch: refs/heads/master
Commit: 43528d5c96de6eb59abed6a01558737d56dfee1c
Parents: b9a0b27
Author: Josh Elser <el...@apache.org>
Authored: Fri Sep 26 14:00:22 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Fri Sep 26 14:00:22 2014 -0400
----------------------------------------------------------------------
test/src/test/java/org/apache/accumulo/test/Accumulo3047IT.java | 2 +-
.../test/java/org/apache/accumulo/test/functional/LargeRowIT.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/43528d5c/test/src/test/java/org/apache/accumulo/test/Accumulo3047IT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/Accumulo3047IT.java b/test/src/test/java/org/apache/accumulo/test/Accumulo3047IT.java
index 6066bf3..70e1c30 100644
--- a/test/src/test/java/org/apache/accumulo/test/Accumulo3047IT.java
+++ b/test/src/test/java/org/apache/accumulo/test/Accumulo3047IT.java
@@ -54,7 +54,7 @@ public class Accumulo3047IT extends ConfigurableMacIT {
private int timeoutFactor = 1;
@Before
- public void setup() {
+ public void getTimeoutFactor() {
try {
timeoutFactor = Integer.parseInt(System.getProperty("timeout.factor"));
} catch (NumberFormatException e) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/43528d5c/test/src/test/java/org/apache/accumulo/test/functional/LargeRowIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/LargeRowIT.java b/test/src/test/java/org/apache/accumulo/test/functional/LargeRowIT.java
index 32f8539..c07ed1c 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/LargeRowIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/LargeRowIT.java
@@ -68,7 +68,7 @@ public class LargeRowIT extends ConfigurableMacIT {
private int timeoutFactor = 1;
@Before
- public void setup() {
+ public void getTimeoutFactor() {
try {
timeoutFactor = Integer.parseInt(System.getProperty("timeout.factor"));
} catch (NumberFormatException e) {
[3/3] git commit: Merge branch '1.6.2-SNAPSHOT'
Posted by el...@apache.org.
Merge branch '1.6.2-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fa7e8664
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fa7e8664
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/fa7e8664
Branch: refs/heads/master
Commit: fa7e866473b7a215e780d7865ececba8f60add3e
Parents: f999318 43528d5
Author: Josh Elser <el...@apache.org>
Authored: Fri Sep 26 14:01:05 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Fri Sep 26 14:01:05 2014 -0400
----------------------------------------------------------------------
.../java/org/apache/accumulo/test/BadDeleteMarkersCreatedIT.java | 2 +-
.../test/java/org/apache/accumulo/test/functional/LargeRowIT.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/fa7e8664/test/src/test/java/org/apache/accumulo/test/BadDeleteMarkersCreatedIT.java
----------------------------------------------------------------------
diff --cc test/src/test/java/org/apache/accumulo/test/BadDeleteMarkersCreatedIT.java
index 6b5fb70,0000000..2ad28b4
mode 100644,000000..100644
--- a/test/src/test/java/org/apache/accumulo/test/BadDeleteMarkersCreatedIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/BadDeleteMarkersCreatedIT.java
@@@ -1,94 -1,0 +1,94 @@@
+/*
+ * 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.test;
+
+import java.util.Map.Entry;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.Scanner;
+import org.apache.accumulo.core.conf.Property;
+import org.apache.accumulo.core.data.Key;
+import org.apache.accumulo.core.data.Value;
+import org.apache.accumulo.core.metadata.MetadataTable;
+import org.apache.accumulo.core.metadata.schema.MetadataSchema;
+import org.apache.accumulo.core.security.Authorizations;
+import org.apache.accumulo.core.util.UtilWaitThread;
+import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl;
+import org.apache.accumulo.test.functional.ConfigurableMacIT;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.io.Text;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+// Accumulo3047
+public class BadDeleteMarkersCreatedIT extends ConfigurableMacIT {
+
+ @Override
+ public int defaultTimeoutSeconds() {
+ return 60;
+ }
+
+ @Override
+ public void configure(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite) {
+ cfg.setNumTservers(1);
+ cfg.setProperty(Property.GC_CYCLE_DELAY, "1s");
+ cfg.setProperty(Property.GC_CYCLE_START, "0s");
+ }
+
+ private int timeoutFactor = 1;
+
+ @Before
- public void setup() {
++ public void getTimeoutFactor() {
+ try {
+ timeoutFactor = Integer.parseInt(System.getProperty("timeout.factor"));
+ } catch (NumberFormatException e) {
+ log.warn("Could not parse integer from timeout.factor");
+ }
+
+ Assert.assertTrue("timeout.factor must be greater than or equal to 1", timeoutFactor >= 1);
+ }
+
+ @Test
+ public void test() throws Exception {
+ // make a table
+ String tableName = getUniqueNames(1)[0];
+ Connector c = getConnector();
+ c.tableOperations().create(tableName);
+ // add some splits
+ SortedSet<Text> splits = new TreeSet<Text>();
+ for (int i = 0; i < 10; i++) {
+ splits.add(new Text("" + i));
+ }
+ c.tableOperations().addSplits(tableName, splits);
+ // get rid of all the splits
+ c.tableOperations().deleteRows(tableName, null, null);
+ // get rid of the table
+ c.tableOperations().delete(tableName);
+ // let gc run
+ UtilWaitThread.sleep(timeoutFactor * 5 * 1000);
+ // look for delete markers
+ Scanner scanner = c.createScanner(MetadataTable.NAME, Authorizations.EMPTY);
+ scanner.setRange(MetadataSchema.DeletesSection.getRange());
+ for (Entry<Key,Value> entry : scanner) {
+ Assert.fail(entry.getKey().getRow().toString());
+ }
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/fa7e8664/test/src/test/java/org/apache/accumulo/test/functional/LargeRowIT.java
----------------------------------------------------------------------