You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2016/09/04 14:40:27 UTC
[1/2] cassandra git commit: Fix NPE in SSTableLoader when specifying
partial directory path
Repository: cassandra
Updated Branches:
refs/heads/trunk ca7256d76 -> 7d593b760
Fix NPE in SSTableLoader when specifying partial directory path
patch by hkroger reviewed by dbrosius for CASSANDRA-12609
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/893fd21b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/893fd21b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/893fd21b
Branch: refs/heads/trunk
Commit: 893fd21b52254b1f7d68d87f6cf5f77f3010734b
Parents: fa14804
Author: Hannu Kr�ger <hk...@gmail.com>
Authored: Sun Sep 4 10:36:37 2016 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Sun Sep 4 10:36:37 2016 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/tools/BulkLoader.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/893fd21b/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 21fc42c..798496a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -48,6 +48,7 @@
* Avoid digest mismatch with empty but static rows (CASSANDRA-12090)
* Fix EOF exception when altering column type (CASSANDRA-11820)
* Fix JsonTransformer output of partition with deletion info (CASSANDRA-12418)
+ * Fix NPE in SSTableLoader when specifying partial directory path (CASSANDRA-12609)
Merged from 2.2:
* Add local address entry in PropertyFileSnitch (CASSANDRA-11332)
* cqlshlib tests: increase default execute timeout (CASSANDRA-12481)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/893fd21b/src/java/org/apache/cassandra/tools/BulkLoader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/BulkLoader.java b/src/java/org/apache/cassandra/tools/BulkLoader.java
index 2b2db15..9dba1b2 100644
--- a/src/java/org/apache/cassandra/tools/BulkLoader.java
+++ b/src/java/org/apache/cassandra/tools/BulkLoader.java
@@ -77,7 +77,7 @@ public class BulkLoader
LoaderOptions options = LoaderOptions.parseArgs(args).validateArguments();
OutputHandler handler = new OutputHandler.SystemOutput(options.verbose, options.debug);
SSTableLoader loader = new SSTableLoader(
- options.directory,
+ options.directory.getAbsoluteFile(),
new ExternalClient(
options.hosts,
options.nativePort,
[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Posted by db...@apache.org.
Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7d593b76
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7d593b76
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7d593b76
Branch: refs/heads/trunk
Commit: 7d593b760cbf0e617d88ec1337fea43d53be660a
Parents: ca7256d 893fd21
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Sun Sep 4 10:39:38 2016 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Sun Sep 4 10:39:38 2016 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/tools/BulkLoader.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7d593b76/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 83060fb,798496a..c466dfe
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -146,15 -47,14 +146,16 @@@ Merged from 3.0
those static columns in query results (CASSANDRA-12123)
* Avoid digest mismatch with empty but static rows (CASSANDRA-12090)
* Fix EOF exception when altering column type (CASSANDRA-11820)
+ * Fix potential race in schema during new table creation (CASSANDRA-12083)
+ * cqlsh: fix error handling in rare COPY FROM failure scenario (CASSANDRA-12070)
+ * Disable autocompaction during drain (CASSANDRA-11878)
+ * Add a metrics timer to MemtablePool and use it to track time spent blocked on memory in MemtableAllocator (CASSANDRA-11327)
+ * Fix upgrading schema with super columns with non-text subcomparators (CASSANDRA-12023)
+ * Add TimeWindowCompactionStrategy (CASSANDRA-9666)
* Fix JsonTransformer output of partition with deletion info (CASSANDRA-12418)
+ * Fix NPE in SSTableLoader when specifying partial directory path (CASSANDRA-12609)
Merged from 2.2:
* Add local address entry in PropertyFileSnitch (CASSANDRA-11332)
- * cqlshlib tests: increase default execute timeout (CASSANDRA-12481)
- * Forward writes to replacement node when replace_address != broadcast_address (CASSANDRA-8523)
- * Enable repair -pr and -local together (fix regression of CASSANDRA-7450) (CASSANDRA-12522)
- * Fail repair on non-existing table (CASSANDRA-12279)
* cqlsh copy: fix missing counter values (CASSANDRA-12476)
* Move migration tasks to non-periodic queue, assure flush executor shutdown after non-periodic executor (CASSANDRA-12251)
* cqlsh copy: fixed possible race in initializing feeding thread (CASSANDRA-11701)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7d593b76/src/java/org/apache/cassandra/tools/BulkLoader.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/tools/BulkLoader.java
index 7d10cdc,9dba1b2..0f1c555
--- a/src/java/org/apache/cassandra/tools/BulkLoader.java
+++ b/src/java/org/apache/cassandra/tools/BulkLoader.java
@@@ -42,18 -46,38 +42,18 @@@ import org.apache.cassandra.utils.Outpu
public class BulkLoader
{
- private static final String TOOL_NAME = "sstableloader";
- private static final String VERBOSE_OPTION = "verbose";
- private static final String HELP_OPTION = "help";
- private static final String NOPROGRESS_OPTION = "no-progress";
- private static final String IGNORE_NODES_OPTION = "ignore";
- private static final String INITIAL_HOST_ADDRESS_OPTION = "nodes";
- private static final String NATIVE_PORT_OPTION = "port";
- private static final String USER_OPTION = "username";
- private static final String PASSWD_OPTION = "password";
- private static final String AUTH_PROVIDER_OPTION = "auth-provider";
- private static final String THROTTLE_MBITS = "throttle";
- private static final String INTER_DC_THROTTLE_MBITS = "inter-dc-throttle";
-
- /* client encryption options */
- private static final String SSL_TRUSTSTORE = "truststore";
- private static final String SSL_TRUSTSTORE_PW = "truststore-password";
- private static final String SSL_KEYSTORE = "keystore";
- private static final String SSL_KEYSTORE_PW = "keystore-password";
- private static final String SSL_PROTOCOL = "ssl-protocol";
- private static final String SSL_ALGORITHM = "ssl-alg";
- private static final String SSL_STORE_TYPE = "store-type";
- private static final String SSL_CIPHER_SUITES = "ssl-ciphers";
- private static final String CONNECTIONS_PER_HOST = "connections-per-host";
- private static final String CONFIG_PATH = "conf-path";
-
- public static void main(String args[])
+ public static void main(String args[]) throws BulkLoadException
{
- Config.setClientMode(true);
- LoaderOptions options = LoaderOptions.parseArgs(args).validateArguments();
+ LoaderOptions options = LoaderOptions.builder().parseArgs(args).build();
+ load(options);
+ }
+
+ public static void load(LoaderOptions options) throws BulkLoadException
+ {
+ DatabaseDescriptor.toolInitialization();
OutputHandler handler = new OutputHandler.SystemOutput(options.verbose, options.debug);
SSTableLoader loader = new SSTableLoader(
- options.directory,
+ options.directory.getAbsoluteFile(),
new ExternalClient(
options.hosts,
options.nativePort,