Repository: tajo Updated Branches: refs/heads/master ef94bb38d -> 94197c38a
TAJO-1461: Follow Protocol Buffer Style Guide. (Contributed by David Chen, committed by hyunsik) Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/94197c38 Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/94197c38 Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/94197c38 Branch: refs/heads/master Commit: 94197c38a5d2bf053f5bebcae4c524e8aa1b552e Parents: ef94bb3 Author: Hyunsik Choi <[email protected]> Authored: Sat Oct 3 09:51:59 2015 -0700 Committer: Hyunsik Choi <[email protected]> Committed: Sat Oct 3 09:51:59 2015 -0700 ---------------------------------------------------------------------- CHANGES | 3 + .../src/main/proto/CatalogProtocol.proto | 24 +- .../tajo/function/FunctionInvocation.java | 10 +- .../src/main/proto/CatalogProtos.proto | 182 ++++++------ .../org/apache/tajo/client/QueryClientImpl.java | 4 +- tajo-client/src/main/proto/ClientProtos.proto | 210 +++++++------- .../main/proto/TajoMasterClientProtocol.proto | 9 +- .../src/main/proto/PrimitiveProtos.proto | 4 +- tajo-common/src/main/proto/TajoIdProtos.proto | 14 +- tajo-common/src/main/proto/tajo_protos.proto | 18 +- .../java/org/apache/tajo/master/QueryInfo.java | 2 +- tajo-core/src/main/proto/InternalTypes.proto | 4 +- tajo-core/src/main/proto/ResourceProtos.proto | 284 +++++++++---------- .../src/main/proto/TajoWorkerProtocol.proto | 3 +- .../src/main/proto/IndexProtos.proto | 6 +- .../src/main/proto/StorageFragmentProtos.proto | 12 +- .../src/main/proto/StorageFragmentProtos.proto | 6 +- 17 files changed, 403 insertions(+), 392 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/94197c38/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 83c1790..b688b3a 100644 --- a/CHANGES +++ b/CHANGES @@ -6,6 +6,9 @@ Release 0.12.0 - unreleased IMPROVEMENT + TAJO-1461: Follow Protocol Buffer Style Guide. (Contributed by David Chen, + committed by hyunsik) + TAJO-1768: Move Tajo into Java 8. (hyunsik) BUG FIXES http://git-wip-us.apache.org/repos/asf/tajo/blob/94197c38/tajo-catalog/tajo-catalog-client/src/main/proto/CatalogProtocol.proto ---------------------------------------------------------------------- diff --git a/tajo-catalog/tajo-catalog-client/src/main/proto/CatalogProtocol.proto b/tajo-catalog/tajo-catalog-client/src/main/proto/CatalogProtocol.proto index a3a904b..33fe91e 100644 --- a/tajo-catalog/tajo-catalog-client/src/main/proto/CatalogProtocol.proto +++ b/tajo-catalog/tajo-catalog-client/src/main/proto/CatalogProtocol.proto @@ -75,8 +75,8 @@ message GetIndexeDescResponse { } message GetIndexByColumnNamesRequest { - required TableIdentifierProto tableIdentifier = 1; - repeated string columnNames = 2; + required TableIdentifierProto table_identifier = 1; + repeated string column_names = 2; } message GetPartitionsResponse { @@ -117,23 +117,29 @@ service CatalogProtocolService { rpc getAllTableStats(NullProto) returns (GetTableStatsResponse); rpc getAllColumns(NullProto) returns (GetColumnsResponse); - rpc getPartitionMethodByTableName(TableIdentifierProto) returns (GetPartitionMethodResponse); + rpc getPartitionMethodByTableName(TableIdentifierProto) + returns (GetPartitionMethodResponse); rpc existPartitionMethod(TableIdentifierProto) returns (ReturnState); rpc existsPartitions(TableIdentifierProto) returns (ReturnState); - rpc getPartitionByPartitionName(PartitionIdentifierProto) returns (GetPartitionDescResponse); - rpc getPartitionsByTableName(TableIdentifierProto) returns (GetPartitionsResponse); + rpc getPartitionByPartitionName(PartitionIdentifierProto) + returns (GetPartitionDescResponse); + rpc getPartitionsByTableName(TableIdentifierProto) + returns (GetPartitionsResponse); rpc getAllPartitions(NullProto) returns (GetTablePartitionsResponse); rpc addPartitions(AddPartitionsProto) returns (ReturnState); - rpc getPartitionsByAlgebra(PartitionsByAlgebraProto) returns (GetPartitionsResponse); + rpc getPartitionsByAlgebra(PartitionsByAlgebraProto) + returns (GetPartitionsResponse); rpc createIndex(IndexDescProto) returns (ReturnState); rpc dropIndex(IndexNameProto) returns (ReturnState); rpc existIndexByName(IndexNameProto) returns (ReturnState); - rpc existIndexByColumnNames(GetIndexByColumnNamesRequest) returns (ReturnState); + rpc existIndexByColumnNames(GetIndexByColumnNamesRequest) + returns (ReturnState); rpc existIndexesByTable(TableIdentifierProto) returns (ReturnState); rpc getIndexByName(IndexNameProto) returns (IndexResponse); - rpc getIndexByColumnNames(GetIndexByColumnNamesRequest) returns (IndexResponse); + rpc getIndexByColumnNames(GetIndexByColumnNamesRequest) + returns (IndexResponse); rpc getAllIndexesByTable(TableIdentifierProto) returns (IndexListResponse); rpc getAllIndexes(NullProto) returns (IndexListResponse); @@ -142,4 +148,4 @@ service CatalogProtocolService { rpc getFunctions(NullProto) returns (GetFunctionsResponse); rpc getFunctionMeta(GetFunctionMetaRequest) returns (FunctionResponse); rpc containFunction(ContainFunctionRequest) returns (ReturnState); -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/tajo/blob/94197c38/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/function/FunctionInvocation.java ---------------------------------------------------------------------- diff --git a/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/function/FunctionInvocation.java b/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/function/FunctionInvocation.java index ae57e1d..09b056b 100644 --- a/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/function/FunctionInvocation.java +++ b/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/function/FunctionInvocation.java @@ -51,10 +51,10 @@ public class FunctionInvocation implements ProtoObject<FunctionInvocationProto> if (proto.hasAggregation()) { this.aggregation = new ClassBaseInvocationDesc(proto.getAggregation()); } - if (proto.hasScalarJIT()) { - this.scalarJIT = new StaticMethodInvocationDesc(proto.getScalarJIT()); + if (proto.hasScalarJit()) { + this.scalarJIT = new StaticMethodInvocationDesc(proto.getScalarJit()); } - if (proto.hasAggregationJIT()) { + if (proto.hasAggregationJit()) { this.aggregationJIT = new ClassBaseInvocationDesc(proto.getAggregation()); } if (proto.hasPython()) { @@ -163,10 +163,10 @@ public class FunctionInvocation implements ProtoObject<FunctionInvocationProto> builder.setAggregation(aggregation.getProto()); } if (hasScalarJIT()) { - builder.setScalarJIT(scalarJIT.getProto()); + builder.setScalarJit(scalarJIT.getProto()); } if (hasAggregationJIT()) { - builder.setAggregationJIT(aggregationJIT.getProto()); + builder.setAggregationJit(aggregationJIT.getProto()); } if (hasPython() || hasPythonAggregation()) { builder.setPython(python.getProto()); http://git-wip-us.apache.org/repos/asf/tajo/blob/94197c38/tajo-catalog/tajo-catalog-common/src/main/proto/CatalogProtos.proto ---------------------------------------------------------------------- diff --git a/tajo-catalog/tajo-catalog-common/src/main/proto/CatalogProtos.proto b/tajo-catalog/tajo-catalog-common/src/main/proto/CatalogProtos.proto index 9a7b66a..2b34095 100644 --- a/tajo-catalog/tajo-catalog-common/src/main/proto/CatalogProtos.proto +++ b/tajo-catalog/tajo-catalog-common/src/main/proto/CatalogProtos.proto @@ -66,7 +66,7 @@ enum AlterTableType { message ColumnProto { required string name = 1; optional int32 tid = 2; - required DataType dataType = 3; + required DataType data_type = 3; } message SchemaProto { @@ -75,12 +75,12 @@ message SchemaProto { message FragmentProto { required string id = 1; - required string dataFormat = 2; + required string data_format = 2; required bytes contents = 3; } message TableProto { - required string dataFormat = 1; + required string data_format = 1; optional KeyValueSetProto params = 2; } @@ -101,13 +101,13 @@ message TableDescProto { optional SchemaProto schema = 5; optional TableStatsProto stats = 6; optional PartitionMethodProto partition = 7; - optional bool isExternal = 8 [default = false]; + optional bool is_external = 8 [default = false]; } message TableIdentifierProto { required string database_name = 1; required string table_name = 2; - optional int32 dbId = 3; + optional int32 db_id = 3; optional int32 tid = 4; } @@ -117,14 +117,14 @@ message NamespaceProto { } message IndexDescProto { - required TableIdentifierProto tableIdentifier = 1; - required string indexName = 2; - required IndexMethod indexMethod = 3; - required string indexPath = 4; + required TableIdentifierProto table_identifier = 1; + required string index_name = 2; + required IndexMethod index_method = 3; + required string index_path = 4; repeated SortSpecProto key_sort_specs = 5; - required SchemaProto targetRelationSchema = 6; - optional bool isUnique = 7 [default = false]; - optional bool isClustered = 8 [default = false]; + required SchemaProto target_relation_schema = 6; + optional bool is_unique = 7 [default = false]; + optional bool is_clustered = 8 [default = false]; } enum IndexMethod { @@ -135,9 +135,9 @@ enum IndexMethod { } message IndexNameProto { - required string databaseName = 1; + required string database_name = 1; optional string namespace = 2; - required string indexName = 3; + required string index_name = 3; } message TableOptionProto { @@ -148,13 +148,13 @@ message TableOptionProto { message TablePartitionProto { required int32 partition_id = 1; required int32 tid = 2; - optional string partitionName = 3; + optional string partition_name = 3; optional string path = 4; } message GetFunctionsResponse { required ReturnState state = 1; - repeated FunctionDescProto functionDesc = 2; + repeated FunctionDescProto function_desc = 2; } message UnregisterFunctionRequest { @@ -163,33 +163,33 @@ message UnregisterFunctionRequest { message GetFunctionMetaRequest { required string signature = 1; - optional FunctionType functionType = 2; - repeated DataType parameterTypes = 3; + optional FunctionType function_type = 2; + repeated DataType parameter_types = 3; } message ContainFunctionRequest { required string signature = 1; - optional FunctionType functionType = 2; - repeated DataType parameterTypes = 3; + optional FunctionType function_type = 2; + repeated DataType parameter_types = 3; } message TableStatsProto { - required int64 numRows = 1; - required int64 numBytes = 2; - optional int32 numBlocks = 4; - optional int32 numShuffleOutputs = 5; - optional int64 avgRows = 6; - optional int64 readBytes = 7; - repeated ColumnStatsProto colStat = 8; + required int64 num_rows = 1; + required int64 num_bytes = 2; + optional int32 num_blocks = 4; + optional int32 num_shuffle_outputs = 5; + optional int64 avg_rows = 6; + optional int64 read_bytes = 7; + repeated ColumnStatsProto col_stat = 8; optional int32 tid = 9; } message ColumnStatsProto { required ColumnProto column = 1; - optional int64 numDistVal = 2; - optional int64 numNulls = 3; - optional bytes minValue = 4; - optional bytes maxValue = 5; + optional int64 num_dist_val = 2; + optional int64 num_nulls = 3; + optional bytes min_value = 4; + optional bytes max_value = 5; } enum StatType { @@ -213,91 +213,93 @@ message StatProto { } message ServerNameProto { - required string serverName = 1; - required string hostName = 2; + required string server_name = 1; + required string host_name = 2; required int32 port = 3; } message TupleComparatorSpecProto { - required int32 columnId = 1; + required int32 column_id = 1; optional bool ascending = 2 [default = true]; - optional bool nullFirst = 3 [default = false]; + optional bool null_first = 3 [default = false]; } message SortSpecProto { required ColumnProto column = 1; optional bool ascending = 2 [default = true]; - optional bool nullFirst = 3 [default = false]; + optional bool null_first = 3 [default = false]; } message PartitionMethodProto { - required TableIdentifierProto tableIdentifier = 1; - required PartitionType partitionType = 2; + required TableIdentifierProto table_identifier = 1; + required PartitionType partition_type = 2; required string expression = 3; - required SchemaProto expressionSchema = 4; + required SchemaProto expression_schema = 4; } message AddPartitionsProto { - required TableIdentifierProto tableIdentifier = 1; - repeated PartitionDescProto partitionDesc = 2; - required bool ifNotExists = 3; + required TableIdentifierProto table_identifier = 1; + repeated PartitionDescProto partition_desc = 2; + required bool if_not_exists = 3; } message PartitionDescProto { - required string partitionName = 1; - repeated PartitionKeyProto partitionKeys = 2; + required string partition_name = 1; + repeated PartitionKeyProto partition_keys = 2; optional string path = 3; optional int32 id = 4; - optional int64 numBytes = 5; + optional int64 num_bytes = 5; } message PartitionKeyProto { - required string columnName = 1; - required string partitionValue = 2; + required string column_name = 1; + required string partition_value = 2; } message PartitionIdentifierProto { - required string databaseName = 1; - required string tableName = 2; - optional string partitionName = 3; + required string database_name = 1; + required string table_name = 2; + optional string partition_name = 3; } message PartitionsByAlgebraProto { - required string databaseName = 1; - required string tableName = 2; - required string algebra = 3; // json object which contains algebra expressions + required string database_name = 1; + required string table_name = 2; + // JSON object which contains algebra expressions. + required string algebra = 3; } message PartitionsByFilterProto { - required string databaseName = 1; - required string tableName = 2; - required string filter = 3; // filter string: (col1 ='1' or col1 = '100') and col3 > 20 + required string database_name = 1; + required string table_name = 2; + // Filter string: (col1 ='1' or col1 = '100') and col3 > 20 + required string filter = 3; } message TablespaceProto { - required string spaceName = 1; + required string space_name = 1; required string uri = 2; optional string handler = 3; - optional int32 id = 4; + optional int32 id = 4; } message DatabaseProto { - required int32 spaceId = 1; - required int32 id = 2; - required string name = 3; + required int32 space_id = 1; + required int32 id = 2; + required string name = 3; } message TableDescriptorProto { - required int32 dbId = 1; + required int32 db_id = 1; required int32 tid = 2; required string name = 3; - optional string tableType = 4; + optional string table_type = 4; required string path = 5; - required string dataFormat = 6; + required string data_format = 6; } message AlterTablespaceProto { - required string spaceName = 1; + required string space_name = 1; repeated AlterTablespaceCommand command = 2; enum AlterTablespaceType { @@ -311,23 +313,23 @@ message AlterTablespaceProto { } message AlterTableDescProto { - required string tableName = 1; - optional string newTableName = 2 ; - optional ColumnProto addColumn = 3; - optional AlterColumnProto alterColumnName = 4; - required AlterTableType alterTableType = 5; - optional PartitionDescProto partitionDesc = 6; + required string table_name = 1; + optional string new_table_name = 2 ; + optional ColumnProto add_column = 3; + optional AlterColumnProto alter_column_name = 4; + required AlterTableType alter_table_type = 5; + optional PartitionDescProto partition_desc = 6; optional KeyValueSetProto params = 7; - optional string newTablePath = 8; + optional string new_table_path = 8; } message AlterColumnProto { - required string oldColumnName = 1; - required string newColumnName = 2; + required string old_column_name = 1; + required string new_column_name = 2; } message UpdateTableStatsProto { - required string tableName = 1; + required string table_name = 1; required TableStatsProto stats = 2; } @@ -355,12 +357,12 @@ message FunctionDescProto { message FunctionSignatureProto { required FunctionType type = 1; required string name = 2; - required DataType returnType = 3; - repeated DataType parameterTypes = 4; + required DataType return_type = 3; + repeated DataType parameter_types = 4; } message FunctionSupplementProto { - optional string shortDescription = 1; + optional string short_description = 1; optional string detail = 2; optional string example = 3; } @@ -369,26 +371,26 @@ message FunctionInvocationProto { optional ClassBaseInvocationDescProto legacy = 1; optional StaticMethodInvocationDescProto scalar = 2; optional ClassBaseInvocationDescProto aggregation = 3; - optional StaticMethodInvocationDescProto scalarJIT = 4; - optional ClassBaseInvocationDescProto aggregationJIT = 5; + optional StaticMethodInvocationDescProto scalar_jit = 4; + optional ClassBaseInvocationDescProto aggregation_jit = 5; optional PythonInvocationDescProto python = 6; } message ClassBaseInvocationDescProto { - required string className = 1; + required string class_name = 1; } message StaticMethodInvocationDescProto { - required string className = 1; - required string methodName = 2; - required string returnClass = 3; - repeated string paramClasses = 4; + required string class_name = 1; + required string method_name = 2; + required string return_class = 3; + repeated string param_classes = 4; } message PythonInvocationDescProto { - required string funcName = 1; - required string filePath = 2; - required bool isScalarFunction = 3; + required string func_name = 1; + required string file_path = 2; + required bool is_scalar_function = 3; } message TableResponse { @@ -408,12 +410,12 @@ message FunctionListResponse { message IndexListResponse { required ReturnState state = 1; - repeated IndexDescProto indexDesc = 2; + repeated IndexDescProto index_desc = 2; } message IndexResponse { required ReturnState state = 1; - optional IndexDescProto indexDesc = 2; + optional IndexDescProto index_desc = 2; } message PartitionListResponse { http://git-wip-us.apache.org/repos/asf/tajo/blob/94197c38/tajo-client/src/main/java/org/apache/tajo/client/QueryClientImpl.java ---------------------------------------------------------------------- diff --git a/tajo-client/src/main/java/org/apache/tajo/client/QueryClientImpl.java b/tajo-client/src/main/java/org/apache/tajo/client/QueryClientImpl.java index 364292e..4d19c3f 100644 --- a/tajo-client/src/main/java/org/apache/tajo/client/QueryClientImpl.java +++ b/tajo-client/src/main/java/org/apache/tajo/client/QueryClientImpl.java @@ -532,12 +532,12 @@ public class QueryClientImpl implements QueryClient { public QueryHistoryProto getQueryHistory(final QueryId queryId) throws QueryNotFoundException { final QueryInfoProto queryInfo = getQueryInfo(queryId); - if (queryInfo.getHostNameOfQM() == null || queryInfo.getQueryMasterClientPort() == 0) { + if (queryInfo.getHostNameOfQm() == null || queryInfo.getQueryMasterClientPort() == 0) { return null; } InetSocketAddress qmAddress = new InetSocketAddress( - queryInfo.getHostNameOfQM(), queryInfo.getQueryMasterClientPort()); + queryInfo.getHostNameOfQm(), queryInfo.getQueryMasterClientPort()); RpcClientManager manager = RpcClientManager.getInstance(); NettyClientBase qmClient = null; http://git-wip-us.apache.org/repos/asf/tajo/blob/94197c38/tajo-client/src/main/proto/ClientProtos.proto ---------------------------------------------------------------------- diff --git a/tajo-client/src/main/proto/ClientProtos.proto b/tajo-client/src/main/proto/ClientProtos.proto index 5cf9639..b6bcaeb 100644 --- a/tajo-client/src/main/proto/ClientProtos.proto +++ b/tajo-client/src/main/proto/ClientProtos.proto @@ -31,28 +31,28 @@ import "DataTypes.proto"; message CreateSessionRequest { required string username = 1; - optional string baseDatabaseName = 2; + optional string base_database_name = 2; } message CreateSessionResponse { required ReturnState state = 1; - optional SessionIdProto sessionId = 2; - optional KeyValueSetProto sessionVars = 3; + optional SessionIdProto session_id = 2; + optional KeyValueSetProto session_vars = 3; } message UpdateSessionVariableRequest { - optional SessionIdProto sessionId = 1; - optional KeyValueSetProto sessionVars = 2; - repeated string unsetVariables = 3; + optional SessionIdProto session_id = 1; + optional KeyValueSetProto session_vars = 2; + repeated string unset_variables = 3; } message SessionUpdateResponse { required ReturnState state = 1; - optional KeyValueSetProto sessionVars = 2; + optional KeyValueSetProto session_vars = 2; } message SessionedStringProto { - optional SessionIdProto sessionId = 1; + optional SessionIdProto session_id = 1; optional string value = 2; } @@ -62,137 +62,137 @@ message ExplainQueryResponse { } message QueryRequest { - optional SessionIdProto sessionId = 1; + optional SessionIdProto session_id = 1; required string query = 2; - repeated KeyValueProto sessionVars = 3; - required bool isJson = 4; + repeated KeyValueProto session_vars = 3; + required bool is_json = 4; } message UpdateQueryResponse { required ReturnState state = 1; - optional KeyValueSetProto sessionVars = 2; + optional KeyValueSetProto session_vars = 2; } message GetQueryResultRequest { - optional SessionIdProto sessionId = 1; - required QueryIdProto queryId = 2; + optional SessionIdProto session_id = 1; + required QueryIdProto query_id = 2; } message GetQueryResultResponse { required ReturnState state = 1; - optional TableDescProto tableDesc = 2; - optional string tajoUserName = 3; + optional TableDescProto table_desc = 2; + optional string tajo_user_name = 3; } message QueryIdRequest { - optional SessionIdProto sessionId = 1; - required QueryIdProto queryId = 2; + optional SessionIdProto session_id = 1; + required QueryIdProto query_id = 2; } message GetQueryListRequest { - optional SessionIdProto sessionId = 1; + optional SessionIdProto session_id = 1; } message BriefQueryInfo { - required QueryIdProto queryId = 1; + required QueryIdProto query_id = 1; required QueryState state = 2; - required int64 startTime = 3; - required int64 finishTime = 4; + required int64 start_time = 3; + required int64 finish_time = 4; required string query = 5; - optional string queryMasterHost = 6; - optional int32 queryMasterPort = 7; + optional string query_master_host = 6; + optional int32 query_master_port = 7; required float progress = 8; } message GetQueryListResponse { required ReturnState state = 1; - repeated BriefQueryInfo queryList = 2; + repeated BriefQueryInfo query_list = 2; } message GetQueryStatusRequest { - optional SessionIdProto sessionId = 1; - required QueryIdProto queryId = 2; + optional SessionIdProto session_id = 1; + required QueryIdProto query_id = 2; } message SerializedResultSet { required SchemaProto schema = 1; required int32 rows = 2; - optional int32 decompressedLength = 3; - optional CodecType decompressCodec = 4; - optional bytes serializedTuples = 5; + optional int32 decompressed_length = 3; + optional CodecType decompress_codec = 4; + optional bytes serialized_tuples = 5; } message SubmitQueryResponse { required ReturnState state = 1; enum ResultType { - NO_RESULT = 0; // this query does not have any result. - ENCLOSED = 1; // the response encloses the query result. - FETCH = 2; // the query result should be fetched + NO_RESULT = 0; // this query does not have any result. + ENCLOSED = 1; // the response encloses the query result. + FETCH = 2; // the query result should be fetched } optional ResultType result_type = 2; - optional QueryIdProto queryId = 3; - optional string userName = 4; + optional QueryIdProto query_id = 3; + optional string user_name = 4; - optional string queryMasterHost = 6; - optional int32 queryMasterPort = 7; + optional string query_master_host = 6; + optional int32 query_master_port = 7; - optional SerializedResultSet resultSet = 8; - optional TableDescProto tableDesc = 9; - optional int32 maxRowNum = 10; + optional SerializedResultSet result_set = 8; + optional TableDescProto table_desc = 9; + optional int32 max_row_num = 10; - optional KeyValueSetProto sessionVars = 11; + optional KeyValueSetProto session_vars = 11; } message GetQueryStatusResponse { required ReturnState state = 1; - optional QueryIdProto queryId = 2; + optional QueryIdProto query_id = 2; optional QueryState query_state = 3; optional float progress = 4; - optional int64 submitTime = 5; - optional int64 finishTime = 7; - optional bool hasResult = 8; - optional string errorMessage = 9; - optional string errorTrace = 10; - optional string queryMasterHost = 11; - optional int32 queryMasterPort = 12; + optional int64 submit_time = 5; + optional int64 finish_time = 7; + optional bool has_result = 8; + optional string error_message = 9; + optional string error_trace = 10; + optional string query_master_host = 11; + optional int32 query_master_port = 12; } message GetQueryResultDataRequest { - required SessionIdProto sessionId = 1; - required QueryIdProto queryId = 2; - required int32 fetchRowNum = 3; - optional CodecType compressCodec = 4; + required SessionIdProto session_id = 1; + required QueryIdProto query_id = 2; + required int32 fetch_row_num = 3; + optional CodecType compress_codec = 4; } message GetQueryResultDataResponse { required ReturnState state = 1; - optional SerializedResultSet resultSet = 2; + optional SerializedResultSet result_set = 2; } message GetClusterInfoRequest { - optional SessionIdProto sessionId = 1; + optional SessionIdProto session_id = 1; } message WorkerResourceInfo { - required WorkerConnectionInfoProto connectionInfo = 1; - required NodeResourceProto totalResource = 2; - required NodeResourceProto availableResource = 3; - required int32 numRunningTasks = 4; - required string workerStatus = 5; - required int64 lastHeartbeat = 6; - required int32 numQueryMasterTasks = 7; + required WorkerConnectionInfoProto connection_info = 1; + required NodeResourceProto total_resource = 2; + required NodeResourceProto available_resource = 3; + required int32 num_running_tasks = 4; + required string worker_status = 5; + required int64 last_heartbeat = 6; + required int32 num_query_master_tasks = 7; } message GetClusterInfoResponse { required ReturnState state = 1; - repeated WorkerResourceInfo workerList = 2; + repeated WorkerResourceInfo worker_list = 2; } message CreateTableRequest { - optional SessionIdProto sessionId = 1; + optional SessionIdProto session_id = 1; required string name = 2; optional SchemaProto schema = 3; required TableProto meta = 4; @@ -201,77 +201,77 @@ message CreateTableRequest { } message DropTableRequest { - optional SessionIdProto sessionId = 1; + optional SessionIdProto session_id = 1; required string name = 2; optional bool purge = 3 [default = false]; } message QueryInfoProto { - required string queryId = 1; + required string query_id = 1; optional string sql = 2; - optional KeyValueSetProto contextVars= 3; - optional QueryState queryState = 4; + optional KeyValueSetProto context_vars = 3; + optional QueryState query_state = 4; optional float progress = 5; - optional int64 startTime = 6; - optional int64 finishTime = 7; - optional string lastMessage = 8; - optional string hostNameOfQM = 9; - optional int32 queryMasterPort = 10; - optional int32 queryMasterClientPort = 11; - optional int32 queryMasterInfoPort = 12; - optional TableDescProto resultDesc = 13; + optional int64 start_time = 6; + optional int64 finish_time = 7; + optional string last_message = 8; + optional string host_name_of_qm = 9; + optional int32 query_master_port = 10; + optional int32 query_master_client_port = 11; + optional int32 query_master_info_port = 12; + optional TableDescProto result_desc = 13; } message StageHistoryProto { - required string executionBlockId =1; + required string execution_block_id =1; required string state = 2; - optional int64 startTime = 3; - optional int64 finishTime = 4; - optional int32 succeededObjectCount = 5; - optional int32 failedObjectCount = 6; - optional int32 killedObjectCount = 7; - optional int32 totalScheduledObjectsCount = 8; - - optional int64 totalInputBytes = 9; - optional int64 totalReadBytes = 10; - optional int64 totalReadRows = 11; - optional int64 totalWriteBytes = 12; - optional int64 totalWriteRows = 13; - optional int32 numShuffles = 14; + optional int64 start_time = 3; + optional int64 finish_time = 4; + optional int32 succeeded_object_count = 5; + optional int32 failed_object_count = 6; + optional int32 killed_object_count = 7; + optional int32 total_scheduled_objects_count = 8; + + optional int64 total_input_bytes = 9; + optional int64 total_read_bytes = 10; + optional int64 total_read_rows = 11; + optional int64 total_write_bytes = 12; + optional int64 total_write_rows = 13; + optional int32 num_shuffles = 14; optional float progress =15; optional string plan = 16; - optional int32 hostLocalAssigned = 17; - optional int32 rackLocalAssigned = 18; + optional int32 host_local_assigned = 17; + optional int32 rack_local_assigned = 18; } message QueryHistoryProto { - required string queryId = 1; - optional string queryMaster = 2; - optional int32 httpPort = 3; - optional string logicalPlan = 4; - optional string distributedPlan = 5; - repeated KeyValueProto sessionVariables = 6; - repeated StageHistoryProto stageHistories = 7; + required string query_id = 1; + optional string query_master = 2; + optional int32 http_port = 3; + optional string logical_plan = 4; + optional string distributed_plan = 5; + repeated KeyValueProto session_variables = 6; + repeated StageHistoryProto stage_histories = 7; } message GetQueryHistoryResponse { required ReturnState state = 1; - optional QueryHistoryProto queryHistory = 2; + optional QueryHistoryProto query_history = 2; } message GetQueryInfoResponse { required ReturnState state = 1; - optional QueryInfoProto queryInfo = 2; + optional QueryInfoProto query_info = 2; } message CreateIndexResponse { required ReturnState result = 1; - optional IndexDescProto indexDesc = 2; + optional IndexDescProto index_desc = 2; } message GetIndexWithColumnsRequest { - required SessionIdProto sessionId = 1; - required string tableName = 2; - repeated string columnNames = 3; + required SessionIdProto session_id = 1; + required string table_name = 2; + repeated string column_names = 3; } http://git-wip-us.apache.org/repos/asf/tajo/blob/94197c38/tajo-client/src/main/proto/TajoMasterClientProtocol.proto ---------------------------------------------------------------------- diff --git a/tajo-client/src/main/proto/TajoMasterClientProtocol.proto b/tajo-client/src/main/proto/TajoMasterClientProtocol.proto index fd76c80..e860e9c 100644 --- a/tajo-client/src/main/proto/TajoMasterClientProtocol.proto +++ b/tajo-client/src/main/proto/TajoMasterClientProtocol.proto @@ -35,7 +35,8 @@ service TajoMasterClientProtocolService { // Session APIs rpc createSession(CreateSessionRequest) returns (CreateSessionResponse); rpc removeSession(SessionIdProto) returns (ReturnState); - rpc updateSessionVariables(UpdateSessionVariableRequest) returns (SessionUpdateResponse); + rpc updateSessionVariables(UpdateSessionVariableRequest) + returns (SessionUpdateResponse); rpc existSessionVariable(SessionedStringProto) returns (ReturnState); rpc getSessionVariable(SessionedStringProto) returns (StringResponse); rpc getAllSessionVariables(SessionIdProto) returns (KeyValueSetResponse); @@ -44,7 +45,8 @@ service TajoMasterClientProtocolService { rpc submitQuery(QueryRequest) returns (SubmitQueryResponse); rpc updateQuery(QueryRequest) returns (UpdateQueryResponse); rpc getQueryResult(GetQueryResultRequest) returns (GetQueryResultResponse); - rpc getQueryResultData(GetQueryResultDataRequest) returns (GetQueryResultDataResponse); + rpc getQueryResultData(GetQueryResultDataRequest) + returns (GetQueryResultDataResponse); // Query And Resource Management APIs rpc getQueryStatus(GetQueryStatusRequest) returns (GetQueryStatusResponse); @@ -70,7 +72,8 @@ service TajoMasterClientProtocolService { rpc getTableList(SessionedStringProto) returns (StringListResponse); rpc getTableDesc(SessionedStringProto) returns (TableResponse); rpc getFunctionList(SessionedStringProto) returns (FunctionListResponse); - rpc getPartitionsByTableName(SessionedStringProto) returns (PartitionListResponse); + rpc getPartitionsByTableName(SessionedStringProto) + returns (PartitionListResponse); // Index Management APIs rpc getIndexWithName(SessionedStringProto) returns (IndexResponse); http://git-wip-us.apache.org/repos/asf/tajo/blob/94197c38/tajo-common/src/main/proto/PrimitiveProtos.proto ---------------------------------------------------------------------- diff --git a/tajo-common/src/main/proto/PrimitiveProtos.proto b/tajo-common/src/main/proto/PrimitiveProtos.proto index 0fdd1bb..4a709a1 100644 --- a/tajo-common/src/main/proto/PrimitiveProtos.proto +++ b/tajo-common/src/main/proto/PrimitiveProtos.proto @@ -58,7 +58,7 @@ message KeyValueSetProto { message ReturnState { required tajo.error.ResultCode return_code = 1; - optional string message = 2; + optional string message = 2; optional tajo.error.StackTrace stack_trace = 3; } @@ -75,4 +75,4 @@ message KeyValueSetResponse { message StringResponse { required ReturnState state = 1; optional string value = 2; -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/tajo/blob/94197c38/tajo-common/src/main/proto/TajoIdProtos.proto ---------------------------------------------------------------------- diff --git a/tajo-common/src/main/proto/TajoIdProtos.proto b/tajo-common/src/main/proto/TajoIdProtos.proto index c5e80a6..3e987eb 100644 --- a/tajo-common/src/main/proto/TajoIdProtos.proto +++ b/tajo-common/src/main/proto/TajoIdProtos.proto @@ -22,22 +22,22 @@ option java_generic_services = false; option java_generate_equals_and_hash = true; message QueryIdProto { - required string id = 1; - required int32 seq = 2; + required string id = 1; + required int32 seq = 2; } message ExecutionBlockIdProto { - required QueryIdProto queryId = 1; - required int32 id = 2; + required QueryIdProto query_id = 1; + required int32 id = 2; } message TaskIdProto { - required ExecutionBlockIdProto executionBlockId = 1; - required int32 id = 2; + required ExecutionBlockIdProto execution_block_id = 1; + required int32 id = 2; } message TaskAttemptIdProto { - required TaskIdProto taskId = 1; + required TaskIdProto task_id = 1; required int32 id = 2; } http://git-wip-us.apache.org/repos/asf/tajo/blob/94197c38/tajo-common/src/main/proto/tajo_protos.proto ---------------------------------------------------------------------- diff --git a/tajo-common/src/main/proto/tajo_protos.proto b/tajo-common/src/main/proto/tajo_protos.proto index 2a836d3..4d7925d 100644 --- a/tajo-common/src/main/proto/tajo_protos.proto +++ b/tajo-common/src/main/proto/tajo_protos.proto @@ -55,13 +55,13 @@ enum FetcherState { } message WorkerConnectionInfoProto { - required int32 id = 1; - required string host = 2; - required int32 peerRpcPort = 3; - required int32 pullServerPort = 4; - optional int32 queryMasterPort = 5; - required int32 clientPort = 6; - required int32 httpInfoPort = 7; + required int32 id = 1; + required string host = 2; + required int32 peer_rpc_port = 3; + required int32 pull_server_port = 4; + optional int32 query_master_port = 5; + required int32 client_port = 6; + required int32 http_info_port = 7; } message NodeResourceProto { @@ -71,5 +71,5 @@ message NodeResourceProto { } enum CodecType { - SNAPPY = 0; -} \ No newline at end of file + SNAPPY = 0; +} http://git-wip-us.apache.org/repos/asf/tajo/blob/94197c38/tajo-core/src/main/java/org/apache/tajo/master/QueryInfo.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/master/QueryInfo.java b/tajo-core/src/main/java/org/apache/tajo/master/QueryInfo.java index 38e9403..6c324d9 100644 --- a/tajo-core/src/main/java/org/apache/tajo/master/QueryInfo.java +++ b/tajo-core/src/main/java/org/apache/tajo/master/QueryInfo.java @@ -227,7 +227,7 @@ public class QueryInfo implements GsonObject, History, Comparable<QueryInfo> { } if (hostNameOfQM != null) { - builder.setHostNameOfQM(hostNameOfQM); + builder.setHostNameOfQm(hostNameOfQM); } return builder.build(); http://git-wip-us.apache.org/repos/asf/tajo/blob/94197c38/tajo-core/src/main/proto/InternalTypes.proto ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/proto/InternalTypes.proto b/tajo-core/src/main/proto/InternalTypes.proto index d23e244..fd362ba 100644 --- a/tajo-core/src/main/proto/InternalTypes.proto +++ b/tajo-core/src/main/proto/InternalTypes.proto @@ -32,7 +32,7 @@ message AvgDoubleProto { } message VarianceProto { - required double squareSumOfDiff = 1; + required double square_sum_of_diff = 1; required double avg = 2; required int64 count = 3; } @@ -44,4 +44,4 @@ message CorrProto { required double xvar = 4; required double yvar = 5; required double covar = 6; -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/tajo/blob/94197c38/tajo-core/src/main/proto/ResourceProtos.proto ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/proto/ResourceProtos.proto b/tajo-core/src/main/proto/ResourceProtos.proto index a24c840..3b9a85e 100644 --- a/tajo-core/src/main/proto/ResourceProtos.proto +++ b/tajo-core/src/main/proto/ResourceProtos.proto @@ -28,160 +28,159 @@ import "PrimitiveProtos.proto"; import "Plan.proto"; enum ResponseCommand { - NORMAL = 1; //ping - MEMBERSHIP = 2; // request membership to worker node - ABORT_QUERY = 3; //query master failure - SHUTDOWN = 4; // black list + NORMAL = 1; // ping + MEMBERSHIP = 2; // request membership to worker node + ABORT_QUERY = 3; //query master failure + SHUTDOWN = 4; // black list } -//TODO add node health information +// TODO add node health information message NodeStatusProto { } enum ResourceType { - LEAF = 1; - INTERMEDIATE = 2; - QUERYMASTER = 3; + LEAF = 1; + INTERMEDIATE = 2; + QUERYMASTER = 3; } message AllocationResourceProto { - required int32 workerId = 1; - required NodeResourceProto resource = 2; + required int32 worker_id = 1; + required NodeResourceProto resource = 2; } - message ExecutionBlockListProto { - repeated ExecutionBlockIdProto executionBlockId = 1; + repeated ExecutionBlockIdProto execution_block_id = 1; } message TaskAllocationProto { - required TaskRequestProto taskRequest = 1; - required NodeResourceProto resource = 2; + required TaskRequestProto task_request = 1; + required NodeResourceProto resource = 2; } message TaskRequestProto { - required string queryMasterHostAndPort = 1; - required TaskAttemptIdProto id = 2; - repeated FragmentProto fragments = 3; - required string outputTable = 4; - required bool clusteredOutput = 5; - required LogicalNodeTree plan = 6; - optional bool interQuery = 7 [default = false]; - repeated FetchProto fetches = 8; - optional KeyValueSetProto queryContext = 9; - optional DataChannelProto dataChannel = 10; - optional EnforcerProto enforcer = 11; + required string query_master_host_and_port = 1; + required TaskAttemptIdProto id = 2; + repeated FragmentProto fragments = 3; + required string output_table = 4; + required bool clustered_output = 5; + required LogicalNodeTree plan = 6; + optional bool inter_query = 7 [default = false]; + repeated FetchProto fetches = 8; + optional KeyValueSetProto query_context = 9; + optional DataChannelProto data_channel = 10; + optional EnforcerProto enforcer = 11; } message FetchProto { - required string host = 1; - required int32 port = 2; - required ShuffleType type = 3; - required ExecutionBlockIdProto executionBlockId = 4; - required int32 partitionId = 5; - required string name = 6; - optional string rangeParams = 7; - optional bool hasNext = 8 [default = false]; + required string host = 1; + required int32 port = 2; + required ShuffleType type = 3; + required ExecutionBlockIdProto execution_block_id = 4; + required int32 partition_id = 5; + required string name = 6; + optional string range_params = 7; + optional bool has_next = 8 [default = false]; - //repeated part - repeated int32 taskId = 9 [packed=true]; - repeated int32 attemptId = 10 [packed=true]; + // repeated part + repeated int32 task_id = 9 [packed = true]; + repeated int32 attempt_id = 10 [packed = true]; - optional int64 offset = 11; - optional int64 length = 12; + optional int64 offset = 11; + optional int64 length = 12; } message TaskStatusProto { required TaskAttemptIdProto id = 1; - required string workerName = 2; + required string worker_name = 2; required float progress = 3; required TaskAttemptState state = 4; optional StatSetProto stats = 5; - optional TableStatsProto inputStats = 6; - optional TableStatsProto resultStats = 7; - repeated ShuffleFileOutput shuffleFileOutputs = 8; + optional TableStatsProto input_stats = 6; + optional TableStatsProto result_stats = 7; + repeated ShuffleFileOutput shuffle_file_outputs = 8; } message TaskCompletionReport { required TaskAttemptIdProto id = 1; optional StatSetProto stats = 2; - optional TableStatsProto inputStats = 3; - optional TableStatsProto resultStats = 4; - repeated ShuffleFileOutput shuffleFileOutputs = 5; + optional TableStatsProto input_stats = 3; + optional TableStatsProto result_stats = 4; + repeated ShuffleFileOutput shuffle_file_outputs = 5; repeated PartitionDescProto partitions = 6; } message TaskFatalErrorReport { required TaskAttemptIdProto id = 1; - optional string errorMessage = 2; - optional string errorTrace = 3; + optional string error_message = 2; + optional string error_trace = 3; } message FailureIntermediateProto { - required int64 pagePos = 1; - required int32 startRowNum = 2; - required int32 endRowNum = 3; + required int64 page_pos = 1; + required int32 start_row_num = 2; + required int32 end_row_num = 3; } message IntermediateEntryProto { - message PageProto { - required int64 pos = 1; - required int32 length = 2; - } - required ExecutionBlockIdProto ebId = 1; - required int32 taskId = 2; - required int32 attemptId = 3; - required int32 partId = 4; - required string host = 5; - required int64 volume = 6; - repeated PageProto pages = 7; - repeated FailureIntermediateProto failures = 8; + message PageProto { + required int64 pos = 1; + required int32 length = 2; + } + required ExecutionBlockIdProto eb_id = 1; + required int32 task_id = 2; + required int32 attempt_id = 3; + required int32 part_id = 4; + required string host = 5; + required int64 volume = 6; + repeated PageProto pages = 7; + repeated FailureIntermediateProto failures = 8; } message ExecutionBlockReport { - required ExecutionBlockIdProto ebId = 1; - required bool reportSuccess = 2; - optional string reportErrorMessage = 3; - required int32 succeededTasks = 4; - repeated IntermediateEntryProto intermediateEntries = 5; + required ExecutionBlockIdProto eb_id = 1; + required bool report_success = 2; + optional string report_error_message = 3; + required int32 succeeded_tasks = 4; + repeated IntermediateEntryProto intermediate_entries = 5; } // deprecated message TaskResponseProto { - required string id = 1; - required QueryState status = 2; + required string id = 1; + required QueryState status = 2; } message StatusReportProto { required int64 timestamp = 1; - required string serverName = 2; + required string server_name = 2; repeated TaskStatusProto status = 3; repeated TaskAttemptIdProto pings = 4; } message CommandRequestProto { - repeated Command command = 1; + repeated Command command = 1; } message CommandResponseProto { } message Command { - required TaskAttemptIdProto id = 1; - required CommandType type = 2; + required TaskAttemptIdProto id = 1; + required CommandType type = 2; } enum CommandType { - PREPARE = 0; - LAUNCH = 1; - STOP = 2; - FINALIZE = 3; + PREPARE = 0; + LAUNCH = 1; + STOP = 2; + FINALIZE = 3; } message ShuffleFileOutput { - required int32 partId = 1; - optional string fileName = 2; - optional int64 volume = 3; + required int32 part_id = 1; + optional string file_name = 2; + optional int64 volume = 3; } message SessionProto { @@ -193,120 +192,119 @@ message SessionProto { } message NodeHeartbeatRequest { - required int32 workerId = 1; - optional NodeResourceProto totalResource = 2; - optional NodeResourceProto availableResource = 3; - optional int32 runningTasks = 4; - optional int32 runningQueryMasters = 5; - optional WorkerConnectionInfoProto connectionInfo = 6; + required int32 worker_id = 1; + optional NodeResourceProto total_resource = 2; + optional NodeResourceProto available_resource = 3; + optional int32 running_tasks = 4; + optional int32 running_query_masters = 5; + optional WorkerConnectionInfoProto connection_info = 6; optional NodeStatusProto status = 7; } message NodeHeartbeatResponse { required ResponseCommand command = 1 [default = NORMAL]; - optional int32 heartBeatInterval = 2; - repeated QueryIdProto queryId = 3; + optional int32 heart_beat_interval = 2; + repeated QueryIdProto query_id = 3; } // deprecated message TajoHeartbeatRequest { - required WorkerConnectionInfoProto connectionInfo = 1; - optional QueryIdProto queryId = 2; + required WorkerConnectionInfoProto connection_info = 1; + optional QueryIdProto query_id = 2; optional QueryState state = 3; - optional TableDescProto resultDesc = 4; - optional string statusMessage = 5; - optional float queryProgress = 6; + optional TableDescProto result_desc = 4; + optional string status_message = 5; + optional float query_progress = 6; } // deprecated message TajoHeartbeatResponse { message ResponseCommand { - required string command = 1; - repeated string params = 2; + required string command = 1; + repeated string params = 2; } - required BoolProto heartbeatResult = 1; - optional ResponseCommand responseCommand = 3; + required BoolProto heartbeat_result = 1; + optional ResponseCommand response_command = 3; } message WorkerConnectionsResponse { - repeated WorkerConnectionInfoProto worker = 1; + repeated WorkerConnectionInfoProto worker = 1; } message NodeResourceRequest { - optional string queue = 1; - required string userId = 2; - required ResourceType type = 3; - required int32 priority = 4; - required QueryIdProto queryId = 5; - required int32 numContainers = 6; - required NodeResourceProto capacity = 7; - required int32 runningTasks = 8; - repeated int32 candidateNodes = 9; + optional string queue = 1; + required string user_id = 2; + required ResourceType type = 3; + required int32 priority = 4; + required QueryIdProto query_id = 5; + required int32 num_containers = 6; + required NodeResourceProto capacity = 7; + required int32 running_tasks = 8; + repeated int32 candidate_nodes = 9; } message NodeResourceResponse { - required QueryIdProto queryId = 1; - repeated AllocationResourceProto resource = 2; + required QueryIdProto query_id = 1; + repeated AllocationResourceProto resource = 2; } message ExecutionBlockContextRequest { - required ExecutionBlockIdProto executionBlockId = 1; - required WorkerConnectionInfoProto worker = 2; + required ExecutionBlockIdProto execution_block_id = 1; + required WorkerConnectionInfoProto worker = 2; } message ExecutionBlockContextResponse { - required ExecutionBlockIdProto executionBlockId = 1; - optional string queryOutputPath = 2; + required ExecutionBlockIdProto execution_block_id = 1; + optional string query_output_path = 2; - required KeyValueSetProto queryContext = 3; - required string planJson = 4; - required ShuffleType shuffleType = 5; + required KeyValueSetProto query_context = 3; + required string plan_json = 4; + required ShuffleType shuffle_type = 5; } message StopExecutionBlockRequest { - required ExecutionBlockIdProto executionBlockId = 1; - optional ExecutionBlockListProto cleanupList = 2; + required ExecutionBlockIdProto execution_block_id = 1; + optional ExecutionBlockListProto cleanup_list = 2; } message BatchAllocationRequest { - required ExecutionBlockIdProto executionBlockId = 1; - repeated TaskAllocationProto taskRequest = 2; + required ExecutionBlockIdProto execution_block_id = 1; + repeated TaskAllocationProto task_request = 2; } message BatchAllocationResponse { - repeated TaskAllocationProto cancellationTask = 1; + repeated TaskAllocationProto cancellation_task = 1; } message QueryExecutionRequest { - required QueryIdProto queryId = 1; - required SessionProto session = 2; - required KeyValueSetProto queryContext = 3; - required StringProto exprInJson = 4; - optional StringProto logicalPlanJson = 5; - required AllocationResourceProto allocation = 6; + required QueryIdProto query_id = 1; + required SessionProto session = 2; + required KeyValueSetProto query_context = 3; + required StringProto expr_in_json = 4; + optional StringProto logical_plan_json = 5; + required AllocationResourceProto allocation = 6; } - -//Task history +// Task history message FetcherHistoryProto { - required int64 startTime = 1; - optional int64 finishTime = 2; + required int64 start_time = 1; + optional int64 finish_time = 2; required FetcherState state = 3; - required int64 fileLength = 4; - required int32 messageReceivedCount = 5; + required int64 file_length = 4; + required int32 message_received_count = 5; } message TaskHistoryProto { - required TaskAttemptIdProto taskAttemptId = 1; + required TaskAttemptIdProto task_attempt_id = 1; required TaskAttemptState state = 2; required float progress = 3; - required int64 startTime = 4; - required int64 finishTime = 5; - required TableStatsProto inputStats = 6; - optional TableStatsProto outputStats = 7; - optional string outputPath = 8; - optional string workingPath = 9; - optional int32 finishedFetchCount = 10; - optional int32 totalFetchCount = 11; - repeated FetcherHistoryProto fetcherHistories = 12; + required int64 start_time = 4; + required int64 finish_time = 5; + required TableStatsProto input_stats = 6; + optional TableStatsProto output_stats = 7; + optional string output_path = 8; + optional string working_path = 9; + optional int32 finished_fetch_count = 10; + optional int32 total_fetch_count = 11; + repeated FetcherHistoryProto fetcher_histories = 12; } http://git-wip-us.apache.org/repos/asf/tajo/blob/94197c38/tajo-core/src/main/proto/TajoWorkerProtocol.proto ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/proto/TajoWorkerProtocol.proto b/tajo-core/src/main/proto/TajoWorkerProtocol.proto index 8667702..c737e47 100644 --- a/tajo-core/src/main/proto/TajoWorkerProtocol.proto +++ b/tajo-core/src/main/proto/TajoWorkerProtocol.proto @@ -22,7 +22,6 @@ option java_outer_classname = "TajoWorkerProtocol"; option java_generic_services = true; option java_generate_equals_and_hash = true; - import "TajoIdProtos.proto"; import "PrimitiveProtos.proto"; import "ResourceProtos.proto"; @@ -37,4 +36,4 @@ service TajoWorkerProtocolService { rpc stopExecutionBlock(StopExecutionBlockRequest) returns (BoolProto); rpc killTaskAttempt(TaskAttemptIdProto) returns (BoolProto); rpc stopQuery(QueryIdProto) returns (BoolProto); -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/tajo/blob/94197c38/tajo-storage/tajo-storage-common/src/main/proto/IndexProtos.proto ---------------------------------------------------------------------- diff --git a/tajo-storage/tajo-storage-common/src/main/proto/IndexProtos.proto b/tajo-storage/tajo-storage-common/src/main/proto/IndexProtos.proto index f5c8a08..6011033 100644 --- a/tajo-storage/tajo-storage-common/src/main/proto/IndexProtos.proto +++ b/tajo-storage/tajo-storage-common/src/main/proto/IndexProtos.proto @@ -26,6 +26,6 @@ import "CatalogProtos.proto"; message TupleComparatorProto { required SchemaProto schema = 1; - repeated SortSpecProto sortSpecs = 2; - repeated TupleComparatorSpecProto compSpecs = 3; -} \ No newline at end of file + repeated SortSpecProto sort_specs = 2; + repeated TupleComparatorSpecProto comp_specs = 3; +} http://git-wip-us.apache.org/repos/asf/tajo/blob/94197c38/tajo-storage/tajo-storage-hbase/src/main/proto/StorageFragmentProtos.proto ---------------------------------------------------------------------- diff --git a/tajo-storage/tajo-storage-hbase/src/main/proto/StorageFragmentProtos.proto b/tajo-storage/tajo-storage-hbase/src/main/proto/StorageFragmentProtos.proto index 33d45b3..f068a89 100644 --- a/tajo-storage/tajo-storage-hbase/src/main/proto/StorageFragmentProtos.proto +++ b/tajo-storage/tajo-storage-hbase/src/main/proto/StorageFragmentProtos.proto @@ -26,11 +26,11 @@ import "CatalogProtos.proto"; message HBaseFragmentProto { required string uri = 1; - required string tableName = 2; - required string hbaseTableName = 3; - required bytes startRow = 4; - required bytes stopRow = 5; + required string table_name = 2; + required string hbase_table_name = 3; + required bytes start_row = 4; + required bytes stop_row = 5; required bool last = 6; required int64 length = 7; - optional string regionLocation = 8; -} \ No newline at end of file + optional string region_location = 8; +} http://git-wip-us.apache.org/repos/asf/tajo/blob/94197c38/tajo-storage/tajo-storage-hdfs/src/main/proto/StorageFragmentProtos.proto ---------------------------------------------------------------------- diff --git a/tajo-storage/tajo-storage-hdfs/src/main/proto/StorageFragmentProtos.proto b/tajo-storage/tajo-storage-hdfs/src/main/proto/StorageFragmentProtos.proto index ce9aab6..0579f05 100644 --- a/tajo-storage/tajo-storage-hdfs/src/main/proto/StorageFragmentProtos.proto +++ b/tajo-storage/tajo-storage-hdfs/src/main/proto/StorageFragmentProtos.proto @@ -27,8 +27,8 @@ import "CatalogProtos.proto"; message FileFragmentProto { required string id = 1; required string path = 2; - required int64 startOffset = 3; + required int64 start_offset = 3; required int64 length = 4; repeated string hosts = 5; - repeated int32 diskIds = 6; -} \ No newline at end of file + repeated int32 disk_ids = 6; +}
