>From Michael Blow <[email protected]>:
Michael Blow has submitted this change. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19415 )
Change subject: Merge branch 'gerrit/ionic' into 'master'
......................................................................
Merge branch 'gerrit/ionic' into 'master'
Change-Id: I7295ae44db8341e6f38c4a73a04bc9412cfa3136
---
M
asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/DatasetUtil.java
2 files changed, 21 insertions(+), 3 deletions(-)
Approvals:
Jenkins: Verified; Verified
Anon. E. Moose #1000171:
Michael Blow: Looks good to me, approved
diff --git
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/DatasetUtil.java
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/DatasetUtil.java
index 77d864a..8bcf7a2 100644
---
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/DatasetUtil.java
+++
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/DatasetUtil.java
@@ -756,7 +756,6 @@
&& dataset.getDatasetFormatInfo().getFormat() ==
DatasetConfig.DatasetFormat.COLUMN;
}
-<<<<<<< HEAD (50d671 [ASTERIXDB-3392] Minor formatting COPY TO parquet)
public static void truncate(MetadataProvider metadataProvider, Dataset ds)
throws Exception {
if (ds.getDatasetType() == DatasetType.INTERNAL) {
IHyracksClientConnection hcc;
@@ -847,10 +846,10 @@
+ partition);
}
return dsr;
-=======
+ }
+
public static boolean isDeltaTable(Dataset dataset) {
return dataset.getDatasetType() == DatasetType.EXTERNAL &&
ExternalDataUtils
.isDeltaTable(((ExternalDatasetDetails)
dataset.getDatasetDetails()).getProperties());
->>>>>>> BRANCH (a15494 Merge branch 'gerrit/trinity' into 'gerrit/ionic')
}
}
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19415
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: I7295ae44db8341e6f38c4a73a04bc9412cfa3136
Gerrit-Change-Number: 19415
Gerrit-PatchSet: 1
Gerrit-Owner: [email protected]
Gerrit-Reviewer: Ali Alsuliman <[email protected]>
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins <[email protected]>
Gerrit-Reviewer: Michael Blow <[email protected]>
Gerrit-MessageType: merged
