[asterixdb] branch master updated: [NO-ISSUE][TYPE] Set data format in metadata provider

[ggalvizo]

This is an automated email from the ASF dual-hosted git repository.

ggalvizo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git


The following commit(s) were added to refs/heads/master by this push:
     new 4b5cc2d3a2 [NO-ISSUE][TYPE] Set data format in metadata provider
4b5cc2d3a2 is described below

commit 4b5cc2d3a2f755e247d8cfefc3f17eebe4140956
Author: glennga <ggalv...@uci.edu>
AuthorDate: Mon Jul 17 11:37:23 2023 -0700

    [NO-ISSUE][TYPE] Set data format in metadata provider
    
    - user model changes: no
    - storage format changes: no
    - interface changes: no
    
    This small patch allows extensions to set the data format in
    MetadataProvider.
    
    Change-Id: I9eda624d0f86a9bdcc9ec5d907b759d909f4da55
    Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17646
    Integration-Tests: Jenkins <jenk...@fulliautomatix.ics.uci.edu>
    Reviewed-by: Ian Maxon <ima...@uci.edu>
    Tested-by: Jenkins <jenk...@fulliautomatix.ics.uci.edu>
---
 .../org/apache/asterix/metadata/declared/MetadataProvider.java     | 7 ++++++-
 .../asterix/formats/nontagged/SerializerDeserializerProvider.java  | 4 ++--
 .../org/apache/asterix/runtime/formats/NonTaggedDataFormat.java    | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git 
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataProvider.java
 
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataProvider.java
index ea1b9e675e..e85e10a5cd 100644
--- 
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataProvider.java
+++ 
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataProvider.java
@@ -188,6 +188,7 @@ public class MetadataProvider implements 
IMetadataProvider<DataSourceId, String>
     private boolean blockingOperatorDisabled = false;
 
     private final DataPartitioningProvider dataPartitioningProvider;
+    private IDataFormat dataFormat = FormatUtils.getDefaultFormat();
 
     public static MetadataProvider create(ICcApplicationContext appCtx, 
Dataverse defaultDataverse) {
         java.util.function.Function<ICcApplicationContext, 
IMetadataProvider<?, ?>> factory =
@@ -318,7 +319,11 @@ public class MetadataProvider implements 
IMetadataProvider<DataSourceId, String>
     }
 
     public IDataFormat getDataFormat() {
-        return FormatUtils.getDefaultFormat();
+        return dataFormat;
+    }
+
+    public void setDataFormat(IDataFormat dataFormat) {
+        this.dataFormat = dataFormat;
     }
 
     public StorageProperties getStorageProperties() {
diff --git 
a/asterixdb/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/SerializerDeserializerProvider.java
 
b/asterixdb/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/SerializerDeserializerProvider.java
index 2ba9e56ddd..521e52815d 100644
--- 
a/asterixdb/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/SerializerDeserializerProvider.java
+++ 
b/asterixdb/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/SerializerDeserializerProvider.java
@@ -72,10 +72,10 @@ import org.apache.hyracks.util.string.UTF8StringWriter;
 
 public class SerializerDeserializerProvider implements 
ISerializerDeserializerProvider, Serializable {
 
-    private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 2L;
     public static final SerializerDeserializerProvider INSTANCE = new 
SerializerDeserializerProvider();
 
-    private SerializerDeserializerProvider() {
+    protected SerializerDeserializerProvider() {
     }
 
     // Can't be shared among threads <Stateful>
diff --git 
a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/formats/NonTaggedDataFormat.java
 
b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/formats/NonTaggedDataFormat.java
index 8c8b7e6ed0..6715cbd5b7 100644
--- 
a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/formats/NonTaggedDataFormat.java
+++ 
b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/formats/NonTaggedDataFormat.java
@@ -95,7 +95,7 @@ public class NonTaggedDataFormat implements IDataFormat {
 
     public static final String NON_TAGGED_DATA_FORMAT = 
"org.apache.asterix.runtime.formats.NonTaggedDataFormat";
 
-    private NonTaggedDataFormat() {
+    protected NonTaggedDataFormat() {
     }
 
     @Override