Skip to content
GitLab
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
ee5c9ada
Commit
ee5c9ada
authored
Aug 23, 2021
by
Bill Wang
Browse files
update
parent
2af933d7
Changes
3
Hide whitespace changes
Inline
Side-by-side
provider/search-aws/src/main/java/org/opengroup/osdu/search/provider/aws/cache/CursorCacheImpl.java
View file @
ee5c9ada
...
...
@@ -26,8 +26,18 @@ import org.opengroup.osdu.core.common.model.search.CursorSettings;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.stereotype.Component
;
import
java.util.Map
;
@Component
public
class
CursorCacheImpl
implements
CursorCache
{
@Value
(
"${aws.elasticache.cluster.cursor.endpoint}"
)
String
REDIS_SEARCH_HOST
;
@Value
(
"${aws.elasticache.cluster.cursor.port}"
)
String
REDIS_SEARCH_PORT
;
@Value
(
"${aws.elasticache.cluster.cursor.key}"
)
String
REDIS_SEARCH_KEY
;
@Value
(
"${aws.elasticache.cluster.cursor.expiration}"
)
String
INDEX_CACHE_EXPIRATION
;
private
ICache
<
String
,
CursorSettings
>
cache
;
private
Boolean
local
;
...
...
@@ -46,7 +56,7 @@ public class CursorCacheImpl implements CursorCache {
*
* @param INDEX_CACHE_EXPIRATION - the expiration time for the Cursor Cache Redis cluster.
*/
public
CursorCacheImpl
(
@Value
(
"${aws.elasticache.cluster.cursor.expiration}"
)
final
String
INDEX_CACHE_EXPIRATION
)
throws
K8sParameterNotFoundException
,
JsonProcessingException
{
public
CursorCacheImpl
()
throws
K8sParameterNotFoundException
,
JsonProcessingException
{
int
expTimeSeconds
=
Integer
.
parseInt
(
INDEX_CACHE_EXPIRATION
)
*
60
;
K8sLocalParameterProvider
provider
=
new
K8sLocalParameterProvider
();
if
(
provider
.
getLocalMode
()){
...
...
@@ -55,10 +65,15 @@ public class CursorCacheImpl implements CursorCache {
}
this
.
cache
=
new
VmCache
<>(
expTimeSeconds
,
10
);
}
else
{
String
host
=
provider
.
getParameterAsString
(
"CACHE_CLUSTER_ENDPOINT"
);
int
port
=
Integer
.
parseInt
(
provider
.
getParameterAsString
(
"CACHE_CLUSTER_PORT"
));
String
password
=
provider
.
getCredentialsAsMap
(
"CACHE_CLUSTER_KEY"
).
get
(
"token"
);
String
host
=
provider
.
getParameterAsStringOrDefault
(
"CACHE_CLUSTER_ENDPOINT"
,
REDIS_SEARCH_HOST
);
int
port
=
Integer
.
parseInt
(
provider
.
getParameterAsStringOrDefault
(
"CACHE_CLUSTER_PORT"
,
REDIS_SEARCH_PORT
));
Map
<
String
,
String
>
credential
=
provider
.
getCredentialsAsMap
(
"CACHE_CLUSTER_KEY"
);
String
password
;
if
(
credential
!=
null
){
password
=
credential
.
get
(
"token"
);
}
else
{
password
=
REDIS_SEARCH_KEY
;
}
cache
=
new
RedisCache
(
host
,
port
,
password
,
expTimeSeconds
,
String
.
class
,
CursorSettings
.
class
);
}
local
=
cache
.
getClass
()
!=
RedisCache
.
class
;
...
...
provider/search-aws/src/main/java/org/opengroup/osdu/search/provider/aws/cache/FieldTypeMappingCacheImpl.java
View file @
ee5c9ada
...
...
@@ -30,7 +30,14 @@ import java.util.Map;
@Component
public
class
FieldTypeMappingCacheImpl
implements
IFieldTypeMappingCache
{
@Value
(
"${aws.elasticache.cluster.cursor.endpoint}"
)
String
REDIS_SEARCH_HOST
;
@Value
(
"${aws.elasticache.cluster.cursor.port}"
)
String
REDIS_SEARCH_PORT
;
@Value
(
"${aws.elasticache.cluster.cursor.key}"
)
String
REDIS_SEARCH_KEY
;
@Value
(
"${aws.elasticache.cluster.cursor.expiration}"
)
String
INDEX_CACHE_EXPIRATION
;
private
ICache
<
String
,
Map
>
cache
;
private
Boolean
local
;
/**
...
...
@@ -38,19 +45,25 @@ public class FieldTypeMappingCacheImpl implements IFieldTypeMappingCache {
* properties file.
*
*/
public
FieldTypeMappingCacheImpl
(
@Value
(
"${aws.elasticache.cluster.cursor.expiration}"
)
final
String
INDEX_CACHE_EXPIRATION
)
throws
K8sParameterNotFoundException
,
JsonProcessingException
{
public
FieldTypeMappingCacheImpl
()
throws
K8sParameterNotFoundException
,
JsonProcessingException
{
int
expTimeSeconds
=
Integer
.
parseInt
(
INDEX_CACHE_EXPIRATION
)
*
60
;
K8sLocalParameterProvider
provider
=
new
K8sLocalParameterProvider
();
if
(
provider
.
getLocalMode
()){
if
(
Boolean
.
parseBoolean
(
System
.
getenv
(
"DISABLE_CACHE"
))){
cache
=
new
DummyCache
();
}
this
.
cache
=
new
VmCache
<>(
expTimeSeconds
,
10
);
}
else
{
String
host
=
provider
.
getParameterAsString
(
"CACHE_CLUSTER_ENDPOINT"
);
int
port
=
Integer
.
parseInt
(
provider
.
getParameterAsString
(
"CACHE_CLUSTER_PORT"
));
String
password
=
provider
.
getCredentialsAsMap
(
"CACHE_CLUSTER_KEY"
).
get
(
"token"
);
String
host
=
provider
.
getParameterAsStringOrDefault
(
"CACHE_CLUSTER_ENDPOINT"
,
REDIS_SEARCH_HOST
);
int
port
=
Integer
.
parseInt
(
provider
.
getParameterAsStringOrDefault
(
"CACHE_CLUSTER_PORT"
,
REDIS_SEARCH_PORT
));
Map
<
String
,
String
>
credential
=
provider
.
getCredentialsAsMap
(
"CACHE_CLUSTER_KEY"
);
String
password
;
if
(
credential
!=
null
){
password
=
credential
.
get
(
"token"
);
}
else
{
password
=
REDIS_SEARCH_KEY
;
}
cache
=
new
RedisCache
(
host
,
port
,
password
,
expTimeSeconds
,
String
.
class
,
Map
.
class
);
}
local
=
cache
.
getClass
()
!=
RedisCache
.
class
;
...
...
provider/search-aws/src/main/java/org/opengroup/osdu/search/provider/aws/cache/IndexCacheImpl.java
View file @
ee5c9ada
...
...
@@ -26,9 +26,18 @@ import org.opengroup.osdu.core.common.provider.interfaces.IIndexCache;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.stereotype.Component
;
import
java.util.Map
;
@Component
public
class
IndexCacheImpl
implements
IIndexCache
<
String
,
Boolean
>,
AutoCloseable
{
@Value
(
"${aws.elasticache.cluster.cursor.endpoint}"
)
String
REDIS_SEARCH_HOST
;
@Value
(
"${aws.elasticache.cluster.cursor.port}"
)
String
REDIS_SEARCH_PORT
;
@Value
(
"${aws.elasticache.cluster.cursor.key}"
)
String
REDIS_SEARCH_KEY
;
@Value
(
"${aws.elasticache.cluster.cursor.expiration}"
)
String
INDEX_CACHE_EXPIRATION
;
private
ICache
<
String
,
Boolean
>
cache
;
private
Boolean
local
;
public
IndexCacheImpl
(
@Value
(
"${aws.elasticache.cluster.index.expiration}"
)
final
String
INDEX_CACHE_EXPIRATION
)
throws
K8sParameterNotFoundException
,
JsonProcessingException
{
...
...
@@ -40,10 +49,15 @@ public class IndexCacheImpl implements IIndexCache<String, Boolean>, AutoCloseab
}
this
.
cache
=
new
VmCache
<>(
expTimeSeconds
,
10
);
}
else
{
String
host
=
provider
.
getParameterAsString
(
"CACHE_CLUSTER_ENDPOINT"
);
int
port
=
Integer
.
parseInt
(
provider
.
getParameterAsString
(
"CACHE_CLUSTER_PORT"
));
String
password
=
provider
.
getCredentialsAsMap
(
"CACHE_CLUSTER_KEY"
).
get
(
"token"
);
String
host
=
provider
.
getParameterAsStringOrDefault
(
"CACHE_CLUSTER_ENDPOINT"
,
REDIS_SEARCH_HOST
);
int
port
=
Integer
.
parseInt
(
provider
.
getParameterAsStringOrDefault
(
"CACHE_CLUSTER_PORT"
,
REDIS_SEARCH_PORT
));
Map
<
String
,
String
>
credential
=
provider
.
getCredentialsAsMap
(
"CACHE_CLUSTER_KEY"
);
String
password
;
if
(
credential
!=
null
){
password
=
credential
.
get
(
"token"
);
}
else
{
password
=
REDIS_SEARCH_KEY
;
}
cache
=
new
RedisCache
(
host
,
port
,
password
,
expTimeSeconds
,
String
.
class
,
Boolean
.
class
);
}
local
=
cache
.
getClass
()
!=
RedisCache
.
class
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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