[1/3] kudu git commit: [iwyu] minor cleanup after LLVM/IWYU update
Repository: kudu Updated Branches: refs/heads/master 934e34328 -> 953a7070f [iwyu] minor cleanup after LLVM/IWYU update It seems IWYU started output some new warning since LLVM/IWYU was upgraded recently. I found that while looking at IWYU warnings output while processing HMS-related code. This small update cleans up all warnings from all files we currently check with IWYU tool. As an additional update, I switched client/error-internal.{cc,h} from gscoped_ptr to std::unique_ptr. This changelist does not contain any functional changes. Change-Id: I6314e0df6273a602c71c728a7e4126a8d2edddfd Reviewed-on: http://gerrit.cloudera.org:8080/10130 Tested-by: Alexey SerbinReviewed-by: Alexey Serbin Project: http://git-wip-us.apache.org/repos/asf/kudu/repo Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/767005c5 Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/767005c5 Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/767005c5 Branch: refs/heads/master Commit: 767005c5760f5664e8c2ac8508ad3181fe7a27ca Parents: 934e343 Author: Alexey Serbin Authored: Thu Apr 19 16:45:49 2018 -0700 Committer: Alexey Serbin Committed: Fri Apr 20 04:36:38 2018 + -- src/kudu/benchmarks/tpch/tpch_real_world.cc | 1 - src/kudu/cfile/cfile_reader.cc| 1 - src/kudu/client/batcher.cc| 1 - src/kudu/client/client.cc | 3 +-- src/kudu/client/error-internal.cc | 7 ++- src/kudu/client/error-internal.h | 10 +- src/kudu/client/error_collector.cc| 1 - src/kudu/codegen/codegen-test.cc | 1 - src/kudu/common/encoded_key.cc| 1 - src/kudu/common/partition_pruner-test.cc | 1 - src/kudu/common/scan_spec-test.cc | 1 - src/kudu/consensus/consensus_peers-test.cc| 1 - src/kudu/consensus/consensus_peers.cc | 1 - src/kudu/consensus/leader_election-test.cc| 1 - src/kudu/consensus/leader_election.cc | 1 - src/kudu/consensus/log-test.cc| 1 - src/kudu/consensus/log.h | 2 +- src/kudu/consensus/peer_manager.cc| 1 - src/kudu/consensus/raft_consensus.cc | 1 - src/kudu/consensus/raft_consensus_quorum-test.cc | 1 - src/kudu/integration-tests/create-table-itest.cc | 1 - .../integration-tests/raft_consensus_nonvoter-itest.cc| 4 ++-- src/kudu/master/catalog_manager.cc| 1 - src/kudu/master/master.cc | 1 - src/kudu/master/sys_catalog.cc| 1 - src/kudu/mini-cluster/external_mini_cluster-test.cc | 1 + src/kudu/rpc/connection.cc| 1 - src/kudu/rpc/inbound_call.cc | 1 - src/kudu/rpc/messenger.cc | 1 - src/kudu/rpc/mt-rpc-test.cc | 1 - src/kudu/rpc/negotiation-test.cc | 1 + src/kudu/rpc/outbound_call.cc | 1 - src/kudu/rpc/service_pool.cc | 1 - src/kudu/security/tls_context.h | 5 +++-- src/kudu/server/rpc_server.cc | 1 - src/kudu/server/server_base.cc| 1 - src/kudu/tablet/compaction.cc | 1 - src/kudu/tablet/diskrowset-test.cc| 1 - src/kudu/tablet/memrowset.cc | 1 - src/kudu/tablet/row_op.cc | 1 - src/kudu/tablet/rowset.h | 1 - src/kudu/tablet/rowset_info.cc| 1 - src/kudu/tablet/svg_dump.cc | 1 - src/kudu/tablet/tablet-test.cc| 1 - src/kudu/tablet/tablet.cc | 1 - src/kudu/tablet/tablet_bootstrap-test.cc | 1 - src/kudu/tablet/tablet_history_gc-test.cc | 1 - src/kudu/tablet/tablet_metadata.cc| 1 - src/kudu/tablet/tablet_metadata.h | 2 +- src/kudu/tablet/tablet_replica-test.cc| 1 - src/kudu/tablet/tablet_replica.cc | 1 - src/kudu/tablet/transactions/transaction_driver.cc| 1 - src/kudu/tablet/transactions/transaction_tracker-test.cc | 1 - src/kudu/tablet/transactions/write_transaction.cc | 1 - src/kudu/tools/ksck_remote.cc
[3/3] kudu git commit: build-support: add a nicer logger to python scripts
build-support: add a nicer logger to python scripts Change-Id: Ic648fadfbb11eb3e0a8f137ae3f3143e52149101 Reviewed-on: http://gerrit.cloudera.org:8080/10131 Reviewed-by: Alexey SerbinTested-by: Alexey Serbin Project: http://git-wip-us.apache.org/repos/asf/kudu/repo Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/953a7070 Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/953a7070 Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/953a7070 Branch: refs/heads/master Commit: 953a7070f6a743410f9b8dc74e85b66023d8ab56 Parents: b463969 Author: Todd Lipcon Authored: Thu Apr 19 16:44:22 2018 -0700 Committer: Alexey Serbin Committed: Fri Apr 20 05:52:05 2018 + -- build-support/build_source_release.py | 5 +++-- build-support/check_compatibility.py | 4 ++-- build-support/clang_tidy_gerrit.py| 4 +++- build-support/dist_test.py| 24 +--- build-support/gen_version_info.py | 5 +++-- build-support/iwyu.py | 5 ++--- build-support/kudu_util.py| 14 ++ build-support/push_to_asf.py | 4 ++-- 8 files changed, 42 insertions(+), 23 deletions(-) -- http://git-wip-us.apache.org/repos/asf/kudu/blob/953a7070/build-support/build_source_release.py -- diff --git a/build-support/build_source_release.py b/build-support/build_source_release.py index 35ffa40..5ef39b2 100755 --- a/build-support/build_source_release.py +++ b/build-support/build_source_release.py @@ -31,7 +31,8 @@ try: except ImportError: import urllib -from kudu_util import check_output, confirm_prompt, Colors, get_my_email, get_upstream_commit, ROOT +from kudu_util import check_output, confirm_prompt, Colors, get_my_email, get_upstream_commit, \ + init_logging, ROOT def check_repo_not_dirty(): @@ -190,5 +191,5 @@ def main(): if __name__ == "__main__": - logging.basicConfig(level=logging.INFO) + init_logging() main() http://git-wip-us.apache.org/repos/asf/kudu/blob/953a7070/build-support/check_compatibility.py -- diff --git a/build-support/check_compatibility.py b/build-support/check_compatibility.py index a8b8e3e..61d5661 100755 --- a/build-support/check_compatibility.py +++ b/build-support/check_compatibility.py @@ -32,7 +32,7 @@ import subprocess import sys import tempfile -from kudu_util import check_output +from kudu_util import check_output, init_logging JAVA_ACC_GIT_URL = "https://github.com/lvc/japi-compliance-checker.git; @@ -180,7 +180,6 @@ def run_java_acc(src_name, src, dst_name, dst): def main(argv): - logging.basicConfig(level=logging.INFO) parser = optparse.OptionParser( usage="usage: %prog SRC..[DST]") parser.add_option("-f", "--force-download", dest="force_download_deps", @@ -223,4 +222,5 @@ def main(argv): if __name__ == "__main__": + init_logging() main(sys.argv) http://git-wip-us.apache.org/repos/asf/kudu/blob/953a7070/build-support/clang_tidy_gerrit.py -- diff --git a/build-support/clang_tidy_gerrit.py b/build-support/clang_tidy_gerrit.py index 3e77abe..d29a792 100755 --- a/build-support/clang_tidy_gerrit.py +++ b/build-support/clang_tidy_gerrit.py @@ -31,6 +31,8 @@ import sys import unittest import tempfile +from kudu_util import init_logging + ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), "..")) CLANG_TIDY_DIFF = os.path.join( @@ -176,7 +178,7 @@ class TestClangTidyGerrit(unittest.TestCase): if __name__ == "__main__": # Basic setup and argument parsing. -logging.basicConfig(level=logging.INFO) +init_logging() parser = argparse.ArgumentParser( description="Run clang-tidy on a patch, optionally posting warnings as comments to gerrit") parser.add_argument("-n", "--no-gerrit", action="store_true", http://git-wip-us.apache.org/repos/asf/kudu/blob/953a7070/build-support/dist_test.py -- diff --git a/build-support/dist_test.py b/build-support/dist_test.py index 132b465..87ac820 100755 --- a/build-support/dist_test.py +++ b/build-support/dist_test.py @@ -39,6 +39,8 @@ import shutil import subprocess import time +from kudu_util import init_logging + TEST_TIMEOUT_SECS = int(os.environ.get('TEST_TIMEOUT_SECS', '900')) ARTIFACT_ARCHIVE_GLOBS = ["build/*/test-logs/**/*"] ISOLATE_SERVER = os.environ.get('ISOLATE_SERVER', @@ -165,7 +167,7 @@ def get_test_executions(options): cwd=rel_to_abs("build/latest")) out, err = p.communicate() if p.returncode != 0: -print >>sys.stderr, "Unable to
kudu git commit: [Java] Mark the Yetus annotations dependency optional
Repository: kudu Updated Branches: refs/heads/master e6061b205 -> 934e34328 [Java] Mark the Yetus annotations dependency optional Given the Yetus dependency is mainly used for documentation generation and is not used at runtime, we can mark the annotation as optional for users consuming Kudu. This is similar to the jsr305 dependency which we mark as optional. Additionally we donât need to include Yetus in our shaded jars. Change-Id: I6daf4f21c6cdde08145f5467e84d68dbe40cec16 Reviewed-on: http://gerrit.cloudera.org:8080/10095 Reviewed-by: Grant HenkeTested-by: Kudu Jenkins Project: http://git-wip-us.apache.org/repos/asf/kudu/repo Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/934e3432 Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/934e3432 Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/934e3432 Branch: refs/heads/master Commit: 934e343288836025d8bb571d27d7f33130e4e5b4 Parents: e6061b2 Author: Grant Henke Authored: Mon Apr 16 09:28:23 2018 -0500 Committer: Grant Henke Committed: Fri Apr 20 03:49:11 2018 + -- java/kudu-client-tools/build.gradle | 4 ++-- java/kudu-client-tools/pom.xml | 13 +++-- java/kudu-client/build.gradle | 2 +- java/kudu-client/pom.xml| 11 ++- java/kudu-flume-sink/build.gradle | 3 ++- java/kudu-flume-sink/pom.xml| 12 +++- java/kudu-jepsen/build.gradle | 3 ++- java/kudu-jepsen/pom.xml| 1 + java/kudu-mapreduce/build.gradle| 3 ++- java/kudu-mapreduce/pom.xml | 12 +++- java/kudu-spark-tools/build.gradle | 3 ++- java/kudu-spark-tools/pom.xml | 14 +++--- java/kudu-spark/build.gradle| 3 ++- java/kudu-spark/pom.xml | 12 +++- 14 files changed, 55 insertions(+), 41 deletions(-) -- http://git-wip-us.apache.org/repos/asf/kudu/blob/934e3432/java/kudu-client-tools/build.gradle -- diff --git a/java/kudu-client-tools/build.gradle b/java/kudu-client-tools/build.gradle index 2728287..fb07600 100644 --- a/java/kudu-client-tools/build.gradle +++ b/java/kudu-client-tools/build.gradle @@ -19,12 +19,12 @@ apply from: "$rootDir/gradle/shadow.gradle" dependencies { compile project(":kudu-mapreduce") - // This artifact is in compile scope for convenience, as it is typically // not included in the job classpath by MapReduce platform providers. compile libs.parquetHadoop compile libs.slf4jApi - compile libs.yetusAnnotations + + optional libs.yetusAnnotations provided libs.hadoopClient http://git-wip-us.apache.org/repos/asf/kudu/blob/934e3432/java/kudu-client-tools/pom.xml -- diff --git a/java/kudu-client-tools/pom.xml b/java/kudu-client-tools/pom.xml index d72b9cb..b363e49 100644 --- a/java/kudu-client-tools/pom.xml +++ b/java/kudu-client-tools/pom.xml @@ -37,11 +37,6 @@ ${project.version} -org.apache.yetus -audience-annotations -${yetus.version} - - org.slf4j slf4j-api ${slf4j.version} @@ -63,6 +58,13 @@ +org.apache.yetus +audience-annotations +${yetus.version} +true + + + org.apache.kudu kudu-client ${project.version} @@ -112,7 +114,6 @@ org.apache.kudu:kudu-client org.apache.kudu:kudu-mapreduce - org.apache.yetus:audience-annotations org.apache.parquet:parquet-hadoop http://git-wip-us.apache.org/repos/asf/kudu/blob/934e3432/java/kudu-client/build.gradle -- diff --git a/java/kudu-client/build.gradle b/java/kudu-client/build.gradle index b266073..3161f6c 100644 --- a/java/kudu-client/build.gradle +++ b/java/kudu-client/build.gradle @@ -28,7 +28,6 @@ dependencies { exclude group: "org.slf4j", module: "slf4j-api" } compileUnshaded libs.slf4jApi - compileUnshaded libs.yetusAnnotations compile libs.guava compile libs.murmur @@ -36,6 +35,7 @@ dependencies { compile libs.protobufJava optional libs.jsr305 + optional libs.yetusAnnotations testCompile libs.commonsIo testCompile libs.hamcrestCore http://git-wip-us.apache.org/repos/asf/kudu/blob/934e3432/java/kudu-client/pom.xml -- diff --git a/java/kudu-client/pom.xml b/java/kudu-client/pom.xml index
kudu git commit: [Java] Remove ImmutableList use in kudu-spark
Repository: kudu Updated Branches: refs/heads/master 1f380f279 -> e6061b205 [Java] Remove ImmutableList use in kudu-spark This is currently breaking the build because another non-conflicting patch removed guava from kudu-spark. Change-Id: Ib8ddf8435d0e7224c379de38b8ec4649aa8d6c81 Reviewed-on: http://gerrit.cloudera.org:8080/10124 Reviewed-by: Adar DemboTested-by: Grant Henke Project: http://git-wip-us.apache.org/repos/asf/kudu/repo Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/e6061b20 Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/e6061b20 Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/e6061b20 Branch: refs/heads/master Commit: e6061b205415ad77160ad2e2bb934f62e1f1607c Parents: 1f380f2 Author: Grant Henke Authored: Thu Apr 19 15:25:14 2018 -0500 Committer: Grant Henke Committed: Thu Apr 19 20:47:04 2018 + -- .../src/test/scala/org/apache/kudu/spark/kudu/TestContext.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/kudu/blob/e6061b20/java/kudu-spark/src/test/scala/org/apache/kudu/spark/kudu/TestContext.scala -- diff --git a/java/kudu-spark/src/test/scala/org/apache/kudu/spark/kudu/TestContext.scala b/java/kudu-spark/src/test/scala/org/apache/kudu/spark/kudu/TestContext.scala index f00a4b4..f290043 100644 --- a/java/kudu-spark/src/test/scala/org/apache/kudu/spark/kudu/TestContext.scala +++ b/java/kudu-spark/src/test/scala/org/apache/kudu/spark/kudu/TestContext.scala @@ -74,9 +74,9 @@ trait TestContext extends BeforeAndAfterAll { self: Suite => } lazy val simpleSchema: Schema = { -val columns = ImmutableList.of( +val columns = List( new ColumnSchemaBuilder("key", Type.INT32).key(true).build(), - new ColumnSchemaBuilder("val", Type.STRING).nullable(true).build()) + new ColumnSchemaBuilder("val", Type.STRING).nullable(true).build()).asJava new Schema(columns) }
kudu git commit: KUDU-2351 Add IP/port for Recv() failure
Repository: kudu Updated Branches: refs/heads/master abbde75e1 -> 1f380f279 KUDU-2351 Add IP/port for Recv() failure Error messages like "Recv() got EOF from remote", "recv error:" and "BlockingRecv error: failed to read from TLS socket" don't contain the remote address, making it hard to locate the server the connection failed to. This change introduces adds the peer's IP address and port number to these error messages. Examples: Recv() got EOF from remote 127.0.0.1:7050 recv error from 127.0.0.1:7050: Resource temporarily unavailable BlockingRecv error: failed to read from TLS socket (remote: \ 127.0.0.1:7050): Can't send after socket shutdown Change-Id: I22436b13bb351b132e1c0b7159294dd0c980c2b3 Reviewed-on: http://gerrit.cloudera.org:8080/9818 Tested-by: Kudu Jenkins Reviewed-by: Dan BurkertProject: http://git-wip-us.apache.org/repos/asf/kudu/repo Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/1f380f27 Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/1f380f27 Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/1f380f27 Branch: refs/heads/master Commit: 1f380f27960021b267766fcefb6764e95e1d98dc Parents: abbde75 Author: Attila Bukor Authored: Thu Apr 19 21:18:45 2018 +0200 Committer: Dan Burkert Committed: Thu Apr 19 20:07:16 2018 + -- src/kudu/security/tls_socket-test.cc | 30 +++ src/kudu/security/tls_socket.cc | 11 +++- src/kudu/util/CMakeLists.txt | 1 + src/kudu/util/net/socket-test.cc | 89 +++ src/kudu/util/net/socket.cc | 12 +++-- 5 files changed, 138 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/kudu/blob/1f380f27/src/kudu/security/tls_socket-test.cc -- diff --git a/src/kudu/security/tls_socket-test.cc b/src/kudu/security/tls_socket-test.cc index db4ff9b..001a206 100644 --- a/src/kudu/security/tls_socket-test.cc +++ b/src/kudu/security/tls_socket-test.cc @@ -45,6 +45,7 @@ #include "kudu/util/random.h" #include "kudu/util/random_util.h" #include "kudu/util/scoped_cleanup.h" +#include "kudu/util/slice.h" #include "kudu/util/status.h" #include "kudu/util/test_macros.h" #include "kudu/util/test_util.h" @@ -171,6 +172,8 @@ class EchoServer { SleepFor(MonoDelta::FromMilliseconds(10)); } } + +CHECK_OK(listener_.Close()); }); } @@ -212,6 +215,33 @@ class EchoServer { void handler(int /* signal */) {} +TEST_F(TlsSocketTest, TestRecvFailure) { +EchoServer server; +server.Start(); +unique_ptr client_sock; +NO_FATALS(ConnectClient(server.listen_addr(), _sock)); +unique_ptr buf(new uint8_t[kEchoChunkSize]); + +SleepFor(MonoDelta::FromMilliseconds(100)); +server.Stop(); + +size_t nwritten; +ASSERT_OK(client_sock->BlockingWrite(buf.get(), kEchoChunkSize, , +MonoTime::Now() + kTimeout)); +size_t nread; + +ASSERT_OK(client_sock->BlockingRecv(buf.get(), kEchoChunkSize, , +MonoTime::Now() + kTimeout)); + +Status s = client_sock->BlockingRecv(buf.get(), kEchoChunkSize, , +MonoTime::Now() + kTimeout); + +ASSERT_TRUE(!s.ok()); +ASSERT_TRUE(s.IsNetworkError()); +ASSERT_STR_MATCHES(s.message().ToString(), "BlockingRecv error: failed to read from " + "TLS socket \\(remote: 127.0.0.1:[0-9]+\\): "); +} + // Test for failures to handle EINTR during TLS connection // negotiation and data send/receive. TEST_F(TlsSocketTest, TestTlsSocketInterrupted) { http://git-wip-us.apache.org/repos/asf/kudu/blob/1f380f27/src/kudu/security/tls_socket.cc -- diff --git a/src/kudu/security/tls_socket.cc b/src/kudu/security/tls_socket.cc index 4fce907..355f04b 100644 --- a/src/kudu/security/tls_socket.cc +++ b/src/kudu/security/tls_socket.cc @@ -20,14 +20,17 @@ #include #include +#include #include #include #include #include "kudu/gutil/basictypes.h" +#include "kudu/gutil/strings/substitute.h" #include "kudu/security/openssl_util.h" #include "kudu/util/errno.h" +#include "kudu/util/net/sockaddr.h" #include "kudu/util/net/socket.h" namespace kudu { @@ -104,20 +107,24 @@ Status TlsSocket::Writev(const struct ::iovec *iov, int iov_len, int64_t *nwritt Status TlsSocket::Recv(uint8_t *buf, int32_t amt, int32_t *nread) { SCOPED_OPENSSL_NO_PENDING_ERRORS; - const char* kErrString = "failed to read from TLS socket"; CHECK(ssl_); errno = 0; int32_t bytes_read = SSL_read(ssl_.get(), buf, amt); int save_errno = errno; if (bytes_read <= 0) { +Sockaddr remote; +Socket::GetPeerAddress(); +std::string kErrString =
kudu git commit: [Java] Use Yetus annotations in place of @VisibleForTesting
Repository: kudu Updated Branches: refs/heads/master a9271b05d -> abbde75e1 [Java] Use Yetus annotations in place of @VisibleForTesting We use yetus for marking our intended InterfaceAudience. This patch replaces Guavaâs @VisibleForTesting with @InterfaceAudience.LimitedPrivate("Testâ). kudu-hive is an exception to the rule because it can not have any dependencies that are not provided by the hive-metastore. This limitation is noted in the kudu-hive build files. I also elimated an uneccesary usage of ImmutableList and Lists while making this change. Scala has straightforward syntax for making lists without Guava. The primary reason for this change is to use Yetus as the single annotation library for defining InterfaceAudience, but this has the added benefit of eliminating any Guava use in kudu-spark, kudu-spark-tools which didnât have Gauva marked as a dependency. Change-Id: Ic0d8845e8cbbf5ea81345c46c5487121d1098f91 Reviewed-on: http://gerrit.cloudera.org:8080/10077 Tested-by: Kudu Jenkins Reviewed-by: Adar DemboReviewed-by: Dan Burkert Project: http://git-wip-us.apache.org/repos/asf/kudu/repo Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/abbde75e Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/abbde75e Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/abbde75e Branch: refs/heads/master Commit: abbde75e12f2275e1a286df60d788e9c5b411bcb Parents: a9271b0 Author: Grant Henke Authored: Mon Apr 16 10:46:27 2018 -0500 Committer: Grant Henke Committed: Thu Apr 19 19:41:23 2018 + -- java/kudu-client-tools/build.gradle | 3 +-- .../java/org/apache/kudu/client/AsyncKuduClient.java | 11 +-- .../java/org/apache/kudu/client/AsyncKuduSession.java| 3 +-- .../src/main/java/org/apache/kudu/client/Batch.java | 3 +-- .../java/org/apache/kudu/client/ConnectToCluster.java| 11 +-- .../src/main/java/org/apache/kudu/client/Connection.java | 3 +-- .../java/org/apache/kudu/client/ConnectionCache.java | 3 +-- .../src/main/java/org/apache/kudu/client/KuduClient.java | 3 +-- .../main/java/org/apache/kudu/client/KuduPredicate.java | 9 - .../src/main/java/org/apache/kudu/client/KuduRpc.java| 3 +-- .../main/java/org/apache/kudu/client/KuduScanToken.java | 3 +-- .../main/java/org/apache/kudu/client/KuduScanner.java| 5 ++--- .../src/main/java/org/apache/kudu/client/Negotiator.java | 3 +-- .../src/main/java/org/apache/kudu/client/RpcProxy.java | 3 +-- .../java/org/apache/kudu/client/SecurityContext.java | 4 ++-- .../src/main/java/org/apache/kudu/client/Status.java | 7 +++ .../java/org/apache/kudu/client/TableLocationsCache.java | 3 +-- .../src/main/java/org/apache/kudu/util/ByteVec.java | 3 +-- .../main/java/org/apache/kudu/flume/sink/KuduSink.java | 3 +-- java/kudu-spark-tools/build.gradle | 1 + java/kudu-spark-tools/pom.xml| 6 ++ .../org/apache/kudu/spark/tools/ImportExportFiles.scala | 4 ++-- .../kudu/spark/tools/IntegrationTestBigLinkedList.scala | 8 .../org/apache/kudu/spark/kudu/DefaultSourceTest.scala | 5 ++--- .../scala/org/apache/kudu/spark/kudu/TestContext.scala | 5 ++--- 25 files changed, 51 insertions(+), 64 deletions(-) -- http://git-wip-us.apache.org/repos/asf/kudu/blob/abbde75e/java/kudu-client-tools/build.gradle -- diff --git a/java/kudu-client-tools/build.gradle b/java/kudu-client-tools/build.gradle index b409491..2728287 100644 --- a/java/kudu-client-tools/build.gradle +++ b/java/kudu-client-tools/build.gradle @@ -23,9 +23,8 @@ dependencies { // This artifact is in compile scope for convenience, as it is typically // not included in the job classpath by MapReduce platform providers. compile libs.parquetHadoop - - compile libs.yetusAnnotations compile libs.slf4jApi + compile libs.yetusAnnotations provided libs.hadoopClient http://git-wip-us.apache.org/repos/asf/kudu/blob/abbde75e/java/kudu-client/src/main/java/org/apache/kudu/client/AsyncKuduClient.java -- diff --git a/java/kudu-client/src/main/java/org/apache/kudu/client/AsyncKuduClient.java b/java/kudu-client/src/main/java/org/apache/kudu/client/AsyncKuduClient.java index c4d558f..cebb132 100644 --- a/java/kudu-client/src/main/java/org/apache/kudu/client/AsyncKuduClient.java +++ b/java/kudu-client/src/main/java/org/apache/kudu/client/AsyncKuduClient.java @@ -48,7 +48,6 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import javax.annotation.concurrent.GuardedBy; -import