You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2017/01/06 15:43:08 UTC
[2/6] flink git commit: [FLINK-5412] Enable RocksDB tests on Windows
OS
[FLINK-5412] Enable RocksDB tests on Windows OS
This closes #3067.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/e13ac598
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/e13ac598
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/e13ac598
Branch: refs/heads/master
Commit: e13ac598b48305080f19af32f475b95ab669dc3b
Parents: 2ed899d
Author: zentol <ch...@apache.org>
Authored: Thu Jan 5 16:18:38 2017 +0100
Committer: zentol <ch...@apache.org>
Committed: Fri Jan 6 12:53:40 2017 +0100
----------------------------------------------------------------------
.../streaming/state/RocksDBAsyncSnapshotTest.java | 8 --------
.../streaming/state/RocksDBStateBackendConfigTest.java | 13 +++----------
.../streaming/state/RocksDBStateBackendTest.java | 8 --------
3 files changed, 3 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/e13ac598/flink-contrib/flink-statebackend-rocksdb/src/test/java/org/apache/flink/contrib/streaming/state/RocksDBAsyncSnapshotTest.java
----------------------------------------------------------------------
diff --git a/flink-contrib/flink-statebackend-rocksdb/src/test/java/org/apache/flink/contrib/streaming/state/RocksDBAsyncSnapshotTest.java b/flink-contrib/flink-statebackend-rocksdb/src/test/java/org/apache/flink/contrib/streaming/state/RocksDBAsyncSnapshotTest.java
index f3da93e..002b16d 100644
--- a/flink-contrib/flink-statebackend-rocksdb/src/test/java/org/apache/flink/contrib/streaming/state/RocksDBAsyncSnapshotTest.java
+++ b/flink-contrib/flink-statebackend-rocksdb/src/test/java/org/apache/flink/contrib/streaming/state/RocksDBAsyncSnapshotTest.java
@@ -47,15 +47,12 @@ import org.apache.flink.streaming.runtime.tasks.OneInputStreamTask;
import org.apache.flink.streaming.runtime.tasks.OneInputStreamTaskTestHarness;
import org.apache.flink.streaming.runtime.tasks.StreamMockEnvironment;
import org.apache.flink.streaming.runtime.tasks.StreamTask;
-import org.apache.flink.util.OperatingSystem;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.LocalFileSystem;
import org.junit.Assert;
-import org.junit.Assume;
-import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -86,11 +83,6 @@ import static org.junit.Assert.assertNotNull;
@SuppressWarnings("serial")
public class RocksDBAsyncSnapshotTest {
- @Before
- public void checkOperatingSystem() {
- Assume.assumeTrue("This test can't run successfully on Windows.", !OperatingSystem.isWindows());
- }
-
/**
* This ensures that asynchronous state handles are actually materialized asynchronously.
*
http://git-wip-us.apache.org/repos/asf/flink/blob/e13ac598/flink-contrib/flink-statebackend-rocksdb/src/test/java/org/apache/flink/contrib/streaming/state/RocksDBStateBackendConfigTest.java
----------------------------------------------------------------------
diff --git a/flink-contrib/flink-statebackend-rocksdb/src/test/java/org/apache/flink/contrib/streaming/state/RocksDBStateBackendConfigTest.java b/flink-contrib/flink-statebackend-rocksdb/src/test/java/org/apache/flink/contrib/streaming/state/RocksDBStateBackendConfigTest.java
index a7bac4f..bc0777c 100644
--- a/flink-contrib/flink-statebackend-rocksdb/src/test/java/org/apache/flink/contrib/streaming/state/RocksDBStateBackendConfigTest.java
+++ b/flink-contrib/flink-statebackend-rocksdb/src/test/java/org/apache/flink/contrib/streaming/state/RocksDBStateBackendConfigTest.java
@@ -23,6 +23,7 @@ import org.apache.flink.api.common.JobID;
import org.apache.flink.api.common.TaskInfo;
import org.apache.flink.api.common.typeutils.base.IntSerializer;
import org.apache.flink.configuration.Configuration;
+import org.apache.flink.core.fs.Path;
import org.apache.flink.runtime.execution.Environment;
import org.apache.flink.runtime.io.disk.iomanager.IOManager;
import org.apache.flink.runtime.jobgraph.JobVertexID;
@@ -31,9 +32,6 @@ import org.apache.flink.runtime.state.AbstractStateBackend;
import org.apache.flink.runtime.state.KeyGroupRange;
import org.apache.flink.runtime.taskmanager.TaskManagerRuntimeInfo;
import org.apache.flink.runtime.util.TestingTaskManagerRuntimeInfo;
-import org.apache.flink.util.OperatingSystem;
-import org.junit.Assume;
-import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
@@ -70,11 +68,6 @@ public class RocksDBStateBackendConfigTest {
@Rule
public TemporaryFolder tempFolder = new TemporaryFolder();
- @Before
- public void checkOperatingSystem() {
- Assume.assumeTrue("This test can't run successfully on Windows.", !OperatingSystem.isWindows());
- }
-
// ------------------------------------------------------------------------
// RocksDB local file directory
// ------------------------------------------------------------------------
@@ -90,13 +83,13 @@ public class RocksDBStateBackendConfigTest {
assertNull(rocksDbBackend.getDbStoragePaths());
rocksDbBackend.setDbStoragePath(testDir1.getAbsolutePath());
- assertArrayEquals(new String[] { testDir1.getAbsolutePath() }, rocksDbBackend.getDbStoragePaths());
+ assertArrayEquals(new String[] { new Path(testDir1.getAbsolutePath()).toString() }, rocksDbBackend.getDbStoragePaths());
rocksDbBackend.setDbStoragePath(null);
assertNull(rocksDbBackend.getDbStoragePaths());
rocksDbBackend.setDbStoragePaths(testDir1.getAbsolutePath(), testDir2.getAbsolutePath());
- assertArrayEquals(new String[] { testDir1.getAbsolutePath(), testDir2.getAbsolutePath() }, rocksDbBackend.getDbStoragePaths());
+ assertArrayEquals(new String[] { new Path(testDir1.getAbsolutePath()).toString(), new Path(testDir2.getAbsolutePath()).toString() }, rocksDbBackend.getDbStoragePaths());
Environment env = getMockEnvironment();
RocksDBKeyedStateBackend<Integer> keyedBackend = (RocksDBKeyedStateBackend<Integer>) rocksDbBackend.
http://git-wip-us.apache.org/repos/asf/flink/blob/e13ac598/flink-contrib/flink-statebackend-rocksdb/src/test/java/org/apache/flink/contrib/streaming/state/RocksDBStateBackendTest.java
----------------------------------------------------------------------
diff --git a/flink-contrib/flink-statebackend-rocksdb/src/test/java/org/apache/flink/contrib/streaming/state/RocksDBStateBackendTest.java b/flink-contrib/flink-statebackend-rocksdb/src/test/java/org/apache/flink/contrib/streaming/state/RocksDBStateBackendTest.java
index 314717b..b474d3d 100644
--- a/flink-contrib/flink-statebackend-rocksdb/src/test/java/org/apache/flink/contrib/streaming/state/RocksDBStateBackendTest.java
+++ b/flink-contrib/flink-statebackend-rocksdb/src/test/java/org/apache/flink/contrib/streaming/state/RocksDBStateBackendTest.java
@@ -34,9 +34,6 @@ import org.apache.flink.runtime.state.VoidNamespace;
import org.apache.flink.runtime.state.VoidNamespaceSerializer;
import org.apache.flink.runtime.state.filesystem.FsStateBackend;
import org.apache.flink.runtime.state.memory.MemCheckpointStreamFactory;
-import org.apache.flink.util.OperatingSystem;
-import org.junit.Assume;
-import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
@@ -82,11 +79,6 @@ public class RocksDBStateBackendTest extends StateBackendTestBase<RocksDBStateBa
@Rule
public TemporaryFolder tempFolder = new TemporaryFolder();
- @Before
- public void checkOS() throws Exception {
- Assume.assumeTrue("This test can't run successfully on Windows.", !OperatingSystem.isWindows());
- }
-
@Override
protected RocksDBStateBackend getStateBackend() throws IOException {
String dbPath = tempFolder.newFolder().getAbsolutePath();