amrishlal commented on a change in pull request #6845:
URL: https://github.com/apache/incubator-pinot/pull/6845#discussion_r623238892
##########
File path:
pinot-core/src/test/java/org/apache/pinot/core/util/SchemaUtilsTest.java
##########
@@ -140,7 +140,7 @@ public void testCompatibilityWithTableConfig() {
.addDateTime(TIME_COLUMN, DataType.LONG, "1:MILLISECONDS:EPOCH",
"1:HOURS").build();
tableConfig = new
TableConfigBuilder(TableType.REALTIME).setTableName(TABLE_NAME).setTimeColumnName(TIME_COLUMN)
.setIngestionConfig(
- new IngestionConfig(null, null, null, Lists.newArrayList(new
TransformConfig("colA", "round(colB, 1000)"))))
+ new IngestionConfig(null, null, null, Lists.newArrayList(new
TransformConfig("colA", "round(colB, 1000)")), null))
Review comment:
Many of the lines being modified in this PR are only for adding null at
the end of IngestionConfig constructor. Can we create a new IngestionConfig
constructor instead?
##########
File path:
pinot-segment-local/src/main/java/org/apache/pinot/segment/local/recordtransformer/ComplexTypeTransformer.java
##########
@@ -0,0 +1,184 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pinot.segment.local.recordtransformer;
+
+import com.google.common.annotations.VisibleForTesting;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import javax.annotation.Nullable;
+import org.apache.pinot.spi.config.table.TableConfig;
+import org.apache.pinot.spi.config.table.ingestion.ComplexTypeHandlingConfig;
+import org.apache.pinot.spi.data.readers.GenericRow;
+
+
+public class ComplexTypeTransformer implements RecordTransformer {
+ private static final CharSequence DELIMITER = ".";
+ private final List<String> _collectionsToUnnest;
+
+ public ComplexTypeTransformer(TableConfig tableConfig) {
+ if (tableConfig.getIngestionConfig() != null
+ && tableConfig.getIngestionConfig().getComplexTypeHandlingConfig() !=
null) {
+ _collectionsToUnnest =
+
tableConfig.getIngestionConfig().getComplexTypeHandlingConfig().getUnnestConfig()
!= null ? tableConfig
+
.getIngestionConfig().getComplexTypeHandlingConfig().getUnnestConfig() : new
ArrayList<>();
+ } else {
+ _collectionsToUnnest = new ArrayList<>();
+ }
+ }
+
+ @VisibleForTesting
+ public ComplexTypeTransformer(List<String> unnestCollections) {
+ _collectionsToUnnest = new ArrayList<>(unnestCollections);
+ Collections.sort(_collectionsToUnnest);
+ }
+
+ public static boolean isComplexTypeHandlingEnabled(TableConfig tableConfig) {
+ if (tableConfig.getIngestionConfig() == null
+ || tableConfig.getIngestionConfig().getComplexTypeHandlingConfig() ==
null
+ ||
tableConfig.getIngestionConfig().getComplexTypeHandlingConfig().getMode() ==
null) {
+ return false;
+ }
+ return
tableConfig.getIngestionConfig().getComplexTypeHandlingConfig().getMode()
+ != ComplexTypeHandlingConfig.Mode.NONE;
+ }
+
+ @Nullable
+ @Override
+ public GenericRow transform(GenericRow record) {
+ flattenMap(record, new HashSet<>(record.getFieldToValueMap().keySet()));
Review comment:
Why does the `Set<String>` returned by `keySet()` need to be copied into
a new `HashSet`?
##########
File path:
pinot-segment-local/src/main/java/org/apache/pinot/segment/local/recordtransformer/ComplexTypeTransformer.java
##########
@@ -0,0 +1,184 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pinot.segment.local.recordtransformer;
+
+import com.google.common.annotations.VisibleForTesting;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import javax.annotation.Nullable;
+import org.apache.pinot.spi.config.table.TableConfig;
+import org.apache.pinot.spi.config.table.ingestion.ComplexTypeHandlingConfig;
+import org.apache.pinot.spi.data.readers.GenericRow;
+
+
+public class ComplexTypeTransformer implements RecordTransformer {
Review comment:
I would also like to see an example that shows what final output of
transform(GenericRow record) function (output rows, columns, values) will look
like for an input row with JSON object.
##########
File path:
pinot-segment-local/src/main/java/org/apache/pinot/segment/local/recordtransformer/ComplexTypeTransformer.java
##########
@@ -0,0 +1,184 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pinot.segment.local.recordtransformer;
+
+import com.google.common.annotations.VisibleForTesting;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import javax.annotation.Nullable;
+import org.apache.pinot.spi.config.table.TableConfig;
+import org.apache.pinot.spi.config.table.ingestion.ComplexTypeHandlingConfig;
+import org.apache.pinot.spi.data.readers.GenericRow;
+
+
+public class ComplexTypeTransformer implements RecordTransformer {
+ private static final CharSequence DELIMITER = ".";
+ private final List<String> _collectionsToUnnest;
+
+ public ComplexTypeTransformer(TableConfig tableConfig) {
+ if (tableConfig.getIngestionConfig() != null
+ && tableConfig.getIngestionConfig().getComplexTypeHandlingConfig() !=
null) {
+ _collectionsToUnnest =
+
tableConfig.getIngestionConfig().getComplexTypeHandlingConfig().getUnnestConfig()
!= null ? tableConfig
+
.getIngestionConfig().getComplexTypeHandlingConfig().getUnnestConfig() : new
ArrayList<>();
+ } else {
+ _collectionsToUnnest = new ArrayList<>();
+ }
+ }
+
+ @VisibleForTesting
+ public ComplexTypeTransformer(List<String> unnestCollections) {
+ _collectionsToUnnest = new ArrayList<>(unnestCollections);
+ Collections.sort(_collectionsToUnnest);
+ }
+
+ public static boolean isComplexTypeHandlingEnabled(TableConfig tableConfig) {
+ if (tableConfig.getIngestionConfig() == null
+ || tableConfig.getIngestionConfig().getComplexTypeHandlingConfig() ==
null
+ ||
tableConfig.getIngestionConfig().getComplexTypeHandlingConfig().getMode() ==
null) {
+ return false;
+ }
+ return
tableConfig.getIngestionConfig().getComplexTypeHandlingConfig().getMode()
+ != ComplexTypeHandlingConfig.Mode.NONE;
+ }
+
+ @Nullable
+ @Override
+ public GenericRow transform(GenericRow record) {
+ flattenMap(record, new HashSet<>(record.getFieldToValueMap().keySet()));
+ for (String collection : _collectionsToUnnest) {
+ unnestCollection(record, collection);
+ }
+ return record;
+ }
+
+ private GenericRow unnestCollection(GenericRow record, String column) {
+ if (record.getValue(GenericRow.MULTIPLE_RECORDS_KEY) == null) {
+ List<GenericRow> list = new ArrayList<>();
+ unnestCollection(record, column, list);
+ record.putValue(GenericRow.MULTIPLE_RECORDS_KEY, list);
+ } else {
+ Collection<GenericRow> records = (Collection)
record.getValue(GenericRow.MULTIPLE_RECORDS_KEY);
+ List<GenericRow> list = new ArrayList<>();
+ for (GenericRow innerRecord : records) {
+ unnestCollection(innerRecord, column, list);
+ }
+ record.putValue(GenericRow.MULTIPLE_RECORDS_KEY, list);
+ }
+ return record;
+ }
+
+ private void unnestCollection(GenericRow record, String column,
List<GenericRow> list) {
+ Object value = record.removeValue(column);
+ if (value == null) {
+ // use the record itself
+ list.add(record);
+ return;
+ } else if (value instanceof Collection) {
+ if (((Collection) value).isEmpty()) {
+ // use the record itself
+ list.add(record);
+ } else {
+ for (Object obj : (Collection) value) {
+ GenericRow copy = flattenCollectionItem(record, obj, column);
+ list.add(copy);
+ }
+ }
+ } else if (value.getClass().isArray()) {
+ if (((Object[]) value).length == 0) {
+ // use the record itself
+ list.add(record);
+ } else {
+ for (Object obj : (Object[]) value) {
+ GenericRow copy = flattenCollectionItem(record, obj, column);
+ list.add(copy);
+ }
+ }
+ }
+ }
+
+ private GenericRow flattenCollectionItem(GenericRow record, Object obj,
String column) {
+ GenericRow copy = record.copy();
+ if (obj instanceof Map) {
+ Map<String, Object> map = (Map<String, Object>) obj;
+ for (Map.Entry<String, Object> entry : new HashSet<>(map.entrySet())) {
+ String flattenName = concat(column, entry.getKey());
+ copy.putValue(flattenName, entry.getValue());
+ }
+ } else {
+ copy.putValue(column, obj);
+ }
+ return copy;
Review comment:
If we take the json snippet above as an example, then what would the
final output of transform(GenericRow record) function (output rows, columns,
values) will look like?
Also, will the final output contain only the leaf nodes of the tree or also
intermediate nodes?
##########
File path:
pinot-segment-local/src/main/java/org/apache/pinot/segment/local/recordtransformer/ComplexTypeTransformer.java
##########
@@ -0,0 +1,184 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pinot.segment.local.recordtransformer;
+
+import com.google.common.annotations.VisibleForTesting;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import javax.annotation.Nullable;
+import org.apache.pinot.spi.config.table.TableConfig;
+import org.apache.pinot.spi.config.table.ingestion.ComplexTypeHandlingConfig;
+import org.apache.pinot.spi.data.readers.GenericRow;
+
+
+public class ComplexTypeTransformer implements RecordTransformer {
+ private static final CharSequence DELIMITER = ".";
+ private final List<String> _collectionsToUnnest;
+
+ public ComplexTypeTransformer(TableConfig tableConfig) {
+ if (tableConfig.getIngestionConfig() != null
+ && tableConfig.getIngestionConfig().getComplexTypeHandlingConfig() !=
null) {
+ _collectionsToUnnest =
+
tableConfig.getIngestionConfig().getComplexTypeHandlingConfig().getUnnestConfig()
!= null ? tableConfig
+
.getIngestionConfig().getComplexTypeHandlingConfig().getUnnestConfig() : new
ArrayList<>();
+ } else {
+ _collectionsToUnnest = new ArrayList<>();
+ }
+ }
+
+ @VisibleForTesting
+ public ComplexTypeTransformer(List<String> unnestCollections) {
+ _collectionsToUnnest = new ArrayList<>(unnestCollections);
+ Collections.sort(_collectionsToUnnest);
+ }
+
+ public static boolean isComplexTypeHandlingEnabled(TableConfig tableConfig) {
+ if (tableConfig.getIngestionConfig() == null
+ || tableConfig.getIngestionConfig().getComplexTypeHandlingConfig() ==
null
+ ||
tableConfig.getIngestionConfig().getComplexTypeHandlingConfig().getMode() ==
null) {
+ return false;
+ }
+ return
tableConfig.getIngestionConfig().getComplexTypeHandlingConfig().getMode()
+ != ComplexTypeHandlingConfig.Mode.NONE;
+ }
+
+ @Nullable
+ @Override
+ public GenericRow transform(GenericRow record) {
+ flattenMap(record, new HashSet<>(record.getFieldToValueMap().keySet()));
+ for (String collection : _collectionsToUnnest) {
+ unnestCollection(record, collection);
+ }
+ return record;
+ }
+
+ private GenericRow unnestCollection(GenericRow record, String column) {
+ if (record.getValue(GenericRow.MULTIPLE_RECORDS_KEY) == null) {
+ List<GenericRow> list = new ArrayList<>();
+ unnestCollection(record, column, list);
+ record.putValue(GenericRow.MULTIPLE_RECORDS_KEY, list);
+ } else {
+ Collection<GenericRow> records = (Collection)
record.getValue(GenericRow.MULTIPLE_RECORDS_KEY);
+ List<GenericRow> list = new ArrayList<>();
+ for (GenericRow innerRecord : records) {
+ unnestCollection(innerRecord, column, list);
+ }
+ record.putValue(GenericRow.MULTIPLE_RECORDS_KEY, list);
+ }
+ return record;
+ }
+
+ private void unnestCollection(GenericRow record, String column,
List<GenericRow> list) {
+ Object value = record.removeValue(column);
+ if (value == null) {
+ // use the record itself
+ list.add(record);
+ return;
Review comment:
return appears to be unnecessary.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For additional commands, e-mail: commits-h...@pinot.apache.org
