You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by kt...@apache.org on 2021/08/05 22:40:32 UTC
[accumulo] branch 1.10 updated: removes extraneous code from
TabletIteratorTest
This is an automated email from the ASF dual-hosted git repository.
kturner pushed a commit to branch 1.10
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/1.10 by this push:
new 5d475b0 removes extraneous code from TabletIteratorTest
5d475b0 is described below
commit 5d475b00eabf9aa419dbc49d5a49465633a61815
Author: Keith Turner <kt...@apache.org>
AuthorDate: Thu Aug 5 18:37:12 2021 -0400
removes extraneous code from TabletIteratorTest
---
server/base/.gitignore | 1 +
.../java/org/apache/accumulo/server/util/TabletIteratorTest.java | 6 +-----
server/tserver/.gitignore | 1 +
test/.gitignore | 1 +
4 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/server/base/.gitignore b/server/base/.gitignore
index e77a822..320dd27 100644
--- a/server/base/.gitignore
+++ b/server/base/.gitignore
@@ -26,3 +26,4 @@
/nbproject/
/nbactions.xml
/nb-configuration.xml
+/bin/
diff --git a/server/base/src/test/java/org/apache/accumulo/server/util/TabletIteratorTest.java b/server/base/src/test/java/org/apache/accumulo/server/util/TabletIteratorTest.java
index 43888af..b60630d 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/util/TabletIteratorTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/util/TabletIteratorTest.java
@@ -121,12 +121,8 @@ public class TabletIteratorTest {
createTabletData(data1, "3", "c", null);
createTabletData(data1, "3", "n", "c");
- TreeMap<Key,Value> data2 = new TreeMap<>(data1);
-
- createTabletData(data2, "3", null, "n");
-
assertThrows(IllegalStateException.class,
- () -> runTest(Arrays.asList(data1, data2), Arrays.asList("3;c", "3;n", "3<")));
+ () -> runTest(Arrays.asList(data1), Arrays.asList("3;c", "3;n")));
}
@Test
diff --git a/server/tserver/.gitignore b/server/tserver/.gitignore
index e77a822..320dd27 100644
--- a/server/tserver/.gitignore
+++ b/server/tserver/.gitignore
@@ -26,3 +26,4 @@
/nbproject/
/nbactions.xml
/nb-configuration.xml
+/bin/
diff --git a/test/.gitignore b/test/.gitignore
index 87da2f9..c92e5e7 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -30,3 +30,4 @@
# python ignores
*.pyc
+/bin/
Re: [accumulo] branch 1.10 updated: removes extraneous code from TabletIteratorTest
Posted by Christopher <ct...@apache.org>.
Seems reasonable. Thanks for the explanation and satisfying my curiosity 😁
On Fri, Aug 6, 2021, 13:31 Keith Turner <ke...@deenlo.com> wrote:
> Was looking at this test with Mike Wall and we were getting very
> confused by it. We determined the confusion was caused by the test
> having extra code that was not needed. Since we had done the work to
> decipher this I thought it would be worthwhile to push it. Usually I
> would do a PR, but I thought it was only 3 lines so why bother? After
> pushing the commit I realized I had accidentally pushed a few files
> that Eclipse had changed that I did not want to push. So I did
> another commit to revert those unintended changes.
>
> As for the sours merge, the test does not exist in 2.x. I did check
> that my two commits were the only unmerged commits before doing the
> sours merge.
>
> On Thu, Aug 5, 2021 at 7:30 PM Christopher <ct...@apache.org> wrote:
> >
> > Hey Keith,
> >
> > Just curious because of all the activity around this change in 1.10
> > (the subsequent partial revert and the merge commits to main, which
> > seem to be -sours), what motivated the change to TabletIteratorTest in
> > the older branch?
> >
> > On Thu, Aug 5, 2021 at 6:40 PM <kt...@apache.org> wrote:
> > >
> > > This is an automated email from the ASF dual-hosted git repository.
> > >
> > > kturner pushed a commit to branch 1.10
> > > in repository https://gitbox.apache.org/repos/asf/accumulo.git
> > >
> > >
> > > The following commit(s) were added to refs/heads/1.10 by this push:
> > > new 5d475b0 removes extraneous code from TabletIteratorTest
> > > 5d475b0 is described below
> > >
> > > commit 5d475b00eabf9aa419dbc49d5a49465633a61815
> > > Author: Keith Turner <kt...@apache.org>
> > > AuthorDate: Thu Aug 5 18:37:12 2021 -0400
> > >
> > > removes extraneous code from TabletIteratorTest
> > > ---
> > > server/base/.gitignore |
> 1 +
> > > .../java/org/apache/accumulo/server/util/TabletIteratorTest.java |
> 6 +-----
> > > server/tserver/.gitignore |
> 1 +
> > > test/.gitignore |
> 1 +
> > > 4 files changed, 4 insertions(+), 5 deletions(-)
> > >
> > > diff --git a/server/base/.gitignore b/server/base/.gitignore
> > > index e77a822..320dd27 100644
> > > --- a/server/base/.gitignore
> > > +++ b/server/base/.gitignore
> > > @@ -26,3 +26,4 @@
> > > /nbproject/
> > > /nbactions.xml
> > > /nb-configuration.xml
> > > +/bin/
> > > diff --git
> a/server/base/src/test/java/org/apache/accumulo/server/util/TabletIteratorTest.java
> b/server/base/src/test/java/org/apache/accumulo/server/util/TabletIteratorTest.java
> > > index 43888af..b60630d 100644
> > > ---
> a/server/base/src/test/java/org/apache/accumulo/server/util/TabletIteratorTest.java
> > > +++
> b/server/base/src/test/java/org/apache/accumulo/server/util/TabletIteratorTest.java
> > > @@ -121,12 +121,8 @@ public class TabletIteratorTest {
> > > createTabletData(data1, "3", "c", null);
> > > createTabletData(data1, "3", "n", "c");
> > >
> > > - TreeMap<Key,Value> data2 = new TreeMap<>(data1);
> > > -
> > > - createTabletData(data2, "3", null, "n");
> > > -
> > > assertThrows(IllegalStateException.class,
> > > - () -> runTest(Arrays.asList(data1, data2),
> Arrays.asList("3;c", "3;n", "3<")));
> > > + () -> runTest(Arrays.asList(data1), Arrays.asList("3;c",
> "3;n")));
> > > }
> > >
> > > @Test
> > > diff --git a/server/tserver/.gitignore b/server/tserver/.gitignore
> > > index e77a822..320dd27 100644
> > > --- a/server/tserver/.gitignore
> > > +++ b/server/tserver/.gitignore
> > > @@ -26,3 +26,4 @@
> > > /nbproject/
> > > /nbactions.xml
> > > /nb-configuration.xml
> > > +/bin/
> > > diff --git a/test/.gitignore b/test/.gitignore
> > > index 87da2f9..c92e5e7 100644
> > > --- a/test/.gitignore
> > > +++ b/test/.gitignore
> > > @@ -30,3 +30,4 @@
> > > # python ignores
> > > *.pyc
> > >
> > > +/bin/
>
Re: [accumulo] branch 1.10 updated: removes extraneous code from TabletIteratorTest
Posted by Keith Turner <ke...@deenlo.com>.
Was looking at this test with Mike Wall and we were getting very
confused by it. We determined the confusion was caused by the test
having extra code that was not needed. Since we had done the work to
decipher this I thought it would be worthwhile to push it. Usually I
would do a PR, but I thought it was only 3 lines so why bother? After
pushing the commit I realized I had accidentally pushed a few files
that Eclipse had changed that I did not want to push. So I did
another commit to revert those unintended changes.
As for the sours merge, the test does not exist in 2.x. I did check
that my two commits were the only unmerged commits before doing the
sours merge.
On Thu, Aug 5, 2021 at 7:30 PM Christopher <ct...@apache.org> wrote:
>
> Hey Keith,
>
> Just curious because of all the activity around this change in 1.10
> (the subsequent partial revert and the merge commits to main, which
> seem to be -sours), what motivated the change to TabletIteratorTest in
> the older branch?
>
> On Thu, Aug 5, 2021 at 6:40 PM <kt...@apache.org> wrote:
> >
> > This is an automated email from the ASF dual-hosted git repository.
> >
> > kturner pushed a commit to branch 1.10
> > in repository https://gitbox.apache.org/repos/asf/accumulo.git
> >
> >
> > The following commit(s) were added to refs/heads/1.10 by this push:
> > new 5d475b0 removes extraneous code from TabletIteratorTest
> > 5d475b0 is described below
> >
> > commit 5d475b00eabf9aa419dbc49d5a49465633a61815
> > Author: Keith Turner <kt...@apache.org>
> > AuthorDate: Thu Aug 5 18:37:12 2021 -0400
> >
> > removes extraneous code from TabletIteratorTest
> > ---
> > server/base/.gitignore | 1 +
> > .../java/org/apache/accumulo/server/util/TabletIteratorTest.java | 6 +-----
> > server/tserver/.gitignore | 1 +
> > test/.gitignore | 1 +
> > 4 files changed, 4 insertions(+), 5 deletions(-)
> >
> > diff --git a/server/base/.gitignore b/server/base/.gitignore
> > index e77a822..320dd27 100644
> > --- a/server/base/.gitignore
> > +++ b/server/base/.gitignore
> > @@ -26,3 +26,4 @@
> > /nbproject/
> > /nbactions.xml
> > /nb-configuration.xml
> > +/bin/
> > diff --git a/server/base/src/test/java/org/apache/accumulo/server/util/TabletIteratorTest.java b/server/base/src/test/java/org/apache/accumulo/server/util/TabletIteratorTest.java
> > index 43888af..b60630d 100644
> > --- a/server/base/src/test/java/org/apache/accumulo/server/util/TabletIteratorTest.java
> > +++ b/server/base/src/test/java/org/apache/accumulo/server/util/TabletIteratorTest.java
> > @@ -121,12 +121,8 @@ public class TabletIteratorTest {
> > createTabletData(data1, "3", "c", null);
> > createTabletData(data1, "3", "n", "c");
> >
> > - TreeMap<Key,Value> data2 = new TreeMap<>(data1);
> > -
> > - createTabletData(data2, "3", null, "n");
> > -
> > assertThrows(IllegalStateException.class,
> > - () -> runTest(Arrays.asList(data1, data2), Arrays.asList("3;c", "3;n", "3<")));
> > + () -> runTest(Arrays.asList(data1), Arrays.asList("3;c", "3;n")));
> > }
> >
> > @Test
> > diff --git a/server/tserver/.gitignore b/server/tserver/.gitignore
> > index e77a822..320dd27 100644
> > --- a/server/tserver/.gitignore
> > +++ b/server/tserver/.gitignore
> > @@ -26,3 +26,4 @@
> > /nbproject/
> > /nbactions.xml
> > /nb-configuration.xml
> > +/bin/
> > diff --git a/test/.gitignore b/test/.gitignore
> > index 87da2f9..c92e5e7 100644
> > --- a/test/.gitignore
> > +++ b/test/.gitignore
> > @@ -30,3 +30,4 @@
> > # python ignores
> > *.pyc
> >
> > +/bin/
Re: [accumulo] branch 1.10 updated: removes extraneous code from TabletIteratorTest
Posted by Christopher <ct...@apache.org>.
Hey Keith,
Just curious because of all the activity around this change in 1.10
(the subsequent partial revert and the merge commits to main, which
seem to be -sours), what motivated the change to TabletIteratorTest in
the older branch?
On Thu, Aug 5, 2021 at 6:40 PM <kt...@apache.org> wrote:
>
> This is an automated email from the ASF dual-hosted git repository.
>
> kturner pushed a commit to branch 1.10
> in repository https://gitbox.apache.org/repos/asf/accumulo.git
>
>
> The following commit(s) were added to refs/heads/1.10 by this push:
> new 5d475b0 removes extraneous code from TabletIteratorTest
> 5d475b0 is described below
>
> commit 5d475b00eabf9aa419dbc49d5a49465633a61815
> Author: Keith Turner <kt...@apache.org>
> AuthorDate: Thu Aug 5 18:37:12 2021 -0400
>
> removes extraneous code from TabletIteratorTest
> ---
> server/base/.gitignore | 1 +
> .../java/org/apache/accumulo/server/util/TabletIteratorTest.java | 6 +-----
> server/tserver/.gitignore | 1 +
> test/.gitignore | 1 +
> 4 files changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/server/base/.gitignore b/server/base/.gitignore
> index e77a822..320dd27 100644
> --- a/server/base/.gitignore
> +++ b/server/base/.gitignore
> @@ -26,3 +26,4 @@
> /nbproject/
> /nbactions.xml
> /nb-configuration.xml
> +/bin/
> diff --git a/server/base/src/test/java/org/apache/accumulo/server/util/TabletIteratorTest.java b/server/base/src/test/java/org/apache/accumulo/server/util/TabletIteratorTest.java
> index 43888af..b60630d 100644
> --- a/server/base/src/test/java/org/apache/accumulo/server/util/TabletIteratorTest.java
> +++ b/server/base/src/test/java/org/apache/accumulo/server/util/TabletIteratorTest.java
> @@ -121,12 +121,8 @@ public class TabletIteratorTest {
> createTabletData(data1, "3", "c", null);
> createTabletData(data1, "3", "n", "c");
>
> - TreeMap<Key,Value> data2 = new TreeMap<>(data1);
> -
> - createTabletData(data2, "3", null, "n");
> -
> assertThrows(IllegalStateException.class,
> - () -> runTest(Arrays.asList(data1, data2), Arrays.asList("3;c", "3;n", "3<")));
> + () -> runTest(Arrays.asList(data1), Arrays.asList("3;c", "3;n")));
> }
>
> @Test
> diff --git a/server/tserver/.gitignore b/server/tserver/.gitignore
> index e77a822..320dd27 100644
> --- a/server/tserver/.gitignore
> +++ b/server/tserver/.gitignore
> @@ -26,3 +26,4 @@
> /nbproject/
> /nbactions.xml
> /nb-configuration.xml
> +/bin/
> diff --git a/test/.gitignore b/test/.gitignore
> index 87da2f9..c92e5e7 100644
> --- a/test/.gitignore
> +++ b/test/.gitignore
> @@ -30,3 +30,4 @@
> # python ignores
> *.pyc
>
> +/bin/