You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2013/07/27 23:20:06 UTC
svn commit: r1507713 [6/6] - in /hive/trunk: data/files/
jdbc/src/java/org/apache/hadoop/hive/jdbc/
jdbc/src/java/org/apache/hive/jdbc/
jdbc/src/test/org/apache/hadoop/hive/jdbc/
jdbc/src/test/org/apache/hive/jdbc/ ql/src/gen/protobuf/gen-java/org/apac...
Modified: hive/trunk/service/src/gen/thrift/gen-cpp/TCLIService_types.cpp
URL: http://svn.apache.org/viewvc/hive/trunk/service/src/gen/thrift/gen-cpp/TCLIService_types.cpp?rev=1507713&r1=1507712&r2=1507713&view=diff
==============================================================================
--- hive/trunk/service/src/gen/thrift/gen-cpp/TCLIService_types.cpp (original)
+++ hive/trunk/service/src/gen/thrift/gen-cpp/TCLIService_types.cpp Sat Jul 27 21:20:03 2013
@@ -35,7 +35,8 @@ int _kTTypeIdValues[] = {
TTypeId::UNION_TYPE,
TTypeId::USER_DEFINED_TYPE,
TTypeId::DECIMAL_TYPE,
- TTypeId::NULL_TYPE
+ TTypeId::NULL_TYPE,
+ TTypeId::DATE_TYPE
};
const char* _kTTypeIdNames[] = {
"BOOLEAN_TYPE",
@@ -54,9 +55,10 @@ const char* _kTTypeIdNames[] = {
"UNION_TYPE",
"USER_DEFINED_TYPE",
"DECIMAL_TYPE",
- "NULL_TYPE"
+ "NULL_TYPE",
+ "DATE_TYPE"
};
-const std::map<int, const char*> _TTypeId_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(17, _kTTypeIdValues, _kTTypeIdNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
+const std::map<int, const char*> _TTypeId_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(18, _kTTypeIdValues, _kTTypeIdNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
int _kTStatusCodeValues[] = {
TStatusCode::SUCCESS_STATUS,
Modified: hive/trunk/service/src/gen/thrift/gen-cpp/TCLIService_types.h
URL: http://svn.apache.org/viewvc/hive/trunk/service/src/gen/thrift/gen-cpp/TCLIService_types.h?rev=1507713&r1=1507712&r2=1507713&view=diff
==============================================================================
--- hive/trunk/service/src/gen/thrift/gen-cpp/TCLIService_types.h (original)
+++ hive/trunk/service/src/gen/thrift/gen-cpp/TCLIService_types.h Sat Jul 27 21:20:03 2013
@@ -42,7 +42,8 @@ struct TTypeId {
UNION_TYPE = 13,
USER_DEFINED_TYPE = 14,
DECIMAL_TYPE = 15,
- NULL_TYPE = 16
+ NULL_TYPE = 16,
+ DATE_TYPE = 17
};
};
Modified: hive/trunk/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TCLIServiceConstants.java
URL: http://svn.apache.org/viewvc/hive/trunk/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TCLIServiceConstants.java?rev=1507713&r1=1507712&r2=1507713&view=diff
==============================================================================
--- hive/trunk/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TCLIServiceConstants.java (original)
+++ hive/trunk/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TCLIServiceConstants.java Sat Jul 27 21:20:03 2013
@@ -47,6 +47,7 @@ public class TCLIServiceConstants {
PRIMITIVE_TYPES.add(org.apache.hive.service.cli.thrift.TTypeId.BINARY_TYPE);
PRIMITIVE_TYPES.add(org.apache.hive.service.cli.thrift.TTypeId.DECIMAL_TYPE);
PRIMITIVE_TYPES.add(org.apache.hive.service.cli.thrift.TTypeId.NULL_TYPE);
+ PRIMITIVE_TYPES.add(org.apache.hive.service.cli.thrift.TTypeId.DATE_TYPE);
}
public static final Set<TTypeId> COMPLEX_TYPES = new HashSet<TTypeId>();
@@ -82,6 +83,7 @@ public class TCLIServiceConstants {
TYPE_NAMES.put(org.apache.hive.service.cli.thrift.TTypeId.UNION_TYPE, "UNIONTYPE");
TYPE_NAMES.put(org.apache.hive.service.cli.thrift.TTypeId.DECIMAL_TYPE, "DECIMAL");
TYPE_NAMES.put(org.apache.hive.service.cli.thrift.TTypeId.NULL_TYPE, "NULL");
+ TYPE_NAMES.put(org.apache.hive.service.cli.thrift.TTypeId.DATE_TYPE, "DATE");
}
}
Modified: hive/trunk/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TTypeId.java
URL: http://svn.apache.org/viewvc/hive/trunk/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TTypeId.java?rev=1507713&r1=1507712&r2=1507713&view=diff
==============================================================================
--- hive/trunk/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TTypeId.java (original)
+++ hive/trunk/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TTypeId.java Sat Jul 27 21:20:03 2013
@@ -28,7 +28,8 @@ public enum TTypeId implements org.apach
UNION_TYPE(13),
USER_DEFINED_TYPE(14),
DECIMAL_TYPE(15),
- NULL_TYPE(16);
+ NULL_TYPE(16),
+ DATE_TYPE(17);
private final int value;
@@ -83,6 +84,8 @@ public enum TTypeId implements org.apach
return DECIMAL_TYPE;
case 16:
return NULL_TYPE;
+ case 17:
+ return DATE_TYPE;
default:
return null;
}
Modified: hive/trunk/service/src/gen/thrift/gen-py/TCLIService/constants.py
URL: http://svn.apache.org/viewvc/hive/trunk/service/src/gen/thrift/gen-py/TCLIService/constants.py?rev=1507713&r1=1507712&r2=1507713&view=diff
==============================================================================
--- hive/trunk/service/src/gen/thrift/gen-py/TCLIService/constants.py (original)
+++ hive/trunk/service/src/gen/thrift/gen-py/TCLIService/constants.py Sat Jul 27 21:20:03 2013
@@ -22,6 +22,7 @@ PRIMITIVE_TYPES = set([
9,
15,
16,
+ 17,
])
COMPLEX_TYPES = set([
10,
@@ -51,4 +52,5 @@ TYPE_NAMES = {
13 : "UNIONTYPE",
15 : "DECIMAL",
16 : "NULL",
+ 17 : "DATE",
}
Modified: hive/trunk/service/src/gen/thrift/gen-py/TCLIService/ttypes.py
URL: http://svn.apache.org/viewvc/hive/trunk/service/src/gen/thrift/gen-py/TCLIService/ttypes.py?rev=1507713&r1=1507712&r2=1507713&view=diff
==============================================================================
--- hive/trunk/service/src/gen/thrift/gen-py/TCLIService/ttypes.py (original)
+++ hive/trunk/service/src/gen/thrift/gen-py/TCLIService/ttypes.py Sat Jul 27 21:20:03 2013
@@ -45,6 +45,7 @@ class TTypeId:
USER_DEFINED_TYPE = 14
DECIMAL_TYPE = 15
NULL_TYPE = 16
+ DATE_TYPE = 17
_VALUES_TO_NAMES = {
0: "BOOLEAN_TYPE",
@@ -64,6 +65,7 @@ class TTypeId:
14: "USER_DEFINED_TYPE",
15: "DECIMAL_TYPE",
16: "NULL_TYPE",
+ 17: "DATE_TYPE",
}
_NAMES_TO_VALUES = {
@@ -84,6 +86,7 @@ class TTypeId:
"USER_DEFINED_TYPE": 14,
"DECIMAL_TYPE": 15,
"NULL_TYPE": 16,
+ "DATE_TYPE": 17,
}
class TStatusCode:
Modified: hive/trunk/service/src/gen/thrift/gen-rb/t_c_l_i_service_constants.rb
URL: http://svn.apache.org/viewvc/hive/trunk/service/src/gen/thrift/gen-rb/t_c_l_i_service_constants.rb?rev=1507713&r1=1507712&r2=1507713&view=diff
==============================================================================
--- hive/trunk/service/src/gen/thrift/gen-rb/t_c_l_i_service_constants.rb (original)
+++ hive/trunk/service/src/gen/thrift/gen-rb/t_c_l_i_service_constants.rb Sat Jul 27 21:20:03 2013
@@ -20,6 +20,7 @@ PRIMITIVE_TYPES = Set.new([
9,
15,
16,
+ 17,
])
COMPLEX_TYPES = Set.new([
@@ -52,5 +53,6 @@ TYPE_NAMES = {
13 => %q"UNIONTYPE",
15 => %q"DECIMAL",
16 => %q"NULL",
+ 17 => %q"DATE",
}
Modified: hive/trunk/service/src/gen/thrift/gen-rb/t_c_l_i_service_types.rb
URL: http://svn.apache.org/viewvc/hive/trunk/service/src/gen/thrift/gen-rb/t_c_l_i_service_types.rb?rev=1507713&r1=1507712&r2=1507713&view=diff
==============================================================================
--- hive/trunk/service/src/gen/thrift/gen-rb/t_c_l_i_service_types.rb (original)
+++ hive/trunk/service/src/gen/thrift/gen-rb/t_c_l_i_service_types.rb Sat Jul 27 21:20:03 2013
@@ -30,8 +30,9 @@ module TTypeId
USER_DEFINED_TYPE = 14
DECIMAL_TYPE = 15
NULL_TYPE = 16
- VALUE_MAP = {0 => "BOOLEAN_TYPE", 1 => "TINYINT_TYPE", 2 => "SMALLINT_TYPE", 3 => "INT_TYPE", 4 => "BIGINT_TYPE", 5 => "FLOAT_TYPE", 6 => "DOUBLE_TYPE", 7 => "STRING_TYPE", 8 => "TIMESTAMP_TYPE", 9 => "BINARY_TYPE", 10 => "ARRAY_TYPE", 11 => "MAP_TYPE", 12 => "STRUCT_TYPE", 13 => "UNION_TYPE", 14 => "USER_DEFINED_TYPE", 15 => "DECIMAL_TYPE", 16 => "NULL_TYPE"}
- VALID_VALUES = Set.new([BOOLEAN_TYPE, TINYINT_TYPE, SMALLINT_TYPE, INT_TYPE, BIGINT_TYPE, FLOAT_TYPE, DOUBLE_TYPE, STRING_TYPE, TIMESTAMP_TYPE, BINARY_TYPE, ARRAY_TYPE, MAP_TYPE, STRUCT_TYPE, UNION_TYPE, USER_DEFINED_TYPE, DECIMAL_TYPE, NULL_TYPE]).freeze
+ DATE_TYPE = 17
+ VALUE_MAP = {0 => "BOOLEAN_TYPE", 1 => "TINYINT_TYPE", 2 => "SMALLINT_TYPE", 3 => "INT_TYPE", 4 => "BIGINT_TYPE", 5 => "FLOAT_TYPE", 6 => "DOUBLE_TYPE", 7 => "STRING_TYPE", 8 => "TIMESTAMP_TYPE", 9 => "BINARY_TYPE", 10 => "ARRAY_TYPE", 11 => "MAP_TYPE", 12 => "STRUCT_TYPE", 13 => "UNION_TYPE", 14 => "USER_DEFINED_TYPE", 15 => "DECIMAL_TYPE", 16 => "NULL_TYPE", 17 => "DATE_TYPE"}
+ VALID_VALUES = Set.new([BOOLEAN_TYPE, TINYINT_TYPE, SMALLINT_TYPE, INT_TYPE, BIGINT_TYPE, FLOAT_TYPE, DOUBLE_TYPE, STRING_TYPE, TIMESTAMP_TYPE, BINARY_TYPE, ARRAY_TYPE, MAP_TYPE, STRUCT_TYPE, UNION_TYPE, USER_DEFINED_TYPE, DECIMAL_TYPE, NULL_TYPE, DATE_TYPE]).freeze
end
module TStatusCode
Modified: hive/trunk/service/src/java/org/apache/hive/service/cli/ColumnValue.java
URL: http://svn.apache.org/viewvc/hive/trunk/service/src/java/org/apache/hive/service/cli/ColumnValue.java?rev=1507713&r1=1507712&r2=1507713&view=diff
==============================================================================
--- hive/trunk/service/src/java/org/apache/hive/service/cli/ColumnValue.java (original)
+++ hive/trunk/service/src/java/org/apache/hive/service/cli/ColumnValue.java Sat Jul 27 21:20:03 2013
@@ -18,6 +18,7 @@
package org.apache.hive.service.cli;
+import java.sql.Date;
import java.sql.Timestamp;
import org.apache.hadoop.hive.common.type.HiveDecimal;
@@ -117,6 +118,14 @@ public class ColumnValue {
return new ColumnValue(TColumnValue.stringVal(tStringValue));
}
+ public static ColumnValue dateValue(Date value) {
+ TStringValue tStringValue = new TStringValue();
+ if (value != null) {
+ tStringValue.setValue(value.toString());
+ }
+ return new ColumnValue(TColumnValue.stringVal(tStringValue));
+ }
+
public static ColumnValue timestampValue(Timestamp value) {
TStringValue tStringValue = new TStringValue();
if (value != null) {
@@ -151,6 +160,8 @@ public class ColumnValue {
return doubleValue((Double)value);
case STRING_TYPE:
return stringValue((String)value);
+ case DATE_TYPE:
+ return dateValue((Date)value);
case TIMESTAMP_TYPE:
return timestampValue((Timestamp)value);
case DECIMAL_TYPE:
Modified: hive/trunk/service/src/java/org/apache/hive/service/cli/Type.java
URL: http://svn.apache.org/viewvc/hive/trunk/service/src/java/org/apache/hive/service/cli/Type.java?rev=1507713&r1=1507712&r2=1507713&view=diff
==============================================================================
--- hive/trunk/service/src/java/org/apache/hive/service/cli/Type.java (original)
+++ hive/trunk/service/src/java/org/apache/hive/service/cli/Type.java Sat Jul 27 21:20:03 2013
@@ -54,6 +54,9 @@ public enum Type {
STRING_TYPE("STRING",
java.sql.Types.VARCHAR,
TTypeId.STRING_TYPE),
+ DATE_TYPE("DATE",
+ java.sql.Types.DATE,
+ TTypeId.DATE_TYPE),
TIMESTAMP_TYPE("TIMESTAMP",
java.sql.Types.TIMESTAMP,
TTypeId.TIMESTAMP_TYPE),
@@ -213,6 +216,7 @@ public enum Type {
switch (this) {
case BOOLEAN_TYPE:
case STRING_TYPE:
+ case DATE_TYPE:
case TIMESTAMP_TYPE:
case TINYINT_TYPE:
case SMALLINT_TYPE:
@@ -247,6 +251,8 @@ public enum Type {
case STRING_TYPE:
case BINARY_TYPE:
return Integer.MAX_VALUE;
+ case DATE_TYPE:
+ return 10;
case TIMESTAMP_TYPE:
return 30;
default: