date:20190607

[accumulo-wikisearch] branch master updated: Minor fixes

2019-06-07 Thread mmiller

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-wikisearch.git


The following commit(s) were added to refs/heads/master by this push:
 new 10bb3d1  Minor fixes
10bb3d1 is described below

commit 10bb3d158eb6bed6e584ce79e1aa661369488d7e
Author: Mike Miller 
AuthorDate: Fri Jun 7 14:11:03 2019 -0400

Minor fixes
---
 ingest/pom.xml| 4 ++--
 .../accumulo/examples/wikisearch/ingest/WikipediaMapper.java  | 8 +---
 pom.xml   | 2 +-
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/ingest/pom.xml b/ingest/pom.xml
index 1f6bc99..a8a0a6c 100644
--- a/ingest/pom.xml
+++ b/ingest/pom.xml
@@ -84,8 +84,8 @@
 prepare-package
 
   lib
-  ! just grab the non-provided runtime dependencies 

-  ! XXX we include guava at the same version as hadoop 
2 provides so that we have it on hadoop 1 
+ 
+ 
   
commons-lang,guava,lucene-core,lucene-analyzers,lucene-wikipedia,protobuf-java,accumulo-core,hadoop-core,libthrift,zookeeper,commons-codec,accumulo-fate,accumulo-trace
   false
 
diff --git 
a/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/ingest/WikipediaMapper.java
 
