From 3ca5b9fdcd56a70aaa32df1cedfe689fc48559a3 Mon Sep 17 00:00:00 2001
From: Jongyoung Park <eminency@gmail.com>
Date: Fri, 20 Nov 2015 17:05:22 +0900
Subject: [PATCH 1/6] use 'data format' instead of 'file format'

---
 .../main/java/org/apache/tajo/conf/TajoConf.java  |  2 +-
 .../engine/planner/physical/PhysicalPlanUtil.java |  6 +++---
 tajo-docs/src/main/sphinx/table_management.rst    |  8 ++++----
 .../main/sphinx/table_management/data_formats.rst | 15 +++++++++++++++
 .../main/sphinx/table_management/file_formats.rst | 15 ---------------
 .../sphinx/table_management/table_overview.rst    |  2 +-
 .../main/sphinx/table_management/tablespaces.rst  |  4 ++--
 .../org/apache/tajo/storage/StorageProperty.java  |  6 +++---
 8 files changed, 29 insertions(+), 29 deletions(-)
 create mode 100644 tajo-docs/src/main/sphinx/table_management/data_formats.rst
 delete mode 100644 tajo-docs/src/main/sphinx/table_management/file_formats.rst

diff --git a/tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java b/tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java
index a2c1fb820e..9b9a743bf5 100644
--- a/tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java
+++ b/tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java
@@ -368,7 +368,7 @@ public static enum ConfVars implements ConfigKey {
     $TIMEZONE("tajo.timezone", TimeZone.getDefault().getID()),
     $DATE_ORDER("tajo.datetime.date-order", "YMD"),
 
-    // FILE FORMAT
+    // DATA FORMAT
     $TEXT_NULL("tajo.text.null", "\\\\N"),
 
     // Only for Debug and Testing
diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/PhysicalPlanUtil.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/PhysicalPlanUtil.java
index 8d63410308..04aa310a19 100644
--- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/PhysicalPlanUtil.java
+++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/PhysicalPlanUtil.java
@@ -203,7 +203,7 @@ public PhysicalExec visit(PhysicalExec exec, Stack<PhysicalExec> stack, Class<?
   }
 
   /**
-   * Set nullChar to TableMeta according to file format
+   * Set nullChar to TableMeta according to data format
    *
    * @param meta TableMeta
    * @param nullChar A character for NULL representation
@@ -220,10 +220,10 @@ private static void setNullCharForTextSerializer(TableMeta meta, String nullChar
   }
 
   /**
-   * Check if TableMeta contains NULL char property according to file format
+   * Check if TableMeta contains NULL char property according to data format
    *
    * @param meta Table Meta
-   * @return True if TableMeta contains NULL char property according to file format
+   * @return True if TableMeta contains NULL char property according to data format
    */
   public static boolean containsNullChar(TableMeta meta) {
     String dataFormat = meta.getDataFormat();
diff --git a/tajo-docs/src/main/sphinx/table_management.rst b/tajo-docs/src/main/sphinx/table_management.rst
index 5a4693e348..dd7b9ad4c0 100644
--- a/tajo-docs/src/main/sphinx/table_management.rst
+++ b/tajo-docs/src/main/sphinx/table_management.rst
@@ -1,6 +1,6 @@
-******************
+****************
 Table Management
-******************
+****************
 
 In Tajo, a table is a logical view of one data sources. Logically, one table consists of a logical schema, partitions, URL, and various properties. Physically, A table can be a directory in HDFS, a single file, one HBase table, or a RDBMS table. In order to make good use of Tajo, users need to understand features and physical characteristics of their physical layout. This section explains all about table management.
 
@@ -9,5 +9,5 @@ In Tajo, a table is a logical view of one data sources. Logically, one table con
 
     table_management/table_overview
     table_management/tablespaces
-    table_management/file_formats
-    table_management/compression
\ No newline at end of file
+    table_management/data_formats
+    table_management/compression
diff --git a/tajo-docs/src/main/sphinx/table_management/data_formats.rst b/tajo-docs/src/main/sphinx/table_management/data_formats.rst
new file mode 100644
index 0000000000..b17e3f3255
--- /dev/null
+++ b/tajo-docs/src/main/sphinx/table_management/data_formats.rst
@@ -0,0 +1,15 @@
+************
+Data Formats
+************
+
+Currently, Tajo provides following data formats:
+
+.. toctree::
+    :maxdepth: 1
+
+    text
+    json
+    rcfile
+    parquet
+    orc
+    sequencefile
\ No newline at end of file
diff --git a/tajo-docs/src/main/sphinx/table_management/file_formats.rst b/tajo-docs/src/main/sphinx/table_management/file_formats.rst
deleted file mode 100644
index 966903c39d..0000000000
--- a/tajo-docs/src/main/sphinx/table_management/file_formats.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-*************************************
-File Formats
-*************************************
-
-Currently, Tajo provides following file formats:
-
-.. toctree::
-    :maxdepth: 1
-
-    text
-    json
-    rcfile
-    parquet
-    orc
-    sequencefile
\ No newline at end of file
diff --git a/tajo-docs/src/main/sphinx/table_management/table_overview.rst b/tajo-docs/src/main/sphinx/table_management/table_overview.rst
index d030b4a442..c0ec43bce8 100644
--- a/tajo-docs/src/main/sphinx/table_management/table_overview.rst
+++ b/tajo-docs/src/main/sphinx/table_management/table_overview.rst
@@ -65,7 +65,7 @@ The following example is to set a custom field delimiter, NULL character, and co
                    'text.null'='\\N',
                    'compression.codec'='org.apache.hadoop.io.compress.SnappyCodec');
 
-Each physical table layout has its own specialized properties. They will be addressed in :doc:`/table_management/file_formats`.
+Each physical table layout has its own specialized properties. They will be addressed in :doc:`/table_management/data_formats`.
 
 
 Common Table Properties
diff --git a/tajo-docs/src/main/sphinx/table_management/tablespaces.rst b/tajo-docs/src/main/sphinx/table_management/tablespaces.rst
index 79ea65f1f5..9316154683 100644
--- a/tajo-docs/src/main/sphinx/table_management/tablespaces.rst
+++ b/tajo-docs/src/main/sphinx/table_management/tablespaces.rst
@@ -1,6 +1,6 @@
-*************************************
+***********
 Tablespaces
-*************************************
+***********
 
 Tablespaces in Tajo allow users to define locations in the storage system where the files or data objects representing database objects can be stored. Once defined, a tablespace can be referred to by name when creating a database or a table. Especially, it is very useful when a Tajo cluster instance should use heterogeneous storage systems such as HDFS, MySQL, and Oracle.
 
diff --git a/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/StorageProperty.java b/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/StorageProperty.java
index 41ecd385a3..c3dc3e9718 100644
--- a/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/StorageProperty.java
+++ b/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/StorageProperty.java
@@ -22,7 +22,7 @@
  * Storage Properties
  */
 public class StorageProperty {
-  /** default file format */
+  /** default data format */
   private final String defaultFormat;
   /** if this storage supports move operator */
   private final boolean movable;
@@ -47,8 +47,8 @@ public StorageProperty(String defaultFormat,
   }
 
   /**
-   * Return default file format
-   * @return Default file format
+   * Return default data format
+   * @return Default data format
    */
   public String defaultFormat() {
     return defaultFormat;

From 334ac58d59e4100f8cb79f5b14cf4e23a7125d39 Mon Sep 17 00:00:00 2001
From: Jongyoung Park <eminency@gmail.com>
Date: Fri, 20 Nov 2015 17:05:51 +0900
Subject: [PATCH 2/6] compression document is written roughly

---
 .../sphinx/table_management/compression.rst   | 24 ++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/tajo-docs/src/main/sphinx/table_management/compression.rst b/tajo-docs/src/main/sphinx/table_management/compression.rst
index 3d03ba8c9c..f635b50658 100644
--- a/tajo-docs/src/main/sphinx/table_management/compression.rst
+++ b/tajo-docs/src/main/sphinx/table_management/compression.rst
@@ -1,5 +1,23 @@
-*********************************
+***********
 Compression
-*********************************
+***********
 
-.. todo::
\ No newline at end of file
+Using compression makes data size compact and network traffic low. Most of Tajo data types support data compression feature.
+Currently, compression configuration affcts only for stored data format and it is specified when a table is created as table meta information.
+Compression for intermidate data or others is not supported now.
+
+===========================================
+Compression Properties for each Data Format
+===========================================
+
+ .. csv-table:: Compression Properties and Codec Class
+
+  **Data Format**,**Property Name**,**Avaliable Values**
+  text/json/rcfile/sequencefile [#f1]_,compression.codec,Fully Qualified Classname in Hadoop [#f2]_
+  parquet,parquet.compression,uncompressed/snappy/gzip/lzo
+  orc,orc.compression.kind,none/snappy/zlib
+
+.. rubric:: Footnotes
+
+.. [#f1] For sequence file, you should specify 'compression.type' in addition to 'compression.codec'. Refer to :doc:`/table_management/sequencefile`.
+.. [#f2] All classes are available if they implement `org.apache.hadoop.io.compress.CompressionCodec <https://hadoop.apache.org/docs/current/api/org/apache/hadoop/io/compress/CompressionCodec.html>`_.

From 0f5cdd82cac7691f325fe3d14ec2bdf48ca665ae Mon Sep 17 00:00:00 2001
From: Jongyoung Park <eminency@gmail.com>
Date: Fri, 20 Nov 2015 17:11:50 +0900
Subject: [PATCH 3/6] some comment modified

---
 tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java b/tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java
index 9b9a743bf5..9f788ebb8a 100644
--- a/tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java
+++ b/tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java
@@ -368,7 +368,7 @@ public static enum ConfVars implements ConfigKey {
     $TIMEZONE("tajo.timezone", TimeZone.getDefault().getID()),
     $DATE_ORDER("tajo.datetime.date-order", "YMD"),
 
-    // DATA FORMAT
+    // null character for text file output
     $TEXT_NULL("tajo.text.null", "\\\\N"),
 
     // Only for Debug and Testing

From 051f0b29e5d5dad720a05b17a948735477daec90 Mon Sep 17 00:00:00 2001
From: Jongyoung Park <eminency@gmail.com>
Date: Tue, 24 Nov 2015 11:17:30 +0900
Subject: [PATCH 4/6] Update more

---
 .../src/main/sphinx/table_management/compression.rst | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tajo-docs/src/main/sphinx/table_management/compression.rst b/tajo-docs/src/main/sphinx/table_management/compression.rst
index f635b50658..67dd2559d1 100644
--- a/tajo-docs/src/main/sphinx/table_management/compression.rst
+++ b/tajo-docs/src/main/sphinx/table_management/compression.rst
@@ -2,20 +2,20 @@
 Compression
 ***********
 
-Using compression makes data size compact and network traffic low. Most of Tajo data types support data compression feature.
-Currently, compression configuration affcts only for stored data format and it is specified when a table is created as table meta information.
+Using compression can make data size compact, thereby enabling efficient use of network bandwidth and storage. Most of Tajo data formats support data compression feature.
+Currently, compression configuration affects only for stored data format and it is specified when a table is created as table meta information(See `Create Table <../sql_language/ddl.html#create-table>`_).
 Compression for intermidate data or others is not supported now.
 
 ===========================================
 Compression Properties for each Data Format
 ===========================================
 
- .. csv-table:: Compression Properties and Codec Class
+ .. csv-table:: Compression Properties
 
   **Data Format**,**Property Name**,**Avaliable Values**
-  text/json/rcfile/sequencefile [#f1]_,compression.codec,Fully Qualified Classname in Hadoop [#f2]_
-  parquet,parquet.compression,uncompressed/snappy/gzip/lzo
-  orc,orc.compression.kind,none/snappy/zlib
+  :doc:`text</table_management/text>`/:doc:`json</table_management/json>`/:doc:`rcfile</table_management/rcfile>`/:doc:`sequencefile</table_management/sequencefile>` [#f1]_,compression.codec,Fully Qualified Classname in Hadoop [#f2]_
+  :doc:`parquet</table_management/parquet>`,parquet.compression,uncompressed/snappy/gzip/lzo
+  :doc:`orc</table_management/orc>`,orc.compression.kind,none/snappy/zlib
 
 .. rubric:: Footnotes
 

From 0ba6383a6d86a94ad5ce83542cb9ff4552a842e1 Mon Sep 17 00:00:00 2001
From: Jongyoung Park <eminency@gmail.com>
Date: Tue, 24 Nov 2015 11:41:14 +0900
Subject: [PATCH 5/6] Add a link

---
 tajo-docs/src/main/sphinx/table_management/table_overview.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tajo-docs/src/main/sphinx/table_management/table_overview.rst b/tajo-docs/src/main/sphinx/table_management/table_overview.rst
index c0ec43bce8..4f4f764d7f 100644
--- a/tajo-docs/src/main/sphinx/table_management/table_overview.rst
+++ b/tajo-docs/src/main/sphinx/table_management/table_overview.rst
@@ -75,7 +75,8 @@ There are some common table properties which are used in most tables.
 
 Compression
 -----------
-.. todo::
+
+See :doc:`compression`.
 
 Time zone
 ---------

From b6f77d1b844608ccf67bdccf62d50eab9d55f018 Mon Sep 17 00:00:00 2001
From: Jongyoung Park <eminency@gmail.com>
Date: Tue, 24 Nov 2015 11:57:50 +0900
Subject: [PATCH 6/6] trivial

---
 .../main/sphinx/table_management/table_overview.rst  | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/tajo-docs/src/main/sphinx/table_management/table_overview.rst b/tajo-docs/src/main/sphinx/table_management/table_overview.rst
index 4f4f764d7f..7ecf53b6c0 100644
--- a/tajo-docs/src/main/sphinx/table_management/table_overview.rst
+++ b/tajo-docs/src/main/sphinx/table_management/table_overview.rst
@@ -1,10 +1,12 @@
-*************************************
+***********************
 Overview of Tajo Tables
-*************************************
+***********************
 
+========
 Overview
 ========
 
+===========
 Tablespaces
 ===========
 
@@ -12,8 +14,9 @@ Tablespaces is a physical location where files or data objects representing data
 
 Please refer to :doc:`/table_management/tablespaces` if you want to know more information about tablespaces.
 
+=============
 Managed Table
-================
+=============
 
 ``CREATE TABLE`` statement lets you create a table located in the warehouse directory specified by the configuration property ``tajo.warehouse.directory`` or ``${tajo.root}/warehouse`` by default. For example:
 
@@ -26,8 +29,9 @@ Managed Table
  );
 
 
+==============
 External Table
-================
+==============
 
 ``CREATE EXTERNAL TABLE`` statement lets you create a table located in a specify location so that Tajo does not use a default data warehouse location for the table. External tables are in common used if you already have data generated. LOCATION clause must be required for an external table.