Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Open Subsurface Data Universe Software
Platform
System
Search
Commits
e7a48963
Commit
e7a48963
authored
Jul 06, 2021
by
neelesh thakur
Browse files
Merge branch 'master' into sort-mulitfield
parents
a6fe77c5
ccfbf697
Pipeline
#50699
passed with stages
in 44 minutes and 38 seconds
Changes
4
Pipelines
5
Hide whitespace changes
Inline
Side-by-side
provider/search-azure/pom.xml
View file @
e7a48963
...
...
@@ -36,7 +36,7 @@
<failOnMissingWebXml>
false
</failOnMissingWebXml>
<project.main.basedir>
${project.parent.basedir}
</project.main.basedir>
<springboot.version>
2.1.7.RELEASE
</springboot.version>
<osdu.corelibazure.version>
0.
9.0
</osdu.corelibazure.version>
<osdu.corelibazure.version>
0.
10.0-rc8
</osdu.corelibazure.version>
<osdu.oscorecommon.version>
0.9.0
</osdu.oscorecommon.version>
<osdu.search-core.version>
0.10.0-SNAPSHOT
</osdu.search-core.version>
<spatial4j.version>
0.7
</spatial4j.version>
...
...
search-core/src/main/java/org/opengroup/osdu/search/service/EntitlementsAndCacheServiceImpl.java
View file @
e7a48963
...
...
@@ -149,7 +149,7 @@ public class EntitlementsAndCacheServiceImpl implements IEntitlementsExtensionSe
try
{
groups
=
service
.
getGroups
();
this
.
cache
.
put
(
cacheKey
,
groups
);
this
.
logger
.
info
(
"Entitlements cache miss"
);
this
.
logger
.
debug
(
"Entitlements cache miss"
);
}
catch
(
EntitlementsException
e
)
{
e
.
printStackTrace
();
HttpResponse
response
=
e
.
getHttpResponse
();
...
...
search-core/src/main/java/org/opengroup/osdu/search/smart/models/AttributeCollection.java
View file @
e7a48963
...
...
@@ -90,7 +90,7 @@ public class AttributeCollection {
for
(
Attribute
attr
:
attributes
)
{
String
cacheKey
=
String
.
format
(
"%s-%s-%s"
,
searchConfigurationProperties
.
getDeployedServiceId
(),
this
.
headersInfo
.
getPartitionId
(),
attr
.
getName
());
log
.
info
(
String
.
format
(
"updating the cache with key: %s"
,
cacheKey
));
log
.
debug
(
String
.
format
(
"updating the cache with key: %s"
,
cacheKey
));
Set
<
String
>
attrVals
=
new
HashSet
<>();
for
(
String
fieldName
:
attr
.
getSchemaMapping
())
{
attrVals
.
addAll
(
this
.
getTermAggregationForField
(
"by_"
+
fieldName
,
fieldName
));
...
...
@@ -194,7 +194,7 @@ public class AttributeCollection {
if
(
response
.
getResponseCode
()
!=
200
)
log
.
warning
(
String
.
format
(
"Failed to update field: %s | indices: %s"
,
fieldName
,
indicesSet
));
else
log
.
info
(
String
.
format
(
"Updated field: %s | indices: %s"
,
fieldName
,
indicesSet
));
log
.
debug
(
String
.
format
(
"Updated field: %s | indices: %s"
,
fieldName
,
indicesSet
));
}
}
...
...
search-core/src/main/java/org/opengroup/osdu/search/smart/models/Kinds.java
View file @
e7a48963
...
...
@@ -78,7 +78,7 @@ public class Kinds {
public
void
cacheSync
()
throws
IOException
{
String
cacheKey
=
String
.
format
(
"%s-%s"
,
configurationProperties
.
getDeployedServiceId
(),
this
.
headersInfo
.
getPartitionId
());
log
.
info
(
String
.
format
(
"updating the cache with key: %s"
,
cacheKey
));
log
.
debug
(
String
.
format
(
"updating the cache with key: %s"
,
cacheKey
));
Set
<
String
>
kindVals
=
this
.
getTermAggregation
(
"by_kind"
,
RecordMetaAttribute
.
KIND
.
getValue
());
this
.
cache
.
put
(
cacheKey
,
kindVals
);
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment