diff --git a/itests/qtest-accumulo/src/test/java/org/apache/hadoop/hive/cli/TestAccumuloCliDriver.java b/itests/qtest-accumulo/src/test/java/org/apache/hadoop/hive/cli/TestAccumuloCliDriver.java
index 83c87b4f8c9b..8f1533004df6 100644
--- a/itests/qtest-accumulo/src/test/java/org/apache/hadoop/hive/cli/TestAccumuloCliDriver.java
+++ b/itests/qtest-accumulo/src/test/java/org/apache/hadoop/hive/cli/TestAccumuloCliDriver.java
@@ -25,12 +25,14 @@
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
+import org.junit.Ignore;
import org.junit.rules.TestRule;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
@RunWith(Parameterized.class)
+@Ignore("This test will be enabled after accumulo is upgraded to 2.X version")
public class TestAccumuloCliDriver {
static CliAdapter adapter = new CliConfigs.AccumuloCliConfig().getCliAdapter();
diff --git a/pom.xml b/pom.xml
index d00058022303..ddb59b7c5527 100644
--- a/pom.xml
+++ b/pom.xml
@@ -173,7 +173,7 @@
1.12.0
0.9.3
- 0.9.3-1
+ 0.13.0
2.12.1
2.5.0
2.3
@@ -1508,7 +1508,7 @@
-
+
diff --git a/ql/src/gen/thrift/gen-cpp/queryplan_constants.cpp b/ql/src/gen/thrift/gen-cpp/queryplan_constants.cpp
index 9186bade53d7..0ee2fc9dde9e 100644
--- a/ql/src/gen/thrift/gen-cpp/queryplan_constants.cpp
+++ b/ql/src/gen/thrift/gen-cpp/queryplan_constants.cpp
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.13.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
diff --git a/ql/src/gen/thrift/gen-cpp/queryplan_constants.h b/ql/src/gen/thrift/gen-cpp/queryplan_constants.h
index 6cc8af0c53d9..cf5e3da6290d 100644
--- a/ql/src/gen/thrift/gen-cpp/queryplan_constants.h
+++ b/ql/src/gen/thrift/gen-cpp/queryplan_constants.h
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.13.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
diff --git a/ql/src/gen/thrift/gen-cpp/queryplan_types.cpp b/ql/src/gen/thrift/gen-cpp/queryplan_types.cpp
index e64ba65ac8d0..d6e0fecf4627 100644
--- a/ql/src/gen/thrift/gen-cpp/queryplan_types.cpp
+++ b/ql/src/gen/thrift/gen-cpp/queryplan_types.cpp
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.13.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -23,6 +23,25 @@ const char* _kAdjacencyTypeNames[] = {
};
const std::map _AdjacencyType_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(2, _kAdjacencyTypeValues, _kAdjacencyTypeNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
+std::ostream& operator<<(std::ostream& out, const AdjacencyType::type& val) {
+ std::map::const_iterator it = _AdjacencyType_VALUES_TO_NAMES.find(val);
+ if (it != _AdjacencyType_VALUES_TO_NAMES.end()) {
+ out << it->second;
+ } else {
+ out << static_cast(val);
+ }
+ return out;
+}
+
+std::string to_string(const AdjacencyType::type& val) {
+ std::map::const_iterator it = _AdjacencyType_VALUES_TO_NAMES.find(val);
+ if (it != _AdjacencyType_VALUES_TO_NAMES.end()) {
+ return std::string(it->second);
+ } else {
+ return std::to_string(static_cast(val));
+ }
+}
+
int _kNodeTypeValues[] = {
NodeType::OPERATOR,
NodeType::STAGE
@@ -33,6 +52,25 @@ const char* _kNodeTypeNames[] = {
};
const std::map _NodeType_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(2, _kNodeTypeValues, _kNodeTypeNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
+std::ostream& operator<<(std::ostream& out, const NodeType::type& val) {
+ std::map::const_iterator it = _NodeType_VALUES_TO_NAMES.find(val);
+ if (it != _NodeType_VALUES_TO_NAMES.end()) {
+ out << it->second;
+ } else {
+ out << static_cast(val);
+ }
+ return out;
+}
+
+std::string to_string(const NodeType::type& val) {
+ std::map::const_iterator it = _NodeType_VALUES_TO_NAMES.find(val);
+ if (it != _NodeType_VALUES_TO_NAMES.end()) {
+ return std::string(it->second);
+ } else {
+ return std::to_string(static_cast(val));
+ }
+}
+
int _kOperatorTypeValues[] = {
OperatorType::JOIN,
OperatorType::MAPJOIN,
@@ -93,6 +131,25 @@ const char* _kOperatorTypeNames[] = {
};
const std::map _OperatorType_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(27, _kOperatorTypeValues, _kOperatorTypeNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
+std::ostream& operator<<(std::ostream& out, const OperatorType::type& val) {
+ std::map::const_iterator it = _OperatorType_VALUES_TO_NAMES.find(val);
+ if (it != _OperatorType_VALUES_TO_NAMES.end()) {
+ out << it->second;
+ } else {
+ out << static_cast(val);
+ }
+ return out;
+}
+
+std::string to_string(const OperatorType::type& val) {
+ std::map::const_iterator it = _OperatorType_VALUES_TO_NAMES.find(val);
+ if (it != _OperatorType_VALUES_TO_NAMES.end()) {
+ return std::string(it->second);
+ } else {
+ return std::to_string(static_cast(val));
+ }
+}
+
int _kTaskTypeValues[] = {
TaskType::MAP,
TaskType::REDUCE,
@@ -105,6 +162,25 @@ const char* _kTaskTypeNames[] = {
};
const std::map _TaskType_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(3, _kTaskTypeValues, _kTaskTypeNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
+std::ostream& operator<<(std::ostream& out, const TaskType::type& val) {
+ std::map::const_iterator it = _TaskType_VALUES_TO_NAMES.find(val);
+ if (it != _TaskType_VALUES_TO_NAMES.end()) {
+ out << it->second;
+ } else {
+ out << static_cast(val);
+ }
+ return out;
+}
+
+std::string to_string(const TaskType::type& val) {
+ std::map::const_iterator it = _TaskType_VALUES_TO_NAMES.find(val);
+ if (it != _TaskType_VALUES_TO_NAMES.end()) {
+ return std::string(it->second);
+ } else {
+ return std::to_string(static_cast(val));
+ }
+}
+
int _kStageTypeValues[] = {
StageType::CONDITIONAL,
StageType::COPY,
@@ -157,8 +233,27 @@ const char* _kStageTypeNames[] = {
};
const std::map _StageType_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(23, _kStageTypeValues, _kStageTypeNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
+std::ostream& operator<<(std::ostream& out, const StageType::type& val) {
+ std::map::const_iterator it = _StageType_VALUES_TO_NAMES.find(val);
+ if (it != _StageType_VALUES_TO_NAMES.end()) {
+ out << it->second;
+ } else {
+ out << static_cast(val);
+ }
+ return out;
+}
-Adjacency::~Adjacency() throw() {
+std::string to_string(const StageType::type& val) {
+ std::map::const_iterator it = _StageType_VALUES_TO_NAMES.find(val);
+ if (it != _StageType_VALUES_TO_NAMES.end()) {
+ return std::string(it->second);
+ } else {
+ return std::to_string(static_cast(val));
+ }
+}
+
+
+Adjacency::~Adjacency() noexcept {
}
@@ -173,10 +268,16 @@ void Adjacency::__set_children(const std::vector & val) {
void Adjacency::__set_adjacencyType(const AdjacencyType::type val) {
this->adjacencyType = val;
}
+std::ostream& operator<<(std::ostream& out, const Adjacency& obj)
+{
+ obj.printTo(out);
+ return out;
+}
+
uint32_t Adjacency::read(::apache::thrift::protocol::TProtocol* iprot) {
- apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+ ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
uint32_t xfer = 0;
std::string fname;
::apache::thrift::protocol::TType ftype;
@@ -247,7 +348,7 @@ uint32_t Adjacency::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t Adjacency::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+ ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
xfer += oprot->writeStructBegin("Adjacency");
xfer += oprot->writeFieldBegin("node", ::apache::thrift::protocol::T_STRING, 1);
@@ -306,7 +407,7 @@ void Adjacency::printTo(std::ostream& out) const {
}
-Graph::~Graph() throw() {
+Graph::~Graph() noexcept {
}
@@ -321,10 +422,16 @@ void Graph::__set_roots(const std::vector & val) {
void Graph::__set_adjacencyList(const std::vector & val) {
this->adjacencyList = val;
}
+std::ostream& operator<<(std::ostream& out, const Graph& obj)
+{
+ obj.printTo(out);
+ return out;
+}
+
uint32_t Graph::read(::apache::thrift::protocol::TProtocol* iprot) {
- apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+ ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
uint32_t xfer = 0;
std::string fname;
::apache::thrift::protocol::TType ftype;
@@ -407,7 +514,7 @@ uint32_t Graph::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t Graph::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+ ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
xfer += oprot->writeStructBegin("Graph");
xfer += oprot->writeFieldBegin("nodeType", ::apache::thrift::protocol::T_I32, 1);
@@ -474,7 +581,7 @@ void Graph::printTo(std::ostream& out) const {
}
-Operator::~Operator() throw() {
+Operator::~Operator() noexcept {
}
@@ -501,10 +608,16 @@ void Operator::__set_done(const bool val) {
void Operator::__set_started(const bool val) {
this->started = val;
}
+std::ostream& operator<<(std::ostream& out, const Operator& obj)
+{
+ obj.printTo(out);
+ return out;
+}
+
uint32_t Operator::read(::apache::thrift::protocol::TProtocol* iprot) {
- apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+ ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
uint32_t xfer = 0;
std::string fname;
::apache::thrift::protocol::TType ftype;
@@ -617,7 +730,7 @@ uint32_t Operator::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t Operator::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+ ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
xfer += oprot->writeStructBegin("Operator");
xfer += oprot->writeFieldBegin("operatorId", ::apache::thrift::protocol::T_STRING, 1);
@@ -710,7 +823,7 @@ void Operator::printTo(std::ostream& out) const {
}
-Task::~Task() throw() {
+Task::~Task() noexcept {
}
@@ -747,10 +860,16 @@ void Task::__set_done(const bool val) {
void Task::__set_started(const bool val) {
this->started = val;
}
+std::ostream& operator<<(std::ostream& out, const Task& obj)
+{
+ obj.printTo(out);
+ return out;
+}
+
uint32_t Task::read(::apache::thrift::protocol::TProtocol* iprot) {
- apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+ ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
uint32_t xfer = 0;
std::string fname;
::apache::thrift::protocol::TType ftype;
@@ -891,7 +1010,7 @@ uint32_t Task::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t Task::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+ ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
xfer += oprot->writeStructBegin("Task");
xfer += oprot->writeFieldBegin("taskId", ::apache::thrift::protocol::T_STRING, 1);
@@ -1010,7 +1129,7 @@ void Task::printTo(std::ostream& out) const {
}
-Stage::~Stage() throw() {
+Stage::~Stage() noexcept {
}
@@ -1041,10 +1160,16 @@ void Stage::__set_done(const bool val) {
void Stage::__set_started(const bool val) {
this->started = val;
}
+std::ostream& operator<<(std::ostream& out, const Stage& obj)
+{
+ obj.printTo(out);
+ return out;
+}
+
uint32_t Stage::read(::apache::thrift::protocol::TProtocol* iprot) {
- apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+ ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
uint32_t xfer = 0;
std::string fname;
::apache::thrift::protocol::TType ftype;
@@ -1177,7 +1302,7 @@ uint32_t Stage::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t Stage::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+ ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
xfer += oprot->writeStructBegin("Stage");
xfer += oprot->writeFieldBegin("stageId", ::apache::thrift::protocol::T_STRING, 1);
@@ -1286,7 +1411,7 @@ void Stage::printTo(std::ostream& out) const {
}
-Query::~Query() throw() {
+Query::~Query() noexcept {
}
@@ -1321,10 +1446,16 @@ void Query::__set_done(const bool val) {
void Query::__set_started(const bool val) {
this->started = val;
}
+std::ostream& operator<<(std::ostream& out, const Query& obj)
+{
+ obj.printTo(out);
+ return out;
+}
+
uint32_t Query::read(::apache::thrift::protocol::TProtocol* iprot) {
- apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+ ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
uint32_t xfer = 0;
std::string fname;
::apache::thrift::protocol::TType ftype;
@@ -1463,7 +1594,7 @@ uint32_t Query::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t Query::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+ ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
xfer += oprot->writeStructBegin("Query");
xfer += oprot->writeFieldBegin("queryId", ::apache::thrift::protocol::T_STRING, 1);
@@ -1580,7 +1711,7 @@ void Query::printTo(std::ostream& out) const {
}
-QueryPlan::~QueryPlan() throw() {
+QueryPlan::~QueryPlan() noexcept {
}
@@ -1595,10 +1726,16 @@ void QueryPlan::__set_done(const bool val) {
void QueryPlan::__set_started(const bool val) {
this->started = val;
}
+std::ostream& operator<<(std::ostream& out, const QueryPlan& obj)
+{
+ obj.printTo(out);
+ return out;
+}
+
uint32_t QueryPlan::read(::apache::thrift::protocol::TProtocol* iprot) {
- apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+ ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
uint32_t xfer = 0;
std::string fname;
::apache::thrift::protocol::TType ftype;
@@ -1667,7 +1804,7 @@ uint32_t QueryPlan::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t QueryPlan::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+ ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
xfer += oprot->writeStructBegin("QueryPlan");
xfer += oprot->writeFieldBegin("queries", ::apache::thrift::protocol::T_LIST, 1);
diff --git a/ql/src/gen/thrift/gen-cpp/queryplan_types.h b/ql/src/gen/thrift/gen-cpp/queryplan_types.h
index 1e8c702df36d..beba59e2e19a 100644
--- a/ql/src/gen/thrift/gen-cpp/queryplan_types.h
+++ b/ql/src/gen/thrift/gen-cpp/queryplan_types.h
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.13.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -11,10 +11,12 @@
#include
#include
+#include
#include
#include
-#include
+#include
+#include
namespace Apache { namespace Hadoop { namespace Hive {
@@ -28,6 +30,10 @@ struct AdjacencyType {
extern const std::map _AdjacencyType_VALUES_TO_NAMES;
+std::ostream& operator<<(std::ostream& out, const AdjacencyType::type& val);
+
+std::string to_string(const AdjacencyType::type& val);
+
struct NodeType {
enum type {
OPERATOR = 0,
@@ -37,6 +43,10 @@ struct NodeType {
extern const std::map _NodeType_VALUES_TO_NAMES;
+std::ostream& operator<<(std::ostream& out, const NodeType::type& val);
+
+std::string to_string(const NodeType::type& val);
+
struct OperatorType {
enum type {
JOIN = 0,
@@ -71,6 +81,10 @@ struct OperatorType {
extern const std::map _OperatorType_VALUES_TO_NAMES;
+std::ostream& operator<<(std::ostream& out, const OperatorType::type& val);
+
+std::string to_string(const OperatorType::type& val);
+
struct TaskType {
enum type {
MAP = 0,
@@ -81,6 +95,10 @@ struct TaskType {
extern const std::map _TaskType_VALUES_TO_NAMES;
+std::ostream& operator<<(std::ostream& out, const TaskType::type& val);
+
+std::string to_string(const TaskType::type& val);
+
struct StageType {
enum type {
CONDITIONAL = 0,
@@ -111,6 +129,10 @@ struct StageType {
extern const std::map _StageType_VALUES_TO_NAMES;
+std::ostream& operator<<(std::ostream& out, const StageType::type& val);
+
+std::string to_string(const StageType::type& val);
+
class Adjacency;
class Graph;
@@ -132,7 +154,7 @@ typedef struct _Adjacency__isset {
bool adjacencyType :1;
} _Adjacency__isset;
-class Adjacency {
+class Adjacency : public virtual ::apache::thrift::TBase {
public:
Adjacency(const Adjacency&);
@@ -140,7 +162,7 @@ class Adjacency {
Adjacency() : node(), adjacencyType((AdjacencyType::type)0) {
}
- virtual ~Adjacency() throw();
+ virtual ~Adjacency() noexcept;
std::string node;
std::vector children;
AdjacencyType::type adjacencyType;
@@ -177,11 +199,7 @@ class Adjacency {
void swap(Adjacency &a, Adjacency &b);
-inline std::ostream& operator<<(std::ostream& out, const Adjacency& obj)
-{
- obj.printTo(out);
- return out;
-}
+std::ostream& operator<<(std::ostream& out, const Adjacency& obj);
typedef struct _Graph__isset {
_Graph__isset() : nodeType(false), roots(false), adjacencyList(false) {}
@@ -190,7 +208,7 @@ typedef struct _Graph__isset {
bool adjacencyList :1;
} _Graph__isset;
-class Graph {
+class Graph : public virtual ::apache::thrift::TBase {
public:
Graph(const Graph&);
@@ -198,7 +216,7 @@ class Graph {
Graph() : nodeType((NodeType::type)0) {
}
- virtual ~Graph() throw();
+ virtual ~Graph() noexcept;
NodeType::type nodeType;
std::vector roots;
std::vector adjacencyList;
@@ -235,11 +253,7 @@ class Graph {
void swap(Graph &a, Graph &b);
-inline std::ostream& operator<<(std::ostream& out, const Graph& obj)
-{
- obj.printTo(out);
- return out;
-}
+std::ostream& operator<<(std::ostream& out, const Graph& obj);
typedef struct _Operator__isset {
_Operator__isset() : operatorId(false), operatorType(false), operatorAttributes(false), operatorCounters(false), done(false), started(false) {}
@@ -251,7 +265,7 @@ typedef struct _Operator__isset {
bool started :1;
} _Operator__isset;
-class Operator {
+class Operator : public virtual ::apache::thrift::TBase {
public:
Operator(const Operator&);
@@ -259,7 +273,7 @@ class Operator {
Operator() : operatorId(), operatorType((OperatorType::type)0), done(0), started(0) {
}
- virtual ~Operator() throw();
+ virtual ~Operator() noexcept;
std::string operatorId;
OperatorType::type operatorType;
std::map operatorAttributes;
@@ -311,11 +325,7 @@ class Operator {
void swap(Operator &a, Operator &b);
-inline std::ostream& operator<<(std::ostream& out, const Operator& obj)
-{
- obj.printTo(out);
- return out;
-}
+std::ostream& operator<<(std::ostream& out, const Operator& obj);
typedef struct _Task__isset {
_Task__isset() : taskId(false), taskType(false), taskAttributes(false), taskCounters(false), operatorGraph(false), operatorList(false), done(false), started(false) {}
@@ -329,7 +339,7 @@ typedef struct _Task__isset {
bool started :1;
} _Task__isset;
-class Task {
+class Task : public virtual ::apache::thrift::TBase {
public:
Task(const Task&);
@@ -337,7 +347,7 @@ class Task {
Task() : taskId(), taskType((TaskType::type)0), done(0), started(0) {
}
- virtual ~Task() throw();
+ virtual ~Task() noexcept;
std::string taskId;
TaskType::type taskType;
std::map taskAttributes;
@@ -403,11 +413,7 @@ class Task {
void swap(Task &a, Task &b);
-inline std::ostream& operator<<(std::ostream& out, const Task& obj)
-{
- obj.printTo(out);
- return out;
-}
+std::ostream& operator<<(std::ostream& out, const Task& obj);
typedef struct _Stage__isset {
_Stage__isset() : stageId(false), stageType(false), stageAttributes(false), stageCounters(false), taskList(false), done(false), started(false) {}
@@ -420,7 +426,7 @@ typedef struct _Stage__isset {
bool started :1;
} _Stage__isset;
-class Stage {
+class Stage : public virtual ::apache::thrift::TBase {
public:
Stage(const Stage&);
@@ -428,7 +434,7 @@ class Stage {
Stage() : stageId(), stageType((StageType::type)0), done(0), started(0) {
}
- virtual ~Stage() throw();
+ virtual ~Stage() noexcept;
std::string stageId;
StageType::type stageType;
std::map stageAttributes;
@@ -485,11 +491,7 @@ class Stage {
void swap(Stage &a, Stage &b);
-inline std::ostream& operator<<(std::ostream& out, const Stage& obj)
-{
- obj.printTo(out);
- return out;
-}
+std::ostream& operator<<(std::ostream& out, const Stage& obj);
typedef struct _Query__isset {
_Query__isset() : queryId(false), queryType(false), queryAttributes(false), queryCounters(false), stageGraph(false), stageList(false), done(false), started(false) {}
@@ -503,7 +505,7 @@ typedef struct _Query__isset {
bool started :1;
} _Query__isset;
-class Query {
+class Query : public virtual ::apache::thrift::TBase {
public:
Query(const Query&);
@@ -511,7 +513,7 @@ class Query {
Query() : queryId(), queryType(), done(0), started(0) {
}
- virtual ~Query() throw();
+ virtual ~Query() noexcept;
std::string queryId;
std::string queryType;
std::map queryAttributes;
@@ -573,11 +575,7 @@ class Query {
void swap(Query &a, Query &b);
-inline std::ostream& operator<<(std::ostream& out, const Query& obj)
-{
- obj.printTo(out);
- return out;
-}
+std::ostream& operator<<(std::ostream& out, const Query& obj);
typedef struct _QueryPlan__isset {
_QueryPlan__isset() : queries(false), done(false), started(false) {}
@@ -586,7 +584,7 @@ typedef struct _QueryPlan__isset {
bool started :1;
} _QueryPlan__isset;
-class QueryPlan {
+class QueryPlan : public virtual ::apache::thrift::TBase {
public:
QueryPlan(const QueryPlan&);
@@ -594,7 +592,7 @@ class QueryPlan {
QueryPlan() : done(0), started(0) {
}
- virtual ~QueryPlan() throw();
+ virtual ~QueryPlan() noexcept;
std::vector queries;
bool done;
bool started;
@@ -631,11 +629,7 @@ class QueryPlan {
void swap(QueryPlan &a, QueryPlan &b);
-inline std::ostream& operator<<(std::ostream& out, const QueryPlan& obj)
-{
- obj.printTo(out);
- return out;
-}
+std::ostream& operator<<(std::ostream& out, const QueryPlan& obj);
}}} // namespace
diff --git a/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Adjacency.java b/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Adjacency.java
index 37edf2aa447e..dbfb052f4538 100644
--- a/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Adjacency.java
+++ b/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Adjacency.java
@@ -1,40 +1,13 @@
/**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.13.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
*/
package org.apache.hadoop.hive.ql.plan.api;
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.13.0)")
public class Adjacency implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Adjacency");
@@ -42,15 +15,12 @@ public class Adjacency implements org.apache.thrift.TBase, SchemeFactory> schemes = new HashMap, SchemeFactory>();
- static {
- schemes.put(StandardScheme.class, new AdjacencyStandardSchemeFactory());
- schemes.put(TupleScheme.class, new AdjacencyTupleSchemeFactory());
- }
+ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new AdjacencyStandardSchemeFactory();
+ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new AdjacencyTupleSchemeFactory();
- private String node; // required
- private List children; // required
- private AdjacencyType adjacencyType; // required
+ private @org.apache.thrift.annotation.Nullable java.lang.String node; // required
+ private @org.apache.thrift.annotation.Nullable java.util.List children; // required
+ private @org.apache.thrift.annotation.Nullable AdjacencyType adjacencyType; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -62,10 +32,10 @@ public enum _Fields implements org.apache.thrift.TFieldIdEnum {
*/
ADJACENCY_TYPE((short)3, "adjacencyType");
- private static final Map byName = new HashMap();
+ private static final java.util.Map byName = new java.util.HashMap();
static {
- for (_Fields field : EnumSet.allOf(_Fields.class)) {
+ for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
byName.put(field.getFieldName(), field);
}
}
@@ -73,6 +43,7 @@ public enum _Fields implements org.apache.thrift.TFieldIdEnum {
/**
* Find the _Fields constant that matches fieldId, or null if its not found.
*/
+ @org.apache.thrift.annotation.Nullable
public static _Fields findByThriftId(int fieldId) {
switch(fieldId) {
case 1: // NODE
@@ -92,21 +63,22 @@ public static _Fields findByThriftId(int fieldId) {
*/
public static _Fields findByThriftIdOrThrow(int fieldId) {
_Fields fields = findByThriftId(fieldId);
- if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+ if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
return fields;
}
/**
* Find the _Fields constant that matches name, or null if its not found.
*/
- public static _Fields findByName(String name) {
+ @org.apache.thrift.annotation.Nullable
+ public static _Fields findByName(java.lang.String name) {
return byName.get(name);
}
private final short _thriftId;
- private final String _fieldName;
+ private final java.lang.String _fieldName;
- _Fields(short thriftId, String fieldName) {
+ _Fields(short thriftId, java.lang.String fieldName) {
_thriftId = thriftId;
_fieldName = fieldName;
}
@@ -115,15 +87,15 @@ public short getThriftFieldId() {
return _thriftId;
}
- public String getFieldName() {
+ public java.lang.String getFieldName() {
return _fieldName;
}
}
// isset id assignments
- public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+ public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
- Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+ java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
tmpMap.put(_Fields.NODE, new org.apache.thrift.meta_data.FieldMetaData("node", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.CHILDREN, new org.apache.thrift.meta_data.FieldMetaData("children", org.apache.thrift.TFieldRequirementType.DEFAULT,
@@ -131,7 +103,7 @@ public String getFieldName() {
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
tmpMap.put(_Fields.ADJACENCY_TYPE, new org.apache.thrift.meta_data.FieldMetaData("adjacencyType", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, AdjacencyType.class)));
- metaDataMap = Collections.unmodifiableMap(tmpMap);
+ metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Adjacency.class, metaDataMap);
}
@@ -139,8 +111,8 @@ public Adjacency() {
}
public Adjacency(
- String node,
- List children,
+ java.lang.String node,
+ java.util.List children,
AdjacencyType adjacencyType)
{
this();
@@ -157,7 +129,7 @@ public Adjacency(Adjacency other) {
this.node = other.node;
}
if (other.isSetChildren()) {
- List __this__children = new ArrayList(other.children);
+ java.util.List __this__children = new java.util.ArrayList(other.children);
this.children = __this__children;
}
if (other.isSetAdjacencyType()) {
@@ -176,11 +148,12 @@ public void clear() {
this.adjacencyType = null;
}
- public String getNode() {
+ @org.apache.thrift.annotation.Nullable
+ public java.lang.String getNode() {
return this.node;
}
- public void setNode(String node) {
+ public void setNode(@org.apache.thrift.annotation.Nullable java.lang.String node) {
this.node = node;
}
@@ -203,22 +176,24 @@ public int getChildrenSize() {
return (this.children == null) ? 0 : this.children.size();
}
- public java.util.Iterator getChildrenIterator() {
+ @org.apache.thrift.annotation.Nullable
+ public java.util.Iterator getChildrenIterator() {
return (this.children == null) ? null : this.children.iterator();
}
- public void addToChildren(String elem) {
+ public void addToChildren(java.lang.String elem) {
if (this.children == null) {
- this.children = new ArrayList();
+ this.children = new java.util.ArrayList();
}
this.children.add(elem);
}
- public List getChildren() {
+ @org.apache.thrift.annotation.Nullable
+ public java.util.List getChildren() {
return this.children;
}
- public void setChildren(List children) {
+ public void setChildren(@org.apache.thrift.annotation.Nullable java.util.List children) {
this.children = children;
}
@@ -241,6 +216,7 @@ public void setChildrenIsSet(boolean value) {
*
* @see AdjacencyType
*/
+ @org.apache.thrift.annotation.Nullable
public AdjacencyType getAdjacencyType() {
return this.adjacencyType;
}
@@ -249,7 +225,7 @@ public AdjacencyType getAdjacencyType() {
*
* @see AdjacencyType
*/
- public void setAdjacencyType(AdjacencyType adjacencyType) {
+ public void setAdjacencyType(@org.apache.thrift.annotation.Nullable AdjacencyType adjacencyType) {
this.adjacencyType = adjacencyType;
}
@@ -268,13 +244,13 @@ public void setAdjacencyTypeIsSet(boolean value) {
}
}
- public void setFieldValue(_Fields field, Object value) {
+ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
switch (field) {
case NODE:
if (value == null) {
unsetNode();
} else {
- setNode((String)value);
+ setNode((java.lang.String)value);
}
break;
@@ -282,7 +258,7 @@ public void setFieldValue(_Fields field, Object value) {
if (value == null) {
unsetChildren();
} else {
- setChildren((List)value);
+ setChildren((java.util.List)value);
}
break;
@@ -297,7 +273,8 @@ public void setFieldValue(_Fields field, Object value) {
}
}
- public Object getFieldValue(_Fields field) {
+ @org.apache.thrift.annotation.Nullable
+ public java.lang.Object getFieldValue(_Fields field) {
switch (field) {
case NODE:
return getNode();
@@ -309,13 +286,13 @@ public Object getFieldValue(_Fields field) {
return getAdjacencyType();
}
- throw new IllegalStateException();
+ throw new java.lang.IllegalStateException();
}
/** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
public boolean isSet(_Fields field) {
if (field == null) {
- throw new IllegalArgumentException();
+ throw new java.lang.IllegalArgumentException();
}
switch (field) {
@@ -326,11 +303,11 @@ public boolean isSet(_Fields field) {
case ADJACENCY_TYPE:
return isSetAdjacencyType();
}
- throw new IllegalStateException();
+ throw new java.lang.IllegalStateException();
}
@Override
- public boolean equals(Object that) {
+ public boolean equals(java.lang.Object that) {
if (that == null)
return false;
if (that instanceof Adjacency)
@@ -341,6 +318,8 @@ public boolean equals(Object that) {
public boolean equals(Adjacency that) {
if (that == null)
return false;
+ if (this == that)
+ return true;
boolean this_present_node = true && this.isSetNode();
boolean that_present_node = true && that.isSetNode();
@@ -374,24 +353,21 @@ public boolean equals(Adjacency that) {
@Override
public int hashCode() {
- List