This is an automated email from the ASF dual-hosted git repository.

mhubail pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git

commit 01a301d975f37945dfe23a4968263b435a0763c1
Merge: b317f37 c402e3a
Author: Michael Blow <[email protected]>
AuthorDate: Tue Nov 3 09:32:38 2020 -0500

    Merge remote-tracking branch 'gerrit/mad-hatter'
    
    Change-Id: Ia1402644a9ca2878c493293e9dcb92176d589736

 asterixdb/asterix-doc/pom.xml                      |  2 +-
 .../asterix-doc/src/main/markdown/sqlpp/0_toc.md   |  1 +
 .../src/main/markdown/sqlpp/appendix_2_hints.md    | 52 ++++++++++++++++++++++
 .../hyracks/hyracks-storage-am-btree/pom.xml       | 13 ++++++
 .../hyracks/storage/am/btree/impls/BTree.java      | 26 ++++++++++-
 .../hyracks/hyracks-storage-am-common/pom.xml      |  4 ++
 .../storage/am/common/api/ITreeIndexFrame.java     | 13 ++++++
 .../am/common/frames/TreeIndexNSMFrame.java        | 20 +++++++++
 8 files changed, 129 insertions(+), 2 deletions(-)

diff --cc asterixdb/asterix-doc/pom.xml
index 98e86b3,e1a1e69..88cc8cf
--- a/asterixdb/asterix-doc/pom.xml
+++ b/asterixdb/asterix-doc/pom.xml
@@@ -52,7 -52,7 +52,7 @@@
              <configuration>
                <target>
                  <concat 
destfile="${project.build.directory}/generated-site/markdown/sqlpp/manual.md">
-                   <filelist dir="${project.basedir}/src/main/markdown/sqlpp" 
files="0_toc.md,1_intro.md,2_expr_title.md,2_expr.md,3_query_title.md,3_declare_dataverse.md,3_declare_function.md,3_query.md,4_error_title.md,4_error.md,5_ddl_head.md,5_ddl_dataset_index.md,5_ddl_function_removal.md,5_ddl_dml.md,appendix_1_title.md,appendix_1_keywords.md,appendix_2_title.md,appendix_2_parameters.md,appendix_2_parallel_sort.md,appendix_2_index_only.md,appendix_2_interval_joins.md,appendix_3_tit
 [...]
 -                  <filelist dir="${project.basedir}/src/main/markdown/sqlpp" 
files="0_toc.md,1_intro.md,2_expr_title.md,2_expr.md,3_query_title.md,3_declare_dataverse.md,3_declare_function.md,3_query.md,4_error_title.md,4_error.md,5_ddl_head.md,5_ddl_dataset_index.md,5_ddl_function_removal.md,5_ddl_dml.md,appendix_1_title.md,appendix_1_keywords.md,appendix_2_title.md,appendix_2_parameters.md,appendix_2_parallel_sort.md,appendix_2_index_only.md,appendix_2_hints.md,appendix_3_title.md,app
 [...]
++                  <filelist dir="${project.basedir}/src/main/markdown/sqlpp" 
files="0_toc.md,1_intro.md,2_expr_title.md,2_expr.md,3_query_title.md,3_declare_dataverse.md,3_declare_function.md,3_query.md,4_error_title.md,4_error.md,5_ddl_head.md,5_ddl_dataset_index.md,5_ddl_function_removal.md,5_ddl_dml.md,appendix_1_title.md,appendix_1_keywords.md,appendix_2_title.md,appendix_2_parameters.md,appendix_2_parallel_sort.md,appendix_2_index_only.md,appendix_2_hints.md,appendix_2_interval_joi
 [...]
                  </concat>
                  <concat 
destfile="${project.build.directory}/generated-site/markdown/sqlpp/builtins.md">
                    <filelist 
dir="${project.basedir}/src/main/markdown/builtins" 
files="0_toc.md,0_toc_sqlpp.md,0_toc_common.md,1_numeric_common.md,1_numeric_delta.md,2_string_common.md,2_string_delta.md,3_binary.md,4_spatial.md,5_similarity.md,6_tokenizing.md,7_temporal.md,7_allens.md,8_record.md,9_aggregate_sql.md,10_comparison.md,11_type.md,13_conditional.md,12_misc.md,15_bitwise.md,14_window.md"
 />
diff --cc asterixdb/asterix-doc/src/main/markdown/sqlpp/0_toc.md
index f4e2cef,8680c43..ca1ca19
--- a/asterixdb/asterix-doc/src/main/markdown/sqlpp/0_toc.md
+++ b/asterixdb/asterix-doc/src/main/markdown/sqlpp/0_toc.md
@@@ -99,6 -98,6 +99,7 @@@
  * [Appendix 1. Reserved Keywords](#Reserved_keywords)
  * [Appendix 2. Performance Tuning](#Performance_tuning)
        * [Parallelism Parameter](#Parallelism_parameter)
 +      * [Interval Joins](#Interval_joins)
        * [Memory Parameters](#Memory_parameters)
+       * [Query Hints](#Query_hints)
  * [Appendix 3. Variable Bindings and Name 
Resolution](#Variable_bindings_and_name_resolution)

Reply via email to