[GitHub] tinkerpop pull request #920: optmizes collection copy with Collections addAl...

2018-08-22 Thread otaviojava
GitHub user otaviojava opened a pull request:

https://github.com/apache/tinkerpop/pull/920

optmizes collection copy with Collections addAll

Copying of array contents to a collection where each element is added 
individually using a for a loop. We can be replaced by a call to 
Collections.addAll().
As the documentation says:

> Adds all of the specified elements to the specified collection. Elements 
to be added may be specified individually or as an array. The behavior of this 
convenience method is identical to that of c.addAll(Arrays.asList(elements)), 
but this method is likely to run significantly faster under most 
implementations.
When elements are specified individually, this method provides a convenient 
way to add a few elements to an existing collection:


https://docs.oracle.com/javase/8/docs/api/java/util/Collections.html#addAll-java.util.Collection-T...-

In my experience using either Collections.addll or Collections.addAll used 
to be 30% faster then add from loop.


You can merge this pull request into a Git repository by running:

$ git pull https://github.com/otaviojava/tinkerpop 
optmizes_collections_copy_tp32

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/tinkerpop/pull/920.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #920


commit 0e34073d8a756a52eda571bd9ddac0b94b42d54a
Author: Otavio Santana 
Date:   2018-08-22T19:45:19Z

optmizes collection copy with Collections addAll




---


[GitHub] tinkerpop pull request #914: Do not format and reparse eval timeout arg when...

2018-08-22 Thread asfgit
Github user asfgit closed the pull request at:

https://github.com/apache/tinkerpop/pull/914


---


[GitHub] tinkerpop pull request #919: String loop to String builder

2018-08-22 Thread otaviojava
Github user otaviojava commented on a diff in the pull request:

https://github.com/apache/tinkerpop/pull/919#discussion_r211940616
  
--- Diff: 
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
 ---
