Repository: phoenix Updated Branches: refs/heads/omid2 0fcca0a76 -> 5728e183f
add omid coprocessor classes to phoenix-server. default tso world_time. fix omid run script parameters Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/5728e183 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/5728e183 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/5728e183 Branch: refs/heads/omid2 Commit: 5728e183fdb4cbec5aed6c01bf958611733bef4d Parents: 0fcca0a Author: Yonatan Gottesman <yonig...@gmail.com> Authored: Sun Nov 4 09:03:31 2018 +0200 Committer: James Taylor <jamestay...@apache.org> Committed: Tue Nov 6 07:16:59 2018 -0800 ---------------------------------------------------------------------- bin/omid-env.sh | 22 +++++++++++++++++++--- bin/omid-server-configuration.yml | 3 +++ phoenix-server/pom.xml | 1 + 3 files changed, 23 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/5728e183/bin/omid-env.sh ---------------------------------------------------------------------- diff --git a/bin/omid-env.sh b/bin/omid-env.sh index 578382c..820cdaa 100644 --- a/bin/omid-env.sh +++ b/bin/omid-env.sh @@ -21,7 +21,23 @@ # --------------------------------------------------------------------------------------------------------------------- # Check if HADOOP_CONF_DIR and HBASE_CONF_DIR are set # --------------------------------------------------------------------------------------------------------------------- +export JVM_FLAGS=-Xmx4096m +if [ -z ${HADOOP_CONF_DIR+x} ]; then + if [ -z ${HADOOP_HOME+x} ]; then + echo "WARNING: HADOOP_HOME or HADOOP_CONF_DIR are unset"; + else + export HADOOP_CONF_DIR=${HADOOP_HOME}/conf + fi +else + echo "HADOOP_CONF_DIR is set to '$HADOOP_CONF_DIR'"; +fi -if [ -z ${HADOOP_CONF_DIR+x} ]; then echo "WARNING: HADOOP_CONF_DIR is unset"; else echo "HADOOP_CONF_DIR is set to '$HADOOP_CONF_DIR'"; fi -if [ -z ${HBASE_CONF_DIR+x} ]; then echo "WARNING: HBASE_CONF_DIR is unset"; else echo "HBASE_CONF_DIR is set to '$HBASE_CONF_DIR'"; fi - +if [ -z ${HBASE_CONF_DIR+x} ]; then + if [ -z ${HBASE_HOME+x} ]; then + echo "WARNING: HBASE_HOME or HBASE_CONF_DIR are unset"; + else + export HBASE_CONF_DIR=${HBASE_HOME}/conf + fi +else + echo "HBASE_CONF_DIR is set to '$HBASE_CONF_DIR'"; +fi http://git-wip-us.apache.org/repos/asf/phoenix/blob/5728e183/bin/omid-server-configuration.yml ---------------------------------------------------------------------- diff --git a/bin/omid-server-configuration.yml b/bin/omid-server-configuration.yml index ab80667..8d1616e 100644 --- a/bin/omid-server-configuration.yml +++ b/bin/omid-server-configuration.yml @@ -20,3 +20,6 @@ metrics: !!org.apache.omid.metrics.CodahaleMetricsProvider [ csvDir: "csvMetrics", } ] + +timestampType: WORLD_TIME +lowLatency: false http://git-wip-us.apache.org/repos/asf/phoenix/blob/5728e183/phoenix-server/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-server/pom.xml b/phoenix-server/pom.xml index f5ba7f7..daf9fe5 100644 --- a/phoenix-server/pom.xml +++ b/phoenix-server/pom.xml @@ -125,6 +125,7 @@ <include>org.iq80.snappy:snappy</include> <include>org.antlr:antlr*</include> <include>org.apache.tephra:tephra*</include> + <include>org.apache.omid:omid*</include> <include>com.google.code.gson:gson</include> <include>org.jruby.joni:joni</include> <include>org.jruby.jcodings:jcodings</include>
