You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2015/06/22 18:13:29 UTC
cassandra git commit: Deprecate sstable2json and json2sstable
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 d6312c5f4 -> affb10ce3
Deprecate sstable2json and json2sstable
patch by slebresne; reviewed by iamaleksey for CASSANDRA-9618
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/affb10ce
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/affb10ce
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/affb10ce
Branch: refs/heads/cassandra-2.2
Commit: affb10ce3a477c5630dd672af6e7b21ce9079761
Parents: d6312c5
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Mon Jun 22 17:55:16 2015 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Mon Jun 22 18:12:38 2015 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
NEWS.txt | 3 +++
src/java/org/apache/cassandra/tools/SSTableExport.java | 3 +++
src/java/org/apache/cassandra/tools/SSTableImport.java | 4 ++++
4 files changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/affb10ce/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 93753e5..1e2acc4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2
+ * Deprected sstable2json and json2sstable (CASSANDRA-9618)
* Allow native functions in user-defined aggregates (CASSANDRA-9542)
* Don't repair system_distributed by default (CASSANDRA-9621)
* Fix mixing min, max, and count aggregates for blob type (CASSANRA-9622)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/affb10ce/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index 3c71310..fcf254b 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -135,6 +135,9 @@ Upgrading
- The SSTableSimpleWriter and SSTableSimpleUnsortedWriter classes have been
deprecated and will be removed in the next major Cassandra release. You
should use the CQLSSTableWriter class instead.
+ - The sstable2json and json2sstable tools have been deprecated and will be
+ removed in the next major Cassandra release. See CASSANDRA-9618
+ (https://issues.apache.org/jira/browse/CASSANDRA-9618) for details.
2.1.6
=====
http://git-wip-us.apache.org/repos/asf/cassandra/blob/affb10ce/src/java/org/apache/cassandra/tools/SSTableExport.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/SSTableExport.java b/src/java/org/apache/cassandra/tools/SSTableExport.java
index bc460a1..9f833e7 100644
--- a/src/java/org/apache/cassandra/tools/SSTableExport.java
+++ b/src/java/org/apache/cassandra/tools/SSTableExport.java
@@ -380,6 +380,9 @@ public class SSTableExport
*/
public static void main(String[] args) throws ConfigurationException
{
+ System.err.println("WARNING: please note that sstable2json is now deprecated and will be removed in Cassandra 3.0. "
+ + "Please see https://issues.apache.org/jira/browse/CASSANDRA-9618 for details.");
+
String usage = String.format("Usage: %s <sstable> [-k key [-k key [...]] -x key [-x key [...]]]%n", SSTableExport.class.getName());
CommandLineParser parser = new PosixParser();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/affb10ce/src/java/org/apache/cassandra/tools/SSTableImport.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/SSTableImport.java b/src/java/org/apache/cassandra/tools/SSTableImport.java
index 2fda6bd..b2d63aa 100644
--- a/src/java/org/apache/cassandra/tools/SSTableImport.java
+++ b/src/java/org/apache/cassandra/tools/SSTableImport.java
@@ -470,6 +470,10 @@ public class SSTableImport
*/
public static void main(String[] args) throws ParseException, ConfigurationException
{
+ System.err.println("WARNING: please note that json2sstable is now deprecated and will be removed in Cassandra 3.0. "
+ + "You should use CQLSSTableWriter if you want to write sstables directly. "
+ + "Please see https://issues.apache.org/jira/browse/CASSANDRA-9618 for details.");
+
CommandLineParser parser = new PosixParser();
try