Merge pull request #1023 from allwefantasy/TRY

add releases.md
byzer-org · Apr 14, 2019 · be144f5 · be144f5
2 parents ba4661a + bdc63f3
commit be144f5
Show file tree

Hide file tree

Showing 15 changed files with 96 additions and 623 deletions.
diff --git a/RELEASES.md b/RELEASES.md
@@ -0,0 +1,55 @@
+MLSQL Version 1.2.0 (2019-04-11)
+==========================
+
+MLSQL Language
+--------
+
+- Adding new symbol `!` to execute command in MLSQL.
+- Grammar validate before really execute MLSQL script. 
+
+Bug Fix
+---------
+
+- [PR-1011 Jython udf do not support null parameter](https://github.com/allwefantasy/streamingpro/pull/1011)
+- [PR-1010 Kill cannot kill job when sessionPerUser enabled](https://github.com/allwefantasy/streamingpro/pull/1010)
+- [PR-1000 System show jobs without stream jobs.](https://github.com/allwefantasy/streamingpro/pull/1000)
+
+New Features
+----------
+
+- [Compile time auth/Select Statement runtime support](https://github.com/allwefantasy/streamingpro/pull/990)
+- [UDF written by Java support](https://github.com/allwefantasy/streamingpro/pull/911)
+
+Break Features 
+--------
+
+- Use streamJDBC instead of JDBC in stream sink.
+- Use streamParquet instead of parquet in stream sink.
+
+Components
+--------
+
+- [MLSQL Console](https://github.com/allwefantasy/mlsql-api-console) can be used with MLSQL Engine.
+
+
+Plan of next release.
+-------
+
+- API `/stream/jobs/kill` and `/stream/jobs/running`,`/run/sql` will be removed in next release.
+- Module `streamingpro-automl`  will be removed in next release.
+
+Docs Link
+--------
+
+- [MLSQL-1.2.0](http://docs.mlsql.tech/v1.2.0/zh/) 
+
+Download Link
+---------
+
+- [MLSQL-1.2.0](http://download.mlsql.tech/1.2.0/)
+
+
+
+
+
+
diff --git a/docs/gitbook/zh/SUMMARY.md b/docs/gitbook/zh/SUMMARY.md
@@ -95,6 +95,7 @@
         * [如何统一管理scala/python udf脚本](include/include_script.md)        
         * [如何统一管理中间表](include/table.md)
         * [如何开启include功能](include/enable.md)
+        * [定义自己的命令](include/commands.md)
 
     * [流式计算](stream/README.md)        
         * [数据源](stream/datasource.md)           

diff --git a/docs/gitbook/zh/datasource/solr.md b/docs/gitbook/zh/datasource/solr.md
@@ -24,5 +24,5 @@ options soft_commit_secs = "1";
 ```
 
 在Solr里，数据连接引用和表之间的分隔符不是`.`,而是`/`。 这是因为Solr索引名允许带"."。
-所以Solr相关的参数可以参考驱动[官方文档](https://github.com/lucidworks/spark-solr)。
+所有Solr相关的参数可以参考驱动[官方文档](https://github.com/lucidworks/spark-solr)。
 
diff --git a/docs/gitbook/zh/include/commands.md b/docs/gitbook/zh/include/commands.md
@@ -0,0 +1,30 @@
+#定义自己的命令
+
+大家可以使用系统内置的一些命令,具体查看方式如下：
+
+```sql
+!show help;
+``` 
+
+此外还内置了如下两个指令：
+
+```sql
+!desc jdbc;
+!kill 任务id;
+```
+
+
+用户也可以定制自己的指令，比如用户自己实现kill指令：
+
+```sql
+set kill = '''
+-- 注意结尾没有分号
+run command Kill.`{}`
+''';
+```
+
+接着就可以使用`!`来使用kill指令了。
+
+```sql
+!kill jobId;
+```
diff --git a/docs/gitbook/zh/jobs/cancel_job.md b/docs/gitbook/zh/jobs/cancel_job.md
@@ -5,7 +5,7 @@
 具体取消的方式为：
 
 ```sql
-run command as Kill.`23`; 
+!kill.`23`; 
 ```
 
 > groupId,jobName 都可以做为任务的唯一标识

diff --git a/docs/gitbook/zh/jobs/list_jobs.md b/docs/gitbook/zh/jobs/list_jobs.md
@@ -3,7 +3,7 @@
 获取所有运行任务（只能看到自己的），可以通过load语法
 
 ```sql
-load _mlsql_.`jobs` as output;
+!show jobs;
 ```
 
 显示结果如下：
@@ -17,20 +17,20 @@ [email protected]	script	2595b404-c54c-436a-9cb7-ccd33438bc36	load _mlsql_.
 获取某个任务详细情况：
 
 ```sql
-load _mlsql_.`job/2595b404-c54c-436a-9cb7-ccd33438bc36` as output;
+!show "job/2595b404-c54c-436a-9cb7-ccd33438bc36";
 ```
 
 
 获取当前资源总体情况:
 
 ```sql
-load _mlsql_.`resource` as output;
+!show resource;
 ```
 
 获取某个任务详细资源情况：
 
 ```sql
-load _mlsql_.`resource/2595b404-c54c-436a-9cb7-ccd33438bc36` as output;
+!show "resource/2595b404-c54c-436a-9cb7-ccd33438bc36";
 ```
 
 > groupId,jobName 都可以做为任务的唯一标识

diff --git a/docs/mlsql-batch.md b/docs/mlsql-batch.md
diff --git a/docs/mlsql-log-monitor.md b/docs/mlsql-log-monitor.md
diff --git a/docs/mlsql-stream.md b/docs/mlsql-stream.md
@@ -87,7 +87,7 @@ and password="----"
 as mysql1;
 -- Save the data to MYSQL
 save append table21
-as jdbc.`mysql1.test1`
+as streamJDBC.`mysql1.test1`
 options mode="append"
 and `driver-statement-0`="create table test1 if not exists........."
 -- executed in executor
@@ -104,7 +104,7 @@ and checkpointLocation="/tmp/cpl3";
 ```sql
 
 save append table
-as parquet.`/table/hp_stat_date=${pathDate.toString("yyyy-MM-dd")}`
+as streamParquet.`/table/hp_stat_date=${pathDate.toString("yyyy-MM-dd")}`
 options mode="Append"
 and duration="30"
 and checkpointLocation="/tmp/ckl1";
@@ -115,7 +115,7 @@ and checkpointLocation="/tmp/ckl1";
 ```sql
 
 save append table
-as parquet.`table`
+as streamParquet.`table`
 options mode="Append"
 and duration="10"
 and checkpointLocation="/tmp/ckl1"

diff --git a/docs/mlsqlexample.md b/docs/mlsqlexample.md