You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2023/02/10 15:56:22 UTC
[tinkerpop] 03/04: Merge branch '3.5-dev' into 3.6-dev
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 5e1257db96834349c0b2b0d769a22f2828db1d99
Merge: e87775d3e6 e19ca3b3f2
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Fri Feb 10 10:55:52 2023 -0500
Merge branch '3.5-dev' into 3.6-dev
CHANGELOG.asciidoc | 1 +
.../io/graphson/GraphSONRecordReader.java | 37 ++++++++++-----
.../structure/io/RecordReaderWriterTest.java | 32 ++++++++++++-
.../GraphSONV3d0RecordReaderFilterTest.java | 51 +++++++++++++++++++++
.../io/gryo/GryoRecordReaderFilterTest.java | 52 ++++++++++++++++++++++
5 files changed, 161 insertions(+), 12 deletions(-)
diff --cc hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/RecordReaderWriterTest.java
index 40450a8856,64354e9233..b73f62f43d
--- a/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/RecordReaderWriterTest.java
+++ b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/RecordReaderWriterTest.java
@@@ -33,8 -34,12 +34,13 @@@ import org.apache.hadoop.mapreduce.lib.
import org.apache.hadoop.mapreduce.task.TaskAttemptContextImpl;
import org.apache.hadoop.util.ReflectionUtils;
import org.apache.tinkerpop.gremlin.TestHelper;
+import org.apache.tinkerpop.gremlin.features.TestFiles;
+ import org.apache.tinkerpop.gremlin.hadoop.Constants;
import org.apache.tinkerpop.gremlin.hadoop.HadoopGraphProvider;
+ import org.apache.tinkerpop.gremlin.hadoop.structure.util.ConfUtil;
+ import org.apache.tinkerpop.gremlin.process.computer.GraphFilter;
+ import org.apache.tinkerpop.gremlin.process.computer.util.VertexProgramHelper;
+ import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
import org.apache.tinkerpop.gremlin.structure.Direction;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;