Repository: carbondata-site Updated Branches: refs/heads/asf-site ce9d44e1d -> f1a4abdf9
sync docs from github to website Project: http://git-wip-us.apache.org/repos/asf/carbondata-site/repo Commit: http://git-wip-us.apache.org/repos/asf/carbondata-site/commit/f1a4abdf Tree: http://git-wip-us.apache.org/repos/asf/carbondata-site/tree/f1a4abdf Diff: http://git-wip-us.apache.org/repos/asf/carbondata-site/diff/f1a4abdf Branch: refs/heads/asf-site Commit: f1a4abdf91889f1dabeaf7c8614ff80b064b6651 Parents: ce9d44e Author: chenliang613 <chenliang...@apache.org> Authored: Sun Jul 9 06:45:36 2017 +0800 Committer: chenliang613 <chenliang...@apache.org> Committed: Sun Jul 9 06:45:36 2017 +0800 ---------------------------------------------------------------------- content/configuration-parameters.html | 5 ----- content/ddl-operation-on-carbondata.html | 15 ++------------- content/dml-operation-on-carbondata.html | 17 ++++++++--------- content/installation-guide.html | 6 +++--- content/pdf/maven-pdf-plugin.pdf | Bin 230816 -> 155540 bytes src/main/webapp/configuration-parameters.html | 5 ----- .../webapp/ddl-operation-on-carbondata.html | 15 ++------------- .../webapp/dml-operation-on-carbondata.html | 17 ++++++++--------- src/main/webapp/installation-guide.html | 6 +++--- src/main/webapp/pdf/maven-pdf-plugin.pdf | Bin 230816 -> 155540 bytes 10 files changed, 26 insertions(+), 60 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/f1a4abdf/content/configuration-parameters.html ---------------------------------------------------------------------- diff --git a/content/configuration-parameters.html b/content/configuration-parameters.html index b257b1e..233a59b 100644 --- a/content/configuration-parameters.html +++ b/content/configuration-parameters.html @@ -586,11 +586,6 @@ <td>1g</td> <td>Amount of memory to be used per executor process.</td> </tr> -<tr> -<td>spark.sql.bigdata.register.analyseRule</td> -<td>org.apache.spark.sql.hive.acl.CarbonAccessControlRules</td> -<td>CarbonAccessControlRules need to be set for enabling Access Control.</td> -</tr> </tbody> </table> </div> http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/f1a4abdf/content/ddl-operation-on-carbondata.html ---------------------------------------------------------------------- diff --git a/content/ddl-operation-on-carbondata.html b/content/ddl-operation-on-carbondata.html index 735ca17..633115d 100644 --- a/content/ddl-operation-on-carbondata.html +++ b/content/ddl-operation-on-carbondata.html @@ -246,15 +246,6 @@ <p>Here, DICTIONARY_EXCLUDE will exclude dictionary creation. This is applicable for high-cardinality columns and is an optional parameter. DICTIONARY_INCLUDE will generate dictionary for the columns specified in the list.</p> <ul> <li> -<p><strong>Row/Column Format Configuration</strong></p> -<p>Column groups with more than one column are stored in row format, instead of columnar format. By default, each column is a separate column group.</p> -</li> -</ul> -<pre><code> TBLPROPERTIES ('COLUMN_GROUPS'='(column1, column2), - (Column3,Column4,Column5)') -</code></pre> -<ul> -<li> <p><strong>Table Block Size Configuration</strong></p> <p>The block size of table files can be defined using the property TABLE_BLOCKSIZE. It accepts only integer values. The default value is 1024 MB and supports a range of 1 MB to 2048 MB. If you do not specify this value in the DDL command, default value is used.</p> @@ -294,8 +285,7 @@ By default inverted index is enabled. The user can disable the inverted index cr saleQuantity Int, revenue Int) STORED BY 'carbondata' - TBLPROPERTIES ('COLUMN_GROUPS'='(productNumber,productName)', - 'DICTIONARY_EXCLUDE'='storeCity', + TBLPROPERTIES ('DICTIONARY_EXCLUDE'='storeCity', 'DICTIONARY_INCLUDE'='productNumber', 'NO_INVERTED_INDEX'='productBatch') </code></pre> @@ -690,8 +680,7 @@ of columns is used.</p> productBatch String, revenue Int) STORED BY 'carbondata' - TBLPROPERTIES ('COLUMN_GROUPS'='(productNumber,saleQuantity)', - 'DICTIONARY_EXCLUDE'='productName', + TBLPROPERTIES ('DICTIONARY_EXCLUDE'='productName', 'DICTIONARY_INCLUDE'='productNumber,saleQuantity', 'NO_INVERTED_INDEX'='productBatch', 'BUCKETNUMBER'='4', http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/f1a4abdf/content/dml-operation-on-carbondata.html ---------------------------------------------------------------------- diff --git a/content/dml-operation-on-carbondata.html b/content/dml-operation-on-carbondata.html index babba56..cb62bcd 100644 --- a/content/dml-operation-on-carbondata.html +++ b/content/dml-operation-on-carbondata.html @@ -421,11 +421,10 @@ LIMIT number_of_segments; <p>This command is used to delete segment by using the segment ID. Each segment has a unique segment ID associated with it. Using this segment ID, you can remove the segment.</p> <p>The following command will get the segmentID.</p> -<pre><code>SHOW SEGMENTS FOR Table dbname.tablename LIMIT number_of_segments +<pre><code>SHOW SEGMENTS FOR Table [db_name.]table_name LIMIT number_of_segments </code></pre> <p>After you retrieve the segment ID of the segment that you want to delete, execute the following command to delete the selected segment.</p> -<pre><code>DELETE SEGMENT segment_sequence_id1, segments_sequence_id2, .... -FROM TABLE tableName +<pre><code>DELETE FROM TABLE [db_name.]table_name WERE SEGMENT.ID IN (segment_id1, segments_id2, ....) </code></pre> <h3> <a id="parameter-description-3" class="anchor" href="#parameter-description-3" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Parameter Description</h3> @@ -457,16 +456,16 @@ FROM TABLE tableName </table> <h3> <a id="example-2" class="anchor" href="#example-2" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Example:</h3> -<pre><code>DELETE SEGMENT 0 FROM TABLE CarbonDatabase.CarbonTable; -DELETE SEGMENT 0.1,5,8 FROM TABLE CarbonDatabase.CarbonTable; +<pre><code>DELETE FROM TABLE CarbonDatabase.CarbonTable WHERE SEGMENT.ID IN (0); +DELETE FROM TABLE CarbonDatabase.CarbonTable WHERE SEGMENT.ID IN (0,5,8); </code></pre> <p>NOTE: Here 0.1 is compacted segment sequence id.</p> <h2> <a id="delete-segment-by-date" class="anchor" href="#delete-segment-by-date" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>DELETE SEGMENT BY DATE</h2> <p>This command will allow to delete the CarbonData segment(s) from the store based on the date provided by the user in the DML command. The segment created before the particular date will be removed from the specific stores.</p> -<pre><code>DELETE SEGMENTS FROM TABLE [db_name.]table_name -WHERE STARTTIME BEFORE DATE_VALUE +<pre><code>DELETE FROM TABLE [db_name.]table_name +WHERE SEGMENT.STARTTIME BEFORE DATE_VALUE </code></pre> <h3> <a id="parameter-description-4" class="anchor" href="#parameter-description-4" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Parameter Description</h3> @@ -498,8 +497,8 @@ WHERE STARTTIME BEFORE DATE_VALUE </table> <h3> <a id="example-3" class="anchor" href="#example-3" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Example:</h3> -<pre><code> DELETE SEGMENTS FROM TABLE CarbonDatabase.CarbonTable - WHERE STARTTIME BEFORE '2017-06-01 12:05:06'; +<pre><code> DELETE FROM TABLE CarbonDatabase.CarbonTable + WHERE SEGMENT.STARTTIME BEFORE '2017-06-01 12:05:06'; </code></pre> <h2> <a id="update-carbondata-table" class="anchor" href="#update-carbondata-table" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Update CarbonData Table</h2> http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/f1a4abdf/content/installation-guide.html ---------------------------------------------------------------------- diff --git a/content/installation-guide.html b/content/installation-guide.html index d74bbb9..a8d9872 100644 --- a/content/installation-guide.html +++ b/content/installation-guide.html @@ -395,7 +395,7 @@ $SPARK_HOME/carbonlib/$CARBON_ASSEMBLY_JAR <carbon_store_path> <tr> <td>CARBON_ASSEMBLY_JAR</td> <td>CarbonData assembly jar name present in the <code>$SPARK_HOME/carbonlib/</code> folder.</td> -<td>carbondata_2.10-0.1.0-incubating-SNAPSHOT-shade-hadoop2.7.2.jar</td> +<td>carbondata_2.xx-x.x.x-SNAPSHOT-shade-hadoop2.7.2.jar</td> </tr> <tr> <td>carbon_store_path</td> @@ -412,7 +412,7 @@ $SPARK_HOME/carbonlib/$CARBON_ASSEMBLY_JAR <carbon_store_path> --conf spark.sql.hive.thriftServer.singleSession=true --class org.apache.carbondata.spark.thriftserver.CarbonThriftServer $SPARK_HOME/carbonlib -/carbondata_2.10-0.1.0-incubating-SNAPSHOT-shade-hadoop2.7.2.jar +/carbondata_2.xx-x.x.x-SNAPSHOT-shade-hadoop2.7.2.jar hdfs://<host_name>:port/user/hive/warehouse/carbon.store </code></pre> <ul> @@ -423,7 +423,7 @@ hdfs://<host_name>:port/user/hive/warehouse/carbon.store --num-executors 3 --driver-memory 20g --executor-memory 250g --executor-cores 32 /srv/OSCON/BigData/HACluster/install/spark/sparkJdbc/lib -/carbondata_2.10-0.1.0-incubating-SNAPSHOT-shade-hadoop2.7.2.jar +/carbondata_2.xx-x.x.x-SNAPSHOT-shade-hadoop2.7.2.jar hdfs://<host_name>:port/user/hive/warehouse/carbon.store </code></pre> <h3> http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/f1a4abdf/content/pdf/maven-pdf-plugin.pdf ---------------------------------------------------------------------- diff --git a/content/pdf/maven-pdf-plugin.pdf b/content/pdf/maven-pdf-plugin.pdf index 91bdbef..cb6de01 100644 Binary files a/content/pdf/maven-pdf-plugin.pdf and b/content/pdf/maven-pdf-plugin.pdf differ http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/f1a4abdf/src/main/webapp/configuration-parameters.html ---------------------------------------------------------------------- diff --git a/src/main/webapp/configuration-parameters.html b/src/main/webapp/configuration-parameters.html index b257b1e..233a59b 100644 --- a/src/main/webapp/configuration-parameters.html +++ b/src/main/webapp/configuration-parameters.html @@ -586,11 +586,6 @@ <td>1g</td> <td>Amount of memory to be used per executor process.</td> </tr> -<tr> -<td>spark.sql.bigdata.register.analyseRule</td> -<td>org.apache.spark.sql.hive.acl.CarbonAccessControlRules</td> -<td>CarbonAccessControlRules need to be set for enabling Access Control.</td> -</tr> </tbody> </table> </div> http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/f1a4abdf/src/main/webapp/ddl-operation-on-carbondata.html ---------------------------------------------------------------------- diff --git a/src/main/webapp/ddl-operation-on-carbondata.html b/src/main/webapp/ddl-operation-on-carbondata.html index 735ca17..633115d 100644 --- a/src/main/webapp/ddl-operation-on-carbondata.html +++ b/src/main/webapp/ddl-operation-on-carbondata.html @@ -246,15 +246,6 @@ <p>Here, DICTIONARY_EXCLUDE will exclude dictionary creation. This is applicable for high-cardinality columns and is an optional parameter. DICTIONARY_INCLUDE will generate dictionary for the columns specified in the list.</p> <ul> <li> -<p><strong>Row/Column Format Configuration</strong></p> -<p>Column groups with more than one column are stored in row format, instead of columnar format. By default, each column is a separate column group.</p> -</li> -</ul> -<pre><code> TBLPROPERTIES ('COLUMN_GROUPS'='(column1, column2), - (Column3,Column4,Column5)') -</code></pre> -<ul> -<li> <p><strong>Table Block Size Configuration</strong></p> <p>The block size of table files can be defined using the property TABLE_BLOCKSIZE. It accepts only integer values. The default value is 1024 MB and supports a range of 1 MB to 2048 MB. If you do not specify this value in the DDL command, default value is used.</p> @@ -294,8 +285,7 @@ By default inverted index is enabled. The user can disable the inverted index cr saleQuantity Int, revenue Int) STORED BY 'carbondata' - TBLPROPERTIES ('COLUMN_GROUPS'='(productNumber,productName)', - 'DICTIONARY_EXCLUDE'='storeCity', + TBLPROPERTIES ('DICTIONARY_EXCLUDE'='storeCity', 'DICTIONARY_INCLUDE'='productNumber', 'NO_INVERTED_INDEX'='productBatch') </code></pre> @@ -690,8 +680,7 @@ of columns is used.</p> productBatch String, revenue Int) STORED BY 'carbondata' - TBLPROPERTIES ('COLUMN_GROUPS'='(productNumber,saleQuantity)', - 'DICTIONARY_EXCLUDE'='productName', + TBLPROPERTIES ('DICTIONARY_EXCLUDE'='productName', 'DICTIONARY_INCLUDE'='productNumber,saleQuantity', 'NO_INVERTED_INDEX'='productBatch', 'BUCKETNUMBER'='4', http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/f1a4abdf/src/main/webapp/dml-operation-on-carbondata.html ---------------------------------------------------------------------- diff --git a/src/main/webapp/dml-operation-on-carbondata.html b/src/main/webapp/dml-operation-on-carbondata.html index babba56..cb62bcd 100644 --- a/src/main/webapp/dml-operation-on-carbondata.html +++ b/src/main/webapp/dml-operation-on-carbondata.html @@ -421,11 +421,10 @@ LIMIT number_of_segments; <p>This command is used to delete segment by using the segment ID. Each segment has a unique segment ID associated with it. Using this segment ID, you can remove the segment.</p> <p>The following command will get the segmentID.</p> -<pre><code>SHOW SEGMENTS FOR Table dbname.tablename LIMIT number_of_segments +<pre><code>SHOW SEGMENTS FOR Table [db_name.]table_name LIMIT number_of_segments </code></pre> <p>After you retrieve the segment ID of the segment that you want to delete, execute the following command to delete the selected segment.</p> -<pre><code>DELETE SEGMENT segment_sequence_id1, segments_sequence_id2, .... -FROM TABLE tableName +<pre><code>DELETE FROM TABLE [db_name.]table_name WERE SEGMENT.ID IN (segment_id1, segments_id2, ....) </code></pre> <h3> <a id="parameter-description-3" class="anchor" href="#parameter-description-3" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Parameter Description</h3> @@ -457,16 +456,16 @@ FROM TABLE tableName </table> <h3> <a id="example-2" class="anchor" href="#example-2" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Example:</h3> -<pre><code>DELETE SEGMENT 0 FROM TABLE CarbonDatabase.CarbonTable; -DELETE SEGMENT 0.1,5,8 FROM TABLE CarbonDatabase.CarbonTable; +<pre><code>DELETE FROM TABLE CarbonDatabase.CarbonTable WHERE SEGMENT.ID IN (0); +DELETE FROM TABLE CarbonDatabase.CarbonTable WHERE SEGMENT.ID IN (0,5,8); </code></pre> <p>NOTE: Here 0.1 is compacted segment sequence id.</p> <h2> <a id="delete-segment-by-date" class="anchor" href="#delete-segment-by-date" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>DELETE SEGMENT BY DATE</h2> <p>This command will allow to delete the CarbonData segment(s) from the store based on the date provided by the user in the DML command. The segment created before the particular date will be removed from the specific stores.</p> -<pre><code>DELETE SEGMENTS FROM TABLE [db_name.]table_name -WHERE STARTTIME BEFORE DATE_VALUE +<pre><code>DELETE FROM TABLE [db_name.]table_name +WHERE SEGMENT.STARTTIME BEFORE DATE_VALUE </code></pre> <h3> <a id="parameter-description-4" class="anchor" href="#parameter-description-4" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Parameter Description</h3> @@ -498,8 +497,8 @@ WHERE STARTTIME BEFORE DATE_VALUE </table> <h3> <a id="example-3" class="anchor" href="#example-3" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Example:</h3> -<pre><code> DELETE SEGMENTS FROM TABLE CarbonDatabase.CarbonTable - WHERE STARTTIME BEFORE '2017-06-01 12:05:06'; +<pre><code> DELETE FROM TABLE CarbonDatabase.CarbonTable + WHERE SEGMENT.STARTTIME BEFORE '2017-06-01 12:05:06'; </code></pre> <h2> <a id="update-carbondata-table" class="anchor" href="#update-carbondata-table" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Update CarbonData Table</h2> http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/f1a4abdf/src/main/webapp/installation-guide.html ---------------------------------------------------------------------- diff --git a/src/main/webapp/installation-guide.html b/src/main/webapp/installation-guide.html index d74bbb9..a8d9872 100644 --- a/src/main/webapp/installation-guide.html +++ b/src/main/webapp/installation-guide.html @@ -395,7 +395,7 @@ $SPARK_HOME/carbonlib/$CARBON_ASSEMBLY_JAR <carbon_store_path> <tr> <td>CARBON_ASSEMBLY_JAR</td> <td>CarbonData assembly jar name present in the <code>$SPARK_HOME/carbonlib/</code> folder.</td> -<td>carbondata_2.10-0.1.0-incubating-SNAPSHOT-shade-hadoop2.7.2.jar</td> +<td>carbondata_2.xx-x.x.x-SNAPSHOT-shade-hadoop2.7.2.jar</td> </tr> <tr> <td>carbon_store_path</td> @@ -412,7 +412,7 @@ $SPARK_HOME/carbonlib/$CARBON_ASSEMBLY_JAR <carbon_store_path> --conf spark.sql.hive.thriftServer.singleSession=true --class org.apache.carbondata.spark.thriftserver.CarbonThriftServer $SPARK_HOME/carbonlib -/carbondata_2.10-0.1.0-incubating-SNAPSHOT-shade-hadoop2.7.2.jar +/carbondata_2.xx-x.x.x-SNAPSHOT-shade-hadoop2.7.2.jar hdfs://<host_name>:port/user/hive/warehouse/carbon.store </code></pre> <ul> @@ -423,7 +423,7 @@ hdfs://<host_name>:port/user/hive/warehouse/carbon.store --num-executors 3 --driver-memory 20g --executor-memory 250g --executor-cores 32 /srv/OSCON/BigData/HACluster/install/spark/sparkJdbc/lib -/carbondata_2.10-0.1.0-incubating-SNAPSHOT-shade-hadoop2.7.2.jar +/carbondata_2.xx-x.x.x-SNAPSHOT-shade-hadoop2.7.2.jar hdfs://<host_name>:port/user/hive/warehouse/carbon.store </code></pre> <h3> http://git-wip-us.apache.org/repos/asf/carbondata-site/blob/f1a4abdf/src/main/webapp/pdf/maven-pdf-plugin.pdf ---------------------------------------------------------------------- diff --git a/src/main/webapp/pdf/maven-pdf-plugin.pdf b/src/main/webapp/pdf/maven-pdf-plugin.pdf index 91bdbef..cb6de01 100644 Binary files a/src/main/webapp/pdf/maven-pdf-plugin.pdf and b/src/main/webapp/pdf/maven-pdf-plugin.pdf differ