b/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/ingest/WikipediaMapper.java
index c2fed03..63f1d42 100644
--- 
a/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/ingest/WikipediaMapper.java
+++ 
b/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/ingest/WikipediaMapper.java
@@ -226,13 +226,7 @@ public class WikipediaMapper extends 
Mapper {
   static Set getTokens(Article article) {
 Set tokenList = new HashSet<>();
 try (WikipediaTokenizer tok = new WikipediaTokenizer(new 
StringReader(article.getText( {
-  Attribute term = tok.addAttribute(Attribute.class);
-  while (tok.incrementToken()) {
-String token = term.toString();
-if (!StringUtils.isEmpty(token)) {
-  tokenList.add(token);
-}
-  }
+  tokenList.add(tok.toString());
 } catch (IOException e) {
   log.error("Error tokenizing text", e);
 }
diff --git a/pom.xml b/pom.xml
index ba62cf0..e997c9f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -375,7 +375,7 @@
 prepare-package
 
   ../../lib
-! just grab the non-provided runtime dependencies 

+
   
commons-collections,commons-configuration,commons-io,commons-lang,jline,log4j,libthrift,commons-jci-core,commons-jci-fam,commons-logging,commons-logging-api
   accumulo
   true

[accumulo] 01/01: Merge branch '2.0'

2019-06-07 Thread ctubbsii

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 2cd5b4cc3926689179ce1db2b092d8b3c5cb919d
Merge: 1194ac9 55e5e95
Author: Christopher Tubbs 
AuthorDate: Fri Jun 7 13:21:31 2019 -0400

Merge branch '2.0'

 core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReader.java | 1 -
 1 file changed, 1 deletion(-)

[accumulo] branch master updated (1194ac9 -> 2cd5b4c)

2019-06-07 Thread ctubbsii

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 1194ac9  Merge branch '2.0'
 new 55e5e95  Resolve bad merge of #1185 by removing unused import
 new 2cd5b4c  Merge branch '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:
 core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReader.java | 1 -
 1 file changed, 1 deletion(-)

[accumulo] branch 2.0 updated: Resolve bad merge of #1185 by removing unused import

2019-06-07 Thread ctubbsii

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 55e5e95  Resolve bad merge of #1185 by removing unused import
55e5e95 is described below

commit 55e5e95fe11924c957f955ec4a7d83cdc1ac42f5
Author: Christopher Tubbs 
AuthorDate: Fri Jun 7 13:21:09 2019 -0400

Resolve bad merge of #1185 by removing unused import
---
 core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReader.java | 1 -
 1 file changed, 1 deletion(-)

diff --git 
a/core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReader.java 
b/core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReader.java
index 0bddb07..598248c 100644
--- a/core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReader.java
+++ b/core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReader.java
@@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 import org.apache.accumulo.fate.util.Retry;
 import org.apache.accumulo.fate.util.Retry.RetryFactory;
-import org.apache.accumulo.fate.zookeeper.ZooUtil.ZooKeeperConnectionInfo;
 import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.KeeperException.Code;
 import org.apache.zookeeper.Watcher;

[accumulo] branch master updated (2de0d4f -> 1194ac9)

2019-06-07 Thread ctubbsii

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 2de0d4f  Merge branch '2.0'
 add df55b1a  Remove accumulo-proxy from main accumulo build (#1182)
 new 1194ac9  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:
 assemble/conf/accumulo-env.sh  |  2 +-
 assemble/pom.xml   |  5 -
 assemble/src/main/assemblies/component.xml | 30 -
 pom.xml|  6 -
 proxy/.gitignore   | 31 -
 proxy/pom.xml  |120 -
 proxy/proxy.properties | 22 -
 proxy/src/main/cpp/AccumuloProxy.cpp   |  48566 ---
 proxy/src/main/cpp/AccumuloProxy.h |  15433 --
 .../src/main/cpp/AccumuloProxy_server.skeleton.cpp |553 -
 proxy/src/main/cpp/proxy_constants.cpp | 33 -
 proxy/src/main/cpp/proxy_constants.h   | 40 -
 proxy/src/main/cpp/proxy_types.cpp |   5074 -
 proxy/src/main/cpp/proxy_types.h   |   2031 -
 .../main/java/org/apache/accumulo/proxy/Proxy.java |283 -
 .../org/apache/accumulo/proxy/ProxyServer.java |   2244 -
 .../main/java/org/apache/accumulo/proxy/Util.java  | 70 -
 .../accumulo/proxy/thrift/AccumuloException.java   |393 -
 .../accumulo/proxy/thrift/AccumuloProxy.java   | 133906 --
 .../proxy/thrift/AccumuloSecurityException.java|393 -
 .../accumulo/proxy/thrift/ActiveCompaction.java|   1457 -
 .../apache/accumulo/proxy/thrift/ActiveScan.java   |   1626 -
 .../accumulo/proxy/thrift/BatchScanOptions.java|   1030 -
 .../org/apache/accumulo/proxy/thrift/Column.java   |642 -
 .../apache/accumulo/proxy/thrift/ColumnUpdate.java |967 -
 .../accumulo/proxy/thrift/CompactionReason.java| 67 -
 .../proxy/thrift/CompactionStrategyConfig.java |550 -
 .../accumulo/proxy/thrift/CompactionType.java  | 64 -
 .../apache/accumulo/proxy/thrift/Condition.java|784 -
 .../accumulo/proxy/thrift/ConditionalStatus.java   | 67 -
 .../accumulo/proxy/thrift/ConditionalUpdates.java  |608 -
 .../proxy/thrift/ConditionalWriterOptions.java |865 -
 .../apache/accumulo/proxy/thrift/DiskUsage.java|543 -
 .../apache/accumulo/proxy/thrift/Durability.java   | 67 -
 .../accumulo/proxy/thrift/IteratorScope.java   | 61 -
 .../accumulo/proxy/thrift/IteratorSetting.java |755 -
 .../java/org/apache/accumulo/proxy/thrift/Key.java |866 -
 .../apache/accumulo/proxy/thrift/KeyExtent.java|629 -
 .../org/apache/accumulo/proxy/thrift/KeyValue.java |516 -
 .../accumulo/proxy/thrift/KeyValueAndPeek.java |498 -
 .../proxy/thrift/MutationsRejectedException.java   |393 -
 .../proxy/thrift/NamespaceExistsException.java |393 -
 .../proxy/thrift/NamespaceNotEmptyException.java   |393 -
 .../proxy/thrift/NamespaceNotFoundException.java   |393 -
 .../accumulo/proxy/thrift/NamespacePermission.java | 79 -
 .../proxy/thrift/NoMoreEntriesException.java   |393 -
 .../apache/accumulo/proxy/thrift/PartialKey.java   | 70 -
 .../org/apache/accumulo/proxy/thrift/Range.java|704 -
 .../apache/accumulo/proxy/thrift/ScanColumn.java   |527 -
 .../apache/accumulo/proxy/thrift/ScanOptions.java  |980 -
 .../apache/accumulo/proxy/thrift/ScanResult.java   |548 -
 .../apache/accumulo/proxy/thrift/ScanState.java| 61 -
 .../org/apache/accumulo/proxy/thrift/ScanType.java | 58 -
 .../accumulo/proxy/thrift/SystemPermission.java| 88 -
 .../proxy/thrift/TableExistsException.java |393 -
 .../proxy/thrift/TableNotFoundException.java   |393 -
 .../accumulo/proxy/thrift/TablePermission.java | 70 -
 .../org/apache/accumulo/proxy/thrift/TimeType.java | 58 -
 .../accumulo/proxy/thrift/UnknownScanner.java  |393 -
 .../accumulo/proxy/thrift/UnknownWriter.java   |393 -
 .../accumulo/proxy/thrift/WriterOptions.java   |800 -
 proxy/src/main/python/AccumuloProxy-remote |824 -
 proxy/src/main/python/AccumuloProxy.py |  25443 
 proxy/src/main/python/__init__.py  | 15 -
 proxy/src/main/python/constants.py | 28 -
 proxy/src/main/python/ttypes.py|   3234 -
 proxy/src/main/ruby/accumulo_proxy.rb  |   7069 -
 proxy/src/main/ruby/proxy_constants.rb | 25 -
 proxy/src/main/ruby/proxy_types.rb |927 -
 proxy/src/main/scripts/generate-thrift.sh

[accumulo] 01/01: Merge branch '2.0'

2019-06-07 Thread ctubbsii

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 1194ac970c299d913dc76241e6a58e34e5c1de08
Merge: 2de0d4f df55b1a
Author: Christopher Tubbs 
AuthorDate: Fri Jun 7 12:45:00 2019 -0400

Merge branch '2.0'

 assemble/conf/accumulo-env.sh  |  2 +-
 assemble/pom.xml   |  5 -
 assemble/src/main/assemblies/component.xml | 30 -
 pom.xml|  6 -
 proxy/.gitignore   | 31 -
 proxy/pom.xml  |120 -
 proxy/proxy.properties | 22 -
 proxy/src/main/cpp/AccumuloProxy.cpp   |  48566 ---
 proxy/src/main/cpp/AccumuloProxy.h |  15433 --
 .../src/main/cpp/AccumuloProxy_server.skeleton.cpp |553 -
 proxy/src/main/cpp/proxy_constants.cpp | 33 -
 proxy/src/main/cpp/proxy_constants.h   | 40 -
 proxy/src/main/cpp/proxy_types.cpp |   5074 -
 proxy/src/main/cpp/proxy_types.h   |   2031 -
 .../main/java/org/apache/accumulo/proxy/Proxy.java |283 -
 .../org/apache/accumulo/proxy/ProxyServer.java |   2244 -
 .../main/java/org/apache/accumulo/proxy/Util.java  | 70 -
 .../accumulo/proxy/thrift/AccumuloException.java   |393 -
 .../accumulo/proxy/thrift/AccumuloProxy.java   | 133906 --
 .../proxy/thrift/AccumuloSecurityException.java|393 -
 .../accumulo/proxy/thrift/ActiveCompaction.java|   1457 -
 .../apache/accumulo/proxy/thrift/ActiveScan.java   |   1626 -
 .../accumulo/proxy/thrift/BatchScanOptions.java|   1030 -
 .../org/apache/accumulo/proxy/thrift/Column.java   |642 -
 .../apache/accumulo/proxy/thrift/ColumnUpdate.java |967 -
 .../accumulo/proxy/thrift/CompactionReason.java| 67 -
 .../proxy/thrift/CompactionStrategyConfig.java |550 -
 .../accumulo/proxy/thrift/CompactionType.java  | 64 -
 .../apache/accumulo/proxy/thrift/Condition.java|784 -
 .../accumulo/proxy/thrift/ConditionalStatus.java   | 67 -
 .../accumulo/proxy/thrift/ConditionalUpdates.java  |608 -
 .../proxy/thrift/ConditionalWriterOptions.java |865 -
 .../apache/accumulo/proxy/thrift/DiskUsage.java|543 -
 .../apache/accumulo/proxy/thrift/Durability.java   | 67 -
 .../accumulo/proxy/thrift/IteratorScope.java   | 61 -
 .../accumulo/proxy/thrift/IteratorSetting.java |755 -
 .../java/org/apache/accumulo/proxy/thrift/Key.java |866 -
 .../apache/accumulo/proxy/thrift/KeyExtent.java|629 -
 .../org/apache/accumulo/proxy/thrift/KeyValue.java |516 -
 .../accumulo/proxy/thrift/KeyValueAndPeek.java |498 -
 .../proxy/thrift/MutationsRejectedException.java   |393 -
 .../proxy/thrift/NamespaceExistsException.java |393 -
 .../proxy/thrift/NamespaceNotEmptyException.java   |393 -
 .../proxy/thrift/NamespaceNotFoundException.java   |393 -
 .../accumulo/proxy/thrift/NamespacePermission.java | 79 -
 .../proxy/thrift/NoMoreEntriesException.java   |393 -
 .../apache/accumulo/proxy/thrift/PartialKey.java   | 70 -
 .../org/apache/accumulo/proxy/thrift/Range.java|704 -
 .../apache/accumulo/proxy/thrift/ScanColumn.java   |527 -
 .../apache/accumulo/proxy/thrift/ScanOptions.java  |980 -
 .../apache/accumulo/proxy/thrift/ScanResult.java   |548 -
 .../apache/accumulo/proxy/thrift/ScanState.java| 61 -
 .../org/apache/accumulo/proxy/thrift/ScanType.java | 58 -
 .../accumulo/proxy/thrift/SystemPermission.java| 88 -
 .../proxy/thrift/TableExistsException.java |393 -
 .../proxy/thrift/TableNotFoundException.java   |393 -
 .../accumulo/proxy/thrift/TablePermission.java | 70 -
 .../org/apache/accumulo/proxy/thrift/TimeType.java | 58 -
 .../accumulo/proxy/thrift/UnknownScanner.java  |393 -
 .../accumulo/proxy/thrift/UnknownWriter.java   |393 -
 .../accumulo/proxy/thrift/WriterOptions.java   |800 -
 proxy/src/main/python/AccumuloProxy-remote |824 -
 proxy/src/main/python/AccumuloProxy.py |  25443 
 proxy/src/main/python/__init__.py  | 15 -
 proxy/src/main/python/constants.py | 28 -
 proxy/src/main/python/ttypes.py|   3234 -
 proxy/src/main/ruby/accumulo_proxy.rb  |   7069 -
 proxy/src/main/ruby/proxy_constants.rb | 25 -
 proxy/src/main/ruby/proxy_types.rb |927 -
 proxy/src/main/scripts/generate-thrift.sh  | 25 -
 proxy/src/main/spotbugs/exclude-filter.xml | 26 -
 proxy/src/main/thrift/proxy.thrift |   1253 -
 .../org/apache/accumulo/proxy/ProxyServerTest.java |112 -

[accumulo] 01/01: Merge branch '1.9' into 2.0

2019-06-07 Thread ctubbsii

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 3bdb6cd94d0fbdd88bff6da4aeb682bd4391c847
Merge: c8776a9 3311218
Author: Christopher Tubbs 
AuthorDate: Fri Jun 7 12:41:25 2019 -0400

Merge branch '1.9' into 2.0

 core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReader.java | 4 +---
 core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooUtil.java   | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --cc core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReader.java
index 98e49d3,000..0bddb07
mode 100644,00..100644
--- a/core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReader.java
+++ b/core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReader.java
@@@ -1,263 -1,0 +1,261 @@@
 +/*
 + * 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.fate.zookeeper;
 +
 +import java.util.List;
 +import java.util.concurrent.CountDownLatch;
 +import java.util.concurrent.atomic.AtomicInteger;
 +
 +import org.apache.accumulo.fate.util.Retry;
 +import org.apache.accumulo.fate.util.Retry.RetryFactory;
 +import org.apache.accumulo.fate.zookeeper.ZooUtil.ZooKeeperConnectionInfo;
 +import org.apache.zookeeper.KeeperException;
 +import org.apache.zookeeper.KeeperException.Code;
 +import org.apache.zookeeper.Watcher;
 +import org.apache.zookeeper.ZooKeeper;
 +import org.apache.zookeeper.data.ACL;
 +import org.apache.zookeeper.data.Stat;
 +import org.slf4j.Logger;
 +import org.slf4j.LoggerFactory;
 +
 +public class ZooReader implements IZooReader {
 +  private static final Logger log = LoggerFactory.getLogger(ZooReader.class);
 +
 +  protected String keepers;
 +  protected int timeout;
 +  private final RetryFactory retryFactory;
-   private final ZooKeeperConnectionInfo info;
 +
 +  protected ZooKeeper getSession(String keepers, int timeout, String scheme, 
byte[] auth) {
 +return ZooSession.getSession(keepers, timeout, scheme, auth);
 +  }
 +
 +  protected ZooKeeper getZooKeeper() {
 +return getSession(keepers, timeout, null, null);
 +  }
 +
 +  protected RetryFactory getRetryFactory() {
 +return retryFactory;
 +  }
 +
 +  protected void retryOrThrow(Retry retry, KeeperException e) throws 
KeeperException {
 +log.warn("Saw (possibly) transient exception communicating with 
ZooKeeper", e);
 +if (retry.canRetry()) {
 +  retry.useRetry();
 +  return;
 +}
 +
 +log.error("Retry attempts ({}) exceeded trying to communicate with 
ZooKeeper",
 +retry.retriesCompleted());
 +throw e;
 +  }
 +
 +  @Override
 +  public byte[] getData(String zPath, Stat stat) throws KeeperException, 
InterruptedException {
 +return getData(zPath, false, stat);
 +  }
 +
 +  @Override
 +  public byte[] getData(String zPath, boolean watch, Stat stat)
 +  throws KeeperException, InterruptedException {
 +final Retry retry = getRetryFactory().createRetry();
 +while (true) {
 +  try {
 +return getZooKeeper().getData(zPath, watch, stat);
 +  } catch (KeeperException e) {
 +final Code code = e.code();
 +if (code == Code.CONNECTIONLOSS || code == Code.OPERATIONTIMEOUT
 +|| code == Code.SESSIONEXPIRED) {
 +  retryOrThrow(retry, e);
 +} else {
 +  throw e;
 +}
 +  }
 +
 +  retry.waitForNextAttempt();
 +}
 +  }
 +
 +  @Override
 +  public byte[] getData(String zPath, Watcher watcher, Stat stat)
 +  throws KeeperException, InterruptedException {
 +final Retry retry = getRetryFactory().createRetry();
 +while (true) {
 +  try {
 +return getZooKeeper().getData(zPath, watcher, stat);
 +  } catch (KeeperException e) {
 +final Code code = e.code();
 +if (code == Code.CONNECTIONLOSS || code == Code.OPERATIONTIMEOUT
 +|| code == Code.SESSIONEXPIRED) {
 +  retryOrThrow(retry, e);
 +} else {
 +  throw e;
 +}
 +  }
 +
 +  retry.waitForNextAttempt();
 +}
 +  }
 +
 +  @Override
 +  public Stat getStatus(String zPath) throws KeeperException, 
InterruptedException {
 +

[accumulo] branch master updated (f7f18d7 -> 2de0d4f)

2019-06-07 Thread ctubbsii

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 f7f18d7  Update TESTING.md (#1183)
 add 3311218  Ensures correct use of ZooKeeper getAcl (#1185)
 new 3bdb6cd  Merge branch '1.9' into 2.0
 new 2de0d4f  Merge branch '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:
 core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReader.java | 4 +---
 core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooUtil.java   | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

[accumulo] 01/01: Merge branch '2.0'

2019-06-07 Thread ctubbsii

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 2de0d4f90b8b81a2847c6a97e62b267db96cbed7
Merge: f7f18d7 3bdb6cd
Author: Christopher Tubbs 
AuthorDate: Fri Jun 7 12:41:35 2019 -0400

Merge branch '2.0'

 core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReader.java | 4 +---
 core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooUtil.java   | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

[accumulo] branch 2.0 updated (c8776a9 -> 3bdb6cd)

2019-06-07 Thread ctubbsii

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 c8776a9  Update ZooKeeper (CVE-2019-0201)
 add 3311218  Ensures correct use of ZooKeeper getAcl (#1185)
 new 3bdb6cd  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:
 core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReader.java | 4 +---
 core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooUtil.java   | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

[accumulo] branch 1.9 updated: Ensures correct use of ZooKeeper getAcl (#1185)

2019-06-07 Thread ctubbsii

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 3311218  Ensures correct use of ZooKeeper getAcl (#1185)
3311218 is described below

commit 3311218c639173f1df41fa31b318e17a1e0ce47f
Author: Christopher Tubbs 
AuthorDate: Fri Jun 7 12:40:06 2019 -0400

Ensures correct use of ZooKeeper getAcl (#1185)

This fixes a bug in Accumulo where we were using an unauthenticated
ZooKeeper session to read ACLs on a node that we had previously written.

ZooKeeper 3.4.14 fixed a bug in their code that allowed unauthenticated
connections to read ACLs on paths for which they did not have READ
permission.

Using Accumulo with that version of ZooKeeper exposed the bug in our
code that passed the incorrect ZooKeeper session when retrieving ACLs.
---
 fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReader.java | 5 +
 fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooUtil.java   | 4 ++--
 pom.xml  | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git 
a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReader.java 
b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReader.java
index 3bd470f..24a2bc8 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReader.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReader.java
@@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 import org.apache.accumulo.fate.util.Retry;
 import org.apache.accumulo.fate.util.Retry.RetryFactory;
-import org.apache.accumulo.fate.zookeeper.ZooUtil.ZooKeeperConnectionInfo;
 import org.apache.zookeeper.AsyncCallback.VoidCallback;
 import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.KeeperException.Code;
@@ -39,7 +38,6 @@ public class ZooReader implements IZooReader {
   protected String keepers;
   protected int timeout;
   private final RetryFactory retryFactory;
-  private final ZooKeeperConnectionInfo info;
 
   protected ZooKeeper getSession(String keepers, int timeout, String scheme, 
byte[] auth) {
 return ZooSession.getSession(keepers, timeout, scheme, auth);
@@ -255,13 +253,12 @@ public class ZooReader implements IZooReader {
 
   @Override
   public List getACL(String zPath, Stat stat) throws KeeperException, 
InterruptedException {
-return ZooUtil.getACL(info, zPath, stat);
+return ZooUtil.getACL(getZooKeeper(), zPath, stat);
   }
 
   public ZooReader(String keepers, int timeout) {
 this.keepers = keepers;
 this.timeout = timeout;
 this.retryFactory = ZooUtil.DEFAULT_RETRY;
-this.info = new ZooKeeperConnectionInfo(keepers, timeout, null, null);
   }
 }
diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooUtil.java 
b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooUtil.java
index bbd4611..a61d668 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooUtil.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooUtil.java
@@ -545,12 +545,12 @@ public class ZooUtil {
 }
   }
 
-  public static List getACL(ZooKeeperConnectionInfo info, String zPath, 
Stat stat)
+  public static List getACL(ZooKeeper zk, String zPath, Stat stat)
   throws KeeperException, InterruptedException {
 final Retry retry = RETRY_FACTORY.createRetry();
 while (true) {
   try {
-return getZooKeeper(info).getACL(zPath, stat);
+return zk.getACL(zPath, stat);
   } catch (KeeperException e) {
 final Code c = e.code();
 if (c == Code.CONNECTIONLOSS || c == Code.OPERATIONTIMEOUT || c == 
Code.SESSIONEXPIRED) {
diff --git a/pom.xml b/pom.xml
index 1ef5233..e5f2e2b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -149,7 +149,7 @@
 
 0.9.3-1
 
-3.4.6
+3.4.14

[accumulo-wikisearch] branch master updated: Upgrade to lucene 7.1.0

2019-06-07 Thread mmiller

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-wikisearch.git


The following commit(s) were added to refs/heads/master by this push:
 new 134b78d  Upgrade to lucene 7.1.0
134b78d is described below

commit 134b78df77f45184f2193e6f5d822f1d99071f59
Author: Mike Miller 
AuthorDate: Fri Jun 7 11:21:54 2019 -0400

Upgrade to lucene 7.1.0
---
 ingest/pom.xml |  6 +-
 .../wikisearch/ingest/ArticleExtractor.java|  8 +-
 .../wikisearch/ingest/WikipediaConfiguration.java  |  7 --
 .../wikisearch/ingest/WikipediaMapper.java | 25 ++
 .../wikisearch/normalizer/NumberNormalizer.java| 42 --
 .../normalizer/testNumberNormalizer.java   | 90 --
 pom.xml| 21 ++---
 7 files changed, 18 insertions(+), 181 deletions(-)

diff --git a/ingest/pom.xml b/ingest/pom.xml
index 295c8a8..1f6bc99 100644
--- a/ingest/pom.xml
+++ b/ingest/pom.xml
@@ -57,7 +57,7 @@
 
 
   org.apache.lucene
-  lucene-wikipedia
+  lucene-analyzers-common
 
 
   org.apache.zookeeper
@@ -84,8 +84,8 @@
 prepare-package
 
   lib
-  
-  
+  ! just grab the non-provided runtime dependencies 

+  ! XXX we include guava at the same version as hadoop 
2 provides so that we have it on hadoop 1 
   
commons-lang,guava,lucene-core,lucene-analyzers,lucene-wikipedia,protobuf-java,accumulo-core,hadoop-core,libthrift,zookeeper,commons-codec,accumulo-fate,accumulo-trace
   false
 
diff --git 
a/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/ingest/ArticleExtractor.java
 
b/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/ingest/ArticleExtractor.java
index 0699cfa..cda08d8 100644
--- 
a/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/ingest/ArticleExtractor.java
+++ 
b/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/ingest/ArticleExtractor.java
@@ -31,7 +31,6 @@ import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 
 import 
org.apache.accumulo.examples.wikisearch.normalizer.LcNoDiacriticsNormalizer;
-import org.apache.accumulo.examples.wikisearch.normalizer.NumberNormalizer;
 import org.apache.hadoop.io.Text;
 import org.apache.hadoop.io.Writable;
 
@@ -39,7 +38,6 @@ import org.apache.hadoop.io.Writable;
 public class ArticleExtractor {
   
   public final static SimpleDateFormat dateFormat = new 
SimpleDateFormat("-MM-dd'T'HH:mm:ss'Z'Z");
-  private static NumberNormalizer nn = new NumberNormalizer();
   private static LcNoDiacriticsNormalizer lcdn = new 
LcNoDiacriticsNormalizer();
   
   public static class Article implements Writable {
@@ -91,9 +89,11 @@ public class ArticleExtractor {
 
 public Map getNormalizedFieldValues() {
   Map fields = new HashMap();
-  fields.put("ID", nn.normalizeFieldValue("ID", this.id));
+  //fields.put("ID", nn.normalizeFieldValue("ID", this.id));
+  fields.put("ID", Integer.toString(this.id));
   fields.put("TITLE", lcdn.normalizeFieldValue("TITLE", this.title));
-  fields.put("TIMESTAMP", nn.normalizeFieldValue("TIMESTAMP", 
this.timestamp));
+  //fields.put("TIMESTAMP", nn.normalizeFieldValue("TIMESTAMP", 
this.timestamp));
+  fields.put("TIMESTAMP", Long.toString(this.timestamp));
   fields.put("COMMENTS", lcdn.normalizeFieldValue("COMMENTS", 
this.comments));
   return fields;
 }
diff --git 
a/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/ingest/WikipediaConfiguration.java
 
b/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/ingest/WikipediaConfiguration.java
index 44a3fbc..05ce8d8 100644
--- 
a/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/ingest/WikipediaConfiguration.java
+++ 
b/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/ingest/WikipediaConfiguration.java
@@ -28,7 +28,6 @@ import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.util.ReflectionUtils;
 import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.analysis.SimpleAnalyzer;
 
 public class WikipediaConfiguration {
   public final static String INSTANCE_NAME = 
"wikipedia.accumulo.instance_name";
@@ -107,12 +106,6 @@ public class WikipediaConfiguration {
 return new Path(filename);
   }
 
-  public static Analyzer getAnalyzer(Configuration conf) throws IOException {
-Class analyzerClass =
-conf.getClass(ANALYZER, SimpleAnalyzer.class, Analyzer.class);
-return ReflectionUtils.newInstance(analyzerClass, conf);
-  }
-
   public static Connector getConnector(Configuration conf)
   throws AccumuloException, AccumuloSecurityException {
 return

[accumulo-wikisearch] branch master updated: Minor fixes

[accumulo] 01/01: Merge branch '2.0'

[accumulo] branch master updated (1194ac9 -> 2cd5b4c)

[accumulo] branch 2.0 updated: Resolve bad merge of #1185 by removing unused import

[accumulo] branch master updated (2de0d4f -> 1194ac9)

[accumulo] 01/01: Merge branch '2.0'

[accumulo] 01/01: Merge branch '1.9' into 2.0

[accumulo] branch master updated (f7f18d7 -> 2de0d4f)

[accumulo] 01/01: Merge branch '2.0'

[accumulo] branch 2.0 updated (c8776a9 -> 3bdb6cd)

[accumulo] branch 1.9 updated: Ensures correct use of ZooKeeper getAcl (#1185)

[accumulo-wikisearch] branch master updated: Upgrade to lucene 7.1.0

12 matches

Site Navigation

Mail list logo

Footer information