You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fluo.apache.org by mw...@apache.org on 2016/07/26 19:28:16 UTC
[1/2] incubator-fluo-recipes git commit: Closes #94 - Update pom to
use new Fluo parent
Repository: incubator-fluo-recipes
Updated Branches:
refs/heads/master 58d6d9fb8 -> e86ab10da
Closes #94 - Update pom to use new Fluo parent
* Converted a do-while statemnt to while to avoid checkstyle error
* Fix properties in POM used to start MiniAccumulo instance
* Updated snapshots repo to Apache server
Project: http://git-wip-us.apache.org/repos/asf/incubator-fluo-recipes/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fluo-recipes/commit/ab0b5573
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fluo-recipes/tree/ab0b5573
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fluo-recipes/diff/ab0b5573
Branch: refs/heads/master
Commit: ab0b5573eef7d39a4d032202a711b9ac172e7531
Parents: 58d6d9f
Author: Mike Walch <mw...@gmail.com>
Authored: Tue Jul 26 09:54:42 2016 -0400
Committer: Mike Walch <mw...@gmail.com>
Committed: Tue Jul 26 15:22:19 2016 -0400
----------------------------------------------------------------------
.../fluo/recipes/spark/FluoSparkHelper.java | 11 +++++---
pom.xml | 27 ++++----------------
2 files changed, 13 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-fluo-recipes/blob/ab0b5573/modules/spark/src/main/java/org/apache/fluo/recipes/spark/FluoSparkHelper.java
----------------------------------------------------------------------
diff --git a/modules/spark/src/main/java/org/apache/fluo/recipes/spark/FluoSparkHelper.java b/modules/spark/src/main/java/org/apache/fluo/recipes/spark/FluoSparkHelper.java
index a24aa48..ae57e91 100644
--- a/modules/spark/src/main/java/org/apache/fluo/recipes/spark/FluoSparkHelper.java
+++ b/modules/spark/src/main/java/org/apache/fluo/recipes/spark/FluoSparkHelper.java
@@ -275,13 +275,18 @@ public class FluoSparkHelper {
}
}
+ private Path getPossibleTempDir() {
+ return new Path(tempBaseDir.toString() + "/" + tempDirCounter.getAndIncrement());
+ }
+
private Path getTempDir(BulkImportOptions opts) {
Path tempDir;
if (opts.tempDir == null) {
try {
- do {
- tempDir = new Path(tempBaseDir.toString() + "/" + tempDirCounter.getAndIncrement());
- } while (hdfs.exists(tempDir));
+ tempDir = getPossibleTempDir();
+ while (hdfs.exists(tempDir)) {
+ tempDir = getPossibleTempDir();
+ }
} catch (IOException e) {
throw new IllegalStateException(e);
}
http://git-wip-us.apache.org/repos/asf/incubator-fluo-recipes/blob/ab0b5573/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9a90a1d..430e67f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,9 +16,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>io.fluo</groupId>
- <artifactId>fluo-io-parent</artifactId>
- <version>2</version>
+ <groupId>org.apache.fluo</groupId>
+ <artifactId>fluo-parent</artifactId>
+ <version>1-SNAPSHOT</version>
</parent>
<groupId>org.apache.fluo</groupId>
<artifactId>fluo-recipes-parent</artifactId>
@@ -215,22 +215,6 @@
</dependency>
</dependencies>
</dependencyManagement>
- <repositories>
- <repository>
- <releases>
- <enabled>false</enabled>
- <updatePolicy>never</updatePolicy>
- <checksumPolicy>fail</checksumPolicy>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>daily</updatePolicy>
- <checksumPolicy>fail</checksumPolicy>
- </snapshots>
- <id>sonatype-nexus-snapshots</id>
- <url>https://oss.sonatype.org/content/repositories/snapshots</url>
- </repository>
- </repositories>
<build>
<pluginManagement>
<plugins>
@@ -249,8 +233,8 @@
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<systemPropertyVariables>
- <org.apache.fluo.it.instance.name>it-instance-maven</org.apache.fluo.it.instance.name>
- <org.apache.fluo.it.instance.clear>false</org.apache.fluo.it.instance.clear>
+ <fluo.it.instance.name>it-instance-maven</fluo.it.instance.name>
+ <fluo.it.instance.clear>false</fluo.it.instance.clear>
</systemPropertyVariables>
</configuration>
</plugin>
@@ -312,7 +296,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.10</version>
<executions>
<execution>
<id>analyze</id>
[2/2] incubator-fluo-recipes git commit: Merge branch 'fr-94'
Posted by mw...@apache.org.
Merge branch 'fr-94'
Project: http://git-wip-us.apache.org/repos/asf/incubator-fluo-recipes/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fluo-recipes/commit/e86ab10d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fluo-recipes/tree/e86ab10d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fluo-recipes/diff/e86ab10d
Branch: refs/heads/master
Commit: e86ab10daf83ddecf1b3a13bcd1f14f9001387f2
Parents: 58d6d9f ab0b557
Author: Mike Walch <mw...@gmail.com>
Authored: Tue Jul 26 15:26:26 2016 -0400
Committer: Mike Walch <mw...@gmail.com>
Committed: Tue Jul 26 15:26:26 2016 -0400
----------------------------------------------------------------------
.../fluo/recipes/spark/FluoSparkHelper.java | 11 +++++---
pom.xml | 27 ++++----------------
2 files changed, 13 insertions(+), 25 deletions(-)
----------------------------------------------------------------------