[phoenix] branch master updated (6e1b35d -> 21599ac)
This is an automated email from the ASF dual-hosted git repository. larsh pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/phoenix.git. from 6e1b35d PHOENIX-6430 Added support for full row update for tables when no columns specfied in scenario add 21599ac PHOENIX-6436 OrderedResultIterator overestimates memory requirements. No new revisions were added by this update. Summary of changes: .../main/java/org/apache/phoenix/iterate/OrderedResultIterator.java| 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
[phoenix] branch 4.x updated: PHOENIX-6436 OrderedResultIterator overestimates memory requirements.
This is an automated email from the ASF dual-hosted git repository.
larsh pushed a commit to branch 4.x
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.x by this push:
new 5c57004 PHOENIX-6436 OrderedResultIterator overestimates memory
requirements.
5c57004 is described below
commit 5c57004e2717736370aaec208112e197940e5cc2
Author: Lars
AuthorDate: Sun Apr 4 15:42:54 2021 -0700
PHOENIX-6436 OrderedResultIterator overestimates memory requirements.
---
.../main/java/org/apache/phoenix/iterate/OrderedResultIterator.java| 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/OrderedResultIterator.java
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/OrderedResultIterator.java
index bb0607c..4179730 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/OrderedResultIterator.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/OrderedResultIterator.java
@@ -196,7 +196,8 @@ public class OrderedResultIterator implements
PeekingResultIterator {
// Make sure we don't overflow Long, though this is really unlikely to
happen.
assert(limit == null || Long.MAX_VALUE / estimatedEntrySize >= limit +
this.offset);
-this.estimatedByteSize = limit == null ? 0 : (limit + this.offset) *
estimatedEntrySize;
+// Both BufferedSortedQueue and SizeBoundQueue won't allocate more
than thresholdBytes.
+this.estimatedByteSize = limit == null ? 0 : Math.min((limit +
this.offset) * estimatedEntrySize, thresholdBytes);
this.pageSizeMs = pageSizeMs;
}
[phoenix] branch 5.1 updated: PHOENIX-6436 OrderedResultIterator overestimates memory requirements.
This is an automated email from the ASF dual-hosted git repository.
larsh pushed a commit to branch 5.1
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/5.1 by this push:
new 4d8c976 PHOENIX-6436 OrderedResultIterator overestimates memory
requirements.
4d8c976 is described below
commit 4d8c976841bcc37dc455a0b64c3766dab4f76934
Author: Lars
AuthorDate: Sun Apr 4 15:42:54 2021 -0700
PHOENIX-6436 OrderedResultIterator overestimates memory requirements.
---
.../main/java/org/apache/phoenix/iterate/OrderedResultIterator.java| 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/OrderedResultIterator.java
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/OrderedResultIterator.java
index edc7cc0..ac05d02 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/OrderedResultIterator.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/OrderedResultIterator.java
@@ -197,7 +197,8 @@ public class OrderedResultIterator implements
PeekingResultIterator {
// Make sure we don't overflow Long, though this is really unlikely to
happen.
assert(limit == null || Long.MAX_VALUE / estimatedEntrySize >= limit +
this.offset);
-this.estimatedByteSize = limit == null ? 0 : (limit + this.offset) *
estimatedEntrySize;
+// Both BufferedSortedQueue and SizeBoundQueue won't allocate more
than thresholdBytes.
+this.estimatedByteSize = limit == null ? 0 : Math.min((limit +
this.offset) * estimatedEntrySize, thresholdBytes);
this.pageSizeMs = pageSizeMs;
}
Apache-Phoenix | 4.x | HBase 1.6 | Build #258 FAILURE
4.x branch HBase 1.6 build #258 status FAILURE Build #258 https://ci-hadoop.apache.org/job/Phoenix/job/Phoenix-mulitbranch/job/4.x/258/
Apache-Phoenix | master | HBase 2.2 | Build #265 FAILURE
master branch HBase 2.2 build #265 status FAILURE Build #265 https://ci-hadoop.apache.org/job/Phoenix/job/Phoenix-mulitbranch/job/master/265/
Apache-Phoenix | 5.1 | HBase 2.4 | Build #23 FAILURE
5.1 branch HBase 2.4 build #23 status FAILURE Build #23 https://ci-hadoop.apache.org/job/Phoenix/job/Phoenix-mulitbranch/job/5.1/23/
Apache-Phoenix | master | HBase 2.1 | Build #265 FAILURE
master branch HBase 2.1 build #265 status FAILURE Build #265 https://ci-hadoop.apache.org/job/Phoenix/job/Phoenix-mulitbranch/job/master/265/
Apache-Phoenix | master | HBase 2.3 | Build #265 SUCCESS
master branch HBase 2.3 build #265 status SUCCESS Build #265 https://ci-hadoop.apache.org/job/Phoenix/job/Phoenix-mulitbranch/job/master/265/
Apache-Phoenix | 4.x | HBase 1.3 | Build #258 FAILURE
4.x branch HBase 1.3 build #258 status FAILURE Build #258 https://ci-hadoop.apache.org/job/Phoenix/job/Phoenix-mulitbranch/job/4.x/258/
Apache-Phoenix | 5.1 | HBase 2.1 | Build #23 FAILURE
5.1 branch HBase 2.1 build #23 status FAILURE Build #23 https://ci-hadoop.apache.org/job/Phoenix/job/Phoenix-mulitbranch/job/5.1/23/
Apache-Phoenix | master | HBase 2.4 | Build #265 FAILURE
master branch HBase 2.4 build #265 status FAILURE Build #265 https://ci-hadoop.apache.org/job/Phoenix/job/Phoenix-mulitbranch/job/master/265/
Apache-Phoenix | 5.1 | HBase 2.2 | Build #23 FAILURE
5.1 branch HBase 2.2 build #23 status FAILURE Build #23 https://ci-hadoop.apache.org/job/Phoenix/job/Phoenix-mulitbranch/job/5.1/23/
Apache-Phoenix | 5.1 | HBase 2.3 | Build #23 SUCCESS
5.1 branch HBase 2.3 build #23 status SUCCESS Build #23 https://ci-hadoop.apache.org/job/Phoenix/job/Phoenix-mulitbranch/job/5.1/23/
Apache-Phoenix | 4.x | HBase 1.4 | Build #258 SUCCESS
4.x branch HBase 1.4 build #258 status SUCCESS Build #258 https://ci-hadoop.apache.org/job/Phoenix/job/Phoenix-mulitbranch/job/4.x/258/
