You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sdap.apache.org by ea...@apache.org on 2020/08/05 23:52:35 UTC
[incubator-sdap-nexus] branch cassandra-authentication updated:
remove skipcassandra and skipsolr
This is an automated email from the ASF dual-hosted git repository.
eamonford pushed a commit to branch cassandra-authentication
in repository https://gitbox.apache.org/repos/asf/incubator-sdap-nexus.git
The following commit(s) were added to refs/heads/cassandra-authentication by this push:
new 17fc911 remove skipcassandra and skipsolr
17fc911 is described below
commit 17fc911d784c055fda9616ea334a7015da62ed56
Author: Eamon Ford <ea...@gmail.com>
AuthorDate: Wed Aug 5 16:52:24 2020 -0700
remove skipcassandra and skipsolr
---
analysis/webservice/algorithms/NexusCalcHandler.py | 8 +-------
.../webservice/algorithms_spark/DailyDifferenceAverageSpark.py | 2 +-
analysis/webservice/algorithms_spark/Matchup.py | 2 +-
3 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/analysis/webservice/algorithms/NexusCalcHandler.py b/analysis/webservice/algorithms/NexusCalcHandler.py
index bea0842..74f5bf7 100644
--- a/analysis/webservice/algorithms/NexusCalcHandler.py
+++ b/analysis/webservice/algorithms/NexusCalcHandler.py
@@ -22,13 +22,7 @@ class NexusCalcHandler(object):
if "params" not in cls.__dict__:
raise Exception("Property 'params' has not been defined")
- def __init__(self, tile_service_factory, skipCassandra=False, skipSolr=False):
- # self.algorithm_config = algorithm_config
- # self._skipCassandra = skipCassandra
- # self._skipSolr = skipSolr
- # self._tile_service = NexusTileService(skipDatastore=self._skipCassandra,
- # skipMetadatastore=self._skipSolr,
- # config=self.algorithm_config)
+ def __init__(self, tile_service_factory, **kwargs):
self._tile_service_factory = tile_service_factory
self._tile_service = tile_service_factory()
diff --git a/analysis/webservice/algorithms_spark/DailyDifferenceAverageSpark.py b/analysis/webservice/algorithms_spark/DailyDifferenceAverageSpark.py
index 344927f..7ac3f34 100644
--- a/analysis/webservice/algorithms_spark/DailyDifferenceAverageSpark.py
+++ b/analysis/webservice/algorithms_spark/DailyDifferenceAverageSpark.py
@@ -72,7 +72,7 @@ class DailyDifferenceAverageNexusImplSpark(NexusCalcSparkHandler):
singleton = True
def __init__(self, **kwargs):
- NexusCalcSparkHandler.__init__(self, skipCassandra=True, **kwargs)
+ NexusCalcSparkHandler.__init__(self, **kwargs)
self.log = logging.getLogger(__name__)
def parse_arguments(self, request):
diff --git a/analysis/webservice/algorithms_spark/Matchup.py b/analysis/webservice/algorithms_spark/Matchup.py
index 9ae7557..fc90aa1 100644
--- a/analysis/webservice/algorithms_spark/Matchup.py
+++ b/analysis/webservice/algorithms_spark/Matchup.py
@@ -132,7 +132,7 @@ class Matchup(NexusCalcSparkHandler):
singleton = True
def __init__(self, algorithm_config=None, sc=None):
- NexusCalcSparkHandler.__init__(self, algorithm_config=algorithm_config, sc=sc, skipCassandra=True)
+ NexusCalcSparkHandler.__init__(self, algorithm_config=algorithm_config, sc=sc)
self.log = logging.getLogger(__name__)
def parse_arguments(self, request):