date:20151024

[1/5] accumulo git commit: ACCUMULO-4030 Support for IBM IOP in configs (Jerry He).

2015-10-24 Thread elserj

Repository: accumulo
Updated Branches:
  refs/heads/1.7 a4bc71b4d -> 071c5071f
  refs/heads/master 8f52ab250 -> 04e91398b


ACCUMULO-4030 Support for IBM IOP in configs (Jerry He).


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/43df0cfe
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/43df0cfe
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/43df0cfe

Branch: refs/heads/1.7
Commit: 43df0cfe18bad8862be95f8246a0ffd9d50093c8
Parents: a4bc71b
Author: Josh Elser 
Authored: Sat Oct 24 16:58:06 2015 -0400
Committer: Josh Elser 
Committed: Sat Oct 24 16:58:06 2015 -0400

--
 assemble/bin/bootstrap_config.sh  | 29 +-
 assemble/conf/templates/accumulo-site.xml |  9 
 2 files changed, 37 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/43df0cfe/assemble/bin/bootstrap_config.sh
--
diff --git a/assemble/bin/bootstrap_config.sh b/assemble/bin/bootstrap_config.sh
index f6eb4d1..719aff9 100755
--- a/assemble/bin/bootstrap_config.sh
+++ b/assemble/bin/bootstrap_config.sh
@@ -237,13 +237,15 @@ fi
 if [[ -z "${HADOOP_VERSION}" ]]; then
   echo
   echo "Choose the Apache Hadoop version:"
-  select HADOOP in 'Hadoop 2' 'HDP 2.0/2.1' 'HDP 2.2' ; do
+  select HADOOP in 'Hadoop 2' 'HDP 2.0/2.1' 'HDP 2.2' 'IOP 4.1'; do
 if [ "${HADOOP}" == "Hadoop 2" ]; then
   HADOOP_VERSION="2"
 elif [ "${HADOOP}" == "HDP 2.0/2.1" ]; then
   HADOOP_VERSION="HDP2"
 elif [ "${HADOOP}" == "HDP 2.2" ]; then
   HADOOP_VERSION="HDP2.2"
+elif [ "${HADOOP}" == "IOP 4.1" ]; then
+  HADOOP_VERSION="IOP4.1"
 fi
 echo "Using Hadoop version '${HADOOP_VERSION}' configuration"
 echo
@@ -333,6 +335,10 @@ if [[ "${HADOOP_VERSION}" == "2" ]]; then
   -e 's//-->/' \
   "${CONF_DIR}/$ACCUMULO_SITE" > temp
   mv temp "${CONF_DIR}/$ACCUMULO_SITE"
+  sed -e 's///-->/' \
+  "${CONF_DIR}/$ACCUMULO_SITE" > temp
+  mv temp "${CONF_DIR}/$ACCUMULO_SITE"
 elif [[ "${HADOOP_VERSION}" == "HDP2" ]]; then
   sed -e 's///-->/' \
@@ -342,6 +348,10 @@ elif [[ "${HADOOP_VERSION}" == "HDP2" ]]; then
   -e 's//-->/' \
   "${CONF_DIR}/$ACCUMULO_SITE" > temp
   mv temp "${CONF_DIR}/$ACCUMULO_SITE"
+  sed -e 's///-->/' \
+  "${CONF_DIR}/$ACCUMULO_SITE" > temp
+  mv temp "${CONF_DIR}/$ACCUMULO_SITE"
 elif [[ "${HADOOP_VERSION}" == "HDP2.2" ]]; then
   sed -e 's///-->/' \
@@ -351,6 +361,23 @@ elif [[ "${HADOOP_VERSION}" == "HDP2.2" ]]; then
   -e 's//-->/' \
   "${CONF_DIR}/$ACCUMULO_SITE" > temp
   mv temp "${CONF_DIR}/$ACCUMULO_SITE"
