You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by fh...@apache.org on 2016/11/10 14:34:55 UTC

[1/4] flink git commit: [hotfix] [tests] Fix wrong argument order of assertNotNull in ClassLoaderITCase.

Repository: flink
Updated Branches:
  refs/heads/master 6516938b9 -> 5767167db


[hotfix] [tests] Fix wrong argument order of assertNotNull in ClassLoaderITCase.

This closes #2775.


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/a88b6132
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/a88b6132
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/a88b6132

Branch: refs/heads/master
Commit: a88b6132e5bc4f7126303ffa4cda4c1e535f8022
Parents: 0145950
Author: Boris Osipov <bo...@epam.com>
Authored: Tue Nov 8 12:15:19 2016 +0300
Committer: Fabian Hueske <fh...@apache.org>
Committed: Thu Nov 10 15:34:17 2016 +0100

----------------------------------------------------------------------
 .../java/org/apache/flink/test/classloading/ClassLoaderITCase.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/a88b6132/flink-tests/src/test/java/org/apache/flink/test/classloading/ClassLoaderITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/classloading/ClassLoaderITCase.java b/flink-tests/src/test/java/org/apache/flink/test/classloading/ClassLoaderITCase.java
index c7050e5..ca69e80 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/classloading/ClassLoaderITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/classloading/ClassLoaderITCase.java
@@ -312,7 +312,7 @@ public class ClassLoaderITCase extends TestLogger {
 			}
 		}
 
-		assertNotNull(savepointPath, "Failed to trigger savepoint");
+		assertNotNull("Failed to trigger savepoint", savepointPath);
 
 		// Upload JAR
 		LOG.info("Uploading JAR " + CUSTOM_KV_STATE_JAR_PATH + " for savepoint disposal.");


[4/4] flink git commit: [hotfix] [docs] [tableAPI] Fix typos in Table API documentation.

Posted by fh...@apache.org.
[hotfix] [docs] [tableAPI] Fix typos in Table API documentation.

This closes #2776.


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/5767167d
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/5767167d
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/5767167d

Branch: refs/heads/master
Commit: 5767167db6e91d7df2ea0c576b27a6d1d971030a
Parents: a88b613
Author: Jark Wu <wu...@alibaba-inc.com>
Authored: Wed Nov 9 15:21:39 2016 +0800
Committer: Fabian Hueske <fh...@apache.org>
Committed: Thu Nov 10 15:34:18 2016 +0100

----------------------------------------------------------------------
 docs/dev/table_api.md | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/5767167d/docs/dev/table_api.md
----------------------------------------------------------------------
diff --git a/docs/dev/table_api.md b/docs/dev/table_api.md
index 6da2807..d017337 100644
--- a/docs/dev/table_api.md
+++ b/docs/dev/table_api.md
@@ -1013,8 +1013,8 @@ Group-windows are defined using the `window(w: GroupWindow)` clause. The followi
 <div class="codetabs" markdown="1">
 <div data-lang="java" markdown="1">
 {% highlight java %}
-val table = input
-  .window(w: GroupWindow) // define window
+Table table = input
+  .window(GroupWindow w)  // define window
   .select("b.sum")        // aggregate
 {% endhighlight %}
 </div>
@@ -1033,9 +1033,9 @@ In streaming environments, group-window aggregates can only be computed in paral
 <div class="codetabs" markdown="1">
 <div data-lang="java" markdown="1">
 {% highlight java %}
-val table = input
+Table table = input
   .groupBy("a")
-  .window(w: GroupWindow) // define window
+  .window(GroupWindow w)  // define window
   .select("a, b.sum")     // aggregate
 {% endhighlight %}
 </div>
@@ -1056,7 +1056,7 @@ By assigning the group-window an alias using `as`, properties such as the start
 <div class="codetabs" markdown="1">
 <div data-lang="java" markdown="1">
 {% highlight java %}
-val table = input
+Table table = input
   .groupBy("a")
   .window(XXX.as("myWin"))                      // define window alias
   .select("a, myWin.start, myWin.end, b.count") // aggregate
@@ -1482,8 +1482,6 @@ Both the Table API and SQL come with a set of built-in functions for data transf
 <div class="codetabs" markdown="1">
 <div data-lang="java" markdown="1">
 
-<br/>
-
 <table class="table table-bordered">
   <thead>
     <tr>
@@ -2011,7 +2009,6 @@ NUMERIC.rows
 
 </div>
 <div data-lang="scala" markdown="1">
-<br />
 
 <table class="table table-bordered">
   <thead>
@@ -2548,7 +2545,6 @@ The documentation is split up and ordered like the tests in SqlExpressionTest.
 
 The Flink SQL functions (including their syntax) are a subset of Apache Calcite's built-in functions. Most of the documentation has been adopted from the [Calcite SQL reference](https://calcite.apache.org/docs/reference.html).
 
-<br />
 
 <table class="table table-bordered">
   <thead>


[2/4] flink git commit: [hotfix] [tests] Fix boxed Integer comparison with != in PartitionerITCase.

Posted by fh...@apache.org.
[hotfix] [tests] Fix boxed Integer comparison with != in PartitionerITCase.

This closes #2774.


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/01459505
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/01459505
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/01459505

Branch: refs/heads/master
Commit: 014595055aad3e044d17e1290b94e8f6846276ce
Parents: 22958fb
Author: Boris Osipov <bo...@epam.com>
Authored: Tue Nov 8 12:30:29 2016 +0300
Committer: Fabian Hueske <fh...@apache.org>
Committed: Thu Nov 10 15:34:17 2016 +0100

----------------------------------------------------------------------
 .../apache/flink/test/streaming/runtime/PartitionerITCase.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/01459505/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/PartitionerITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/PartitionerITCase.java b/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/PartitionerITCase.java
index bff8df1..3a125ba 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/PartitionerITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/PartitionerITCase.java
@@ -36,6 +36,7 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Objects;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
@@ -174,7 +175,7 @@ public class PartitionerITCase extends StreamingMultipleProgramsTestBase {
 			Integer subtaskIndex = verifier.get(elem.f1);
 			if (subtaskIndex == null) {
 				verifier.put(elem.f1, elem.f0);
-			} else if (subtaskIndex != elem.f0) {
+			} else if (!Objects.equals(subtaskIndex, elem.f0)) {
 				fail();
 			}
 		}


[3/4] flink git commit: [hotfix] Fix duplicate "ms" time unit in RestartStrategy.

Posted by fh...@apache.org.
[hotfix] Fix duplicate "ms" time unit in RestartStrategy.

For example: "Restart with fixed delay (10000 ms ms)."
-> org.apache.flink.api.common.time.Time already prints the time unit.

This closes #2778.


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/22958fba
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/22958fba
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/22958fba

Branch: refs/heads/master
Commit: 22958fbad06ae04bce695f84709d47057d7d6832
Parents: 6516938
Author: Nico Kruber <ni...@data-artisans.com>
Authored: Wed Nov 9 17:54:43 2016 +0100
Committer: Fabian Hueske <fh...@apache.org>
Committed: Thu Nov 10 15:34:17 2016 +0100

----------------------------------------------------------------------
 .../apache/flink/api/common/restartstrategy/RestartStrategies.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/22958fba/flink-core/src/main/java/org/apache/flink/api/common/restartstrategy/RestartStrategies.java
----------------------------------------------------------------------
diff --git a/flink-core/src/main/java/org/apache/flink/api/common/restartstrategy/RestartStrategies.java b/flink-core/src/main/java/org/apache/flink/api/common/restartstrategy/RestartStrategies.java
index 7073c2c..fc24fe7 100644
--- a/flink-core/src/main/java/org/apache/flink/api/common/restartstrategy/RestartStrategies.java
+++ b/flink-core/src/main/java/org/apache/flink/api/common/restartstrategy/RestartStrategies.java
@@ -141,7 +141,7 @@ public class RestartStrategies {
 
 		@Override
 		public String getDescription() {
-			return "Restart with fixed delay (" + delayBetweenAttemptsInterval + " ms). #"
+			return "Restart with fixed delay (" + delayBetweenAttemptsInterval + "). #"
 				+ restartAttempts + " restart attempts.";
 		}
 	}