Skip to content

Commit b376fca

Browse files
ATLAS-5220: Removed unwanted comments
1 parent 99eaed2 commit b376fca

5 files changed

Lines changed: 1 addition & 26 deletions

File tree

distro/src/conf/atlas-application.properties

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818

1919
######### Graph Database Configs #########
2020

21-
# ATLAS-5220: Maven build-time backend selection (set via -Pstorage-* / -Pindex-* / -Pdist). Do not point runtime
22-
# config at a different storage/index backend unless you rebuild with matching profiles.
2321
atlas.build.storage.backend=${atlas.storage.backend}
2422
atlas.build.index.backend=${atlas.index.backend}
2523

graphdb/janus/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
Some dependencies, like slf4j are excluded from the jar because they are included in Atlas -->
3636

3737
<properties>
38-
<!-- Default storage backend for slim packaging; optional backends use storage-* profiles (ATLAS-5220). -->
3938
<atlas.storage.backend>hbase</atlas.storage.backend>
4039
<checkstyle.failOnViolation>true</checkstyle.failOnViolation>
4140
<checkstyle.skip>false</checkstyle.skip>
@@ -73,7 +72,6 @@
7372
<artifactId>commons-text</artifactId>
7473
<version>${commons-text.version}</version>
7574
</dependency>
76-
<!-- Default index: Solr (+Lucene). Elasticsearch: -Pindex-elasticsearch on the WAR (ATLAS-5220). -->
7775
<dependency>
7876
<groupId>org.apache.lucene</groupId>
7977
<artifactId>lucene-analyzers-common</artifactId>
@@ -158,7 +156,6 @@
158156
<artifactId>janusgraph-server</artifactId>
159157
<version>${janusgraph.version}</version>
160158
<exclusions>
161-
<!-- ATLAS-5220: optional Janus storage backends are profile-scoped; do not pull all from server. -->
162159
<exclusion>
163160
<groupId>com.codahale.metrics</groupId>
164161
<artifactId>*</artifactId>
@@ -296,7 +293,6 @@
296293
</plugins>
297294
</build>
298295

299-
<!-- ATLAS-5220: optional storage backends. HBase stack only when atlas.storage.backend=hbase (default). -->
300296
<profiles>
301297
<profile>
302298
<id>atlas-storage-hbase</id>

graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/AtlasJanusGraphDatabase.java

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,7 @@ public class AtlasJanusGraphDatabase implements GraphDatabase<AtlasJanusVertex,
7878
public static final String SOLR_ZOOKEEPER_URLS = "atlas.graph.index.search.solr.zookeeper-urls";
7979
public static final String INDEX_BACKEND_LUCENE = "lucene";
8080
public static final String INDEX_BACKEND_ES = "elasticsearch";
81-
/** Filtered at package time from Maven {@code atlas.storage.backend} (ATLAS-5220). */
8281
public static final String BUILD_STORAGE_BACKEND_CONF = "atlas.build.storage.backend";
83-
/** Filtered at package time from Maven {@code atlas.index.backend} (ATLAS-5220). */
8482
public static final String BUILD_INDEX_BACKEND_CONF = "atlas.build.index.backend";
8583
public static final String GRAPH_TX_LOG_CONF = "tx.log-tx";
8684
public static final String GRAPH_TX_LOG_VERBOSE_CONF = "tx.recovery.verbose";
@@ -261,9 +259,6 @@ static JanusGraph initJanusGraph(Configuration config) {
261259
}
262260
}
263261

