You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rya.apache.org by pu...@apache.org on 2016/09/27 15:04:26 UTC
incubator-rya git commit: RYA-154 Decoupled Updater Configuration
from PCJ Configuration. Closes
Repository: incubator-rya
Updated Branches:
refs/heads/master db281030c -> 62c07940a
RYA-154 Decoupled Updater Configuration from PCJ Configuration. Closes
Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/62c07940
Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/62c07940
Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/62c07940
Branch: refs/heads/master
Commit: 62c07940a7c74f8883d93e910c6727e23ac8e90f
Parents: db28103
Author: Caleb Meier <me...@gmail.com>
Authored: Mon Aug 15 15:46:29 2016 -0400
Committer: pujav65 <pu...@gmail.com>
Committed: Tue Sep 27 11:03:13 2016 -0400
----------------------------------------------------------------------
.../java/mvm/rya/indexing/accumulo/ConfigUtils.java | 16 ++++++++++++----
.../org/apache/rya/indexing/pcj/fluo/ITBase.java | 1 +
2 files changed, 13 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/62c07940/extras/indexing/src/main/java/mvm/rya/indexing/accumulo/ConfigUtils.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/mvm/rya/indexing/accumulo/ConfigUtils.java b/extras/indexing/src/main/java/mvm/rya/indexing/accumulo/ConfigUtils.java
index 7540de4..01c76db 100644
--- a/extras/indexing/src/main/java/mvm/rya/indexing/accumulo/ConfigUtils.java
+++ b/extras/indexing/src/main/java/mvm/rya/indexing/accumulo/ConfigUtils.java
@@ -95,6 +95,7 @@ public class ConfigUtils {
public static final String USE_ENTITY = "sc.use_entity";
public static final String USE_PCJ = "sc.use_pcj";
public static final String USE_OPTIMAL_PCJ = "sc.use.optimal.pcj";
+ public static final String USE_PCJ_UPDATER_INDEX = "sc.use.updater";
public static final String FLUO_APP_NAME = "rya.indexing.pcj.fluo.fluoAppName";
public static final String USE_PCJ_FLUO_UPDATER = "rya.indexing.pcj.updater.fluo";
@@ -354,6 +355,10 @@ public class ConfigUtils {
public static boolean getUseOptimalPCJ(final Configuration conf) {
return conf.getBoolean(USE_OPTIMAL_PCJ, false);
}
+
+ public static boolean getUsePcjUpdaterIndex(final Configuration conf) {
+ return conf.getBoolean(USE_PCJ_UPDATER_INDEX, false);
+ }
/**
@@ -389,10 +394,13 @@ public class ConfigUtils {
}
} else {
- if (getUsePCJ(conf) || getUseOptimalPCJ(conf)) {
- conf.setPcjOptimizer(PCJOptimizer.class);
- indexList.add(PrecomputedJoinIndexer.class.getName());
- }
+ if (getUsePCJ(conf) || getUseOptimalPCJ(conf)) {
+ conf.setPcjOptimizer(PCJOptimizer.class);
+ }
+
+ if(getUsePcjUpdaterIndex(conf)) {
+ indexList.add(PrecomputedJoinIndexer.class.getName());
+ }
if (getUseGeo(conf)) {
indexList.add(GeoMesaGeoIndexer.class.getName());
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/62c07940/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/ITBase.java
----------------------------------------------------------------------
diff --git a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/ITBase.java b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/ITBase.java
index 50ac73c..93968e4 100644
--- a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/ITBase.java
+++ b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/ITBase.java
@@ -376,6 +376,7 @@ public abstract class ITBase {
conf.set(ConfigUtils.CLOUDBASE_INSTANCE, instanceName);
conf.set(ConfigUtils.CLOUDBASE_ZOOKEEPERS, zookeepers);
conf.set(ConfigUtils.USE_PCJ, "true");
+ conf.set(ConfigUtils.USE_PCJ_UPDATER_INDEX, "true");
conf.set(ConfigUtils.USE_PCJ_FLUO_UPDATER, "true");
conf.set(ConfigUtils.FLUO_APP_NAME, appName);
conf.set(ConfigUtils.PCJ_STORAGE_TYPE,