Merge remote-tracking branch 'upstream/develop' into explain-error-me…

…ssage

.github/workflows/sql-jdbc-release-workflow.yml

@@ -9,7 +9,7 @@ jobs:
   Release-SQL-JDBC:
     strategy:
       matrix:
-        java: [14]
+        java: [10]
 
     name: Build and Release JDBC Plugin
     runs-on: ubuntu-latest

.github/workflows/sql-odbc-rename-and-release-workflow.yml

@@ -0,0 +1,54 @@
+name: Rename and release ODBC
+
+# This workflow will rename previous artifacts of odbc and upload to s3, triggered by tag "rename*"
+
+on:
+  push:
+    tags:
+      - rename*
+
+env:
+  OD_VERSION: 1.12.0.0
+
+jobs:
+  upload-odbc:
+    runs-on: ubuntu-latest
+
+    name: Upload ODBC to S3
+    steps:
+      - name: Configure AWS CLI
+        uses: aws-actions/configure-aws-credentials@v1
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: us-east-1
+
+      - name: Rename and upload for MacOS
+        run: |
+          mkdir macos
+          cd macos
+          aws s3 cp "s3://artifacts.opendistroforelasticsearch.amazon.com/downloads/elasticsearch-clients/opendistro-sql-odbc/mac/Open Distro for Elasticsearch SQL ODBC Driver 64-bit-1.11.0.0-Darwin.pkg" "Open Distro for Elasticsearch SQL ODBC Driver 64-bit-${{ env.OD_VERSION }}-Darwin.pkg"
+          mac_installer=`ls -1t *.pkg | grep "Open Distro for Elasticsearch SQL ODBC Driver" | head -1`
+          echo $mac_installer
+          aws s3 cp "$mac_installer" s3://artifacts.opendistroforelasticsearch.amazon.com/downloads/elasticsearch-clients/opendistro-sql-odbc/mac/
+          cd ..
+
+      - name: Rename and upload for win32
+        run: |
+          mkdir win32
+          cd win32
+          aws s3 cp "s3://artifacts.opendistroforelasticsearch.amazon.com/downloads/elasticsearch-clients/opendistro-sql-odbc/windows/Open Distro for Elasticsearch SQL ODBC Driver 32-bit-1.11.0.0-Windows.msi" "Open Distro for Elasticsearch SQL ODBC Driver 32-bit-${{ env.OD_VERSION }}-Windows.msi"
+          windows_installer=`ls -1t *.msi | grep "Open Distro for Elasticsearch SQL ODBC Driver" | head -1`
+          echo $windows_installer
+          aws s3 cp "$windows_installer" s3://artifacts.opendistroforelasticsearch.amazon.com/downloads/elasticsearch-clients/opendistro-sql-odbc/windows/
+          cd ..
+
+      - name: Rename and upload for win64
+        run: |
+          mkdir win64
+          cd win64
+          aws s3 cp "s3://artifacts.opendistroforelasticsearch.amazon.com/downloads/elasticsearch-clients/opendistro-sql-odbc/windows/Open Distro for Elasticsearch SQL ODBC Driver 64-bit-1.11.0.0-Windows.msi" "Open Distro for Elasticsearch SQL ODBC Driver 64-bit-${{ env.OD_VERSION }}-Windows.msi"
+          windows_installer=`ls -1t *.msi | grep "Open Distro for Elasticsearch SQL ODBC Driver" | head -1`
+          echo $windows_installer
+          aws s3 cp "$windows_installer" s3://artifacts.opendistroforelasticsearch.amazon.com/downloads/elasticsearch-clients/opendistro-sql-odbc/windows/
+

.github/workflows/sql-workbench-release-workflow.yml

@@ -42,7 +42,6 @@ jobs:
 
       - name: Move Workbench to Plugins Dir
         run: |
-          mkdir kibana/plugins
           mv workbench kibana/plugins
 
       - name: Kibana Plugin Bootstrap

docs/category.json

@@ -12,7 +12,8 @@
     "experiment/ppl/cmd/search.rst",
     "experiment/ppl/cmd/sort.rst",
     "experiment/ppl/cmd/stats.rst",
-    "experiment/ppl/cmd/where.rst"
+    "experiment/ppl/cmd/where.rst",
+    "experiment/ppl/general/identifiers.rst"
   ],
   "sql_cli": [
     "user/dql/expressions.rst",

docs/experiment/ppl/general/datatypes.rst

@@ -0,0 +1,226 @@
+
+==========
+Data Types
+==========
+
+.. rubric:: Table of contents
+
+.. contents::
+   :local:
+   :depth: 2
+
+
+Overview
+========
+
+PPL Data Types
+-------------------
+
+The PPL support the following data types.
+
++---------------+
+| PPL Data Type |
++===============+
+| boolean       |
++---------------+
+| byte          |
++---------------+
+| short         |
++---------------+
+| integer       |
++---------------+
+| long          |
++---------------+
+| float         |
++---------------+
+| double        |
++---------------+
+| string        |
++---------------+
+| text          |
++---------------+
+| timestamp     |
++---------------+
+| datetime      |
++---------------+
+| date          |
++---------------+
+| time          |
++---------------+
+| interval      |
++---------------+
+| ip            |
++---------------+
+| geo_point     |
++---------------+
+| binary        |
++---------------+
+| struct        |
++---------------+
+| array         |
++---------------+
+
+Data Types Mapping
+------------------
+
+The table below list the mapping between Elasticsearch Data Type, PPL Data Type and SQL Type.
+
++--------------------+---------------+-----------+
+| Elasticsearch Type | PPL Type      | SQL Type  |
++====================+===============+===========+
+| boolean            | boolean       | BOOLEAN   |
++--------------------+---------------+-----------+
+| byte               | byte          | TINYINT   |
++--------------------+---------------+-----------+
+| short              | byte          | SMALLINT  |
++--------------------+---------------+-----------+
+| integer            | integer       | INTEGER   |
++--------------------+---------------+-----------+
+| long               | long          | BIGINT    |
++--------------------+---------------+-----------+
+| float              | float         | REAL      |
++--------------------+---------------+-----------+
+| half_float         | float         | FLOAT     |
++--------------------+---------------+-----------+
+| scaled_float       | float         | DOUBLE    |
++--------------------+---------------+-----------+
+| double             | double        | DOUBLE    |
++--------------------+---------------+-----------+
+| keyword            | string        | VARCHAR   |
++--------------------+---------------+-----------+
+| text               | text          | VARCHAR   |
++--------------------+---------------+-----------+
+| date               | timestamp     | TIMESTAMP |
++--------------------+---------------+-----------+
+| ip                 | ip            | VARCHAR   |
++--------------------+---------------+-----------+
+| date               | timestamp     | TIMESTAMP |
++--------------------+---------------+-----------+
+| binary             | binary        | VARBINARY |
++--------------------+---------------+-----------+
+| object             | struct        | STRUCT    |
++--------------------+---------------+-----------+
+| nested             | array         | STRUCT    |
++--------------------+---------------+-----------+
+
+Notes: Not all the PPL Type has correspond Elasticsearch Type. e.g. data and time. To use function which required such data type, user should explict convert the data type.
+
+
+
+Numeric Data Types
+==================
+
+TODO
+
+
+Date and Time Data Types
+========================
+
+The date and time data types are the types that represent temporal values and PPL plugin supports types including DATE, TIME, DATETIME, TIMESTAMP and INTERVAL. By default, the Elasticsearch DSL uses date type as the only date and time related type, which has contained all information about an absolute time point. To integrate with PPL language, each of the types other than timestamp is holding part of temporal or timezone information, and the usage to explicitly clarify the date and time types is reflected in the datetime functions (see `Functions <functions.rst>`_ for details), where some functions might have restrictions in the input argument type.
+
+
+Date
+----
+
+Date represents the calendar date regardless of the time zone. A given date value represents a 24-hour period, or say a day, but this period varies in different timezones and might have flexible hours during Daylight Savings Time programs. Besides, the date type does not contain time information as well. The supported range is '1000-01-01' to '9999-12-31'.
+
++------+--------------+------------------------------+
+| Type | Syntax       | Range                        |
++======+==============+==============================+
+| Date | 'yyyy-MM-dd' | '0001-01-01' to '9999-12-31' |
++------+--------------+------------------------------+
+
+
+Time
+----
+
+Time represents the time on the clock or watch with no regard for which timezone it might be related with. Time type data does not have date information.
+
++------+-----------------------+----------------------------------------+
+| Type | Syntax                | Range                                  |
++======+=======================+========================================+
+| Time | 'hh:mm:ss[.fraction]' | '00:00:00.000000' to '23:59:59.999999' |
++------+-----------------------+----------------------------------------+
+
+
+Datetime
+--------
+
+Datetime type is the combination of date and time. The conversion rule of date or time to datetime is described in `Conversion between date and time types`_. Datetime type does not contain timezone information. For an absolute time point that contains both date time and timezone information, see `Timestamp`_.
+
++----------+----------------------------------+--------------------------------------------------------------+
+| Type     | Syntax                           | Range                                                        |
++==========+==================================+==============================================================+
+| Datetime | 'yyyy-MM-dd hh:mm:ss[.fraction]' | '0001-01-01 00:00:00.000000' to '9999-12-31 23:59:59.999999' |
++----------+----------------------------------+--------------------------------------------------------------+
+
+
+
+Timestamp
+---------
+
+A timestamp instance is an absolute instant independent of timezone or convention. For example, for a given point of time, if we set the timestamp of this time point into another timezone, the value should also be different accordingly. Besides, the storage of timestamp type is also different from the other types. The timestamp is converted from the current timezone to UTC for storage, and is converted back to the set timezone from UTC when retrieving.
+
++-----------+----------------------------------+------------------------------------------------------------------+
+| Type      | Syntax                           | Range                                                            |
++===========+==================================+==================================================================+
+| Timestamp | 'yyyy-MM-dd hh:mm:ss[.fraction]' | '0001-01-01 00:00:01.000000' UTC to '9999-12-31 23:59:59.999999' |
++-----------+----------------------------------+------------------------------------------------------------------+
+
+
+Interval
+--------
+
+Interval data type represents a temporal duration or a period. The syntax is as follows:
+
++----------+--------------------+
+| Type     | Syntax             |
++==========+====================+
+| Interval | INTERVAL expr unit |
++----------+--------------------+
+
+The expr is any expression that can be iterated to a quantity value eventually, see `Expressions <expressions.rst>`_ for details. The unit represents the unit for interpreting the quantity, including MICROSECOND, SECOND, MINUTE, HOUR, DAY, WEEK, MONTH, QUARTER and YEAR.The INTERVAL keyword and the unit specifier are not case sensitive. Note that there are two classes of intervals. Year-week intervals can store years, quarters, months and weeks. Day-time intervals can store days, hours, minutes, seconds and microseconds. Year-week intervals are comparable only with another year-week intervals. These two types of intervals can only comparable with the same type of themselves.
+
+
+Conversion between date and time types
+--------------------------------------
+
+Basically the date and time types except interval can be converted to each other, but might suffer some alteration of the value or some information loss, for example extracting the time value from a datetime value, or convert a date value to a datetime value and so forth. Here lists the summary of the conversion rules that PPL plugin supports for each of the types:
+
+Conversion from DATE
+>>>>>>>>>>>>>>>>>>>>
+
+- Since the date value does not have any time information, conversion to `Time`_ type is not useful, and will always return a zero time value '00:00:00'.
+
+- Conversion from date to datetime has a data fill-up due to the lack of time information, and it attaches the time '00:00:00' to the original date by default and forms a datetime instance. For example, the result to covert date '2020-08-17' to datetime type is datetime '2020-08-17 00:00:00'.
+
+- Conversion to timestamp is to alternate both the time value and the timezone information, and it attaches the zero time value '00:00:00' and the session timezone (UTC by default) to the date. For example, the result to covert date '2020-08-17' to datetime type with session timezone UTC is datetime '2020-08-17 00:00:00' UTC.
+
+
+Conversion from TIME
+>>>>>>>>>>>>>>>>>>>>
+
+- Time value cannot be converted to any other date and time types since it does not contain any date information, so it is not meaningful to give no date info to a date/datetime/timestamp instance.
+
+
+Conversion from DATETIME
+>>>>>>>>>>>>>>>>>>>>>>>>
+
+- Conversion from datetime to date is to extract the date part from the datetime value. For example, the result to convert datetime '2020-08-17 14:09:00' to date is date '2020-08-08'.
+
+- Conversion to time is to extract the time part from the datetime value. For example, the result to convert datetime '2020-08-17 14:09:00' to time is time '14:09:00'.
+
+- Since the datetime type does not contain timezone information, the conversion to timestamp needs to fill up the timezone part with the session timezone. For example, the result to convert datetime '2020-08-17 14:09:00' with system timezone of UTC, to timestamp is timestamp '2020-08-17 14:09:00' UTC.
+
+
+Conversion from TIMESTAMP
+>>>>>>>>>>>>>>>>>>>>>>>>>
+
+- Conversion from timestamp is much more straightforward. To convert it to date is to extract the date value, and conversion to time is to extract the time value. Conversion to datetime, it will extracts the datetime value and leave the timezone information over. For example, the result to convert datetime '2020-08-17 14:09:00' UTC to date is date '2020-08-17', to time is '14:09:00' and to datetime is datetime '2020-08-17 14:09:00'.
+
+
+String Data Types
+=================
+
+TODO
+