Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 730e8ce

Browse files
maciejmaciejko-gidmaciejmaciejko-gid
authored
Merge branch 'apache:master' into FLINK-38266 
2 parents 05fc55c + 250ab88 commit 730e8ce

File tree

40 files changed

+809
-153
lines changed

40 files changed

+809
-153
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ DataStream<WordWithCount> windowCounts = text
8888
.stream(line.split("\\s"))
8989
.forEach(collector::collect)).returns(String.class)
9090
.map(word -> new WordWithCount(word, 1)).returns(TypeInformation.of(WordWithCount.class))
91-
.keyBy(wordWintCount -> wordWintCount.word)
91+
.keyBy(wordWithCount -> wordWithCount.word)
9292
.sum("count").returns(TypeInformation.of(WordWithCount.class));
9393

9494
windowCounts.print();

‎docs/content.zh/docs/dev/datastream/fault-tolerance/state.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ ttl_config = StateTtlConfig \
320320

321321
可以按照如下所示配置更细粒度的后台清理策略。当前的实现中 `HeapStateBackend` 依赖增量数据清理，`RocksDBStateBackend` 利用压缩过滤器进行后台清理。
322322

323-
#### 全量快照时进行清理
323+
##### 全量快照时进行清理
324324

325325
另外，你可以启用全量快照时进行清理的策略，这可以减少整个快照的大小。当前实现中不会清理本地的状态，但从上次快照恢复时，不会恢复那些已经删除的过期数据。
326326
该策略可以通过 `StateTtlConfig` 配置进行配置：
@@ -520,7 +520,7 @@ public class BufferingSink
520520
}
521521

