This is an automated email from the ASF dual-hosted git repository. pinal pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/atlas.git
The following commit(s) were added to refs/heads/master by this push: new 4387d97 ATLAS-4538 : Upgrade tinkerpop to 3.5.2 4387d97 is described below commit 4387d9795b60bfa0a01f81ba208030dadc9430bf Author: vinayak.marraiya <vinayak.marra...@cloudera.com> AuthorDate: Thu Jan 27 12:00:15 2022 +0530 ATLAS-4538 : Upgrade tinkerpop to 3.5.2 Signed-off-by: Pinal Shah <pinal.s...@freestoneinfotech.com> --- pom.xml | 2 +- .../java/org/apache/atlas/query/TraversalComposerTest.java | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index ba40928..2f7b00a 100644 --- a/pom.xml +++ b/pom.xml @@ -771,7 +771,7 @@ <surefire.forkCount>2C</surefire.forkCount> <surefire.version>3.0.0-M5</surefire.version> <testng.version>7.0.0</testng.version> - <tinkerpop.version>3.5.1</tinkerpop.version> + <tinkerpop.version>3.5.2</tinkerpop.version> <woodstox-core.version>5.0.3</woodstox-core.version> <zookeeper.version>3.5.7</zookeeper.version> </properties> diff --git a/repository/src/test/java/org/apache/atlas/query/TraversalComposerTest.java b/repository/src/test/java/org/apache/atlas/query/TraversalComposerTest.java index 8f76033..6064577 100644 --- a/repository/src/test/java/org/apache/atlas/query/TraversalComposerTest.java +++ b/repository/src/test/java/org/apache/atlas/query/TraversalComposerTest.java @@ -37,23 +37,23 @@ public class TraversalComposerTest extends BaseDSLComposer { @Test public void queries() { verify("hive_db", - "[JanusGraphStep([],[__typeName.eq(hive_db)]), DedupGlobalStep, RangeGlobalStep(0,25)]"); + "[JanusGraphStep([],[__typeName.eq(hive_db)]), DedupGlobalStep(null,null), RangeGlobalStep(0,25)]"); verify("hive_db where owner = 'hdfs'", - "[JanusGraphStep([],[__typeName.eq(hive_db), hive_db.owner.eq(hdfs)]), DedupGlobalStep, RangeGlobalStep(0,25)]"); + "[JanusGraphStep([],[__typeName.eq(hive_db), hive_db.owner.eq(hdfs)]), DedupGlobalStep(null,null), RangeGlobalStep(0,25)]"); verify("DB where owner = ['hdfs', 'anon']", - "[JanusGraphStep([],[__typeName.eq(DB), DB.owner.within([hdfs, anon])]), DedupGlobalStep, RangeGlobalStep(0,25)]"); + "[JanusGraphStep([],[__typeName.eq(DB), DB.owner.within([hdfs, anon])]), DedupGlobalStep(null,null), RangeGlobalStep(0,25)]"); verify("hive_db where hive_db.name='Reporting' and hive_db.createTime < '2017-12-12T02:35:58.440Z'", - "[JanusGraphStep([],[__typeName.eq(hive_db), hive_db.name.eq(Reporting), hive_db.createTime.lt(1513046158440)]), DedupGlobalStep, RangeGlobalStep(0,25)]"); + "[JanusGraphStep([],[__typeName.eq(hive_db), hive_db.name.eq(Reporting), hive_db.createTime.lt(1513046158440)]), DedupGlobalStep(null,null), RangeGlobalStep(0,25)]"); // note that projections are not handled in the conversion verify("DB as d select d.name, d.owner", - "[JanusGraphStep([],[__typeName.eq(DB)]), DedupGlobalStep@[d], RangeGlobalStep(0,25)]"); + "[JanusGraphStep([],[__typeName.eq(DB)]), DedupGlobalStep(null,null)@[d], RangeGlobalStep(0,25)]"); verify("Table groupby(owner) select name, owner, clusterName orderby name", - "[JanusGraphStep([],[__typeName.eq(Table), Table.owner.neq]), GroupStep(value(Table.owner),[FoldStep]), DedupGlobalStep, RangeGlobalStep(0,25)]"); + "[JanusGraphStep([],[__typeName.eq(Table), Table.owner.neq]), GroupStep(value([CoalesceStep([value(Table.owner), (null)])]),[FoldStep]), DedupGlobalStep(null,null), RangeGlobalStep(0,25)]"); } private void verify(String dsl, String expected) {