cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yu...@apache.org
Subject [1/3] git commit: Merge branch 'cassandra-1.1' into trunk
Date Fri, 28 Sep 2012 18:28:32 GMT
Updated Branches:
  refs/heads/cassandra-1.1 c710edf07 -> 732d82b4d
  refs/heads/trunk ccd1a3d38 -> 7a9ca840a


Merge branch 'cassandra-1.1' into trunk

Conflicts:
	src/java/org/apache/cassandra/tools/BulkLoader.java


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

Branch: refs/heads/trunk
Commit: 7a9ca840a35f5a1130f55b9fa8f9e3b97dc186eb
Parents: ccd1a3d 732d82b
Author: Yuki Morishita <yukim@apache.org>
Authored: Fri Sep 28 13:27:20 2012 -0500
Committer: Yuki Morishita <yukim@apache.org>
Committed: Fri Sep 28 13:27:20 2012 -0500

----------------------------------------------------------------------
 CHANGES.txt                                        |    1 +
 .../org/apache/cassandra/tools/BulkLoader.java     |   37 ++++++++++++--
 2 files changed, 32 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7a9ca840/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7a9ca840/src/java/org/apache/cassandra/tools/BulkLoader.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/tools/BulkLoader.java
index 2f76680,88e7443..9c3c5d7
--- a/src/java/org/apache/cassandra/tools/BulkLoader.java
+++ b/src/java/org/apache/cassandra/tools/BulkLoader.java
@@@ -176,10 -179,12 +178,12 @@@ public class BulkLoade
      {
          private final Map<String, Set<String>> knownCfs = new HashMap<String,
Set<String>>();
          private final OutputHandler outputHandler;
 -        private Set<InetAddress> hosts = new HashSet<InetAddress>();
 -        private int rpcPort;
 -        private String user;
 -        private String passwd;
 +        private final Set<InetAddress> hosts;
 +        private final int rpcPort;
++        private final String user;
++        private final String passwd;
  
-         public ExternalClient(OutputHandler outputHandler, Set<InetAddress> hosts,
int port)
+         public ExternalClient(OutputHandler outputHandler, Set<InetAddress> hosts,
int port, String user, String passwd)
          {
              super();
              this.outputHandler = outputHandler;
@@@ -254,10 -270,12 +269,12 @@@
          public boolean verbose;
          public boolean noProgress;
          public int rpcPort = 9160;
+         public String user;
+         public String passwd;
          public int throttle = 0;
  
 -        public Set<InetAddress> hosts = new HashSet<InetAddress>();
 -        public Set<InetAddress> ignores = new HashSet<InetAddress>();
 +        public final Set<InetAddress> hosts = new HashSet<InetAddress>();
 +        public final Set<InetAddress> ignores = new HashSet<InetAddress>();
  
          LoaderOptions(File directory)
          {
@@@ -309,11 -327,17 +326,17 @@@
                  opts.noProgress = cmd.hasOption(NOPROGRESS_OPTION);
  
                  if (cmd.hasOption(THROTTLE_MBITS))
 -                    opts.throttle = Integer.valueOf(cmd.getOptionValue(THROTTLE_MBITS));
 +                    opts.throttle = Integer.parseInt(cmd.getOptionValue(THROTTLE_MBITS));
  
                  if (cmd.hasOption(RPC_PORT_OPTION))
 -                    opts.rpcPort = Integer.valueOf(cmd.getOptionValue(RPC_PORT_OPTION));
 +                    opts.rpcPort = Integer.parseInt(cmd.getOptionValue(RPC_PORT_OPTION));
  
+                 if (cmd.hasOption(USER_OPTION))
+                     opts.user = cmd.getOptionValue(USER_OPTION);
+ 
+                 if (cmd.hasOption(PASSWD_OPTION))
+                     opts.passwd = cmd.getOptionValue(PASSWD_OPTION);
+ 
                  if (cmd.hasOption(INITIAL_HOST_ADDRESS_OPTION))
                  {
                      String[] nodes = cmd.getOptionValue(INITIAL_HOST_ADDRESS_OPTION).split(",");


Mime
View raw message