+  sed -e 's///-->/' \
+  "${CONF_DIR}/$ACCUMULO_SITE" > temp
+  mv temp "${CONF_DIR}/$ACCUMULO_SITE"
+elif [[ "${HADOOP_VERSION}" == "IOP4.1" ]]; then
+  sed -e 's///-->/' \
+  "${CONF_DIR}/$ACCUMULO_SITE" > temp
+  mv temp "${CONF_DIR}/$ACCUMULO_SITE"
+  sed -e 's///-->/' \
+  "${CONF_DIR}/$ACCUMULO_SITE" > temp
+  mv temp "${CONF_DIR}/$ACCUMULO_SITE"
+  sed -e 's///-->/' \
+  "${CONF_DIR}/$ACCUMULO_SITE" > temp
+  mv temp "${CONF_DIR}/$ACCUMULO_SITE"
 fi
 
 #Additional setup steps for native configuration.

http://git-wip-us.apache.org/repos/asf/accumulo/blob/43df0cfe/assemble/conf/templates/accumulo-site.xml
--
diff --git a/assemble/conf/templates/accumulo-site.xml 
b/assemble/conf/templates/accumulo-site.xml
index 0e4f016..eaaf2b6 100644
--- a/assemble/conf/templates/accumulo-site.xml
+++ b/assemble/conf/templates/accumulo-site.xml
@@ -170,6 +170,15 @@ ${mvnProjBaseDir}
   /usr/hdp/current/hadoop-yarn-client/lib/jersey.*.jar,
   /usr/hdp/current/hive-client/lib/hive-accumulo-handler.jar
   
+  
+  /usr/iop/current/hadoop-client/[^.].*.jar,
+  /usr/iop/current/hadoop-client/lib/(?!slf4j)[^.].*.jar,
+  /usr/iop/current/hadoop-hdfs-client/[^.].*.jar,
+  /usr/iop/current/hadoop-mapreduce-client/[^.].*.jar,
+  /usr/iop/current/hadoop-yarn-client/[^.].*.jar,
+  /usr/iop/current/hadoop-yarn-client/lib/jersey.*.jar,
+  /usr/iop/current/hive-client/lib/hive-accumulo-handler.jar
+  
 
 Classpaths that accumulo checks for updates and class 
files.

[2/5] accumulo git commit: ACCUMULO-4030 Support for IBM IOP in configs (Jerry He).

2015-10-24 Thread elserj

ACCUMULO-4030 Support for IBM IOP in configs (Jerry He).


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/43df0cfe
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/43df0cfe
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/43df0cfe

Branch: refs/heads/master
Commit: 43df0cfe18bad8862be95f8246a0ffd9d50093c8
Parents: a4bc71b
Author: Josh Elser 
Authored: Sat Oct 24 16:58:06 2015 -0400
Committer: Josh Elser 
Committed: Sat Oct 24 16:58:06 2015 -0400

--
 assemble/bin/bootstrap_config.sh  | 29 +-
 assemble/conf/templates/accumulo-site.xml |  9 
 2 files changed, 37 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/43df0cfe/assemble/bin/bootstrap_config.sh
--
diff --git a/assemble/bin/bootstrap_config.sh b/assemble/bin/bootstrap_config.sh
index f6eb4d1..719aff9 100755
--- a/assemble/bin/bootstrap_config.sh
+++ b/assemble/bin/bootstrap_config.sh
@@ -237,13 +237,15 @@ fi
 if [[ -z "${HADOOP_VERSION}" ]]; then
   echo
   echo "Choose the Apache Hadoop version:"
-  select HADOOP in 'Hadoop 2' 'HDP 2.0/2.1' 'HDP 2.2' ; do
+  select HADOOP in 'Hadoop 2' 'HDP 2.0/2.1' 'HDP 2.2' 'IOP 4.1'; do
 if [ "${HADOOP}" == "Hadoop 2" ]; then
   HADOOP_VERSION="2"
 elif [ "${HADOOP}" == "HDP 2.0/2.1" ]; then
   HADOOP_VERSION="HDP2"
 elif [ "${HADOOP}" == "HDP 2.2" ]; then
   HADOOP_VERSION="HDP2.2"
+elif [ "${HADOOP}" == "IOP 4.1" ]; then
+  HADOOP_VERSION="IOP4.1"
 fi
 echo "Using Hadoop version '${HADOOP_VERSION}' configuration"
 echo
