Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
atlas
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
dataplatform
atlas
Commits
a98d1bf0
Commit
a98d1bf0
authored
6 years ago
by
Sarath Subramanian
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ATLAS-2920: Update JanusGraph Solr clients to use all zookeeper entries
parent
9e9f024b
master
No related merge requests found
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
39 additions
and
5 deletions
+39
-5
AtlasJanusGraphDatabase.java
...las/repository/graphdb/janus/AtlasJanusGraphDatabase.java
+39
-5
Solr6Index.java
...main/java/org/janusgraph/diskstorage/solr/Solr6Index.java
+0
-0
No files found.
graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/AtlasJanusGraphDatabase.java
View file @
a98d1bf0
...
@@ -18,6 +18,7 @@
...
@@ -18,6 +18,7 @@
package
org
.
apache
.
atlas
.
repository
.
graphdb
.
janus
;
package
org
.
apache
.
atlas
.
repository
.
graphdb
.
janus
;
import
com.google.common.collect.ImmutableMap
;
import
org.apache.atlas.ApplicationProperties
;
import
org.apache.atlas.ApplicationProperties
;
import
org.apache.atlas.AtlasException
;
import
org.apache.atlas.AtlasException
;
import
org.apache.atlas.repository.graphdb.AtlasGraph
;
import
org.apache.atlas.repository.graphdb.AtlasGraph
;
...
@@ -30,19 +31,24 @@ import org.apache.atlas.typesystem.types.DataTypes.TypeCategory;
...
@@ -30,19 +31,24 @@ import org.apache.atlas.typesystem.types.DataTypes.TypeCategory;
import
org.apache.atlas.utils.AtlasPerfTracer
;
import
org.apache.atlas.utils.AtlasPerfTracer
;
import
org.apache.commons.configuration.Configuration
;
import
org.apache.commons.configuration.Configuration
;
import
org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper
;
import
org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper
;
import
org.janusgraph.core.JanusGraph
;
import
org.janusgraph.core.JanusGraphException
;
import
org.janusgraph.core.JanusGraphException
;
import
org.janusgraph.graphdb.database.serialize.attribute.SerializableSerializer
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.janusgraph.core.JanusGraphFactory
;
import
org.janusgraph.core.JanusGraphFactory
;
import
org.janusgraph.core.JanusGraph
;
import
org.janusgraph.core.schema.JanusGraphManagement
;
import
org.janusgraph.core.schema.JanusGraphManagement
;
import
org.janusgraph.diskstorage.StandardIndexProvider
;
import
org.janusgraph.diskstorage.solr.Solr6Index
;
import
org.janusgraph.graphdb.database.serialize.attribute.SerializableSerializer
;
import
org.janusgraph.graphdb.tinkerpop.JanusGraphIoRegistry
;
import
org.janusgraph.graphdb.tinkerpop.JanusGraphIoRegistry
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
java.lang.reflect.Field
;
import
java.lang.reflect.Modifier
;
import
java.math.BigDecimal
;
import
java.math.BigDecimal
;
import
java.math.BigInteger
;
import
java.math.BigInteger
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.Map
;
/**
/**
* Default implementation for Graph Provider that doles out JanusGraph.
* Default implementation for Graph Provider that doles out JanusGraph.
...
@@ -59,6 +65,7 @@ public class AtlasJanusGraphDatabase implements GraphDatabase<AtlasJanusVertex,
...
@@ -59,6 +65,7 @@ public class AtlasJanusGraphDatabase implements GraphDatabase<AtlasJanusVertex,
public
static
final
String
GRAPH_PREFIX
=
"atlas.graph"
;
public
static
final
String
GRAPH_PREFIX
=
"atlas.graph"
;
public
static
final
String
INDEX_BACKEND_CONF
=
"index.search.backend"
;
public
static
final
String
INDEX_BACKEND_CONF
=
"index.search.backend"
;
public
static
final
String
SOLR_ZOOKEEPER_URL
=
"atlas.graph.index.search.solr.zookeeper-url"
;
public
static
final
String
SOLR_ZOOKEEPER_URL
=
"atlas.graph.index.search.solr.zookeeper-url"
;
public
static
final
String
SOLR_ZOOKEEPER_URLS
=
"atlas.graph.index.search.solr.zookeeper-urls"
;
public
static
final
String
INDEX_BACKEND_LUCENE
=
"lucene"
;
public
static
final
String
INDEX_BACKEND_LUCENE
=
"lucene"
;
public
static
final
String
INDEX_BACKEND_ES
=
"elasticsearch"
;
public
static
final
String
INDEX_BACKEND_ES
=
"elasticsearch"
;
...
@@ -74,6 +81,9 @@ public class AtlasJanusGraphDatabase implements GraphDatabase<AtlasJanusVertex,
...
@@ -74,6 +81,9 @@ public class AtlasJanusGraphDatabase implements GraphDatabase<AtlasJanusVertex,
startLocalSolr
();
startLocalSolr
();
Configuration
configProperties
=
ApplicationProperties
.
get
();
Configuration
configProperties
=
ApplicationProperties
.
get
();
configProperties
.
setProperty
(
SOLR_ZOOKEEPER_URLS
,
configProperties
.
getStringArray
(
SOLR_ZOOKEEPER_URL
));
Configuration
janusConfig
=
ApplicationProperties
.
getSubsetConfiguration
(
configProperties
,
GRAPH_PREFIX
);
Configuration
janusConfig
=
ApplicationProperties
.
getSubsetConfiguration
(
configProperties
,
GRAPH_PREFIX
);
//add serializers for non-standard property value types that Atlas uses
//add serializers for non-standard property value types that Atlas uses
...
@@ -93,6 +103,30 @@ public class AtlasJanusGraphDatabase implements GraphDatabase<AtlasJanusVertex,
...
@@ -93,6 +103,30 @@ public class AtlasJanusGraphDatabase implements GraphDatabase<AtlasJanusVertex,
return
janusConfig
;
return
janusConfig
;
}
}
static
{
addSolr6Index
();
}
private
static
void
addSolr6Index
()
{
try
{
Field
field
=
StandardIndexProvider
.
class
.
getDeclaredField
(
"ALL_MANAGER_CLASSES"
);
field
.
setAccessible
(
true
);
Field
modifiersField
=
Field
.
class
.
getDeclaredField
(
"modifiers"
);
modifiersField
.
setAccessible
(
true
);
modifiersField
.
setInt
(
field
,
field
.
getModifiers
()
&
~
Modifier
.
FINAL
);
Map
<
String
,
String
>
customMap
=
new
HashMap
<>(
StandardIndexProvider
.
getAllProviderClasses
());
customMap
.
put
(
"solr"
,
Solr6Index
.
class
.
getName
());
ImmutableMap
<
String
,
String
>
immap
=
ImmutableMap
.
copyOf
(
customMap
);
field
.
set
(
null
,
immap
);
LOG
.
debug
(
"Injected solr6 index - {}"
,
Solr6Index
.
class
.
getName
());
}
catch
(
Exception
e
)
{
throw
new
RuntimeException
(
e
);
}
}
public
static
JanusGraph
getGraphInstance
()
{
public
static
JanusGraph
getGraphInstance
()
{
if
(
graphInstance
==
null
)
{
if
(
graphInstance
==
null
)
{
synchronized
(
AtlasJanusGraphDatabase
.
class
)
{
synchronized
(
AtlasJanusGraphDatabase
.
class
)
{
...
...
This diff is collapsed.
Click to expand it.
graphdb/janus/src/main/java/org/janusgraph/diskstorage/solr/Solr6Index.java
0 → 100644
View file @
a98d1bf0
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
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