522522
@Override
523-
public void invoke(Tuple2<String, Integer> value, Context contex) throws Exception {
523+
public void invoke(Tuple2<String, Integer> value, Context context) throws Exception {
524524
bufferedElements.add(value);
525525
if (bufferedElements.size() >= threshold) {
526526
for (Tuple2<String, Integer> element: bufferedElements) {

‎docs/content.zh/docs/dev/datastream/fault-tolerance/state_v2.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -578,7 +578,7 @@ public class BufferingSink
578578
}
579579

580580
@Override
581-
public void invoke(Tuple2<String, Integer> value, Context contex) throws Exception {
581+
public void invoke(Tuple2<String, Integer> value, Context context) throws Exception {
582582
bufferedElements.add(value);
583583
if (bufferedElements.size() >= threshold) {
584584
for (Tuple2<String, Integer> element: bufferedElements) {

‎docs/content.zh/docs/dev/table/sql/create.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -822,7 +822,7 @@ catalog 属性一般用于存储关于这个 catalog 的额外的信息。
822822
```sql
823823
CREATE DATABASE [IF NOT EXISTS] [catalog_name.]db_name
824824
[COMMENT database_comment]
825-
WITH (key1=val1, key2=val2, ...)
825+
[WITH (key1=val1, key2=val2, ...)]
826826
```
827827

828828
根据给定的表属性创建数据库。若数据库中已存在同名表会抛出异常。

‎docs/content.zh/docs/dev/table/tableApi.md‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ Table result = orders.as("x, y, z, t");
410410
```
411411
{{< /tab >}}
412412
{{< tab "scala" >}}
413-
```java
413+
```scala
414414
val orders: Table = tableEnv.from("Orders").as("x", "y", "z", "t")
415415
```
416416
{{< /tab >}}
@@ -1132,9 +1132,10 @@ tableEnv.createTemporarySystemFunction("rates", rates);
11321132
Table orders = tableEnv.from("Orders");
11331133
Table result = orders
11341134
.joinLateral(call("rates", $("o_proctime")), $("o_currency").isEqual($("r_currency")));
1135+
```
11351136
{{< /tab >}}
1136-
{{< tabs "Scala" >}}
1137-
​```scala
1137+
{{< tab "Scala" >}}
1138+
```scala
11381139
val ratesHistory = tableEnv.from("RatesHistory")
11391140

11401141
// 注册带有时间属性和主键的 temporal table function
@@ -1145,7 +1146,7 @@ val orders = tableEnv.from("Orders")
11451146
val result = orders
11461147
.joinLateral(rates($"o_rowtime"), $"r_currency" === $"o_currency")
11471148
```
1148-
{{< /tabs >}}
1149+
{{< /tab >}}
11491150
{{< tab "Python" >}}
11501151
目前不支持 Python 的 Table API。
11511152
{{< /tab >}}
@@ -1363,7 +1364,7 @@ left.minus_all(right)
13631364
{{< tabs "in" >}}
13641365
{{< tab "Java" >}}
13651366
```java
1366-
Table left = tableEnv.from("Orders1")
1367+
Table left = tableEnv.from("Orders1");
13671368
Table right = tableEnv.from("Orders2");
13681369

13691370
Table result = left.select($("a"), $("b"), $("c")).where($("a").in(right));

‎docs/content.zh/docs/ops/events.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public class MyClass {
5050
metricGroup.addEvent(
5151
Event.builder(MyClass.class, "SomeEvent")
5252
.setObservedTsMillis(observedTs) // Optional
53-
.setAttribute("foo", "bar"); // Optional
53+
.setAttribute("foo", "bar")); // Optional
5454
}
5555
}
5656
```

‎docs/content/docs/dev/datastream/fault-tolerance/state.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -639,7 +639,7 @@ public class BufferingSink
639639
}
640640

641641
@Override
642-
public void invoke(Tuple2<String, Integer> value, Context contex) throws Exception {
642+
public void invoke(Tuple2<String, Integer> value, Context context) throws Exception {
643643
bufferedElements.add(value);
644644
if (bufferedElements.size() >= threshold) {
645645
for (Tuple2<String, Integer> element: bufferedElements) {

‎docs/content/docs/dev/datastream/fault-tolerance/state_v2.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -579,7 +579,7 @@ public class BufferingSink
579579
}
580580

581581
@Override
582-
public void invoke(Tuple2<String, Integer> value, Context contex) throws Exception {
582+
public void invoke(Tuple2<String, Integer> value, Context context) throws Exception {
583583
bufferedElements.add(value);
584584
if (bufferedElements.size() >= threshold) {
585585
for (Tuple2<String, Integer> element: bufferedElements) {

‎docs/content/docs/dev/table/sql/create.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -819,7 +819,7 @@ Check out more details at [Catalogs]({{< ref "docs/dev/table/catalogs" >}}).
819819
```sql
820820
CREATE DATABASE [IF NOT EXISTS] [catalog_name.]db_name
821821
[COMMENT database_comment]
822-
WITH (key1=val1, key2=val2, ...)
822+
[WITH (key1=val1, key2=val2, ...)]
823823
```
824824

825825
Create a database with the given database properties. If a database with the same name already exists in the catalog, an exception is thrown.

‎docs/content/docs/dev/table/tableApi.md‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ Table result = orders.as("x, y, z, t");
412412
```
413413
{{< /tab >}}
414414
{{< tab "scala" >}}
415-
```java
415+
```scala
416416
val orders: Table = tableEnv.from("Orders").as("x", "y", "z", "t")
417417
```
418418
{{< /tab >}}
@@ -1131,8 +1131,9 @@ tableEnv.createTemporarySystemFunction("rates", rates);
11311131
Table orders = tableEnv.from("Orders");
11321132
Table result = orders
11331133
.joinLateral(call("rates", $("o_proctime")), $("o_currency").isEqual($("r_currency")));
1134+
```
11341135
{{< /tab >}}
1135-
{{< tabs "Scala" >}}
1136+
{{< tab "Scala" >}}
11361137
```scala
11371138
val ratesHistory = tableEnv.from("RatesHistory")
11381139

@@ -1144,7 +1145,7 @@ val orders = tableEnv.from("Orders")
11441145
val result = orders
11451146
.joinLateral(rates($"o_rowtime"), $"r_currency" === $"o_currency")
11461147
```
1147-
{{< /tabs >}}
1148+
{{< /tab >}}
11481149
{{< tab "Python" >}}
11491150
Currently not supported in Python Table API.
11501151
{{< /tab >}}
@@ -1362,7 +1363,7 @@ Similar to a SQL `IN` clause. In returns true if an expression exists in a given
13621363
{{< tabs "in" >}}
13631364
{{< tab "Java" >}}
13641365
```java
1365-
Table left = tableEnv.from("Orders1")
1366+
Table left = tableEnv.from("Orders1");
13661367
Table right = tableEnv.from("Orders2");
13671368

13681369
Table result = left.select($("a"), $("b"), $("c")).where($("a").in(right));

0 commit comments

Comments
 (0)