@@ -333,6 +335,10 @@ if [[ "${HADOOP_VERSION}" == "2" ]]; then
   -e 's//-->/' \
   "${CONF_DIR}/$ACCUMULO_SITE" > temp
   mv temp "${CONF_DIR}/$ACCUMULO_SITE"
+  sed -e 's///-->/' \
+  "${CONF_DIR}/$ACCUMULO_SITE" > temp
+  mv temp "${CONF_DIR}/$ACCUMULO_SITE"
 elif [[ "${HADOOP_VERSION}" == "HDP2" ]]; then
   sed -e 's///-->/' \
@@ -342,6 +348,10 @@ elif [[ "${HADOOP_VERSION}" == "HDP2" ]]; then
   -e 's//-->/' \
   "${CONF_DIR}/$ACCUMULO_SITE" > temp
   mv temp "${CONF_DIR}/$ACCUMULO_SITE"
+  sed -e 's///-->/' \
+  "${CONF_DIR}/$ACCUMULO_SITE" > temp
+  mv temp "${CONF_DIR}/$ACCUMULO_SITE"
 elif [[ "${HADOOP_VERSION}" == "HDP2.2" ]]; then
   sed -e 's///-->/' \
@@ -351,6 +361,23 @@ elif [[ "${HADOOP_VERSION}" == "HDP2.2" ]]; then
   -e 's//-->/' \
   "${CONF_DIR}/$ACCUMULO_SITE" > temp
   mv temp "${CONF_DIR}/$ACCUMULO_SITE"
+  sed -e 's///-->/' \
+  "${CONF_DIR}/$ACCUMULO_SITE" > temp
+  mv temp "${CONF_DIR}/$ACCUMULO_SITE"
+elif [[ "${HADOOP_VERSION}" == "IOP4.1" ]]; then
+  sed -e 's///-->/' \
+  "${CONF_DIR}/$ACCUMULO_SITE" > temp
+  mv temp "${CONF_DIR}/$ACCUMULO_SITE"
+  sed -e 's///-->/' \
+  "${CONF_DIR}/$ACCUMULO_SITE" > temp
+  mv temp "${CONF_DIR}/$ACCUMULO_SITE"
+  sed -e 's///-->/' \
+  "${CONF_DIR}/$ACCUMULO_SITE" > temp
+  mv temp "${CONF_DIR}/$ACCUMULO_SITE"
 fi
 
 #Additional setup steps for native configuration.

http://git-wip-us.apache.org/repos/asf/accumulo/blob/43df0cfe/assemble/conf/templates/accumulo-site.xml
--
diff --git a/assemble/conf/templates/accumulo-site.xml 
b/assemble/conf/templates/accumulo-site.xml
index 0e4f016..eaaf2b6 100644
--- a/assemble/conf/templates/accumulo-site.xml
+++ b/assemble/conf/templates/accumulo-site.xml
@@ -170,6 +170,15 @@ ${mvnProjBaseDir}
   /usr/hdp/current/hadoop-yarn-client/lib/jersey.*.jar,
   /usr/hdp/current/hive-client/lib/hive-accumulo-handler.jar
   
+  
+  /usr/iop/current/hadoop-client/[^.].*.jar,
+  /usr/iop/current/hadoop-client/lib/(?!slf4j)[^.].*.jar,
+  /usr/iop/current/hadoop-hdfs-client/[^.].*.jar,
+  /usr/iop/current/hadoop-mapreduce-client/[^.].*.jar,
+  /usr/iop/current/hadoop-yarn-client/[^.].*.jar,
+  /usr/iop/current/hadoop-yarn-client/lib/jersey.*.jar,
+  /usr/iop/current/hive-client/lib/hive-accumulo-handler.jar
+  
 
 Classpaths that accumulo checks for updates and class 
files.

[3/5] accumulo git commit: Commit automatic checkstyle fix.

2015-10-24 Thread elserj

Commit automatic checkstyle fix.


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/071c5071
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/071c5071
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/071c5071

Branch: refs/heads/master
Commit: 071c5071f8e9eaf35ce2a97b8fb3b200d7583c7d
Parents: 43df0cf
Author: Josh Elser 
Authored: Sat Oct 24 17:03:55 2015 -0400
Committer: Josh Elser 
Committed: Sat Oct 24 17:03:55 2015 -0400