@@ -208,14 +208,14 @@ private void handleNestedTraversals(final 
Traversal.Admin traversal, final Mutab
 private void appendMetrics(final Collection 
metrics, final StringBuilder sb, final int indent) {
 // Append each StepMetric's row. indexToLabelMap values are 
ordered by index.
 for (Metrics m : metrics) {
-String rowName = m.getName();
+final StringBuilder metricName = new 
StringBuilder(m.getName());
 
 // Handle indentation
 for (int ii = 0; ii < indent; ii++) {
-rowName = "  " + rowName;
+metricName.insert(0, "  ");
 }
--- End diff --

That is the same previous behavior, but using StringBuilder this time.

https://docs.oracle.com/javase/8/docs/api/java/lang/StringBuilder.html#insert-int-java.lang.String-


---


[GitHub] tinkerpop pull request #919: String loop to String builder [master]

2018-08-22 Thread otaviojava
Github user otaviojava commented on a diff in the pull request:

https://github.com/apache/tinkerpop/pull/919#discussion_r211950542
  
--- Diff: 
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
 ---
@@ -208,14 +208,14 @@ private void handleNestedTraversals(final 
Traversal.Admin traversal, final Mutab
 private void appendMetrics(final Collection 
metrics, final StringBuilder sb, final int indent) {
 // Append each StepMetric's row. indexToLabelMap values are 
ordered by index.
 for (Metrics m : metrics) {
-String rowName = m.getName();
+final StringBuilder metricName = new 
StringBuilder(m.getName());
 
 // Handle indentation
 for (int ii = 0; ii < indent; ii++) {
-rowName = "  " + rowName;
+metricName.insert(0, "  ");
 }
--- End diff --

Do you mean this way?
```java
  private static String padLeft(final String text, final int amountToPad) {
// not sure why this method needed to exist. stupid string format 
stuff and commons utilities wouldn't
// work for some reason in the context this method was used above.
final StringBuilder newText = new StringBuilder();
for (int ix = 0; ix < amountToPad; ix++) {
newText.append(" ");
}
newText.append(text);
return newText.toString();
}

```


---


[GitHub] tinkerpop pull request #919: String loop to String builder [tp32]

2018-08-22 Thread robertdale
Github user robertdale commented on a diff in the pull request:

https://github.com/apache/tinkerpop/pull/919#discussion_r211952645
  
--- Diff: 
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
 ---
@@ -208,14 +208,14 @@ private void handleNestedTraversals(final 
Traversal.Admin traversal, final Mutab
 private void appendMetrics(final Collection 
metrics, final StringBuilder sb, final int indent) {
 // Append each StepMetric's row. indexToLabelMap values are 
ordered by index.
 for (Metrics m : metrics) {
-String rowName = m.getName();
+final StringBuilder metricName = new 
StringBuilder(m.getName());
 
 // Handle indentation
 for (int ii = 0; ii < indent; ii++) {
-rowName = "  " + rowName;
+metricName.insert(0, "  ");
 }
--- End diff --

Right.


---


[GitHub] tinkerpop pull request #919: String loop to String builder [tp32]

2018-08-22 Thread otaviojava
Github user otaviojava commented on a diff in the pull request:

https://github.com/apache/tinkerpop/pull/919#discussion_r211956497
  
--- Diff: 
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
 ---
@@ -286,10 +286,10 @@ private void appendMetrics(final Collection metrics, final St
 private static String padLeft(final String text, final int 
amountToPad) {
 // not sure why this method needed to exist. stupid string format 
stuff and commons utilities wouldn't
 // work for some reason in the context this method was used above.
-String newText = text;
+final StringBuilder newText = new StringBuilder(text);
 for (int ix = 0; ix < amountToPad; ix++) {
-newText = " " + newText;
+newText.insert(0, " ");
 }
--- End diff --

Done, thank you.


---


[GitHub] tinkerpop pull request #919: String loop to String builder [tp32]

2018-08-22 Thread otaviojava
Github user otaviojava commented on a diff in the pull request:

https://github.com/apache/tinkerpop/pull/919#discussion_r211956428
  
--- Diff: 
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
 ---
@@ -208,14 +208,14 @@ private void handleNestedTraversals(final 
Traversal.Admin traversal, final Mutab
 private void appendMetrics(final Collection 
metrics, final StringBuilder sb, final int indent) {
 // Append each StepMetric's row. indexToLabelMap values are 
ordered by index.
 for (Metrics m : metrics) {
-String rowName = m.getName();
+final StringBuilder metricName = new 
StringBuilder(m.getName());
 
 // Handle indentation
 for (int ii = 0; ii < indent; ii++) {
-rowName = "  " + rowName;
+metricName.insert(0, "  ");
 }
--- End diff --

Done in both, thank you.


---


[GitHub] tinkerpop issue #919: String loop to String builder [tp32]

2018-08-22 Thread otaviojava
Github user otaviojava commented on the issue:

https://github.com/apache/tinkerpop/pull/919
  
@spmallette @robertdale When I changed the branch to tp32. When execute 
this code:
`return new ASTTransformationCustomizer(InterpreterMode.class);` It returns 
an NPE, I checked the code.

```java
private static CompilePhase findPhase(ASTTransformation transformation) {
if (transformation==null) throw new 
IllegalArgumentException("Provided transformation must not be null")
final Class clazz = transformation.class//this line returns a NPE
final GroovyASTTransformation annotation = 
clazz.getAnnotation(GroovyASTTransformation)
if (annotation==null) throw new IllegalArgumentException("Provided 
ast transformation is not annotated with "+GroovyASTTransformation.name)

annotation.phase()
}
```
The file: ASTTransformationCustomizer.groovy

I did not change the code at this point.
Suggestions?




---


[GitHub] tinkerpop issue #919: String loop to String builder

2018-08-22 Thread robertdale
Github user robertdale commented on the issue:

https://github.com/apache/tinkerpop/pull/919
  
@otaviojava did you decompile the bytecode to make sure the compiler didn't 
do that automagically?   Otherwise, StringBuilder vars should be final.


---


[GitHub] tinkerpop pull request #919: String loop to String builder

2018-08-22 Thread otaviojava
Github user otaviojava commented on a diff in the pull request:

https://github.com/apache/tinkerpop/pull/919#discussion_r211940698
  
--- Diff: 
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
 ---
@@ -286,10 +286,10 @@ private void appendMetrics(final Collection metrics, final St
 private static String padLeft(final String text, final int 
amountToPad) {
 // not sure why this method needed to exist. stupid string format 
stuff and commons utilities wouldn't
 // work for some reason in the context this method was used above.
-String newText = text;
+final StringBuilder newText = new StringBuilder(text);
 for (int ix = 0; ix < amountToPad; ix++) {
-newText = " " + newText;
+newText.insert(0, " ");
 }
--- End diff --

That is the same previous behavior, but using StringBuilder this time.

https://docs.oracle.com/javase/8/docs/api/java/lang/StringBuilder.html#insert-int-java.lang.String-


---


[GitHub] tinkerpop issue #919: String loop to String builder [master]

2018-08-22 Thread otaviojava
Github user otaviojava commented on the issue:

https://github.com/apache/tinkerpop/pull/919
  
@spmallette done.


---


[GitHub] tinkerpop issue #919: String loop to String builder [master]

2018-08-22 Thread spmallette
Github user spmallette commented on the issue:

https://github.com/apache/tinkerpop/pull/919
  
thanks for the contribution @otaviojava - please edit the PR to target 
tp32. we handle the rest of the merge flow to tp33 and master from there unless 
there are really ugly merges or something between release branches.


---


[GitHub] tinkerpop pull request #919: String loop to String builder [master]

2018-08-22 Thread robertdale
Github user robertdale commented on a diff in the pull request:

https://github.com/apache/tinkerpop/pull/919#discussion_r211948320
  
--- Diff: 
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
 ---
@@ -208,14 +208,14 @@ private void handleNestedTraversals(final 
Traversal.Admin traversal, final Mutab
 private void appendMetrics(final Collection 
metrics, final StringBuilder sb, final int indent) {
 // Append each StepMetric's row. indexToLabelMap values are 
ordered by index.
 for (Metrics m : metrics) {
-String rowName = m.getName();
+final StringBuilder metricName = new 
StringBuilder(m.getName());
 
 // Handle indentation
 for (int ii = 0; ii < indent; ii++) {
-rowName = "  " + rowName;
+metricName.insert(0, "  ");
 }
--- End diff --

Yes, I get that. What I'm suggesting is that instead of having to `insert` 
data later on thus incurring the cost of array copies, why not put the 
indentation loop first, then everything after can be `append` only.


---


[GitHub] tinkerpop issue #919: String loop to String builder [tp32]

2018-08-22 Thread robertdale
Github user robertdale commented on the issue:

https://github.com/apache/tinkerpop/pull/919
  
@otaviojava was that locally?  the travis build failed due to grapes 
download.


---


[GitHub] tinkerpop issue #889: Tinkerpop 1977 - Sasl Authentication

2018-08-22 Thread mattallenuk
Github user mattallenuk commented on the issue:

https://github.com/apache/tinkerpop/pull/889
  
@jorgebay I've rebased my TINKERPOP-1977 onto tp32 and made changes to the 
documentation. Not sure I've done it right as I'm seeing lots of conflicts here 
now lol! 

Let me know if I've done it wrong and how to do it correctly.


---


[jira] [Commented] (TINKERPOP-1977) Gremlin-JavaScript: Support SASL authentication

2018-08-22 Thread ASF GitHub Bot (JIRA)


[ 
https://issues.apache.org/jira/browse/TINKERPOP-1977?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16588864#comment-16588864
 ] 

ASF GitHub Bot commented on TINKERPOP-1977:
---

Github user mattallenuk commented on the issue:

https://github.com/apache/tinkerpop/pull/889
  
@jorgebay I've rebased my TINKERPOP-1977 onto tp32 and made changes to the 
documentation. Not sure I've done it right as I'm seeing lots of conflicts here 
now lol! 

Let me know if I've done it wrong and how to do it correctly.


> Gremlin-JavaScript: Support SASL authentication
> ---
>
> Key: TINKERPOP-1977
> URL: https://issues.apache.org/jira/browse/TINKERPOP-1977
> Project: TinkerPop
>  Issue Type: Improvement
>  Components: javascript
>Reporter: Jorge Bay
>Priority: Major
>
> We should add support for SASL authentication flow, ideally a generic 
> interface and an implementation using username and password.
> An authenticator could have the following interface:
> {code:javascript}
> /** @abstract */
> class Authenticator {
>   /**
>   @returns {Promise} Returns a promise containing the Request to be sent.
>   When the Promise resolves to a null value, it indicates that the 
> authentication flow was successful.
>   */ 
>   evaluateChallenge(response) {
> throw new Error("evaluateChallenge should be implemented");
>   }
> }
> {code}



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)


[GitHub] tinkerpop issue #889: Tinkerpop 1977 - Sasl Authentication

2018-08-22 Thread spmallette
Github user spmallette commented on the issue:

https://github.com/apache/tinkerpop/pull/889
  
Note that it's pulling in commits from master now. Not sure how you got to 
that point exactly, but I think you need to just rebase your commits in your 
local repository on your branch.

```text
git checkout TINKERPOP-1977
git rebase origin/tp32
git push origin TINKERPOP-1977 --force
```

note that i'm assuming that your `origin/tp32` is up to date with the 
upstream TinkerPop `tp32` and thus the `rebase` command should take your 
commits and re-write them on top of the latest commits in the `tp32` branch.  
Before you `push`, please review `git log` and make sure that you only see your 
commits followed by the TinkerPop history from `tp32`.  If something still 
looks funny there, just ping back and we can figure it out.

Once you do all this, the PR should update automatically and you should 
only see your commits on it and a "Files changed" of the same.


---


[jira] [Commented] (TINKERPOP-1977) Gremlin-JavaScript: Support SASL authentication

2018-08-22 Thread ASF GitHub Bot (JIRA)


[ 
https://issues.apache.org/jira/browse/TINKERPOP-1977?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16588876#comment-16588876
 ] 

ASF GitHub Bot commented on TINKERPOP-1977:
---

Github user spmallette commented on the issue:

https://github.com/apache/tinkerpop/pull/889
  
Note that it's pulling in commits from master now. Not sure how you got to 
that point exactly, but I think you need to just rebase your commits in your 
local repository on your branch.

```text
git checkout TINKERPOP-1977
git rebase origin/tp32
git push origin TINKERPOP-1977 --force
```

note that i'm assuming that your `origin/tp32` is up to date with the 
upstream TinkerPop `tp32` and thus the `rebase` command should take your 
commits and re-write them on top of the latest commits in the `tp32` branch.  
Before you `push`, please review `git log` and make sure that you only see your 
commits followed by the TinkerPop history from `tp32`.  If something still 
looks funny there, just ping back and we can figure it out.

Once you do all this, the PR should update automatically and you should 
only see your commits on it and a "Files changed" of the same.


> Gremlin-JavaScript: Support SASL authentication
> ---
>
> Key: TINKERPOP-1977
> URL: https://issues.apache.org/jira/browse/TINKERPOP-1977
> Project: TinkerPop
>  Issue Type: Improvement
>  Components: javascript
>Reporter: Jorge Bay
>Priority: Major
>
> We should add support for SASL authentication flow, ideally a generic 
> interface and an implementation using username and password.
> An authenticator could have the following interface:
> {code:javascript}
> /** @abstract */
> class Authenticator {
>   /**
>   @returns {Promise} Returns a promise containing the Request to be sent.
>   When the Promise resolves to a null value, it indicates that the 
> authentication flow was successful.
>   */ 
>   evaluateChallenge(response) {
> throw new Error("evaluateChallenge should be implemented");
>   }
> }
> {code}



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)


[GitHub] tinkerpop issue #889: Tinkerpop 1977 - Sasl Authentication

2018-08-22 Thread mattallenuk
Github user mattallenuk commented on the issue:

https://github.com/apache/tinkerpop/pull/889
  
@jorgebay I think I've got it now. Starting to see through the fog. 
Hopefully that last push is the one :)


---


[GitHub] tinkerpop pull request #917: Update comments in GraphProvider clear() and op...

2018-08-22 Thread asfgit
Github user asfgit closed the pull request at:

https://github.com/apache/tinkerpop/pull/917


---


[GitHub] tinkerpop pull request #916: Update comments in GraphProvider clear() and op...

2018-08-22 Thread asfgit
Github user asfgit closed the pull request at:

https://github.com/apache/tinkerpop/pull/916


---


[GitHub] tinkerpop issue #898: gremlin-javascript: Typescript typings definition

2018-08-22 Thread spmallette
Github user spmallette commented on the issue:

https://github.com/apache/tinkerpop/pull/898
  
@daem0ndev do you have any thoughts on the recent comments made here?


---


[GitHub] tinkerpop pull request #919: String loop to String builder

2018-08-22 Thread otaviojava
GitHub user otaviojava opened a pull request:

https://github.com/apache/tinkerpop/pull/919

String loop to String builder

String concatenation in loops. As every String concatenation copies the 
whole String, usually it is preferable to replace it with explicit calls to 
StringBuilder.append() or StringBuffer.append().

You can merge this pull request into a Git repository by running:

$ git pull https://github.com/otaviojava/tinkerpop string_string_builder

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/tinkerpop/pull/919.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #919


commit a63df818d54fdb9baee75ce4101e4d5482e069c1
Author: Otavio Santana 
Date:   2018-08-22T12:01:08Z

repleace String loop to String builder




---


[GitHub] tinkerpop pull request #919: String loop to String builder

2018-08-22 Thread robertdale
Github user robertdale commented on a diff in the pull request:

https://github.com/apache/tinkerpop/pull/919#discussion_r211934275
  
--- Diff: 
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
 ---
@@ -286,10 +286,10 @@ private void appendMetrics(final Collection metrics, final St
 private static String padLeft(final String text, final int 
amountToPad) {
 // not sure why this method needed to exist. stupid string format 
stuff and commons utilities wouldn't
 // work for some reason in the context this method was used above.
-String newText = text;
+final StringBuilder newText = new StringBuilder(text);
 for (int ix = 0; ix < amountToPad; ix++) {
-newText = " " + newText;
+newText.insert(0, " ");
 }
--- End diff --

Would it make sense to put this block before `text` then it won't have to 
do inserts?


---


[GitHub] tinkerpop issue #912: TINKERPOP-2023 SSL Enhancements

2018-08-22 Thread spmallette
Github user spmallette commented on the issue:

https://github.com/apache/tinkerpop/pull/912
  
VOTE +1 - server integration tests are good - nice job with docs and 
everything. thanks for doing this nerd work


---


[GitHub] tinkerpop pull request #919: String loop to String builder

2018-08-22 Thread robertdale
Github user robertdale commented on a diff in the pull request:

https://github.com/apache/tinkerpop/pull/919#discussion_r211934120
  
--- Diff: 
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
 ---
@@ -208,14 +208,14 @@ private void handleNestedTraversals(final 
Traversal.Admin traversal, final Mutab
 private void appendMetrics(final Collection 
metrics, final StringBuilder sb, final int indent) {
 // Append each StepMetric's row. indexToLabelMap values are 
ordered by index.
 for (Metrics m : metrics) {
-String rowName = m.getName();
+final StringBuilder metricName = new 
StringBuilder(m.getName());
 
 // Handle indentation
 for (int ii = 0; ii < indent; ii++) {
-rowName = "  " + rowName;
+metricName.insert(0, "  ");
 }
--- End diff --

Would it make sense to put this block before the name then it won't have to 
do inserts?


---


[GitHub] tinkerpop issue #889: Tinkerpop 1977 - Sasl Authentication

2018-08-22 Thread jorgebay
Github user jorgebay commented on the issue:

https://github.com/apache/tinkerpop/pull/889
  
Great contribution @mattallenuk! 

We should merge it to `tp32`. @mattallenuk do you want to change the base 
branch of this pull request and rebase? There shouldn't be any conflicts. We 
can either rebase and [change the base 
branch](https://help.github.com/articles/changing-the-base-branch-of-a-pull-request/)
 here or I could do it before merging it. lmk what you prefer.

About the documentation entries suggested by @spmallette, do you want to 
include it in this pull request @mattallenuk?


---


[GitHub] tinkerpop issue #919: String loop to String builder

2018-08-22 Thread otaviojava
Github user otaviojava commented on the issue:

https://github.com/apache/tinkerpop/pull/919
  
There are optimizations in Java 8 to String, however, it does not cover to 
String in a loop. Yes, I checked also in the bytecode. After that, I put the 
final var.
Thank you for the help.


---


[jira] [Commented] (TINKERPOP-2023) Gremlin Server should not create self-signed certs

2018-08-22 Thread ASF GitHub Bot (JIRA)


[ 
https://issues.apache.org/jira/browse/TINKERPOP-2023?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16588765#comment-16588765
 ] 

ASF GitHub Bot commented on TINKERPOP-2023:
---

Github user spmallette commented on the issue:

https://github.com/apache/tinkerpop/pull/912
  
VOTE +1 - server integration tests are good - nice job with docs and 
everything. thanks for doing this nerd work


> Gremlin Server should not create self-signed certs
> --
>
> Key: TINKERPOP-2023
> URL: https://issues.apache.org/jira/browse/TINKERPOP-2023
> Project: TinkerPop
>  Issue Type: Improvement
>  Components: server
>Affects Versions: 3.2.9
>Reporter: Robert Dale
>Assignee: Robert Dale
>Priority: Minor
>  Labels: breaking, deprecation
>




--
This message was sent by Atlassian JIRA
(v7.6.3#76005)


[GitHub] tinkerpop issue #889: Tinkerpop 1977 - Sasl Authentication

2018-08-22 Thread jorgebay
Github user jorgebay commented on the issue:

https://github.com/apache/tinkerpop/pull/889
  
I think the git branch is still based on`master` instead of `tp32`, that's 
why github shows a lot of additional commits.


---


[GitHub] tinkerpop issue #889: Tinkerpop 1977 - Sasl Authentication

2018-08-22 Thread jorgebay
Github user jorgebay commented on the issue:

https://github.com/apache/tinkerpop/pull/889
  
its not a problem :) 

As long as you make sure you don't loose your commits on the process (make 
sure you push a backup branch to your personal repository).

I think the issue is that your `tp32` branch is incorrect (looks like 
master): https://github.com/apache/tinkerpop/compare/tp32...mattallenuk:tp32

First you have to restore your `tp32` branch locally.

What's your output for: `git remote -vv` ?

I think that with that information, we will be able to help you all the way.


---


[GitHub] tinkerpop issue #889: Tinkerpop 1977 - Sasl Authentication

2018-08-22 Thread jorgebay
Github user jorgebay commented on the issue:

https://github.com/apache/tinkerpop/pull/889
  
awesome!

First, lets restore `tp32` on your repo:

```
git fetch upstream tp32
git checkout tp32
git reset --hard upstream/tp32
git push origin tp32
```

Once you did that, you can try to rebase.


---


[GitHub] tinkerpop issue #889: Tinkerpop 1977 - Sasl Authentication

2018-08-22 Thread mattallenuk
Github user mattallenuk commented on the issue:

https://github.com/apache/tinkerpop/pull/889
  
```
First, rewinding head to replay your work on top of it...
Generating patches: 100% (757/757), done.
Applying: valueMap should always return string keys
Using index info to reconstruct a base tree...
M   
gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyValueMapTest.groovy
M   
gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
M   
gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ValueMapTest.java
.git/rebase-apply/patch:33: space before tab in indent.
// add tokens, as string keys
.git/rebase-apply/patch:57: trailing whitespace.

.git/rebase-apply/patch:60: space before tab in indent.
new ScriptTraversal<>(g, "gremlin-groovy", 
"g.V().hasLabel('person').filter(__.outE('created')).valueMap(true)")
.git/rebase-apply/patch:72: trailing whitespace.

.git/rebase-apply/patch:135: trailing whitespace.
 *
warning: squelched 19 whitespace errors
warning: 24 lines add whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging 
gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ValueMapTest.java
CONFLICT (content): Merge conflict in 
gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ValueMapTest.java
Auto-merging 
gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
CONFLICT (content): Merge conflict in 
gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
Auto-merging 
gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyValueMapTest.groovy
error: Failed to merge in the changes.
Patch failed at 0001 valueMap should always return string keys
Use 'git am --show-current-patch' to see the failed patch

Resolve all conflicts manually, mark them as resolved with
"git add/rm ", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase 
--abort".
```


---


[GitHub] tinkerpop issue #889: Tinkerpop 1977 - Sasl Authentication

2018-08-22 Thread mattallenuk
Github user mattallenuk commented on the issue:

https://github.com/apache/tinkerpop/pull/889
  
If i look at https://github.com/mattallenuk/tinkerpop/commits/tp32, it 
appears to be what you were expecting? Have I done it the wrong way around?


---


[GitHub] tinkerpop issue #889: Tinkerpop 1977 - Sasl Authentication

2018-08-22 Thread mattallenuk
Github user mattallenuk commented on the issue:

https://github.com/apache/tinkerpop/pull/889
  
origin  https://github.com/mattallenuk/tinkerpop.git (fetch)
origin  https://github.com/mattallenuk/tinkerpop.git (push)
upstreamhttps://github.com/apache/tinkerpop.git (fetch)
upstreamhttps://github.com/apache/tinkerpop.git (push)



---


[GitHub] tinkerpop issue #889: Tinkerpop 1977 - Sasl Authentication

2018-08-22 Thread mattallenuk
Github user mattallenuk commented on the issue:

https://github.com/apache/tinkerpop/pull/889
  
Ok, done that which way do I rebase? Tried 

```
git checkout TINKERPOP-1977
git rebase origin/tp32
```

and getting some merges required with files I've not touched.


---


[jira] [Commented] (TINKERPOP-1977) Gremlin-JavaScript: Support SASL authentication

2018-08-22 Thread ASF GitHub Bot (JIRA)


[ 
https://issues.apache.org/jira/browse/TINKERPOP-1977?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16588990#comment-16588990
 ] 

ASF GitHub Bot commented on TINKERPOP-1977:
---

Github user mattallenuk commented on the issue:

https://github.com/apache/tinkerpop/pull/889
  
Ok, done that which way do I rebase? Tried 

```
git checkout TINKERPOP-1977
git rebase origin/tp32
```

and getting some merges required with files I've not touched.


> Gremlin-JavaScript: Support SASL authentication
> ---
>
> Key: TINKERPOP-1977
> URL: https://issues.apache.org/jira/browse/TINKERPOP-1977
> Project: TinkerPop
>  Issue Type: Improvement
>  Components: javascript
>Reporter: Jorge Bay
>Priority: Major
>
> We should add support for SASL authentication flow, ideally a generic 
> interface and an implementation using username and password.
> An authenticator could have the following interface:
> {code:javascript}
> /** @abstract */
> class Authenticator {
>   /**
>   @returns {Promise} Returns a promise containing the Request to be sent.
>   When the Promise resolves to a null value, it indicates that the 
> authentication flow was successful.
>   */ 
>   evaluateChallenge(response) {
> throw new Error("evaluateChallenge should be implemented");
>   }
> }
> {code}



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)


[GitHub] tinkerpop issue #889: Tinkerpop 1977 - Sasl Authentication

2018-08-22 Thread jorgebay
Github user jorgebay commented on the issue:

https://github.com/apache/tinkerpop/pull/889
  
At this stage you have to use "rebase interactive" to manually select your 
commits and skip the rest.

If you have a tool to do that, it would make your job a lot easier.


---


[GitHub] tinkerpop issue #889: Tinkerpop 1977 - Sasl Authentication

2018-08-22 Thread mattallenuk
Github user mattallenuk commented on the issue:

https://github.com/apache/tinkerpop/pull/889
  
:( sorry 


---


[GitHub] tinkerpop issue #889: Tinkerpop 1977 - Sasl Authentication

2018-08-22 Thread mattallenuk
Github user mattallenuk commented on the issue:

https://github.com/apache/tinkerpop/pull/889
  
@spmallette thanks I think I've got it right now. Not a git expert, still 
learning :)


---


[jira] [Commented] (TINKERPOP-1977) Gremlin-JavaScript: Support SASL authentication

2018-08-22 Thread ASF GitHub Bot (JIRA)


[ 
https://issues.apache.org/jira/browse/TINKERPOP-1977?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16588939#comment-16588939
 ] 

ASF GitHub Bot commented on TINKERPOP-1977:
---

Github user spmallette commented on the issue:

https://github.com/apache/tinkerpop/pull/889
  
hmm - something still looks fishy:

https://github.com/mattallenuk/tinkerpop/commits/TINKERPOP-1977

we should have a string of your continuous commits on top of `tp32` but 
they are instead interspersed with the other stuff. not sure how it got in that 
state. 

let me think about how to `git` your way out of this and get the commit 
history clean.


> Gremlin-JavaScript: Support SASL authentication
> ---
>
> Key: TINKERPOP-1977
> URL: https://issues.apache.org/jira/browse/TINKERPOP-1977
> Project: TinkerPop
>  Issue Type: Improvement
>  Components: javascript
>Reporter: Jorge Bay
>Priority: Major
>
> We should add support for SASL authentication flow, ideally a generic 
> interface and an implementation using username and password.
> An authenticator could have the following interface:
> {code:javascript}
> /** @abstract */
> class Authenticator {
>   /**
>   @returns {Promise} Returns a promise containing the Request to be sent.
>   When the Promise resolves to a null value, it indicates that the 
> authentication flow was successful.
>   */ 
>   evaluateChallenge(response) {
> throw new Error("evaluateChallenge should be implemented");
>   }
> }
> {code}



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)


[GitHub] tinkerpop issue #919: String loop to String builder [tp32]

2018-08-22 Thread robertdale
Github user robertdale commented on the issue:

https://github.com/apache/tinkerpop/pull/919
  
Hmm.. it happens on tp32. 


---


[GitHub] tinkerpop issue #919: String loop to String builder [tp32]

2018-08-22 Thread robertdale
Github user robertdale commented on the issue:

https://github.com/apache/tinkerpop/pull/919
  
Nevermind, still just grapes.


---


[GitHub] tinkerpop pull request #919: String loop to String builder [tp32]

2018-08-22 Thread asfgit
Github user asfgit closed the pull request at:

https://github.com/apache/tinkerpop/pull/919


---


[GitHub] tinkerpop issue #914: Do not format and reparse eval timeout arg when evalua...

2018-08-22 Thread robertdale
Github user robertdale commented on the issue:

https://github.com/apache/tinkerpop/pull/914
  
VOTE +1


---