From 5723f712603bf96cc84db75e08ff8a9ae2f720b0 Mon Sep 17 00:00:00 2001 From: Suman Das <59254445+sumandas0@users.noreply.github.com> Date: Mon, 5 Feb 2024 14:25:29 +0530 Subject: [PATCH 1/6] Update DiscoveryREST.java --- .../main/java/org/apache/atlas/web/rest/DiscoveryREST.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/webapp/src/main/java/org/apache/atlas/web/rest/DiscoveryREST.java b/webapp/src/main/java/org/apache/atlas/web/rest/DiscoveryREST.java index 20dd5d9019..cc30e22612 100644 --- a/webapp/src/main/java/org/apache/atlas/web/rest/DiscoveryREST.java +++ b/webapp/src/main/java/org/apache/atlas/web/rest/DiscoveryREST.java @@ -91,6 +91,8 @@ public class DiscoveryREST { private final AtlasDiscoveryService discoveryService; private final SearchLoggingManagement loggerManagement; + private static final String INDEXSEARCH_TAG_NAME = "indexsearch"; + @Inject public DiscoveryREST(AtlasTypeRegistry typeRegistry, AtlasDiscoveryService discoveryService, SearchLoggingManagement loggerManagement, Configuration configuration) { @@ -426,9 +428,9 @@ public AtlasSearchResult indexSearch(@Context HttpServletRequest servletRequest, throw abe; } finally { if(parameters.getUtmTags() != null) { - AtlasPerfMetrics.Metric indexsearchMetric = new AtlasPerfMetrics.Metric("indexsearch"); + AtlasPerfMetrics.Metric indexsearchMetric = new AtlasPerfMetrics.Metric(INDEXSEARCH_TAG_NAME); indexsearchMetric.addTag("utmTags", String.join(",", parameters.getUtmTags())); - indexsearchMetric.addTag("name", "indexsearch"); + indexsearchMetric.addTag("name", INDEXSEARCH_TAG_NAME); indexsearchMetric.addTag("querySize",parameters.getDsl().getOrDefault("size", 20).toString()); indexsearchMetric.setTotalTimeMSecs(System.currentTimeMillis() - startTime); RequestContext.get().addApplicationMetrics(indexsearchMetric); From 2884e6b55d5f4da477f355ddaccc0d4dde003372 Mon Sep 17 00:00:00 2001 From: Suman Das <59254445+sumandas0@users.noreply.github.com> Date: Mon, 5 Feb 2024 22:40:13 +0530 Subject: [PATCH 2/6] revert: PLT-191: IndexSearch latency improvements --- .github/workflows/maven.yml | 10 ---- build.sh | 4 +- common/pom.xml | 46 +------------------ .../service/redis/AbstractRedisService.java | 2 - .../atlas/repository/graphdb/AtlasGraph.java | 5 -- graphdb/janus/pom.xml | 8 ---- .../graphdb/janus/AtlasJanusGraph.java | 9 +--- pom.xml | 17 ++----- repository/pom.xml | 3 +- .../graph/IndexRecoveryService.java | 3 +- .../store/graph/v2/AtlasEntityStoreV2.java | 2 +- .../apache/atlas/services/MetricsService.java | 2 +- .../apache/atlas/util/AtlasMetricsUtil.java | 4 -- .../java/org/apache/atlas/RequestContext.java | 9 ---- webapp/pom.xml | 1 - .../org/apache/atlas/web/rest/EntityREST.java | 2 +- 16 files changed, 12 insertions(+), 115 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 0977cb36a2..fdbc1de38c 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -51,16 +51,6 @@ jobs: run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})" id: get_branch - - name: Create Maven Settings - uses: s4u/maven-settings-action@v2.8.0 - with: - servers: | - [{ - "id": "github", - "username": "atlan-ci", - "password": "${{ secrets.my_pat }}" - }] - - name: Build with Maven run: | branch_name=${{ steps.get_branch.outputs.branch }} diff --git a/build.sh b/build.sh index d60c540769..d3f77f5647 100755 --- a/build.sh +++ b/build.sh @@ -24,9 +24,9 @@ unzip -o keycloak-15.0.2.1.zip -d ~/.m2/repository/org echo "Maven Building" if [ "$1" == "build_without_dashboard" ]; then - mvn -pl '!test-tools,!addons/hdfs-model,!addons/hive-bridge,!addons/hive-bridge-shim,!addons/falcon-bridge-shim,!addons/falcon-bridge,!addons/sqoop-bridge,!addons/sqoop-bridge-shim,!addons/hbase-bridge,!addons/hbase-bridge-shim,!addons/hbase-testing-util,!addons/kafka-bridge,!addons/impala-hook-api,!addons/impala-bridge-shim,!addons/impala-bridge,!dashboardv2,!dashboardv3' -Dmaven.test.skip -DskipTests -Drat.skip=true -DskipOverlay -DskipEnunciate=true package -Pdist + mvn -pl '!addons/hdfs-model,!addons/hive-bridge,!addons/hive-bridge-shim,!addons/falcon-bridge-shim,!addons/falcon-bridge,!addons/sqoop-bridge,!addons/sqoop-bridge-shim,!addons/hbase-bridge,!addons/hbase-bridge-shim,!addons/hbase-testing-util,!addons/kafka-bridge,!addons/impala-hook-api,!addons/impala-bridge-shim,!addons/impala-bridge,!dashboardv2,!dashboardv3' -Dmaven.test.skip -DskipTests -Drat.skip=true -DskipOverlay -DskipEnunciate=true package -Pdist else - mvn -pl '!test-tools,!addons/hdfs-model,!addons/hive-bridge,!addons/hive-bridge-shim,!addons/falcon-bridge-shim,!addons/falcon-bridge,!addons/sqoop-bridge,!addons/sqoop-bridge-shim,!addons/hbase-bridge,!addons/hbase-bridge-shim,!addons/hbase-testing-util,!addons/kafka-bridge,!addons/impala-hook-api,!addons/impala-bridge-shim,!addons/impala-bridge' -Dmaven.test.skip -DskipTests -Drat.skip=true -DskipEnunciate=true package -Pdist + mvn -pl '!addons/hdfs-model,!addons/hive-bridge,!addons/hive-bridge-shim,!addons/falcon-bridge-shim,!addons/falcon-bridge,!addons/sqoop-bridge,!addons/sqoop-bridge-shim,!addons/hbase-bridge,!addons/hbase-bridge-shim,!addons/hbase-testing-util,!addons/kafka-bridge,!addons/impala-hook-api,!addons/impala-bridge-shim,!addons/impala-bridge' -Dmaven.test.skip -DskipTests -Drat.skip=true -DskipEnunciate=true package -Pdist fi echo "[DEBUG listing distro/target" diff --git a/common/pom.xml b/common/pom.xml index ff4d502f12..47c274ca4d 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -145,51 +145,7 @@ - - io.netty - netty-all - ${netty4.version} - - - io.netty - netty-handler - ${netty4.version} - - - io.netty - netty-common - ${netty4.version} - - - io.netty - netty-resolver - ${netty4.version} - - - io.netty - netty-codec - ${netty4.version} - - - io.netty - netty-transport - ${netty4.version} - - - io.netty - netty-buffer - ${netty4.version} - - - io.netty - netty-transport-native-epoll - ${netty4.version} - - - io.netty - netty-transport-native-unix-common - ${netty4.version} - + diff --git a/common/src/main/java/org/apache/atlas/service/redis/AbstractRedisService.java b/common/src/main/java/org/apache/atlas/service/redis/AbstractRedisService.java index 0ae20a60cc..efa94b867a 100644 --- a/common/src/main/java/org/apache/atlas/service/redis/AbstractRedisService.java +++ b/common/src/main/java/org/apache/atlas/service/redis/AbstractRedisService.java @@ -29,7 +29,6 @@ public abstract class AbstractRedisService implements RedisService { private static final String ATLAS_REDIS_LOCK_WATCHDOG_TIMEOUT_MS = "atlas.redis.lock.watchdog_timeout.ms"; private static final int DEFAULT_REDIS_WAIT_TIME_MS = 15_000; private static final int DEFAULT_REDIS_LOCK_WATCHDOG_TIMEOUT_MS = 600_000; - private static final String ATLAS_METASTORE_SERVICE = "atlas-metastore-service"; RedissonClient redisClient; Map keyLockMap; @@ -97,7 +96,6 @@ Config getLocalConfig() throws AtlasException { Config getProdConfig() throws AtlasException { Config config = initAtlasConfig(); config.useSentinelServers() - .setClientName(ATLAS_METASTORE_SERVICE) .setReadMode(ReadMode.MASTER_SLAVE) .setCheckSentinelsList(false) .setKeepAlive(true) diff --git a/graphdb/api/src/main/java/org/apache/atlas/repository/graphdb/AtlasGraph.java b/graphdb/api/src/main/java/org/apache/atlas/repository/graphdb/AtlasGraph.java index 666ab376a7..2b41b1c07d 100644 --- a/graphdb/api/src/main/java/org/apache/atlas/repository/graphdb/AtlasGraph.java +++ b/graphdb/api/src/main/java/org/apache/atlas/repository/graphdb/AtlasGraph.java @@ -383,9 +383,4 @@ public interface AtlasGraph { * @throws AtlasException when error encountered in creating the client. */ AtlasGraphIndexClient getGraphIndexClient()throws AtlasException; - - - void setEnableCache(boolean enableCache); - - Boolean isCacheEnabled(); } diff --git a/graphdb/janus/pom.xml b/graphdb/janus/pom.xml index 5daef76b4e..2206e79519 100644 --- a/graphdb/janus/pom.xml +++ b/graphdb/janus/pom.xml @@ -119,10 +119,6 @@ ch.qos.logback * - - io.netty - * - com.codahale.metrics metrics-core @@ -212,10 +208,6 @@ org.codehaus.woodstox woodstox-core-asl - - io.netty - * - diff --git a/graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/AtlasJanusGraph.java b/graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/AtlasJanusGraph.java index 2886a01eb9..3a9c933797 100644 --- a/graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/AtlasJanusGraph.java +++ b/graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/AtlasJanusGraph.java @@ -126,6 +126,7 @@ public class AtlasJanusGraph implements AtlasGraph0.8.1 4.5.13 4.4.13 - 2.12.4 - 2.12.4 - 0.6.03 + 2.11.3 + 2.11.3 + 0.6.0 0.5.3 1 3.1.0 @@ -778,7 +778,6 @@ 3.4.6 3.20.1 1.11.1 - 4.1.61.Final @@ -836,16 +835,6 @@ false - - github - https://maven.pkg.github.com/atlanhq/atlan-janusgraph - - true - - - true - - hortonworks.repo https://repo.hortonworks.com/content/repositories/releases diff --git a/repository/pom.xml b/repository/pom.xml index 10d8d876fb..0988bd0ee7 100755 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -111,7 +111,7 @@ io.netty - * + netty-handler org.slf4j @@ -393,7 +393,6 @@ org.apache.atlas atlas-testtools ${project.version} - test com.fasterxml.jackson.core diff --git a/repository/src/main/java/org/apache/atlas/repository/graph/IndexRecoveryService.java b/repository/src/main/java/org/apache/atlas/repository/graph/IndexRecoveryService.java index c39876d19c..f6154727ac 100644 --- a/repository/src/main/java/org/apache/atlas/repository/graph/IndexRecoveryService.java +++ b/repository/src/main/java/org/apache/atlas/repository/graph/IndexRecoveryService.java @@ -21,7 +21,6 @@ import org.apache.atlas.ApplicationProperties; import org.apache.atlas.AtlasConstants; import org.apache.atlas.AtlasException; -import org.apache.atlas.RequestContext; import org.apache.atlas.ha.HAConfiguration; import org.apache.atlas.listener.ActiveStateChangeHandler; import org.apache.atlas.repository.graphdb.AtlasGraph; @@ -182,6 +181,7 @@ public void run() { continue; } boolean indexHealthy = isIndexHealthy(); + if (this.txRecoveryObject == null && indexHealthy) { startMonitoring(); } @@ -228,7 +228,6 @@ private void startMonitoring() { try { startTime = recoveryInfoManagement.getStartTime(); Instant newStartTime = Instant.now(); - this.graph.setEnableCache(false); txRecoveryObject = this.graph.getManagementSystem().startIndexRecovery(startTime); recoveryInfoManagement.updateStartTime(newStartTime.toEpochMilli()); diff --git a/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/AtlasEntityStoreV2.java b/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/AtlasEntityStoreV2.java index 6e3487f8d3..78208ca6d3 100644 --- a/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/AtlasEntityStoreV2.java +++ b/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/AtlasEntityStoreV2.java @@ -1559,7 +1559,7 @@ private void executePreProcessor(EntityMutationContext context) throws AtlasBase private EntityMutationContext preCreateOrUpdate(EntityStream entityStream, EntityGraphMapper entityGraphMapper, boolean isPartialUpdate) throws AtlasBaseException { MetricRecorder metric = RequestContext.get().startMetricRecord("preCreateOrUpdate"); - this.graph.setEnableCache(RequestContext.get().isCacheEnabled()); + EntityGraphDiscovery graphDiscoverer = new AtlasEntityGraphDiscoveryV2(graph, typeRegistry, entityStream, entityGraphMapper); EntityGraphDiscoveryContext discoveryContext = graphDiscoverer.discoverEntities(); EntityMutationContext context = new EntityMutationContext(discoveryContext); diff --git a/repository/src/main/java/org/apache/atlas/services/MetricsService.java b/repository/src/main/java/org/apache/atlas/services/MetricsService.java index 5a8f445348..ef30675df1 100644 --- a/repository/src/main/java/org/apache/atlas/services/MetricsService.java +++ b/repository/src/main/java/org/apache/atlas/services/MetricsService.java @@ -98,7 +98,7 @@ public MetricsService(final AtlasGraph graph, final AtlasTypeRegistry typeRegist @SuppressWarnings("unchecked") @GraphTransaction public AtlasMetrics getMetrics() { - this.atlasGraph.setEnableCache(false); + final AtlasTypesDef typesDef = getTypesDef(); Collection entityDefs = typesDef.getEntityDefs(); diff --git a/repository/src/main/java/org/apache/atlas/util/AtlasMetricsUtil.java b/repository/src/main/java/org/apache/atlas/util/AtlasMetricsUtil.java index 971c4d6404..beb90e67b1 100644 --- a/repository/src/main/java/org/apache/atlas/util/AtlasMetricsUtil.java +++ b/repository/src/main/java/org/apache/atlas/util/AtlasMetricsUtil.java @@ -194,11 +194,9 @@ public Map getStats() { private boolean getBackendStoreStatus(){ try { - boolean isCacheEnabled = this.graph.isCacheEnabled(); runWithTimeout(new Runnable() { @Override public void run() { - graph.setEnableCache(isCacheEnabled); graph.query().has(TYPE_NAME_PROPERTY_KEY, TYPE_NAME_INTERNAL).vertices(1); graphCommit(); @@ -219,11 +217,9 @@ private boolean getIndexStoreStatus(){ final String query = AtlasGraphUtilsV2.getIndexSearchPrefix() + "\"" + Constants.TYPE_NAME_PROPERTY_KEY + "\":(" + TYPE_NAME_INTERNAL + ")"; try { - boolean isCacheEnabled = this.graph.isCacheEnabled(); runWithTimeout(new Runnable() { @Override public void run() { - graph.setEnableCache(isCacheEnabled); graph.indexQuery(Constants.VERTEX_INDEX, query).vertices(0, 1); graphCommit(); diff --git a/server-api/src/main/java/org/apache/atlas/RequestContext.java b/server-api/src/main/java/org/apache/atlas/RequestContext.java index bcc4c0085b..f8a6bce643 100644 --- a/server-api/src/main/java/org/apache/atlas/RequestContext.java +++ b/server-api/src/main/java/org/apache/atlas/RequestContext.java @@ -97,7 +97,6 @@ public class RequestContext { private boolean skipAuthorizationCheck = false; private Set deletedEdgesIdsForResetHasLineage = new HashSet<>(0); private String requestUri; - private boolean cacheEnabled; private boolean delayTagNotifications = false; private Map> deletedClassificationAndVertices = new HashMap<>(); @@ -711,14 +710,6 @@ public String getRequestUri() { return this.requestUri; } - public void setEnableCache(boolean cacheEnabled) { - this.cacheEnabled = cacheEnabled; - } - - public boolean isCacheEnabled() { - return this.cacheEnabled; - } - public class EntityGuidPair { private final Object entity; private final String guid; diff --git a/webapp/pom.xml b/webapp/pom.xml index 8783276f6d..35a0e8a010 100755 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@ -552,7 +552,6 @@ org.apache.atlas atlas-testtools ${project.version} - test diff --git a/webapp/src/main/java/org/apache/atlas/web/rest/EntityREST.java b/webapp/src/main/java/org/apache/atlas/web/rest/EntityREST.java index ee6846fd8f..556b9f63fc 100644 --- a/webapp/src/main/java/org/apache/atlas/web/rest/EntityREST.java +++ b/webapp/src/main/java/org/apache/atlas/web/rest/EntityREST.java @@ -893,7 +893,7 @@ public EntityMutationResponse createOrUpdate(AtlasEntitiesWithExtInfo entities, @QueryParam("replaceBusinessAttributes") @DefaultValue("false") boolean replaceBusinessAttributes, @QueryParam("overwriteBusinessAttributes") @DefaultValue("false") boolean isOverwriteBusinessAttributes) throws AtlasBaseException { AtlasPerfTracer perf = null; - RequestContext.get().setEnableCache(false); + try { if (AtlasPerfTracer.isPerfTraceEnabled(PERF_LOG)) { perf = AtlasPerfTracer.getPerfTracer(PERF_LOG, "EntityREST.createOrUpdate(entityCount=" + From 6ca6c87fa69fad131ceaaa979d9d82f36952bd29 Mon Sep 17 00:00:00 2001 From: Suman Das <59254445+sumandas0@users.noreply.github.com> Date: Mon, 5 Feb 2024 22:42:20 +0530 Subject: [PATCH 3/6] revert: PLT-541: make redis client singleton --- .../org/apache/atlas/service/redis/AbstractRedisService.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/common/src/main/java/org/apache/atlas/service/redis/AbstractRedisService.java b/common/src/main/java/org/apache/atlas/service/redis/AbstractRedisService.java index efa94b867a..62274d8cb1 100644 --- a/common/src/main/java/org/apache/atlas/service/redis/AbstractRedisService.java +++ b/common/src/main/java/org/apache/atlas/service/redis/AbstractRedisService.java @@ -98,11 +98,6 @@ Config getProdConfig() throws AtlasException { config.useSentinelServers() .setReadMode(ReadMode.MASTER_SLAVE) .setCheckSentinelsList(false) - .setKeepAlive(true) - .setMasterConnectionMinimumIdleSize(10) - .setMasterConnectionPoolSize(20) - .setSlaveConnectionMinimumIdleSize(10) - .setSlaveConnectionPoolSize(20) .setMasterName(atlasConfig.getString(ATLAS_REDIS_MASTER_NAME)) .addSentinelAddress(formatUrls(atlasConfig.getStringArray(ATLAS_REDIS_SENTINEL_URLS))) .setUsername(atlasConfig.getString(ATLAS_REDIS_USERNAME)) From 7df57e23d42ab03f6af51cd8b5fe0ecad38ba8dd Mon Sep 17 00:00:00 2001 From: Suman Das <59254445+sumandas0@users.noreply.github.com> Date: Tue, 6 Feb 2024 00:57:11 +0530 Subject: [PATCH 4/6] feat: initial commit with working JG upgrade --- .github/workflows/maven.yml | 2 +- graphdb/janus/pom.xml | 4 ++++ .../graphdb/janus/AtlasJanusGraphDatabase.java | 2 +- .../graphdb/janus/AtlasJanusIndexQuery.java | 6 +++--- .../org/janusgraph/diskstorage/solr/Solr6Index.java | 12 +++++++++++- pom.xml | 8 ++++---- repository/pom.xml | 12 ++++++++++++ .../atlas/web/service/AtlasDebugMetricsSink.java | 10 ++++++---- 8 files changed, 42 insertions(+), 14 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index fdbc1de38c..b07a5a0104 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -25,7 +25,7 @@ on: - beta - development - master - - lineageondemand + - janusgraph-upgrade-1.0.0 jobs: build: diff --git a/graphdb/janus/pom.xml b/graphdb/janus/pom.xml index 2206e79519..c75f9d5871 100644 --- a/graphdb/janus/pom.xml +++ b/graphdb/janus/pom.xml @@ -135,6 +135,10 @@ ch.qos.logback * + + cassandra-hadoop-util + * + diff --git a/graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/AtlasJanusGraphDatabase.java b/graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/AtlasJanusGraphDatabase.java index db69d77ee3..88a989241c 100644 --- a/graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/AtlasJanusGraphDatabase.java +++ b/graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/AtlasJanusGraphDatabase.java @@ -90,7 +90,7 @@ public class AtlasJanusGraphDatabase implements GraphDatabase directIndexQuery(String query) throws AtlasBaseExcept @Override public Iterator> vertices() { - Iterator> results = query.vertices().iterator(); + Iterator> results = query.vertexStream().iterator(); Function, Result> function = new Function, Result>() { @@ -77,7 +77,7 @@ public Iterator> vertices(int offset, i Iterator> results = query .offset(offset) .limit(limit) - .vertices().iterator(); + .vertexStream().iterator(); Function, Result> function = new Function, Result>() { @@ -100,7 +100,7 @@ public Iterator> vertices(int offset, i .orderBy(sortBy, sortOrder) .offset(offset) .limit(limit) - .vertices().iterator(); + .vertexStream().iterator(); Function, Result> function = new Function, Result>() { diff --git a/graphdb/janus/src/main/java/org/janusgraph/diskstorage/solr/Solr6Index.java b/graphdb/janus/src/main/java/org/janusgraph/diskstorage/solr/Solr6Index.java index 23c11de301..e462344f99 100644 --- a/graphdb/janus/src/main/java/org/janusgraph/diskstorage/solr/Solr6Index.java +++ b/graphdb/janus/src/main/java/org/janusgraph/diskstorage/solr/Solr6Index.java @@ -121,6 +121,7 @@ import org.janusgraph.graphdb.query.condition.Not; import org.janusgraph.graphdb.query.condition.Or; import org.janusgraph.graphdb.query.condition.PredicateCondition; +import org.janusgraph.graphdb.tinkerpop.optimize.step.Aggregation; import org.janusgraph.graphdb.types.ParameterType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -597,6 +598,11 @@ public void restore(Map>> documents, } } + @Override + public Number queryAggregation(IndexQuery indexQuery, KeyInformation.IndexRetriever indexRetriever, BaseTransaction baseTransaction, Aggregation aggregation) throws BackendException { + return null; + } + // This method will create a map of field ids to values. In the case of multiValued fields, // it will consolidate all the values into one List or Set so it can be updated with a single Solr operation private Map collectFieldValues(List content, String collectionName, @@ -672,7 +678,6 @@ public Stream query(IndexQuery query, KeyInformation.IndexRetriever info doc -> doc.getFieldValue(keyIdField).toString()); } - @Override public Long queryCount(IndexQuery query, KeyInformation.IndexRetriever information, BaseTransaction tx) throws BackendException { try { String collection = query.getStore(); @@ -1064,6 +1069,11 @@ public void clearStorage() throws BackendException { } } + @Override + public void clearStore(String s) throws BackendException { + + } + @Override public boolean supports(KeyInformation information, JanusGraphPredicate predicate) { final Class dataType = information.getDataType(); diff --git a/pom.xml b/pom.xml index c32b51a83d..3a47d13b7d 100644 --- a/pom.xml +++ b/pom.xml @@ -715,9 +715,9 @@ 0.8.1 4.5.13 4.4.13 - 2.11.3 - 2.11.3 - 0.6.0 + 2.12.4 + 2.12.4 + 1.0.0 0.5.3 1 3.1.0 @@ -773,7 +773,7 @@ 2C 3.0.0-M5 6.9.4 - 3.5.1 + 3.7.0 5.0.3 3.4.6 3.20.1 diff --git a/repository/pom.xml b/repository/pom.xml index 0988bd0ee7..4e5c648f57 100755 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -59,6 +59,18 @@ atlas-graphdb-api + + org.apache.tinkerpop + gremlin-util + ${tinkerpop.version} + + + + org.jctools + jctools-core + 4.0.1 + + org.antlr antlr4-runtime diff --git a/webapp/src/main/java/org/apache/atlas/web/service/AtlasDebugMetricsSink.java b/webapp/src/main/java/org/apache/atlas/web/service/AtlasDebugMetricsSink.java index ef24b861ea..ec43d3e141 100644 --- a/webapp/src/main/java/org/apache/atlas/web/service/AtlasDebugMetricsSink.java +++ b/webapp/src/main/java/org/apache/atlas/web/service/AtlasDebugMetricsSink.java @@ -19,6 +19,7 @@ import org.apache.atlas.web.model.DebugMetrics; import org.apache.commons.lang.StringUtils; +import org.apache.hadoop.hbase.shaded.org.apache.commons.configuration2.SubsetConfiguration; import org.apache.hadoop.metrics2.AbstractMetric; import org.apache.hadoop.metrics2.MetricsRecord; import org.apache.hadoop.metrics2.MetricsSink; @@ -58,10 +59,6 @@ public HashMap getMetrics() { return metricStructuredSnapshot; } - @Override - public void init(org.apache.commons.configuration2.SubsetConfiguration subsetConfiguration) { - } - @Override public void flush() { } @@ -112,4 +109,9 @@ private void updateMetricType(DebugMetrics debugMetrics, String metricType, Abst private static String inferMeasureType(String fullName, String nameWithoutMetricType) { return fullName.replaceFirst(nameWithoutMetricType, ""); } + + @Override + public void init(SubsetConfiguration subsetConfiguration) { + + } } \ No newline at end of file From e52097913df2711e416c234b26df11c6366ff2b1 Mon Sep 17 00:00:00 2001 From: Suman Das <59254445+sumandas0@users.noreply.github.com> Date: Tue, 6 Feb 2024 13:58:37 +0530 Subject: [PATCH 5/6] feat: bump es version to support es:8 with backward compatibility --- .gitignore | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6cf6407919..c338c03df9 100755 --- a/.gitignore +++ b/.gitignore @@ -13,7 +13,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - +distro # Maven target* dependency-reduced-pom.xml diff --git a/pom.xml b/pom.xml index 3a47d13b7d..f9871631dd 100644 --- a/pom.xml +++ b/pom.xml @@ -697,7 +697,7 @@ 4.3.0 1.8 3.2.2 - 7.16.2 + 7.17.4 org.apache.atlas.repository.audit.InMemoryEntityAuditRepository 2.13.2 2.18.1 From d117ec78e86bdb05c5ad455670a031912120d15d Mon Sep 17 00:00:00 2001 From: Suman Das <59254445+sumandas0@users.noreply.github.com> Date: Tue, 6 Feb 2024 14:23:28 +0530 Subject: [PATCH 6/6] revert: remove the branch spec build --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index b07a5a0104..fdbc1de38c 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -25,7 +25,7 @@ on: - beta - development - master - - janusgraph-upgrade-1.0.0 + - lineageondemand jobs: build: