You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rya.apache.org by ca...@apache.org on 2017/08/16 19:37:43 UTC
incubator-rya git commit: RYA-343 Fixed rya.api connection issue for
PCJ-enabled rya table. Closes #205.
Repository: incubator-rya
Updated Branches:
refs/heads/master 637e3ff35 -> 34ff001d5
RYA-343 Fixed rya.api connection issue for PCJ-enabled rya table. Closes #205.
Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/34ff001d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/34ff001d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/34ff001d
Branch: refs/heads/master
Commit: 34ff001d59a0ce02cd8d38d5ee0ef94e3d50b0cf
Parents: 637e3ff
Author: jdasch <jd...@localhost.localdomain>
Authored: Mon Aug 14 15:21:10 2017 -0400
Committer: Caleb Meier <ca...@parsons.com>
Committed: Wed Aug 16 12:36:48 2017 -0700
----------------------------------------------------------------------
.../rya/api/instance/ConfigurationFields.java | 1 +
.../api/instance/RyaDetailsToConfiguration.java | 24 +++++++++++---------
2 files changed, 14 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/34ff001d/common/rya.api/src/main/java/org/apache/rya/api/instance/ConfigurationFields.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/instance/ConfigurationFields.java b/common/rya.api/src/main/java/org/apache/rya/api/instance/ConfigurationFields.java
index b236d30..086c3fb 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/instance/ConfigurationFields.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/instance/ConfigurationFields.java
@@ -34,4 +34,5 @@ class ConfigurationFields {
static final String USE_PCJ_UPDATER = "sc.use.updater";
static final String FLUO_APP_NAME = "rya.indexing.pcj.fluo.fluoAppName";
static final String PCJ_UPDATER_TYPE = "rya.indexing.pcj.updaterType";
+ static final String PCJ_STORAGE_TYPE = "rya.indexing.pcj.storageType";
}
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/34ff001d/common/rya.api/src/main/java/org/apache/rya/api/instance/RyaDetailsToConfiguration.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/instance/RyaDetailsToConfiguration.java b/common/rya.api/src/main/java/org/apache/rya/api/instance/RyaDetailsToConfiguration.java
index b26fb10..2605906 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/instance/RyaDetailsToConfiguration.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/instance/RyaDetailsToConfiguration.java
@@ -20,15 +20,15 @@ package org.apache.rya.api.instance;
import static java.util.Objects.requireNonNull;
-import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
-import edu.umd.cs.findbugs.annotations.NonNull;
-
import org.apache.hadoop.conf.Configuration;
import org.apache.log4j.Logger;
import org.apache.rya.api.instance.RyaDetails.PCJIndexDetails;
import com.google.common.base.Optional;
+import edu.umd.cs.findbugs.annotations.DefaultAnnotation;
+import edu.umd.cs.findbugs.annotations.NonNull;
+
/**
* Used to fetch {@link RyaDetails} from a {@link RyaDetailsRepository} and
* add them to the application's {@link Configuration}.
@@ -53,14 +53,16 @@ public class RyaDetailsToConfiguration {
checkAndSet(conf, ConfigurationFields.USE_FREETEXT, details.getFreeTextIndexDetails().isEnabled());
//RYA-215 checkAndSet(conf, ConfigurationFields.USE_GEO, details.getGeoIndexDetails().isEnabled());
checkAndSet(conf, ConfigurationFields.USE_TEMPORAL, details.getTemporalIndexDetails().isEnabled());
- PCJIndexDetails pcjDetails = details.getPCJIndexDetails();
- if (pcjDetails.isEnabled() && pcjDetails.getFluoDetails().isPresent()) {
- checkAndSet(conf, ConfigurationFields.USE_PCJ_UPDATER, true);
- conf.set(ConfigurationFields.FLUO_APP_NAME, pcjDetails.getFluoDetails().get().getUpdateAppName());
- conf.set(ConfigurationFields.PCJ_UPDATER_TYPE, "FLUO");
- } else {
- checkAndSet(conf, ConfigurationFields.USE_PCJ_UPDATER, false);
- }
+ final PCJIndexDetails pcjDetails = details.getPCJIndexDetails();
+ if (pcjDetails.isEnabled() && pcjDetails.getFluoDetails().isPresent()) {
+ checkAndSet(conf, ConfigurationFields.USE_PCJ_UPDATER, true);
+ conf.set(ConfigurationFields.FLUO_APP_NAME, pcjDetails.getFluoDetails().get().getUpdateAppName());
+ conf.set(ConfigurationFields.PCJ_UPDATER_TYPE, "FLUO");
+ conf.set(ConfigurationFields.PCJ_STORAGE_TYPE, "ACCUMULO");
+ } else {
+ checkAndSet(conf, ConfigurationFields.USE_PCJ_UPDATER, false);
+ conf.set(ConfigurationFields.PCJ_UPDATER_TYPE, "NO_UPDATE");
+ }
}
/**