You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sdap.apache.org by sk...@apache.org on 2022/09/02 19:09:32 UTC
[incubator-sdap-nexus] branch matchup-bugfix created (now f85af28)
This is an automated email from the ASF dual-hosted git repository.
skperez pushed a change to branch matchup-bugfix
in repository https://gitbox.apache.org/repos/asf/incubator-sdap-nexus.git
at f85af28 renamed 'details' field for matchup doms to match cdms changes
This branch includes the following new commits:
new 71e2766 Added environment variable to Dockerfile to fix cert error
new 3816909 Updated openapi spec to link to cdmsschema endpoint
new eb049e0 Fixed matchup db insert. Use new names
new f85af28 renamed 'details' field for matchup doms to match cdms changes
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[incubator-sdap-nexus] 01/04: Added environment variable to Dockerfile to fix cert error
Posted by sk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
skperez pushed a commit to branch matchup-bugfix
in repository https://gitbox.apache.org/repos/asf/incubator-sdap-nexus.git
commit 71e2766469d44b16d7e6db0896eebb3e2741ce82
Author: skorper <st...@gmail.com>
AuthorDate: Fri Sep 2 12:06:46 2022 -0700
Added environment variable to Dockerfile to fix cert error
---
docker/nexus-webapp/Dockerfile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/docker/nexus-webapp/Dockerfile b/docker/nexus-webapp/Dockerfile
index fc58e79..afb3b17 100644
--- a/docker/nexus-webapp/Dockerfile
+++ b/docker/nexus-webapp/Dockerfile
@@ -32,7 +32,8 @@ ENV \
SPARK_HOME=/opt/spark \
PYSPARK_DRIVER_PYTHON=/opt/conda/bin/python3.8 \
PYSPARK_PYTHON=/opt/conda/bin/python3.8 \
- LD_LIBRARY_PATH=/usr/lib
+ LD_LIBRARY_PATH=/usr/lib \
+ REQUESTS_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt
RUN apk add --update --no-cache \
bzip2 \
[incubator-sdap-nexus] 04/04: renamed 'details' field for matchup doms to match cdms changes
Posted by sk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
skperez pushed a commit to branch matchup-bugfix
in repository https://gitbox.apache.org/repos/asf/incubator-sdap-nexus.git
commit f85af2813f7983a5030bd726d1b45661c7cc78db
Author: skorper <st...@gmail.com>
AuthorDate: Fri Sep 2 12:08:53 2022 -0700
renamed 'details' field for matchup doms to match cdms changes
---
analysis/webservice/algorithms_spark/MatchupDoms.py | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/analysis/webservice/algorithms_spark/MatchupDoms.py b/analysis/webservice/algorithms_spark/MatchupDoms.py
index 97b3b9e..114b08b 100644
--- a/analysis/webservice/algorithms_spark/MatchupDoms.py
+++ b/analysis/webservice/algorithms_spark/MatchupDoms.py
@@ -266,10 +266,8 @@ class MatchupDoms(NexusCalcSparkHandler):
total_values = sum(len(v) for v in spark_result.values())
details = {
"timeToComplete": int((end - start).total_seconds()),
- "numInSituRecords": 0,
- "numInSituMatched": total_values,
- "numGriddedChecked": 0,
- "numGriddedMatched": total_keys
+ "numSecondaryMatched": total_values,
+ "numPrimaryMatched": total_keys
}
matches = MatchupDoms.convert_to_matches(spark_result)
[incubator-sdap-nexus] 02/04: Updated openapi spec to link to cdmsschema endpoint
Posted by sk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
skperez pushed a commit to branch matchup-bugfix
in repository https://gitbox.apache.org/repos/asf/incubator-sdap-nexus.git
commit 3816909677fd7bc94646c23c85e414173cbba92d
Author: skorper <st...@gmail.com>
AuthorDate: Fri Sep 2 12:07:58 2022 -0700
Updated openapi spec to link to cdmsschema endpoint
---
analysis/webservice/apidocs/openapi.yml | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/analysis/webservice/apidocs/openapi.yml b/analysis/webservice/apidocs/openapi.yml
index 18de2f2..6cdfd2a 100644
--- a/analysis/webservice/apidocs/openapi.yml
+++ b/analysis/webservice/apidocs/openapi.yml
@@ -78,7 +78,11 @@ paths:
example: -45,15,-30,30
- in: query
name: platforms
- description: Platforms to include for matchup consideration. Platform depends on which insitu dataset is selected. See `/get_cdms_schema` endpoint for a list of valid platform ids.
+ description: |
+ Platforms to include for matchup consideration. Platform
+ depends on which insitu dataset is selected. See
+ [/get_cdms_schema](https://doms.jpl.nasa.gov/insitu/1.0/cdms_schema)
+ endpoint for a list of valid platform ids.
required: true
schema:
type: string
@@ -124,8 +128,9 @@ paths:
name: parameter
description: |
The parameter of interest used for the match up. This is
- only used for insitu measurements. See `/cdmsschema` endpoint
- for a list of valid options.
+ only used for insitu measurements. See
+ [/get_cdms_schema](https://doms.jpl.nasa.gov/insitu/1.0/cdms_schema)
+ endpoint for a list of valid options.
required: false
schema:
type: string
[incubator-sdap-nexus] 03/04: Fixed matchup db insert. Use new names
Posted by sk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
skperez pushed a commit to branch matchup-bugfix
in repository https://gitbox.apache.org/repos/asf/incubator-sdap-nexus.git
commit eb049e00a119af27aea0c04d4886f251c40f8974
Author: skorper <st...@gmail.com>
AuthorDate: Fri Sep 2 12:08:24 2022 -0700
Fixed matchup db insert. Use new names
---
analysis/webservice/algorithms/doms/ResultsStorage.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/analysis/webservice/algorithms/doms/ResultsStorage.py b/analysis/webservice/algorithms/doms/ResultsStorage.py
index e9005b7..a228737 100644
--- a/analysis/webservice/algorithms/doms/ResultsStorage.py
+++ b/analysis/webservice/algorithms/doms/ResultsStorage.py
@@ -145,10 +145,10 @@ class ResultsStorage(AbstractResultsContainer):
"""
self._session.execute(cql, (
execution_id,
- stats["numGriddedMatched"],
- stats["numGriddedChecked"],
- stats["numInSituMatched"],
- stats["numInSituRecords"],
+ stats["numPrimaryMatched"],
+ None,
+ stats["numSecondaryMatched"],
+ None,
stats["timeToComplete"]
))