From def58031d54fef239a4051201d097349da05ad50 Mon Sep 17 00:00:00 2001
From: Aleksey Yeschenko <aleksey@apache.org>
Date: Fri, 16 Oct 2015 13:16:49 +0100
Subject: [PATCH] Deprecate Pig support

patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-10542
---
 CHANGES.txt                                                  | 1 +
 NEWS.txt                                                     | 5 +++++
 .../org/apache/cassandra/hadoop/pig/CqlNativeStorage.java    | 2 +-
 src/java/org/apache/cassandra/hadoop/pig/StorageHelper.java  | 1 +
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 9a0baaa7e9..632e2622ab 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.4
+ * Deprecate Pig support (CASSANDRA-10542)
  * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
 Merged from 2.1:
  * (cqlsh) Distinguish negative and positive infinity in output (CASSANDRA-10523)
diff --git a/NEWS.txt b/NEWS.txt
index a235a1d049..4fa61c0945 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -16,6 +16,11 @@ using the provided 'sstableupgrade' tool.
 2.2.4
 =====
 
+Deprecation
+-----------
+    - Pig support has been deprecated, and will be removed in 3.0.
+      Please see CASSANDRA-10542 for more details.
+
 Operations
 ----------
     - Switching racks is no longer an allowed operation on a node which has
diff --git a/src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java b/src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java
index bdf99a0907..ba0a37d6dc 100644
--- a/src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java
+++ b/src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java
@@ -61,7 +61,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.yaml.snakeyaml.external.biz.base64Coder.Base64Coder;
 
-
+@Deprecated
 public class CqlNativeStorage extends LoadFunc implements StoreFuncInterface, LoadMetadata
 {
     protected String DEFAULT_INPUT_FORMAT;
diff --git a/src/java/org/apache/cassandra/hadoop/pig/StorageHelper.java b/src/java/org/apache/cassandra/hadoop/pig/StorageHelper.java
index 66836b2559..d700cb7425 100644
--- a/src/java/org/apache/cassandra/hadoop/pig/StorageHelper.java
+++ b/src/java/org/apache/cassandra/hadoop/pig/StorageHelper.java
@@ -16,6 +16,7 @@ import org.apache.pig.data.DataByteArray;
 import org.apache.pig.data.DataType;
 import org.apache.pig.data.Tuple;
 
+@Deprecated
 public class StorageHelper
 {
     // system environment variables that can be set to configure connection info: