You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tinkerpop.apache.org by Stephen Mallette <sp...@gmail.com> on 2016/04/12 12:52:48 UTC

messed up merge

Yesterday I flubbed a merge from tp31 to master. I know exactly what I did
and the merge was not all that complicated so luckily it was quite easy to
resolve. The only thing that possibly remains amiss are these two lines in
the spark-gremlin pom.xml:

https://github.com/apache/incubator-tinkerpop/blob/bbf6b19cdd62952a086cf6902847a3352e107bd9/spark-gremlin/pom.xml#L413-L414

These two lines were in tp31 but not in master at the time of this merge.
They are now in master and i'm not sure if they should be.  Marko, as this
is spark related, I assume that you would know whether they should be only
in tp31 or not - if so, let me know and I'll remove them from master.

Thanks,

Stephen

Re: messed up merge

Posted by Marko Rodriguez <ok...@gmail.com>.
Hey,

Note that I ran integration tests locally for master/ (3.2.1) and all is good.

[INFO] ------------------------------------------------------------------------
[INFO] Reactor Summary:
[INFO]
[INFO] Apache TinkerPop .................................. SUCCESS [5.270s]
[INFO] Apache TinkerPop :: Gremlin Shaded ................ SUCCESS [3.722s]
[INFO] Apache TinkerPop :: Gremlin Core .................. SUCCESS [44.198s]
[INFO] Apache TinkerPop :: Gremlin Test .................. SUCCESS [12.130s]
[INFO] Apache TinkerPop :: Gremlin Groovy ................ SUCCESS [41.909s]
[INFO] Apache TinkerPop :: Gremlin Groovy Test ........... SUCCESS [6.591s]
[INFO] Apache TinkerPop :: TinkerGraph Gremlin ........... SUCCESS [3:24.813s]
[INFO] Apache TinkerPop :: Gremlin Benchmark ............. SUCCESS [5.218s]
[INFO] Apache TinkerPop :: Hadoop Gremlin ................ SUCCESS [10:49.513s]
[INFO] Apache TinkerPop :: Spark Gremlin ................. SUCCESS [6:48.996s]
[INFO] Apache TinkerPop :: Giraph Gremlin ................ SUCCESS [2:43:25.328s]
[INFO] Apache TinkerPop :: Neo4j Gremlin ................. SUCCESS [18:09.051s]
[INFO] Apache TinkerPop :: Gremlin Driver ................ SUCCESS [9.994s]
[INFO] Apache TinkerPop :: Gremlin Server ................ SUCCESS [12:54.608s]
[INFO] Apache TinkerPop :: Gremlin Console ............... SUCCESS [1:24.927s]
[INFO] Apache TinkerPop :: Gremlin Archetype ............. SUCCESS [0.092s]
[INFO] Apache TinkerPop :: Archetype - TinkerGraph ....... SUCCESS [4.749s]
[INFO] Apache TinkerPop :: Archetype - Server ............ SUCCESS [10.593s]
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 3:39:22.251s
[INFO] Finished at: Mon Apr 11 22:52:18 MDT 2016
[INFO] Final Memory: 102M/693M
[INFO] ------------------------------------------------------------------------

Marko.

http://markorodriguez.com

On Apr 12, 2016, at 7:27 AM, Stephen Mallette <sp...@gmail.com> wrote:

