You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by ch...@apache.org on 2016/11/04 04:20:24 UTC
[1/2] incubator-carbondata git commit: Change thrift files' name to a
unified form
Repository: incubator-carbondata
Updated Branches:
refs/heads/master 2fa653637 -> 01e642fd3
Change thrift files' name to a unified form
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/9edce977
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/9edce977
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/9edce977
Branch: refs/heads/master
Commit: 9edce97765316d9deb523cfebc80ff4ec42a52ac
Parents: 2fa6536
Author: cenyuhai <26...@qq.com>
Authored: Thu Nov 3 21:52:47 2016 +0800
Committer: chenliang613 <ch...@apache.org>
Committed: Fri Nov 4 12:16:38 2016 +0800
----------------------------------------------------------------------
format/src/main/thrift/carbondata_index.thrift | 45 ++++++++++++++++++++
format/src/main/thrift/carbondataindex.thrift | 45 --------------------
format/src/main/thrift/dictionary_meta.thrift | 32 --------------
.../src/main/thrift/dictionary_metadata.thrift | 32 ++++++++++++++
4 files changed, 77 insertions(+), 77 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/9edce977/format/src/main/thrift/carbondata_index.thrift
----------------------------------------------------------------------
diff --git a/format/src/main/thrift/carbondata_index.thrift b/format/src/main/thrift/carbondata_index.thrift
new file mode 100644
index 0000000..e5fda5d
--- /dev/null
+++ b/format/src/main/thrift/carbondata_index.thrift
@@ -0,0 +1,45 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * File format description for the carbon file format
+ */
+namespace java org.apache.carbondata.format
+
+include "schema.thrift"
+include "carbondata.thrift"
+
+/**
+ * header information stored in index file
+ */
+struct IndexHeader{
+ 1: required i32 version; // version used for data compatibility
+ 2: required list<schema.ColumnSchema> table_columns; // Description of columns in this file
+ 3: required carbondata.SegmentInfo segment_info; // Segment info (will be same/repeated for all files in this segment)
+}
+
+/**
+ * block index information stored in index file for every block
+ */
+struct BlockIndex{
+ 1: required i64 num_rows; // Total number of rows in this file
+ 2: required string file_name; // Block file name
+ 3: required i64 offset; // Offset of block
+ 4: required carbondata.BlockletIndex block_index; // Block index
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/9edce977/format/src/main/thrift/carbondataindex.thrift
----------------------------------------------------------------------
diff --git a/format/src/main/thrift/carbondataindex.thrift b/format/src/main/thrift/carbondataindex.thrift
deleted file mode 100644
index e5fda5d..0000000
--- a/format/src/main/thrift/carbondataindex.thrift
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * File format description for the carbon file format
- */
-namespace java org.apache.carbondata.format
-
-include "schema.thrift"
-include "carbondata.thrift"
-
-/**
- * header information stored in index file
- */
-struct IndexHeader{
- 1: required i32 version; // version used for data compatibility
- 2: required list<schema.ColumnSchema> table_columns; // Description of columns in this file
- 3: required carbondata.SegmentInfo segment_info; // Segment info (will be same/repeated for all files in this segment)
-}
-
-/**
- * block index information stored in index file for every block
- */
-struct BlockIndex{
- 1: required i64 num_rows; // Total number of rows in this file
- 2: required string file_name; // Block file name
- 3: required i64 offset; // Offset of block
- 4: required carbondata.BlockletIndex block_index; // Block index
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/9edce977/format/src/main/thrift/dictionary_meta.thrift
----------------------------------------------------------------------
diff --git a/format/src/main/thrift/dictionary_meta.thrift b/format/src/main/thrift/dictionary_meta.thrift
deleted file mode 100644
index d9ab197..0000000
--- a/format/src/main/thrift/dictionary_meta.thrift
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * File format description for carbon dictionary file
- */
-namespace java org.apache.carbondata.format
-
-struct ColumnDictionaryChunkMeta {
- 1: required i32 min_surrogate_key; //The least surrogate key in this dictionary, in most cases min will be 0, but after history data deletion, min can be non-zero
- 2: required i32 max_surrogate_key; //The Max surrogate key to be stored , so that next load can continue ID generation from this number.
- 3: required i64 start_offset; // The start offset of this column dictionary chunk in the dictionary file.
- 4: required i64 end_offset; // The end offset of this column dictionary chunk in the dictionary file.
- 5: required i32 chunk_count; // The count of total dictionary objects for one segment.
- 6: optional i64 segment_id; // the mapping of this dictionary chunk to the corresponding segment of the table, not useful in case of shared dimensions.
-}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/9edce977/format/src/main/thrift/dictionary_metadata.thrift
----------------------------------------------------------------------
diff --git a/format/src/main/thrift/dictionary_metadata.thrift b/format/src/main/thrift/dictionary_metadata.thrift
new file mode 100644
index 0000000..d9ab197
--- /dev/null
+++ b/format/src/main/thrift/dictionary_metadata.thrift
@@ -0,0 +1,32 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * File format description for carbon dictionary file
+ */
+namespace java org.apache.carbondata.format
+
+struct ColumnDictionaryChunkMeta {
+ 1: required i32 min_surrogate_key; //The least surrogate key in this dictionary, in most cases min will be 0, but after history data deletion, min can be non-zero
+ 2: required i32 max_surrogate_key; //The Max surrogate key to be stored , so that next load can continue ID generation from this number.
+ 3: required i64 start_offset; // The start offset of this column dictionary chunk in the dictionary file.
+ 4: required i64 end_offset; // The end offset of this column dictionary chunk in the dictionary file.
+ 5: required i32 chunk_count; // The count of total dictionary objects for one segment.
+ 6: optional i64 segment_id; // the mapping of this dictionary chunk to the corresponding segment of the table, not useful in case of shared dimensions.
+}
[2/2] incubator-carbondata git commit: [CARBONDATA-351] Change thrift
files' name to a unified form This closes #291
Posted by ch...@apache.org.
[CARBONDATA-351] Change thrift files' name to a unified form This closes #291
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/01e642fd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/01e642fd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/01e642fd
Branch: refs/heads/master
Commit: 01e642fd30e4926b6c5214313f8605124ea850d9
Parents: 2fa6536 9edce97
Author: chenliang613 <ch...@apache.org>
Authored: Fri Nov 4 12:19:59 2016 +0800
Committer: chenliang613 <ch...@apache.org>
Committed: Fri Nov 4 12:19:59 2016 +0800
----------------------------------------------------------------------
format/src/main/thrift/carbondata_index.thrift | 45 ++++++++++++++++++++
format/src/main/thrift/carbondataindex.thrift | 45 --------------------
format/src/main/thrift/dictionary_meta.thrift | 32 --------------
.../src/main/thrift/dictionary_metadata.thrift | 32 ++++++++++++++
4 files changed, 77 insertions(+), 77 deletions(-)
----------------------------------------------------------------------