[kudu-jepsen] clean up on require/import lists Change-Id: If3b25dd802e115dc4b0f0bc8aecef5fb2326438a Reviewed-on: http://gerrit.cloudera.org:8080/6570 Reviewed-by: Alexey Serbin <[email protected]> Tested-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/cc6b8fbd Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/cc6b8fbd Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/cc6b8fbd Branch: refs/heads/master Commit: cc6b8fbd9a22b60aaa6ee0b22db3c3ef92cdc186 Parents: 678a309 Author: Alexey Serbin <[email protected]> Authored: Thu Apr 6 12:01:20 2017 -0700 Committer: Alexey Serbin <[email protected]> Committed: Thu Apr 6 19:40:19 2017 +0000 ---------------------------------------------------------------------- java/kudu-jepsen/src/main/clojure/jepsen/kudu.clj | 9 +-------- java/kudu-jepsen/src/main/clojure/jepsen/kudu/client.clj | 3 +-- java/kudu-jepsen/src/main/clojure/jepsen/kudu/nemesis.clj | 5 ++--- java/kudu-jepsen/src/main/clojure/jepsen/kudu/register.clj | 6 +----- java/kudu-jepsen/src/main/clojure/jepsen/kudu/table.clj | 1 - 5 files changed, 5 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kudu/blob/cc6b8fbd/java/kudu-jepsen/src/main/clojure/jepsen/kudu.clj ---------------------------------------------------------------------- diff --git a/java/kudu-jepsen/src/main/clojure/jepsen/kudu.clj b/java/kudu-jepsen/src/main/clojure/jepsen/kudu.clj index a871c63..6c896ab 100644 --- a/java/kudu-jepsen/src/main/clojure/jepsen/kudu.clj +++ b/java/kudu-jepsen/src/main/clojure/jepsen/kudu.clj @@ -18,20 +18,13 @@ (ns jepsen.kudu "Tests for Apache Kudu" (:require [clojure.tools.logging :refer :all] - [clojure.java.io :as io] - [clojure.java.shell :refer [sh]] - [clojure.string :as str] - [clojure.pprint :refer [pprint]] [jepsen - [control :as c :refer [|]] + [control :as c] [db :as db] [net :as net] - [tests :as tests] [util :as util :refer [meh]]] [jepsen.control.net :as cnet :refer [heal]] - [jepsen.control.util :as cu] [jepsen.os.debian :as debian] - [jepsen.kudu.nemesis :as kn] [jepsen.kudu.util :as ku])) (defn db http://git-wip-us.apache.org/repos/asf/kudu/blob/cc6b8fbd/java/kudu-jepsen/src/main/clojure/jepsen/kudu/client.clj ---------------------------------------------------------------------- diff --git a/java/kudu-jepsen/src/main/clojure/jepsen/kudu/client.clj b/java/kudu-jepsen/src/main/clojure/jepsen/kudu/client.clj index 31ab90c..65b6e5a 100644 --- a/java/kudu-jepsen/src/main/clojure/jepsen/kudu/client.clj +++ b/java/kudu-jepsen/src/main/clojure/jepsen/kudu/client.clj @@ -17,8 +17,7 @@ (ns jepsen.kudu.client "Thin wrappers around Kudu Java client." - (:require [clojure.tools.logging :refer :all] - [clojure.pprint :refer [pprint]]) + (:require [clojure.tools.logging :refer :all]) (:import [org.apache.kudu ColumnSchema ColumnSchema$ColumnSchemaBuilder Schema http://git-wip-us.apache.org/repos/asf/kudu/blob/cc6b8fbd/java/kudu-jepsen/src/main/clojure/jepsen/kudu/nemesis.clj ---------------------------------------------------------------------- diff --git a/java/kudu-jepsen/src/main/clojure/jepsen/kudu/nemesis.clj b/java/kudu-jepsen/src/main/clojure/jepsen/kudu/nemesis.clj index ca106e0..0a12b33 100644 --- a/java/kudu-jepsen/src/main/clojure/jepsen/kudu/nemesis.clj +++ b/java/kudu-jepsen/src/main/clojure/jepsen/kudu/nemesis.clj @@ -19,7 +19,6 @@ "Nemeses for Apache Kudu." (:refer-clojure :exclude [test]) (:require [jepsen - [client :as client] [control :as c] [nemesis :as nm] [net :as net] @@ -33,7 +32,7 @@ in response to :start operation: cut network links as defined by (grudge nodes), and restore them back in response to :stop operation." [grudge] - (reify client/Client + (reify jepsen.client/Client (setup! [this test _] (net/heal! (:net test) test) this) @@ -66,7 +65,7 @@ {:value {:n1 [:killed \"java\"]}}" [targeter start! stop!] (let [nodes (atom nil)] - (reify client/Client + (reify jepsen.client/Client (setup! [this test _] this) (invoke! [this test op] http://git-wip-us.apache.org/repos/asf/kudu/blob/cc6b8fbd/java/kudu-jepsen/src/main/clojure/jepsen/kudu/register.clj ---------------------------------------------------------------------- diff --git a/java/kudu-jepsen/src/main/clojure/jepsen/kudu/register.clj b/java/kudu-jepsen/src/main/clojure/jepsen/kudu/register.clj index c7fe45e..4c08b64 100644 --- a/java/kudu-jepsen/src/main/clojure/jepsen/kudu/register.clj +++ b/java/kudu-jepsen/src/main/clojure/jepsen/kudu/register.clj @@ -20,15 +20,11 @@ (:refer-clojure :exclude [test]) (:require [jepsen [kudu :as kudu] - [client :as client] - [util :refer [majority]] [checker :as checker] [generator :as gen] [nemesis :as nemesis]] [jepsen.kudu.client :as kc] [jepsen.kudu.table :as kt] - [jepsen.kudu.nemesis :as kn] - [clojure.tools.logging :refer :all] [knossos.model :as model])) (def register-key "x") @@ -38,7 +34,7 @@ (defn client [client-atom kclient ktable] - (reify client/Client + (reify jepsen.client/Client (setup! [_ test _] "Create the client and the test table. Use the same Kudu client instance " "across all test actors to achieve timestamp propagation for all " http://git-wip-us.apache.org/repos/asf/kudu/blob/cc6b8fbd/java/kudu-jepsen/src/main/clojure/jepsen/kudu/table.clj ---------------------------------------------------------------------- diff --git a/java/kudu-jepsen/src/main/clojure/jepsen/kudu/table.clj b/java/kudu-jepsen/src/main/clojure/jepsen/kudu/table.clj index 5338dad..14117c6 100644 --- a/java/kudu-jepsen/src/main/clojure/jepsen/kudu/table.clj +++ b/java/kudu-jepsen/src/main/clojure/jepsen/kudu/table.clj @@ -18,7 +18,6 @@ (ns jepsen.kudu.table "Utilities to work with kudu tables, for testing." (:require [clojure.tools.logging :refer :all] - [clojure.pprint :refer [pprint]] [jepsen.kudu.client :as c]) (:import [org.apache.kudu ColumnSchema ColumnSchema$ColumnSchemaBuilder
