>From Michael Blow <[email protected]>:
Michael Blow has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19208 )
Change subject: Merge branch 'gerrit/goldfish' into 'master'
......................................................................
Merge branch 'gerrit/goldfish' into 'master'
Change-Id: I5a7b060a02b083a92419397b4e6e9e79cfe95ee1
---
M asterixdb/pom.xml
M
asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/avro/heterogeneous-access/heterogeneous-access.1.ddl.sqlpp
M
asterixdb/asterix-column/src/main/java/org/apache/asterix/column/operation/lsm/flush/NoWriteFlushColumnMetadata.java
M hyracks-fullstack/pom.xml
5 files changed, 25 insertions(+), 18 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/08/19208/1
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/avro/heterogeneous-access/heterogeneous-access.1.ddl.sqlpp
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/avro/heterogeneous-access/heterogeneous-access.1.ddl.sqlpp
index ceb7b10..0ea0cc2 100644
---
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/avro/heterogeneous-access/heterogeneous-access.1.ddl.sqlpp
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/avro/heterogeneous-access/heterogeneous-access.1.ddl.sqlpp
@@ -34,14 +34,8 @@
CREATE EXTERNAL DATASET AvroDataset(AvroType) USING %adapter%
(
%template%,
-<<<<<<< HEAD (5ff8ab [ASTERIXDB-3531][COMP] Format AssignRuntimeFactory,
EmbedPro)
%additional_Properties%,
("definition"="%path_prefix%avro-data/reviews"),
- ("include"="*heterogeneous*"),
-=======
- ("container"="playground"),
- ("definition"="avro-data/reviews"),
("include"="*heterogeneous_*"),
->>>>>>> BRANCH (f9bb94 Merge "Merge branch 'gerrit/trinity' into
'gerrit/goldfish'")
("format" = "avro")
);
\ No newline at end of file
diff --git
a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/operation/lsm/flush/NoWriteFlushColumnMetadata.java
b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/operation/lsm/flush/NoWriteFlushColumnMetadata.java
index c988a11..88e6cc2 100644
---
a/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/operation/lsm/flush/NoWriteFlushColumnMetadata.java
+++
b/asterixdb/asterix-column/src/main/java/org/apache/asterix/column/operation/lsm/flush/NoWriteFlushColumnMetadata.java
@@ -29,8 +29,6 @@
import java.util.List;
import java.util.Map;
-import org.apache.asterix.column.metadata.IFieldNamesDictionary;
-import
org.apache.asterix.column.metadata.dictionary.AbstractFieldNamesDictionary;
import org.apache.asterix.column.metadata.schema.AbstractSchemaNestedNode;
import org.apache.asterix.column.metadata.schema.AbstractSchemaNode;
import org.apache.asterix.column.metadata.schema.ObjectSchemaNode;
@@ -43,6 +41,8 @@
import org.apache.asterix.column.values.IColumnValuesWriter;
import org.apache.asterix.column.values.IColumnValuesWriterFactory;
import org.apache.asterix.column.values.writer.NoOpColumnValuesWriter;
+import org.apache.asterix.om.dictionary.AbstractFieldNamesDictionary;
+import org.apache.asterix.om.dictionary.IFieldNamesDictionary;
import org.apache.asterix.om.types.ARecordType;
import org.apache.asterix.om.types.ATypeTag;
import org.apache.commons.lang3.mutable.Mutable;
@@ -199,4 +199,4 @@
protected AbstractSchemaNode
addDefinitionLevelsAndGet(AbstractSchemaNestedNode nestedNode) {
return nestedNode;
}
-}
\ No newline at end of file
+}
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index 6919430..649906a 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -96,13 +96,8 @@
<log4j.version>2.22.1</log4j.version>
<awsjavasdk.version>2.29.27</awsjavasdk.version>
<awsjavasdk.crt.version>0.29.10</awsjavasdk.crt.version>
-<<<<<<< HEAD (5ff8ab [ASTERIXDB-3531][COMP] Format AssignRuntimeFactory,
EmbedPro)
<parquet.version>1.14.3</parquet.version>
- <hadoop-awsjavasdk.version>1.12.637</hadoop-awsjavasdk.version>
-=======
- <parquet.version>1.14.1</parquet.version>
<hadoop-awsjavasdk.version>1.12.779</hadoop-awsjavasdk.version>
->>>>>>> BRANCH (f9bb94 Merge "Merge branch 'gerrit/trinity' into
'gerrit/goldfish'")
<azureblobjavasdk.version>12.25.1</azureblobjavasdk.version>
<azurecommonjavasdk.version>12.24.1</azurecommonjavasdk.version>
<azureidentity.version>1.13.3</azureidentity.version>
diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml
index 7f9b8b3..ec78f7b 100644
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@ -75,11 +75,7 @@
<snappy.version>1.1.10.5</snappy.version>
<jackson.version>2.14.3</jackson.version>
<jackson-databind.version>${jackson.version}</jackson-databind.version>
-<<<<<<< HEAD (5ff8ab [ASTERIXDB-3531][COMP] Format AssignRuntimeFactory,
EmbedPro)
- <netty.version>4.1.112.Final</netty.version>
-=======
<netty.version>4.1.115.Final</netty.version>
->>>>>>> BRANCH (f9bb94 Merge "Merge branch 'gerrit/trinity' into
'gerrit/goldfish'")
<asm.version>9.3</asm.version>
<implementation.title>Apache Hyracks and Algebricks -
${project.name}</implementation.title>
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19208
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: I5a7b060a02b083a92419397b4e6e9e79cfe95ee1
Gerrit-Change-Number: 19208
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <[email protected]>
Gerrit-MessageType: newchange
