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/12/05 03:02:10 UTC
Change in asterixdb[cheshire-cat]: Merge branch 'gerrit/stabilization-02ea049d7a'
From Michael Blow <mb...@apache.org>:
Michael Blow has uploaded this change for review. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14344 )
Change subject: Merge branch 'gerrit/stabilization-02ea049d7a'
......................................................................
Merge branch 'gerrit/stabilization-02ea049d7a'
Change-Id: I5036734c21343389c7378a06eb9cfb10948af4db
---
M asterixdb/asterix-app/pom.xml
M asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
M asterixdb/pom.xml
M asterixdb/src/main/appended-resources/supplemental-models.xml
M hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/primitive/UTF8StringPointable.java
M hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/test/java/org/apache/hyracks/data/std/primitive/UTF8StringPointableTest.java
M hyracks-fullstack/hyracks/hyracks-storage-common/pom.xml
M hyracks-fullstack/pom.xml
9 files changed, 15 insertions(+), 109 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/44/14344/1
diff --git a/asterixdb/asterix-app/pom.xml b/asterixdb/asterix-app/pom.xml
index 1b26e456..73d425a 100644
--- a/asterixdb/asterix-app/pom.xml
+++ b/asterixdb/asterix-app/pom.xml
@@ -829,7 +829,18 @@
</exclusions>
</dependency>
<dependency>
-<<<<<<< HEAD (5e1105 [NO ISSUE][ACTIVE] Account for force stop while suspending)
+ <groupId>io.netty</groupId>
+ <artifactId>netty-codec-http</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-buffer</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-common</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.mindrot</groupId>
<artifactId>jbcrypt</artifactId>
</dependency>
@@ -841,18 +852,6 @@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
<scope>test</scope>
-=======
- <groupId>io.netty</groupId>
- <artifactId>netty-codec-http</artifactId>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-buffer</artifactId>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-common</artifactId>
->>>>>>> BRANCH (8363dc Merge branch 'gerrit/stabilization-5949a1cb71')
</dependency>
<!-- AWS -->
<dependency>
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 1dbff69..f37648e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
@@ -10161,13 +10161,13 @@
</compilation-unit>
</test-case>
<test-case FilePath="string">
-<<<<<<< HEAD (5e1105 [NO ISSUE][ACTIVE] Account for force stop while suspending)
<compilation-unit name="substring_multi_codepoint_01">
<output-dir compare="Text">substring_multi_codepoint_01</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>
->>>>>>> BRANCH (8363dc Merge branch 'gerrit/stabilization-5949a1cb71')
</compilation-unit>
</test-case>
<test-case FilePath="string">
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index 477cff9..e38ae81 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -1389,11 +1389,7 @@
<dependency>
<groupId>it.unimi.dsi</groupId>
<artifactId>fastutil</artifactId>
-<<<<<<< HEAD (5e1105 [NO ISSUE][ACTIVE] Account for force stop while suspending)
- <version>8.5.4</version>
-=======
<version>8.5.6</version>
->>>>>>> BRANCH (8363dc Merge branch 'gerrit/stabilization-5949a1cb71')
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
diff --git a/asterixdb/src/main/appended-resources/supplemental-models.xml b/asterixdb/src/main/appended-resources/supplemental-models.xml
index b65fe30..5b8c24a 100644
--- a/asterixdb/src/main/appended-resources/supplemental-models.xml
+++ b/asterixdb/src/main/appended-resources/supplemental-models.xml
@@ -324,23 +324,6 @@
<artifactId>fastutil</artifactId>
<properties>
<!-- fastutil is ALv2, and does not contain any embedded LICENSE or NOTICE file -->
-<<<<<<< HEAD (5e1105 [NO ISSUE][ACTIVE] Account for force stop while suspending)
- <!-- see https://github.com/vigna/fastutil/blob/8.5.4/LICENSE-2.0 -->
- <license.ignoreMissingEmbeddedLicense>8.3.0,8.5.4</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>8.3.0,8.5.4</license.ignoreMissingEmbeddedNotice>
- </properties>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>it.unimi.dsi</groupId>
- <artifactId>fastutil-core</artifactId>
- <properties>
- <!-- fastutil is ALv2, and does not contain any embedded LICENSE or NOTICE file -->
- <!-- see https://github.com/vigna/fastutil/blob/8.5.4/LICENSE-2.0 -->
- <license.ignoreMissingEmbeddedLicense>8.5.4</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>8.5.4</license.ignoreMissingEmbeddedNotice>
-=======
<!-- see https://github.com/vigna/fastutil/blob/8.3.0/LICENSE-2.0 -->
<!-- see https://github.com/vigna/fastutil/blob/8.5.4/LICENSE-2.0 -->
<!-- see https://github.com/vigna/fastutil/blob/8.5.6/LICENSE-2.0 -->
@@ -359,7 +342,6 @@
<!-- see https://github.com/vigna/fastutil/blob/8.5.6/LICENSE-2.0 -->
<license.ignoreMissingEmbeddedLicense>8.5.4,8.5.6</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>8.5.4,8.5.6</license.ignoreMissingEmbeddedNotice>
->>>>>>> BRANCH (8363dc Merge branch 'gerrit/stabilization-5949a1cb71')
</properties>
</project>
</supplement>
@@ -382,16 +364,10 @@
<properties>
<!-- snappy-java is ALv2, and does not contain any embedded LICENSE or NOTICE file -->
<!-- license override not needed, ALv2 is specified in its pom.xml -->
-<<<<<<< HEAD (5e1105 [NO ISSUE][ACTIVE] Account for force stop while suspending)
<!-- see https://github.com/xerial/snappy-java/blob/1.1.8.4/LICENSE -->
<license.ignoreMissingEmbeddedLicense>1.1.7.1,1.1.8.4</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>1.1.7.1,1.1.8.4</license.ignoreMissingEmbeddedNotice>
<license.ignoreLicenseOverride>1.1.7.1</license.ignoreLicenseOverride>
-=======
- <!-- see https://github.com/xerial/snappy-java/blob/1.1.7.1/LICENSE -->
- <license.ignoreMissingEmbeddedLicense>1.1.7.1,1.1.8.4</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.1.7.1,1.1.8.4</license.ignoreMissingEmbeddedNotice>
->>>>>>> BRANCH (8363dc Merge branch 'gerrit/stabilization-5949a1cb71')
</properties>
</project>
</supplement>
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 132b134..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,7 +463,6 @@
return false;
}
-<<<<<<< HEAD (5e1105 [NO ISSUE][ACTIVE] Account for force stop while suspending)
int estimateOutBytes = byteIdx == 0 ? codePointLength : (int) (codePointLength * 1.0 * byteIdx / codePointIdx);
builder.reset(out, Math.min(utfLen - byteIdx, estimateOutBytes));
codePointIdx = 0;
@@ -471,16 +470,6 @@
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 (8363dc Merge branch 'gerrit/stabilization-5949a1cb71')
}
builder.finish();
return true;
diff --git a/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/test/java/org/apache/hyracks/data/std/primitive/UTF8StringPointableTest.java b/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/test/java/org/apache/hyracks/data/std/primitive/UTF8StringPointableTest.java
index 3279639..f088c7e 100644
--- a/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/test/java/org/apache/hyracks/data/std/primitive/UTF8StringPointableTest.java
+++ b/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/test/java/org/apache/hyracks/data/std/primitive/UTF8StringPointableTest.java
@@ -395,37 +395,4 @@
assertEquals(chunk, writtenString);
}
- @Test
- public void testStringBuilder() throws Exception {
- UTF8StringBuilder builder = new UTF8StringBuilder();
- GrowableArray array = new GrowableArray();
- UTF8StringPointable stringPointable = new UTF8StringPointable();
- String writtenString;
- int startIdx;
-
- array.append(STRING_UTF8_MIX.getByteArray(), STRING_UTF8_MIX.getStartOffset(), STRING_UTF8_MIX.getLength());
- String chunk = "ABC";
- String originalString = chunk.repeat(699051);
-
- // test grow path
- startIdx = array.getLength();
- builder.reset(array, 2);
- builder.appendString(originalString);
- builder.finish();
- stringPointable.set(array.getByteArray(), startIdx, array.getLength());
- writtenString = stringPointable.toString();
- assertEquals(originalString, writtenString);
-
- // test shrink path
- array.reset();
- array.append(STRING_UTF8_MIX.getByteArray(), STRING_UTF8_MIX.getStartOffset(), STRING_UTF8_MIX.getLength());
- startIdx = array.getLength();
- builder.reset(array, 699051);
- builder.appendString(chunk);
- builder.finish();
- stringPointable.set(array.getByteArray(), startIdx, array.getLength());
- writtenString = stringPointable.toString();
- assertEquals(chunk, writtenString);
- }
-
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-common/pom.xml b/hyracks-fullstack/hyracks/hyracks-storage-common/pom.xml
index f6609eb..7ed6d34 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-common/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-storage-common/pom.xml
@@ -69,13 +69,10 @@
<dependency>
<groupId>org.xerial.snappy</groupId>
<artifactId>snappy-java</artifactId>
-<<<<<<< HEAD (5e1105 [NO ISSUE][ACTIVE] Account for force stop while suspending)
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
-=======
->>>>>>> BRANCH (8363dc Merge branch 'gerrit/stabilization-5949a1cb71')
</dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml
index 9978181..be96503 100644
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@ -74,10 +74,7 @@
<jacoco.version>0.7.6.201602180812</jacoco.version>
<log4j.version>2.14.1</log4j.version>
<snappy.version>1.1.8.4</snappy.version>
-<<<<<<< HEAD (5e1105 [NO ISSUE][ACTIVE] Account for force stop while suspending)
-=======
<jackson.version>2.13.0</jackson.version>
->>>>>>> BRANCH (8363dc Merge branch 'gerrit/stabilization-5949a1cb71')
<implementation.title>Apache Hyracks and Algebricks - ${project.name}</implementation.title>
<implementation.url>https://asterixdb.apache.org/</implementation.url>
@@ -344,21 +341,6 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-1.2-api</artifactId>
- <version>${log4j.version}</version>
- </dependency>
- <dependency>
- <groupId>org.xerial.snappy</groupId>
- <artifactId>snappy-java</artifactId>
- <version>${snappy.version}</version>
- </dependency>
- <dependency>
- <groupId>it.unimi.dsi</groupId>
- <artifactId>fastutil-core</artifactId>
- <version>8.5.4</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-1.2-api</artifactId>
<version>2.13.1</version>
</dependency>
<dependency>
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14344
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: cheshire-cat
Gerrit-Change-Id: I5036734c21343389c7378a06eb9cfb10948af4db
Gerrit-Change-Number: 14344
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-MessageType: newchange
Change in asterixdb[cheshire-cat]: Merge branch 'gerrit/stabilization-02ea049d7a'
Posted by AsterixDB Code Review <do...@asterix-gerrit.ics.uci.edu>.
From Jenkins <je...@fulliautomatix.ics.uci.edu>:
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14344 )
Change subject: Merge branch 'gerrit/stabilization-02ea049d7a'
......................................................................
Patch Set 2: Integration-Tests+1
Integration Tests Successful
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/12792/ : SUCCESS
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14344
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: cheshire-cat
Gerrit-Change-Id: I5036734c21343389c7378a06eb9cfb10948af4db
Gerrit-Change-Number: 14344
Gerrit-PatchSet: 2
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Comment-Date: Mon, 06 Dec 2021 03:25:35 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Change in asterixdb[cheshire-cat]: Merge branch 'gerrit/stabilization-02ea049d7a'
Posted by AsterixDB Code Review <do...@asterix-gerrit.ics.uci.edu>.
From Michael Blow <mb...@apache.org>:
Michael Blow has uploaded this change for review. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14344 )
Change subject: Merge branch 'gerrit/stabilization-02ea049d7a'
......................................................................
Merge branch 'gerrit/stabilization-02ea049d7a'
Change-Id: I5036734c21343389c7378a06eb9cfb10948af4db
---
M asterixdb/asterix-app/pom.xml
M asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
M asterixdb/pom.xml
M asterixdb/src/main/appended-resources/supplemental-models.xml
M hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/primitive/UTF8StringPointable.java
M hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/test/java/org/apache/hyracks/data/std/primitive/UTF8StringPointableTest.java
M hyracks-fullstack/hyracks/hyracks-storage-common/pom.xml
M hyracks-fullstack/pom.xml
9 files changed, 15 insertions(+), 109 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/44/14344/1
diff --git a/asterixdb/asterix-app/pom.xml b/asterixdb/asterix-app/pom.xml
index 1b26e456..73d425a 100644
--- a/asterixdb/asterix-app/pom.xml
+++ b/asterixdb/asterix-app/pom.xml
@@ -829,7 +829,18 @@
</exclusions>
</dependency>
<dependency>
-<<<<<<< HEAD (5e1105 [NO ISSUE][ACTIVE] Account for force stop while suspending)
+ <groupId>io.netty</groupId>
+ <artifactId>netty-codec-http</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-buffer</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-common</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.mindrot</groupId>
<artifactId>jbcrypt</artifactId>
</dependency>
@@ -841,18 +852,6 @@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
<scope>test</scope>
-=======
- <groupId>io.netty</groupId>
- <artifactId>netty-codec-http</artifactId>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-buffer</artifactId>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-common</artifactId>
->>>>>>> BRANCH (8363dc Merge branch 'gerrit/stabilization-5949a1cb71')
</dependency>
<!-- AWS -->
<dependency>
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 1dbff69..f37648e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
@@ -10161,13 +10161,13 @@
</compilation-unit>
</test-case>
<test-case FilePath="string">
-<<<<<<< HEAD (5e1105 [NO ISSUE][ACTIVE] Account for force stop while suspending)
<compilation-unit name="substring_multi_codepoint_01">
<output-dir compare="Text">substring_multi_codepoint_01</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>
->>>>>>> BRANCH (8363dc Merge branch 'gerrit/stabilization-5949a1cb71')
</compilation-unit>
</test-case>
<test-case FilePath="string">
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index 477cff9..e38ae81 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -1389,11 +1389,7 @@
<dependency>
<groupId>it.unimi.dsi</groupId>
<artifactId>fastutil</artifactId>
-<<<<<<< HEAD (5e1105 [NO ISSUE][ACTIVE] Account for force stop while suspending)
- <version>8.5.4</version>
-=======
<version>8.5.6</version>
->>>>>>> BRANCH (8363dc Merge branch 'gerrit/stabilization-5949a1cb71')
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
diff --git a/asterixdb/src/main/appended-resources/supplemental-models.xml b/asterixdb/src/main/appended-resources/supplemental-models.xml
index b65fe30..5b8c24a 100644
--- a/asterixdb/src/main/appended-resources/supplemental-models.xml
+++ b/asterixdb/src/main/appended-resources/supplemental-models.xml
@@ -324,23 +324,6 @@
<artifactId>fastutil</artifactId>
<properties>
<!-- fastutil is ALv2, and does not contain any embedded LICENSE or NOTICE file -->
-<<<<<<< HEAD (5e1105 [NO ISSUE][ACTIVE] Account for force stop while suspending)
- <!-- see https://github.com/vigna/fastutil/blob/8.5.4/LICENSE-2.0 -->
- <license.ignoreMissingEmbeddedLicense>8.3.0,8.5.4</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>8.3.0,8.5.4</license.ignoreMissingEmbeddedNotice>
- </properties>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>it.unimi.dsi</groupId>
- <artifactId>fastutil-core</artifactId>
- <properties>
- <!-- fastutil is ALv2, and does not contain any embedded LICENSE or NOTICE file -->
- <!-- see https://github.com/vigna/fastutil/blob/8.5.4/LICENSE-2.0 -->
- <license.ignoreMissingEmbeddedLicense>8.5.4</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>8.5.4</license.ignoreMissingEmbeddedNotice>
-=======
<!-- see https://github.com/vigna/fastutil/blob/8.3.0/LICENSE-2.0 -->
<!-- see https://github.com/vigna/fastutil/blob/8.5.4/LICENSE-2.0 -->
<!-- see https://github.com/vigna/fastutil/blob/8.5.6/LICENSE-2.0 -->
@@ -359,7 +342,6 @@
<!-- see https://github.com/vigna/fastutil/blob/8.5.6/LICENSE-2.0 -->
<license.ignoreMissingEmbeddedLicense>8.5.4,8.5.6</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>8.5.4,8.5.6</license.ignoreMissingEmbeddedNotice>
->>>>>>> BRANCH (8363dc Merge branch 'gerrit/stabilization-5949a1cb71')
</properties>
</project>
</supplement>
@@ -382,16 +364,10 @@
<properties>
<!-- snappy-java is ALv2, and does not contain any embedded LICENSE or NOTICE file -->
<!-- license override not needed, ALv2 is specified in its pom.xml -->
-<<<<<<< HEAD (5e1105 [NO ISSUE][ACTIVE] Account for force stop while suspending)
<!-- see https://github.com/xerial/snappy-java/blob/1.1.8.4/LICENSE -->
<license.ignoreMissingEmbeddedLicense>1.1.7.1,1.1.8.4</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>1.1.7.1,1.1.8.4</license.ignoreMissingEmbeddedNotice>
<license.ignoreLicenseOverride>1.1.7.1</license.ignoreLicenseOverride>
-=======
- <!-- see https://github.com/xerial/snappy-java/blob/1.1.7.1/LICENSE -->
- <license.ignoreMissingEmbeddedLicense>1.1.7.1,1.1.8.4</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.1.7.1,1.1.8.4</license.ignoreMissingEmbeddedNotice>
->>>>>>> BRANCH (8363dc Merge branch 'gerrit/stabilization-5949a1cb71')
</properties>
</project>
</supplement>
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 132b134..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,7 +463,6 @@
return false;
}
-<<<<<<< HEAD (5e1105 [NO ISSUE][ACTIVE] Account for force stop while suspending)
int estimateOutBytes = byteIdx == 0 ? codePointLength : (int) (codePointLength * 1.0 * byteIdx / codePointIdx);
builder.reset(out, Math.min(utfLen - byteIdx, estimateOutBytes));
codePointIdx = 0;
@@ -471,16 +470,6 @@
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 (8363dc Merge branch 'gerrit/stabilization-5949a1cb71')
}
builder.finish();
return true;
diff --git a/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/test/java/org/apache/hyracks/data/std/primitive/UTF8StringPointableTest.java b/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/test/java/org/apache/hyracks/data/std/primitive/UTF8StringPointableTest.java
index 3279639..f088c7e 100644
--- a/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/test/java/org/apache/hyracks/data/std/primitive/UTF8StringPointableTest.java
+++ b/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/test/java/org/apache/hyracks/data/std/primitive/UTF8StringPointableTest.java
@@ -395,37 +395,4 @@
assertEquals(chunk, writtenString);
}
- @Test
- public void testStringBuilder() throws Exception {
- UTF8StringBuilder builder = new UTF8StringBuilder();
- GrowableArray array = new GrowableArray();
- UTF8StringPointable stringPointable = new UTF8StringPointable();
- String writtenString;
- int startIdx;
-
- array.append(STRING_UTF8_MIX.getByteArray(), STRING_UTF8_MIX.getStartOffset(), STRING_UTF8_MIX.getLength());
- String chunk = "ABC";
- String originalString = chunk.repeat(699051);
-
- // test grow path
- startIdx = array.getLength();
- builder.reset(array, 2);
- builder.appendString(originalString);
- builder.finish();
- stringPointable.set(array.getByteArray(), startIdx, array.getLength());
- writtenString = stringPointable.toString();
- assertEquals(originalString, writtenString);
-
- // test shrink path
- array.reset();
- array.append(STRING_UTF8_MIX.getByteArray(), STRING_UTF8_MIX.getStartOffset(), STRING_UTF8_MIX.getLength());
- startIdx = array.getLength();
- builder.reset(array, 699051);
- builder.appendString(chunk);
- builder.finish();
- stringPointable.set(array.getByteArray(), startIdx, array.getLength());
- writtenString = stringPointable.toString();
- assertEquals(chunk, writtenString);
- }
-
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-common/pom.xml b/hyracks-fullstack/hyracks/hyracks-storage-common/pom.xml
index f6609eb..7ed6d34 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-common/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-storage-common/pom.xml
@@ -69,13 +69,10 @@
<dependency>
<groupId>org.xerial.snappy</groupId>
<artifactId>snappy-java</artifactId>
-<<<<<<< HEAD (5e1105 [NO ISSUE][ACTIVE] Account for force stop while suspending)
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
-=======
->>>>>>> BRANCH (8363dc Merge branch 'gerrit/stabilization-5949a1cb71')
</dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml
index 9978181..be96503 100644
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@ -74,10 +74,7 @@
<jacoco.version>0.7.6.201602180812</jacoco.version>
<log4j.version>2.14.1</log4j.version>
<snappy.version>1.1.8.4</snappy.version>
-<<<<<<< HEAD (5e1105 [NO ISSUE][ACTIVE] Account for force stop while suspending)
-=======
<jackson.version>2.13.0</jackson.version>
->>>>>>> BRANCH (8363dc Merge branch 'gerrit/stabilization-5949a1cb71')
<implementation.title>Apache Hyracks and Algebricks - ${project.name}</implementation.title>
<implementation.url>https://asterixdb.apache.org/</implementation.url>
@@ -344,21 +341,6 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-1.2-api</artifactId>
- <version>${log4j.version}</version>
- </dependency>
- <dependency>
- <groupId>org.xerial.snappy</groupId>
- <artifactId>snappy-java</artifactId>
- <version>${snappy.version}</version>
- </dependency>
- <dependency>
- <groupId>it.unimi.dsi</groupId>
- <artifactId>fastutil-core</artifactId>
- <version>8.5.4</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-1.2-api</artifactId>
<version>2.13.1</version>
</dependency>
<dependency>
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14344
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: cheshire-cat
Gerrit-Change-Id: I5036734c21343389c7378a06eb9cfb10948af4db
Gerrit-Change-Number: 14344
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-MessageType: newchange
Change in asterixdb[cheshire-cat]: Merge branch 'gerrit/stabilization-02ea049d7a'
Posted by AsterixDB Code Review <do...@asterix-gerrit.ics.uci.edu>.
From Michael Blow <mb...@apache.org>:
Hello Jenkins,
I'd like you to reexamine a change. Please visit
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14344
to look at the new patch set (#2).
Change subject: Merge branch 'gerrit/stabilization-02ea049d7a'
......................................................................
Merge branch 'gerrit/stabilization-02ea049d7a'
Change-Id: I5036734c21343389c7378a06eb9cfb10948af4db
---
M asterixdb/asterix-app/pom.xml
M asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
M asterixdb/asterix-external-data/pom.xml
M asterixdb/pom.xml
M asterixdb/src/main/appended-resources/supplemental-models.xml
M hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/primitive/UTF8StringPointable.java
M hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/test/java/org/apache/hyracks/data/std/primitive/UTF8StringPointableTest.java
M hyracks-fullstack/hyracks/hyracks-storage-common/pom.xml
M hyracks-fullstack/pom.xml
10 files changed, 93 insertions(+), 109 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/44/14344/2
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14344
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: cheshire-cat
Gerrit-Change-Id: I5036734c21343389c7378a06eb9cfb10948af4db
Gerrit-Change-Number: 14344
Gerrit-PatchSet: 2
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-MessageType: newpatchset
Change in asterixdb[cheshire-cat]: Merge branch 'gerrit/stabilization-02ea049d7a'
Posted by AsterixDB Code Review <do...@asterix-gerrit.ics.uci.edu>.
From Jenkins <je...@fulliautomatix.ics.uci.edu>:
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14344 )
Change subject: Merge branch 'gerrit/stabilization-02ea049d7a'
......................................................................
Patch Set 1: Integration-Tests+1
Integration Tests Successful
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/12791/ : SUCCESS
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14344
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: cheshire-cat
Gerrit-Change-Id: I5036734c21343389c7378a06eb9cfb10948af4db
Gerrit-Change-Number: 14344
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Comment-Date: Sun, 05 Dec 2021 03:59:58 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment