From ccb2da057c6e1a5d974240b8d5552405d9e0611e Mon Sep 17 00:00:00 2001 From: Maciej Grzenda Date: Wed, 22 Nov 2017 14:20:35 +0100 Subject: [PATCH 01/10] Update .travis.yml SAMOA-76: changes JDK used for Travis builds --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6cf1ad34..cf0952b0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ branches: - gh-pages jdk: -- oraclejdk7 +- openjdk7 install: - echo "apache.snapshots.https${SOSS_USERNAME}${SOSS_PASSWORD}" > ${HOME}/.m2/settings.xml From 4527a84be983f4bc669d6496ddc28de6e3c3bc8b Mon Sep 17 00:00:00 2001 From: Maciej Grzenda Date: Wed, 10 Jan 2018 14:14:26 +0100 Subject: [PATCH 02/10] SAMOA-76: updates Java settings for Travis --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index cf0952b0..793f0ee9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,5 +20,7 @@ notifications: env: global: + - _JAVA_OPTIONS='-Xmx3072m -Xms512m' - secure: "ZSWivIr1Km+EpH7rM4e+GGcDyEdlvkmUhF6nN5z1slDVlN3uL02VQuc8Kh7+5w/vaPVPzCdCLj0cGrW0EoXy+hSntOY52WRAkyFgvLRHX4hjmCfzR7Rdm6wxeyvfBdCDaVwwMYdK6ox5zsRQM1g6Zts2e/KrQt4gz5icWuil9Y0=" - secure: "hJ1W2jOaypXQzsXHXTpFrRW9sTaciXLomvJnzr4Kr66rqwdZqC8Gi77FEx4P3/5kSv0cmQdbPtuCHzfVTZ5eWRqOGENDapQIRheJUYGvrUGBtdT1/tcKAnMKUvVBeyela/sXEPg9/TtHX+52YuasHKMVGTSun9JYIkcJKas8UAE=" + From dc8fba49f890bd3d32def572739acbba96435cf4 Mon Sep 17 00:00:00 2001 From: Maciej Grzenda Date: Wed, 10 Jan 2018 14:30:21 +0100 Subject: [PATCH 03/10] SAMOA-76: updates Java settings for Travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 793f0ee9..5c8da050 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ notifications: env: global: - - _JAVA_OPTIONS='-Xmx3072m -Xms512m' + - _JAVA_OPTIONS='' - secure: "ZSWivIr1Km+EpH7rM4e+GGcDyEdlvkmUhF6nN5z1slDVlN3uL02VQuc8Kh7+5w/vaPVPzCdCLj0cGrW0EoXy+hSntOY52WRAkyFgvLRHX4hjmCfzR7Rdm6wxeyvfBdCDaVwwMYdK6ox5zsRQM1g6Zts2e/KrQt4gz5icWuil9Y0=" - secure: "hJ1W2jOaypXQzsXHXTpFrRW9sTaciXLomvJnzr4Kr66rqwdZqC8Gi77FEx4P3/5kSv0cmQdbPtuCHzfVTZ5eWRqOGENDapQIRheJUYGvrUGBtdT1/tcKAnMKUvVBeyela/sXEPg9/TtHX+52YuasHKMVGTSun9JYIkcJKas8UAE=" From 1e71ec4e18ad405dafefb4479c1a82a139ba38c9 Mon Sep 17 00:00:00 2001 From: Maciej Grzenda Date: Wed, 10 Jan 2018 14:46:06 +0100 Subject: [PATCH 04/10] SAMOA-76: updates Java settings for Travis --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5c8da050..9ec9db18 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,9 @@ branches: jdk: - openjdk7 +before_install: + - unset _JAVA_OPTIONS + install: - echo "apache.snapshots.https${SOSS_USERNAME}${SOSS_PASSWORD}" > ${HOME}/.m2/settings.xml #- cat ${HOME}/.m2/settings.xml @@ -20,7 +23,6 @@ notifications: env: global: - - _JAVA_OPTIONS='' - secure: "ZSWivIr1Km+EpH7rM4e+GGcDyEdlvkmUhF6nN5z1slDVlN3uL02VQuc8Kh7+5w/vaPVPzCdCLj0cGrW0EoXy+hSntOY52WRAkyFgvLRHX4hjmCfzR7Rdm6wxeyvfBdCDaVwwMYdK6ox5zsRQM1g6Zts2e/KrQt4gz5icWuil9Y0=" - secure: "hJ1W2jOaypXQzsXHXTpFrRW9sTaciXLomvJnzr4Kr66rqwdZqC8Gi77FEx4P3/5kSv0cmQdbPtuCHzfVTZ5eWRqOGENDapQIRheJUYGvrUGBtdT1/tcKAnMKUvVBeyela/sXEPg9/TtHX+52YuasHKMVGTSun9JYIkcJKas8UAE=" From b0dc26e6a392b867aa36697f53165ca9cc26ab2a Mon Sep 17 00:00:00 2001 From: Maciej Grzenda Date: Wed, 10 Jan 2018 15:03:22 +0100 Subject: [PATCH 05/10] SAMOA-76: updates Java settings for Travis --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 9ec9db18..4a724813 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,6 +23,7 @@ notifications: env: global: + - _JAVA_OPTIONS='-Xmx4096m' - secure: "ZSWivIr1Km+EpH7rM4e+GGcDyEdlvkmUhF6nN5z1slDVlN3uL02VQuc8Kh7+5w/vaPVPzCdCLj0cGrW0EoXy+hSntOY52WRAkyFgvLRHX4hjmCfzR7Rdm6wxeyvfBdCDaVwwMYdK6ox5zsRQM1g6Zts2e/KrQt4gz5icWuil9Y0=" - secure: "hJ1W2jOaypXQzsXHXTpFrRW9sTaciXLomvJnzr4Kr66rqwdZqC8Gi77FEx4P3/5kSv0cmQdbPtuCHzfVTZ5eWRqOGENDapQIRheJUYGvrUGBtdT1/tcKAnMKUvVBeyela/sXEPg9/TtHX+52YuasHKMVGTSun9JYIkcJKas8UAE=" From 26b0ba40770d9ed62b9508638d5f5a2528b55402 Mon Sep 17 00:00:00 2001 From: Maciej Grzenda Date: Wed, 10 Jan 2018 15:36:01 +0100 Subject: [PATCH 06/10] SAMOA-76: updates Java settings for Travis --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4a724813..95711b2f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,8 @@ language: java +sudo: required +dist: trusty + branches: except: - gh-pages @@ -7,9 +10,6 @@ branches: jdk: - openjdk7 -before_install: - - unset _JAVA_OPTIONS - install: - echo "apache.snapshots.https${SOSS_USERNAME}${SOSS_PASSWORD}" > ${HOME}/.m2/settings.xml #- cat ${HOME}/.m2/settings.xml @@ -23,7 +23,7 @@ notifications: env: global: - - _JAVA_OPTIONS='-Xmx4096m' + - _JAVA_OPTIONS='-Xmx3072m' - secure: "ZSWivIr1Km+EpH7rM4e+GGcDyEdlvkmUhF6nN5z1slDVlN3uL02VQuc8Kh7+5w/vaPVPzCdCLj0cGrW0EoXy+hSntOY52WRAkyFgvLRHX4hjmCfzR7Rdm6wxeyvfBdCDaVwwMYdK6ox5zsRQM1g6Zts2e/KrQt4gz5icWuil9Y0=" - secure: "hJ1W2jOaypXQzsXHXTpFrRW9sTaciXLomvJnzr4Kr66rqwdZqC8Gi77FEx4P3/5kSv0cmQdbPtuCHzfVTZ5eWRqOGENDapQIRheJUYGvrUGBtdT1/tcKAnMKUvVBeyela/sXEPg9/TtHX+52YuasHKMVGTSun9JYIkcJKas8UAE=" From d43afe282f6fe73b832a829cf6e5c64fbf3fcf58 Mon Sep 17 00:00:00 2001 From: Maciej Grzenda Date: Wed, 10 Jan 2018 15:59:59 +0100 Subject: [PATCH 07/10] SAMOA-76: fixing Travis build problems --- .../apache/samoa/streams/fs/HDFSFileStreamSourceTest.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/samoa-api/src/test/java/org/apache/samoa/streams/fs/HDFSFileStreamSourceTest.java b/samoa-api/src/test/java/org/apache/samoa/streams/fs/HDFSFileStreamSourceTest.java index f6846cdd..95ed7708 100644 --- a/samoa-api/src/test/java/org/apache/samoa/streams/fs/HDFSFileStreamSourceTest.java +++ b/samoa-api/src/test/java/org/apache/samoa/streams/fs/HDFSFileStreamSourceTest.java @@ -75,7 +75,9 @@ public void setUp() throws Exception { @After public void tearDown() throws Exception { + System.gc(); hdfsCluster.shutdown(); + System.gc(); } /* @@ -94,6 +96,7 @@ public void testInitWithSingleFileAndExtension() { String fn = streamSource.getFilePathAt(0); assertTrue("Incorrect file in filePaths.", fn.equals(BASE_DIR + "/1.txt") || fn.equals(hdfsURI + BASE_DIR + "1.txt")); + System.gc(); } @Test @@ -109,6 +112,7 @@ public void testInitWithSingleFileAndNullExtension() { String fn = streamSource.getFilePathAt(0); assertTrue("Incorrect file in filePaths.", fn.equals(BASE_DIR + "/1.txt") || fn.equals(hdfsURI + BASE_DIR + "1.txt")); + System.gc(); } @Test @@ -132,6 +136,7 @@ public void testInitWithFolderAndExtension() { String fn = streamSource.getFilePathAt(i); assertTrue("Incorrect file in filePaths:" + fn, filenames.contains(fn)); } + System.gc(); } @Test @@ -154,6 +159,7 @@ public void testInitWithFolderAndNullExtension() { String fn = streamSource.getFilePathAt(i); assertTrue("Incorrect file in filePaths:" + fn, filenames.contains(fn)); } + System.gc(); } /* @@ -195,6 +201,7 @@ public void testGetNextInputStream() { // assert that another call to getNextInputStream will return null assertNull("Call getNextInputStream after the last file did not return null.", streamSource.getNextInputStream()); + System.gc(); } /* @@ -219,6 +226,7 @@ public void testGetCurrentInputStream() { * reset tests */ public void testReset() { + System.gc(); // write input files & noise files writeSimpleFiles(BASE_DIR, "txt", NUM_FILES_IN_DIR); From 5ab0a9aed6c0669ec3a59c69947caa07a9cec6b3 Mon Sep 17 00:00:00 2001 From: Maciej Grzenda Date: Wed, 10 Jan 2018 16:34:41 +0100 Subject: [PATCH 08/10] SAMOA-76: updates Java settings for Travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 95711b2f..bb6cda63 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ branches: - gh-pages jdk: -- openjdk7 +- oraclejdk8 install: - echo "apache.snapshots.https${SOSS_USERNAME}${SOSS_PASSWORD}" > ${HOME}/.m2/settings.xml From d6051f805a29730f2d663f820fa4e5cfae8bc3ab Mon Sep 17 00:00:00 2001 From: Maciej Grzenda Date: Wed, 17 Jan 2018 11:36:28 +0100 Subject: [PATCH 09/10] SAMOA-76: Update Travis configuration --- .travis.yml | 4 ---- .../samoa/streams/fs/HDFSFileStreamSourceTest.java | 9 +-------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index bb6cda63..8a65a6d9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,5 @@ language: java -sudo: required -dist: trusty - branches: except: - gh-pages @@ -23,7 +20,6 @@ notifications: env: global: - - _JAVA_OPTIONS='-Xmx3072m' - secure: "ZSWivIr1Km+EpH7rM4e+GGcDyEdlvkmUhF6nN5z1slDVlN3uL02VQuc8Kh7+5w/vaPVPzCdCLj0cGrW0EoXy+hSntOY52WRAkyFgvLRHX4hjmCfzR7Rdm6wxeyvfBdCDaVwwMYdK6ox5zsRQM1g6Zts2e/KrQt4gz5icWuil9Y0=" - secure: "hJ1W2jOaypXQzsXHXTpFrRW9sTaciXLomvJnzr4Kr66rqwdZqC8Gi77FEx4P3/5kSv0cmQdbPtuCHzfVTZ5eWRqOGENDapQIRheJUYGvrUGBtdT1/tcKAnMKUvVBeyela/sXEPg9/TtHX+52YuasHKMVGTSun9JYIkcJKas8UAE=" diff --git a/samoa-api/src/test/java/org/apache/samoa/streams/fs/HDFSFileStreamSourceTest.java b/samoa-api/src/test/java/org/apache/samoa/streams/fs/HDFSFileStreamSourceTest.java index 95ed7708..0ce26698 100644 --- a/samoa-api/src/test/java/org/apache/samoa/streams/fs/HDFSFileStreamSourceTest.java +++ b/samoa-api/src/test/java/org/apache/samoa/streams/fs/HDFSFileStreamSourceTest.java @@ -75,9 +75,7 @@ public void setUp() throws Exception { @After public void tearDown() throws Exception { - System.gc(); hdfsCluster.shutdown(); - System.gc(); } /* @@ -96,7 +94,6 @@ public void testInitWithSingleFileAndExtension() { String fn = streamSource.getFilePathAt(0); assertTrue("Incorrect file in filePaths.", fn.equals(BASE_DIR + "/1.txt") || fn.equals(hdfsURI + BASE_DIR + "1.txt")); - System.gc(); } @Test @@ -112,7 +109,6 @@ public void testInitWithSingleFileAndNullExtension() { String fn = streamSource.getFilePathAt(0); assertTrue("Incorrect file in filePaths.", fn.equals(BASE_DIR + "/1.txt") || fn.equals(hdfsURI + BASE_DIR + "1.txt")); - System.gc(); } @Test @@ -136,7 +132,6 @@ public void testInitWithFolderAndExtension() { String fn = streamSource.getFilePathAt(i); assertTrue("Incorrect file in filePaths:" + fn, filenames.contains(fn)); } - System.gc(); } @Test @@ -159,7 +154,6 @@ public void testInitWithFolderAndNullExtension() { String fn = streamSource.getFilePathAt(i); assertTrue("Incorrect file in filePaths:" + fn, filenames.contains(fn)); } - System.gc(); } /* @@ -201,7 +195,6 @@ public void testGetNextInputStream() { // assert that another call to getNextInputStream will return null assertNull("Call getNextInputStream after the last file did not return null.", streamSource.getNextInputStream()); - System.gc(); } /* @@ -226,7 +219,6 @@ public void testGetCurrentInputStream() { * reset tests */ public void testReset() { - System.gc(); // write input files & noise files writeSimpleFiles(BASE_DIR, "txt", NUM_FILES_IN_DIR); @@ -309,3 +301,4 @@ private void writeSimpleFiles(String path, String ext, int numOfFiles) { } } + From af6e3023d2854535539026e6cc1d3f6ce0ca9af9 Mon Sep 17 00:00:00 2001 From: Maciej Grzenda Date: Wed, 17 Jan 2018 12:46:04 +0100 Subject: [PATCH 10/10] SAMOA-76: Update Travis configuration --- .../org/apache/samoa/streams/fs/HDFSFileStreamSourceTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/samoa-api/src/test/java/org/apache/samoa/streams/fs/HDFSFileStreamSourceTest.java b/samoa-api/src/test/java/org/apache/samoa/streams/fs/HDFSFileStreamSourceTest.java index 0ce26698..f6846cdd 100644 --- a/samoa-api/src/test/java/org/apache/samoa/streams/fs/HDFSFileStreamSourceTest.java +++ b/samoa-api/src/test/java/org/apache/samoa/streams/fs/HDFSFileStreamSourceTest.java @@ -301,4 +301,3 @@ private void writeSimpleFiles(String path, String ext, int numOfFiles) { } } -