264-
/**
265-
* Fail fast when runtime graph config does not match the Maven slim-build profile (ATLAS-5220).
266-
*/
267262
static void validateBuildBackendAlignment(Configuration janusConfig) {
268263
try {
269264
Configuration appConfig = ApplicationProperties.get();
@@ -442,7 +437,7 @@ public void cleanup() {
442437
* Register shortName -> FQCN in Janus {@code StandardStoreManager} without loading the class first.
443438
* Pre-loading with {@link Class#forName(String)} caused missing map entries when the class was not yet
444439
* visible to the caller's loader at static init time, leading Janus to treat {@code hbase2} as a class name.
445-
* Implementation classes are loaded when the graph opens, as in the pre-ATLAS-5220 behavior.
440+
* Implementation classes are loaded when the graph opens.
446441
*/
447442
private static void safeRegisterStoreManager(String shortName, String managerClassName) {
448443
try {
@@ -498,9 +493,6 @@ private static void injectIndexProvider(String shortName, String providerClassNa
498493
LOG.debug("Registered Janus index provider {} -> {}", shortName, providerClassName);
499494
}
500495

501-
/**
502-
* Register Janus shortName → implementation FQCN only when the class is loadable (ATLAS-5220 slim builds may omit JARs).
503-
*/
504496
private static void registerJanusOptionalBackends() {
505497
registerStoreIfLoadable("hbase2", HBASE2_STORE_MANAGER_CLASS);
506498
registerStoreIfLoadable("cql", CQL_STORE_MANAGER_CLASS);

pom.xml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@
8686
<antlr4.version>4.7</antlr4.version>
8787
<aopalliance.version>1.0</aopalliance.version>
8888
<aspectj.runtime.version>1.8.7</aspectj.runtime.version>
89-
<!-- ATLAS-5220: atlas.audit.backend / atlas.storage.backend / atlas.index.backend for slim packaging; audit pairs with entity.repository.impl. -->
9089
<atlas.audit.backend>hbase</atlas.audit.backend>
9190
<atlas.index.backend>solr</atlas.index.backend>
9291
<atlas.storage.backend>hbase</atlas.storage.backend>
@@ -123,7 +122,6 @@
123122
<falcon.version>0.8</falcon.version>
124123
<fastutil.version>6.5.16</fastutil.version>
125124
<graph.index.backend>solr</graph.index.backend>
126-
<!-- Align filtered test/distro graph backend with atlas.storage.backend default (ATLAS-5220). -->
127125
<graph.storage.backend>hbase2</graph.storage.backend>
128126
<gson.version>2.9.0</gson.version>
129127
<guava.version>25.1-jre</guava.version>
@@ -2292,8 +2290,6 @@
22922290
</repositories>
22932291

22942292
<profiles>
2295-
<!-- ATLAS-5220: combine with -Pstorage-* / -Paudit-* / -Pindex-*; put -Paudit-* after -Pdist.
2296-
Embedded: -Pdist,storage-hbase,audit-hbase,embedded-hbase-solr -->
22972293
<profile>
22982294
<id>dist</id>
22992295
<activation>
@@ -2312,7 +2308,6 @@
23122308
<skipDocs>false</skipDocs>
23132309
</properties>
23142310
</profile>
2315-
<!-- ATLAS-5220: audit backend profiles set entity.repository.impl + atlas.audit.backend. -->
23162311
<profile>
23172312
<id>audit-cassandra</id>
23182313
<activation>
@@ -2325,7 +2320,6 @@
23252320
<atlas.audit.backend>cassandra</atlas.audit.backend>
23262321
<atlas.war.audit.excludes>WEB-INF/lib/hbase-shaded-client-fixed-*.jar,</atlas.war.audit.excludes>
23272322
<entity.repository.impl>org.apache.atlas.repository.audit.CassandraBasedAuditRepository</entity.repository.impl>
2328-
<!-- distro filters ${entity.repository.properties} into atlas-application.properties; impl alone is not enough -->
23292323
<entity.repository.properties>atlas.EntityAuditRepository.impl=org.apache.atlas.repository.audit.CassandraBasedAuditRepository</entity.repository.properties>
23302324
</properties>
23312325
</profile>
@@ -2464,7 +2458,6 @@
24642458
<tests.solr.embedded>true</tests.solr.embedded>
24652459
</properties>
24662460
</profile>
2467-
<!-- ATLAS-5220: index backend (override with -Pindex-*). -->
24682461
<profile>
24692462
<id>index-elasticsearch</id>
24702463
<activation>
@@ -2475,7 +2468,6 @@
24752468
</activation>
24762469
<properties>
24772470
<atlas.index.backend>elasticsearch</atlas.index.backend>
2478-
<!-- Filtered into atlas-application.properties as atlas.graph.index.search.backend -->
24792471
<graph.index.backend>elasticsearch</graph.index.backend>
24802472
</properties>
24812473
</profile>
@@ -2491,7 +2483,6 @@
24912483
<project.build.dashboardv2.gruntBuild>build</project.build.dashboardv2.gruntBuild>
24922484
</properties>
24932485
</profile>
2494-
<!-- ATLAS-5220: storage backend for atlas-graphdb-janus (override with -Pstorage-*). -->
24952486
<profile>
24962487
<id>storage-berkeleyje</id>
24972488
<properties>

webapp/pom.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,6 @@
274274
</exclusions>
275275
</dependency>
276276

277-
<!-- ATLAS-5220: default dist/embedded builds use HBase; keep on WAR (profile-only deps were missing from WEB-INF/lib). -->
278277
<dependency>
279278
<groupId>org.apache.hadoop</groupId>
280279
<artifactId>hadoop-distcp</artifactId>
@@ -829,7 +828,6 @@
829828
</build>
830829

831830
<profiles>
832-
<!-- ATLAS-5220: graph storage JARs (profile id matches root -Pstorage-*). -->
833831
<profile>
834832
<id>storage-berkeleyje</id>
835833
<properties>

0 commit comments

Comments
 (0)