--
 .../java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/071c5071/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
--
diff --git 
a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
 
b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
index 369d9db..9f94622 100644
--- 
a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
+++ 
b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
@@ -267,9 +267,8 @@ public class GarbageCollectionAlgorithm {
 
   }
 
-  private boolean getCandidates(GarbageCollectionEnvironment gce, String 
lastCandidate, List candidates)
-  throws TableNotFoundException, AccumuloException,
-  AccumuloSecurityException {
+  private boolean getCandidates(GarbageCollectionEnvironment gce, String 
lastCandidate, List candidates) throws TableNotFoundException,
+  AccumuloException, AccumuloSecurityException {
 Span candidatesSpan = Trace.start("getCandidates");
 try {
   return gce.getCandidates(lastCandidate, candidates);

[4/5] accumulo git commit: Commit automatic checkstyle fix.

2015-10-24 Thread elserj

Commit automatic checkstyle fix.


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/071c5071
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/071c5071
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/071c5071

Branch: refs/heads/1.7
Commit: 071c5071f8e9eaf35ce2a97b8fb3b200d7583c7d
Parents: 43df0cf
Author: Josh Elser 
Authored: Sat Oct 24 17:03:55 2015 -0400
Committer: Josh Elser 
Committed: Sat Oct 24 17:03:55 2015 -0400

--
 .../java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/071c5071/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
--
diff --git 
a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
 
b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
index 369d9db..9f94622 100644
--- 
a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
+++ 
b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java
@@ -267,9 +267,8 @@ public class GarbageCollectionAlgorithm {
 
   }
 
-  private boolean getCandidates(GarbageCollectionEnvironment gce, String 
lastCandidate, List candidates)
-  throws TableNotFoundException, AccumuloException,
-  AccumuloSecurityException {
+  private boolean getCandidates(GarbageCollectionEnvironment gce, String 
lastCandidate, List candidates) throws TableNotFoundException,
+  AccumuloException, AccumuloSecurityException {
 Span candidatesSpan = Trace.start("getCandidates");
 try {
   return gce.getCandidates(lastCandidate, candidates);

[5/5] accumulo git commit: Merge branch '1.7'

2015-10-24 Thread elserj

Merge branch '1.7'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/04e91398
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/04e91398
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/04e91398

Branch: refs/heads/master
Commit: 04e91398b894768d053a4bc237e23285aaac5d34
Parents: 8f52ab2 071c507
Author: Josh Elser 
Authored: Sat Oct 24 17:04:08 2015 -0400
Committer: Josh Elser 
Committed: Sat Oct 24 17:04:08 2015 -0400

--
 assemble/bin/bootstrap_config.sh| 29 +++-
 assemble/conf/templates/accumulo-site.xml   |  9 ++
 .../accumulo/gc/GarbageCollectionAlgorithm.java |  5 ++--
 3 files changed, 39 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/04e91398/assemble/bin/bootstrap_config.sh
--

[1/3] accumulo git commit: ACCUMULO-4037 Avoid an extra Key creation in TimeSettingIterator.

2015-10-24 Thread elserj

Repository: accumulo
Updated Branches:
  refs/heads/1.7 071c5071f -> a1d3c9286
  refs/heads/master 04e91398b -> dfbb3c299


ACCUMULO-4037 Avoid an extra Key creation in TimeSettingIterator.


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a1d3c928
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a1d3c928
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a1d3c928

Branch: refs/heads/1.7
Commit: a1d3c9286d42a1c0e1556dfce27c2f0f1590dc34
Parents: 071c507
Author: Josh Elser 
Authored: Sat Oct 24 21:14:33 2015 -0400
Committer: Josh Elser 
Committed: Sat Oct 24 21:14:33 2015 -0400

--
 .../iterators/system/TimeSettingIterator.java   |  2 +-
 .../system/TimeSettingIteratorTest.java | 31 ++--
 2 files changed, 29 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/a1d3c928/core/src/main/java/org/apache/accumulo/core/iterators/system/TimeSettingIterator.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/iterators/system/TimeSettingIterator.java
 
b/core/src/main/java/org/apache/accumulo/core/iterators/system/TimeSettingIterator.java
index 3e1b7a9..298ff23 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/iterators/system/TimeSettingIterator.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/iterators/system/TimeSettingIterator.java
@@ -42,7 +42,7 @@ public class TimeSettingIterator implements 
InterruptibleIterator {
 
   @Override
   public Key getTopKey() {
-Key key = new Key(source.getTopKey());
+Key key = source.getTopKey();
 key.setTimestamp(time);
 return key;
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a1d3c928/core/src/test/java/org/apache/accumulo/core/iterators/system/TimeSettingIteratorTest.java
--
diff --git 
a/core/src/test/java/org/apache/accumulo/core/iterators/system/TimeSettingIteratorTest.java
 
b/core/src/test/java/org/apache/accumulo/core/iterators/system/TimeSettingIteratorTest.java
index 783dbc0..3dbe7ca 100644
--- 
a/core/src/test/java/org/apache/accumulo/core/iterators/system/TimeSettingIteratorTest.java
+++ 
b/core/src/test/java/org/apache/accumulo/core/iterators/system/TimeSettingIteratorTest.java
@@ -19,16 +19,20 @@ package org.apache.accumulo.core.iterators.system;
 import java.util.HashSet;
 import java.util.TreeMap;
 
-import junit.framework.TestCase;
-
 import org.apache.accumulo.core.data.ByteSequence;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Range;
 import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.core.iterators.SortedMapIterator;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
-public class TimeSettingIteratorTest extends TestCase {
+public class TimeSettingIteratorTest {
 
+  @Test
   public void test1() throws Exception {
 TreeMap tm1 = new TreeMap();
 
@@ -81,4 +85,25 @@ public class TimeSettingIteratorTest extends TestCase {
 assertFalse(tsi.hasTop());
   }
 
+  @Test
+  public void testAvoidKeyCopy() throws Exception {
+TreeMap tm1 = new TreeMap();
+final Key k = new Key("r0", "cf1", "cq1", 9l);
+
+tm1.put(k, new Value("v0".getBytes()));
+
+TimeSettingIterator tsi = new TimeSettingIterator(new 
SortedMapIterator(tm1), 50);
+
+tsi.seek(new Range(), new HashSet(), false);
+
+assertTrue(tsi.hasTop());
+final Key topKey = tsi.getTopKey();
+assertTrue("Expected the topKey to be the same object", k == topKey);
+assertEquals(new Key("r0", "cf1", "cq1", 50l), topKey);
+assertEquals("v0", tsi.getTopValue().toString());
+tsi.next();
+
+assertFalse(tsi.hasTop());
+  }
+
 }

[3/3] accumulo git commit: Merge branch '1.7'

2015-10-24 Thread elserj

Merge branch '1.7'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/dfbb3c29
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/dfbb3c29
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/dfbb3c29

Branch: refs/heads/master
Commit: dfbb3c2990feed1e9b88e29537dd12d27426686c
Parents: 04e9139 a1d3c92
Author: Josh Elser 
Authored: Sat Oct 24 21:15:12 2015 -0400
Committer: Josh Elser 
Committed: Sat Oct 24 21:15:12 2015 -0400

--
 .../iterators/system/TimeSettingIterator.java   |  2 +-
 .../system/TimeSettingIteratorTest.java | 31 ++--
 2 files changed, 29 insertions(+), 4 deletions(-)
--

[1/5] accumulo git commit: ACCUMULO-4030 Support for IBM IOP in configs (Jerry He).

[2/5] accumulo git commit: ACCUMULO-4030 Support for IBM IOP in configs (Jerry He).

[3/5] accumulo git commit: Commit automatic checkstyle fix.

[4/5] accumulo git commit: Commit automatic checkstyle fix.

[5/5] accumulo git commit: Merge branch '1.7'

[1/3] accumulo git commit: ACCUMULO-4037 Avoid an extra Key creation in TimeSettingIterator.

[3/3] accumulo git commit: Merge branch '1.7'

7 matches

Site Navigation

Mail list logo

Footer information