> Well those are unit tests (so yes - non-integration tests). What I just
> noticed though is that this configuration is for the appveyor windows
> build.  As you say, I think we should just leave it unless Marvin Froeder
> says otherwise..
> 
> On Tue, Apr 12, 2016 at 9:22 AM, Marko Rodriguez <ok...@gmail.com>
> wrote:
> 
>> Hi Stephen,
>> 
>> What is this "excluding" ? This is for non-integration tests?
>> 
>> I believe that I made it so that only
>> SparkGraphComputerProcessIntegrateTest ran to reduce the time it took for
>> "mvn clean install" to do its thing. I would just leave both for now as you
>> have it and if we want to make "mvn clean install" faster, we can remove
>> the SparkGraphComputerGroovyProcessIntegrateTest.
>> 
>> Marko.
>> 
>> http://markorodriguez.com
>> 
>> On Apr 12, 2016, at 4:52 AM, Stephen Mallette <sp...@gmail.com>
>> wrote:
>> 
>>> Yesterday I flubbed a merge from tp31 to master. I know exactly what I
>> did
>>> and the merge was not all that complicated so luckily it was quite easy
>> to
>>> resolve. The only thing that possibly remains amiss are these two lines
>> in
>>> the spark-gremlin pom.xml:
>>> 
>>> 
>> https://github.com/apache/incubator-tinkerpop/blob/bbf6b19cdd62952a086cf6902847a3352e107bd9/spark-gremlin/pom.xml#L413-L414
>>> 
>>> These two lines were in tp31 but not in master at the time of this merge.
>>> They are now in master and i'm not sure if they should be.  Marko, as
>> this
>>> is spark related, I assume that you would know whether they should be
>> only
>>> in tp31 or not - if so, let me know and I'll remove them from master.
>>> 
>>> Thanks,
>>> 
>>> Stephen
>> 
>> 


Re: messed up merge

Posted by Stephen Mallette <sp...@gmail.com>.
Well those are unit tests (so yes - non-integration tests). What I just
noticed though is that this configuration is for the appveyor windows
build.  As you say, I think we should just leave it unless Marvin Froeder
says otherwise..

On Tue, Apr 12, 2016 at 9:22 AM, Marko Rodriguez <ok...@gmail.com>
wrote:

> Hi Stephen,
>
> What is this "excluding" ? This is for non-integration tests?
>
> I believe that I made it so that only
> SparkGraphComputerProcessIntegrateTest ran to reduce the time it took for
> "mvn clean install" to do its thing. I would just leave both for now as you
> have it and if we want to make "mvn clean install" faster, we can remove
> the SparkGraphComputerGroovyProcessIntegrateTest.
>
> Marko.
>
> http://markorodriguez.com
>
> On Apr 12, 2016, at 4:52 AM, Stephen Mallette <sp...@gmail.com>
> wrote:
>
> > Yesterday I flubbed a merge from tp31 to master. I know exactly what I
> did
> > and the merge was not all that complicated so luckily it was quite easy
> to
> > resolve. The only thing that possibly remains amiss are these two lines
> in
> > the spark-gremlin pom.xml:
> >
> >
> https://github.com/apache/incubator-tinkerpop/blob/bbf6b19cdd62952a086cf6902847a3352e107bd9/spark-gremlin/pom.xml#L413-L414
> >
> > These two lines were in tp31 but not in master at the time of this merge.
> > They are now in master and i'm not sure if they should be.  Marko, as
> this
> > is spark related, I assume that you would know whether they should be
> only
> > in tp31 or not - if so, let me know and I'll remove them from master.
> >
> > Thanks,
> >
> > Stephen
>
>

Re: messed up merge

Posted by Marko Rodriguez <ok...@gmail.com>.
Hi Stephen,

What is this "excluding" ? This is for non-integration tests?

I believe that I made it so that only SparkGraphComputerProcessIntegrateTest ran to reduce the time it took for "mvn clean install" to do its thing. I would just leave both for now as you have it and if we want to make "mvn clean install" faster, we can remove the SparkGraphComputerGroovyProcessIntegrateTest.

Marko.

http://markorodriguez.com

On Apr 12, 2016, at 4:52 AM, Stephen Mallette <sp...@gmail.com> wrote:

> Yesterday I flubbed a merge from tp31 to master. I know exactly what I did
> and the merge was not all that complicated so luckily it was quite easy to
> resolve. The only thing that possibly remains amiss are these two lines in
> the spark-gremlin pom.xml:
> 
> https://github.com/apache/incubator-tinkerpop/blob/bbf6b19cdd62952a086cf6902847a3352e107bd9/spark-gremlin/pom.xml#L413-L414
> 
> These two lines were in tp31 but not in master at the time of this merge.
> They are now in master and i'm not sure if they should be.  Marko, as this
> is spark related, I assume that you would know whether they should be only
> in tp31 or not - if so, let me know and I'll remove them from master.
> 
> Thanks,
> 
> Stephen