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/04 16:30:28 UTC

cassandra git commit: Deprecate SSTableSimple[Unsorted]Writer classes

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 4df4f79c5 -> 0022e153f


Deprecate SSTableSimple[Unsorted]Writer classes

patch by slebresne; reviewed by iamaleksey for CASSANDRA-9546


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

Branch: refs/heads/cassandra-2.2
Commit: 0022e153fa4915c0fbf83b7479b54f0809c5a272
Parents: 4df4f79
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Thu Jun 4 16:29:12 2015 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Thu Jun 4 16:29:12 2015 +0200

----------------------------------------------------------------------
 CHANGES.txt                                                       | 2 +-
 NEWS.txt                                                          | 3 +++
 .../apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java  | 3 +++
 src/java/org/apache/cassandra/io/sstable/SSTableSimpleWriter.java | 3 +++
 4 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0022e153/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 2ed9ce9..47ed221 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2
+ * Deprecates SSTableSimpleWriter and SSTableSimpleUnsortedWriter (CASSANDRA-9546)
  * Empty INITCOND treated as null in aggregate (CASSANDRA-9457)
  * Remove use of Cell in Thrift MapReduce classes (CASSANDRA-8609)
  * Integrate pre-release Java Driver 2.2-rc1, custom build (CASSANDRA-9493)
@@ -17,7 +18,6 @@
  * Add ability to stop compaction by ID (CASSANDRA-7207)
  * Let CassandraVersion handle SNAPSHOT version (CASSANDRA-9438)
 Merged from 2.1:
-2.1.6
  * Default commitlog_sync_batch_window_in_ms changed to 2ms (CASSANDRA-9504)
  * Fix empty partition assertion in unsorted sstable writing tools (CASSANDRA-9071)
  * Ensure truncate without snapshot cannot produce corrupt responses (CASSANDRA-9388) 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0022e153/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index 0d6f170..4d950f8 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -125,6 +125,9 @@ Upgrading
      columns were not requiring ALLOW FILTERING as they should. This has been
      fixed, and those queries now require ALLOW FILTERING (see CASSANDRA-8418
      for details).
+   - 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.
 
 2.1.5
 =====

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0022e153/src/java/org/apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java b/src/java/org/apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java
index cc47845..4bb75bc 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java
@@ -47,7 +47,10 @@ import org.apache.cassandra.utils.JVMStabilityInspector;
  * created (and the buffer be reseted).
  *
  * @see AbstractSSTableSimpleWriter
+ *
+ * @deprecated this class is depracted in favor of {@link CQLSSTableWriter}.
  */
+@Deprecated
 public class SSTableSimpleUnsortedWriter extends AbstractSSTableSimpleWriter
 {
     private static final Buffer SENTINEL = new Buffer();

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0022e153/src/java/org/apache/cassandra/io/sstable/SSTableSimpleWriter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableSimpleWriter.java b/src/java/org/apache/cassandra/io/sstable/SSTableSimpleWriter.java
index f206969..2601d6d 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTableSimpleWriter.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableSimpleWriter.java
@@ -38,7 +38,10 @@ import org.apache.cassandra.io.sstable.format.SSTableWriter;
  * prefered.
  *
  * @see AbstractSSTableSimpleWriter
+ *
+ * @deprecated this class is depracted in favor of {@link CQLSSTableWriter}.
  */
+@Deprecated
 public class SSTableSimpleWriter extends AbstractSSTableSimpleWriter
 {
     private final SSTableWriter writer;