You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@asterixdb.apache.org by AsterixDB Code Review <do...@asterix-gerrit.ics.uci.edu> on 2021/09/07 21:10:49 UTC
Change in asterixdb[master]: Merge branch 6.6.4
From Ali Alsuliman <al...@gmail.com>:
Ali Alsuliman has uploaded this change for review. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/13103 )
Change subject: Merge branch 6.6.4
......................................................................
Merge branch 6.6.4
Change-Id: I595437013c07e071e5d3a2e2b9ce0b6d6f5a8ded
---
M asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
M hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/primitive/UTF8StringPointable.java
3 files changed, 12 insertions(+), 17 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/03/13103/1
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
index 783ebf7..4a6c0d5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
@@ -9926,6 +9926,16 @@
</compilation-unit>
</test-case>
<test-case FilePath="string">
+ <compilation-unit name="substring-after-1">
+ <output-dir compare="Text">substring-after-1</output-dir>
+ </compilation-unit>
+ </test-case>
+ <test-case FilePath="string">
+ <compilation-unit name="substr-ASTERIXDB-2949">
+ <output-dir compare="Text">substr-ASTERIXDB-2949</output-dir>
+ </compilation-unit>
+ </test-case>
+ <test-case FilePath="string">
<compilation-unit name="regexp_position_with_flag/offset0/regex_position0_with_flag">
<output-dir compare="Text">regexp_position_with_flag/offset0/regex_position0_with_flag</output-dir>
</compilation-unit>
@@ -10156,13 +10166,8 @@
</compilation-unit>
</test-case>
<test-case FilePath="string">
-<<<<<<< HEAD (2521ad Merge branch 'gerrit/stabilization-02ea049d7a')
<compilation-unit name="substring_multi_codepoint_01">
<output-dir compare="Text">substring_multi_codepoint_01</output-dir>
-=======
- <compilation-unit name="substr-ASTERIXDB-2949">
- <output-dir compare="Text">substr-ASTERIXDB-2949</output-dir>
->>>>>>> BRANCH (cc6143 [ASTERIXDB-2949][RUN][FUN] SUBSTR function produces malforme)
</compilation-unit>
</test-case>
<test-case FilePath="string">
diff --git a/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/primitive/UTF8StringPointable.java b/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/primitive/UTF8StringPointable.java
index c08747a..49f6221 100644
--- a/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/primitive/UTF8StringPointable.java
+++ b/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/primitive/UTF8StringPointable.java
@@ -463,23 +463,13 @@
return false;
}
-<<<<<<< HEAD (2521ad Merge branch 'gerrit/stabilization-02ea049d7a')
- builder.reset(out, Math.min(utfLen - byteIdx, (int) (codePointLength * 1.0 * byteIdx / codePointIdx)));
+ int estimateOutBytes = byteIdx == 0 ? codePointLength : (int) (codePointLength * 1.0 * byteIdx / codePointIdx);
+ builder.reset(out, Math.min(utfLen - byteIdx, estimateOutBytes));
codePointIdx = 0;
while (byteIdx < utfLen && codePointIdx < codePointLength) {
builder.appendCodePoint(src.codePointAt(src.getMetaDataLength() + byteIdx));
codePointIdx++;
byteIdx += src.codePointSize(src.getMetaDataLength() + byteIdx);
-=======
- // for byteIdx = 0, this estimate assumes that every char size = 1 byte
- int estimateOutBytes = byteIdx == 0 ? charLength : (int) (charLength * 1.0 * byteIdx / chIdx);
- builder.reset(out, Math.min(utfLen - byteIdx, estimateOutBytes));
- chIdx = 0;
- while (byteIdx < utfLen && chIdx < charLength) {
- builder.appendChar(src.charAt(src.getMetaDataLength() + byteIdx));
- chIdx++;
- byteIdx += src.charSize(src.getMetaDataLength() + byteIdx);
->>>>>>> BRANCH (cc6143 [ASTERIXDB-2949][RUN][FUN] SUBSTR function produces malforme)
}
builder.finish();
return true;
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/13103
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Change-Id: I595437013c07e071e5d3a2e2b9ce0b6d6f5a8ded
Gerrit-Change-Number: 13103
Gerrit-PatchSet: 1
Gerrit-Owner: Ali Alsuliman <al...@gmail.com>
Gerrit-MessageType: newchange
Change in asterixdb[master]: Merge branch 6.6.4
Posted by AsterixDB Code Review <do...@asterix-gerrit.ics.uci.edu>.
From Ali Alsuliman <al...@gmail.com>:
Ali Alsuliman has uploaded this change for review. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/13103 )
Change subject: Merge branch 6.6.4
......................................................................
Merge branch 6.6.4
Change-Id: I595437013c07e071e5d3a2e2b9ce0b6d6f5a8ded
---
M asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
M hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/primitive/UTF8StringPointable.java
3 files changed, 12 insertions(+), 17 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/03/13103/1
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
index 783ebf7..4a6c0d5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
@@ -9926,6 +9926,16 @@
</compilation-unit>
</test-case>
<test-case FilePath="string">
+ <compilation-unit name="substring-after-1">
+ <output-dir compare="Text">substring-after-1</output-dir>
+ </compilation-unit>
+ </test-case>
+ <test-case FilePath="string">
+ <compilation-unit name="substr-ASTERIXDB-2949">
+ <output-dir compare="Text">substr-ASTERIXDB-2949</output-dir>
+ </compilation-unit>
+ </test-case>
+ <test-case FilePath="string">
<compilation-unit name="regexp_position_with_flag/offset0/regex_position0_with_flag">
<output-dir compare="Text">regexp_position_with_flag/offset0/regex_position0_with_flag</output-dir>
</compilation-unit>
@@ -10156,13 +10166,8 @@
</compilation-unit>
</test-case>
<test-case FilePath="string">
-<<<<<<< HEAD (2521ad Merge branch 'gerrit/stabilization-02ea049d7a')
<compilation-unit name="substring_multi_codepoint_01">
<output-dir compare="Text">substring_multi_codepoint_01</output-dir>
-=======
- <compilation-unit name="substr-ASTERIXDB-2949">
- <output-dir compare="Text">substr-ASTERIXDB-2949</output-dir>
->>>>>>> BRANCH (cc6143 [ASTERIXDB-2949][RUN][FUN] SUBSTR function produces malforme)
</compilation-unit>
</test-case>
<test-case FilePath="string">
diff --git a/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/primitive/UTF8StringPointable.java b/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/primitive/UTF8StringPointable.java
index c08747a..49f6221 100644
--- a/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/primitive/UTF8StringPointable.java
+++ b/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/primitive/UTF8StringPointable.java
@@ -463,23 +463,13 @@
return false;
}
-<<<<<<< HEAD (2521ad Merge branch 'gerrit/stabilization-02ea049d7a')
- builder.reset(out, Math.min(utfLen - byteIdx, (int) (codePointLength * 1.0 * byteIdx / codePointIdx)));
+ int estimateOutBytes = byteIdx == 0 ? codePointLength : (int) (codePointLength * 1.0 * byteIdx / codePointIdx);
+ builder.reset(out, Math.min(utfLen - byteIdx, estimateOutBytes));
codePointIdx = 0;
while (byteIdx < utfLen && codePointIdx < codePointLength) {
builder.appendCodePoint(src.codePointAt(src.getMetaDataLength() + byteIdx));
codePointIdx++;
byteIdx += src.codePointSize(src.getMetaDataLength() + byteIdx);
-=======
- // for byteIdx = 0, this estimate assumes that every char size = 1 byte
- int estimateOutBytes = byteIdx == 0 ? charLength : (int) (charLength * 1.0 * byteIdx / chIdx);
- builder.reset(out, Math.min(utfLen - byteIdx, estimateOutBytes));
- chIdx = 0;
- while (byteIdx < utfLen && chIdx < charLength) {
- builder.appendChar(src.charAt(src.getMetaDataLength() + byteIdx));
- chIdx++;
- byteIdx += src.charSize(src.getMetaDataLength() + byteIdx);
->>>>>>> BRANCH (cc6143 [ASTERIXDB-2949][RUN][FUN] SUBSTR function produces malforme)
}
builder.finish();
return true;
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/13103
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Change-Id: I595437013c07e071e5d3a2e2b9ce0b6d6f5a8ded
Gerrit-Change-Number: 13103
Gerrit-PatchSet: 1
Gerrit-Owner: Ali Alsuliman <al...@gmail.com>
Gerrit-MessageType: newchange