You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pinot.apache.org by GitBox <gi...@apache.org> on 2020/10/07 03:59:53 UTC
[GitHub] [incubator-pinot] yupeng9 commented on a change in pull request #6113: Adding the upsert support to real-time ingestion and query
yupeng9 commented on a change in pull request #6113:
URL: https://github.com/apache/incubator-pinot/pull/6113#discussion_r500721504
##########
File path: pinot-core/src/main/java/org/apache/pinot/core/upsert/UpsertMetadataTableManager.java
##########
@@ -0,0 +1,74 @@
+/**
+ * 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.core.upsert;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import javax.annotation.concurrent.ThreadSafe;
+import org.apache.pinot.core.data.manager.realtime.RealtimeTableDataManager;
+import org.apache.pinot.core.realtime.impl.ThreadSafeMutableRoaringBitmap;
+import org.apache.pinot.spi.data.readers.PrimaryKey;
+
+/**
+ * The manager of the upsert metadata of a table.
+ */
+@ThreadSafe
+public class UpsertMetadataTableManager {
Review comment:
I'd like to keep this class for (1) a group of the `PartitionUpsertMetadataManager ` (note `PartitionUpsertMetadataManager ` is package-private); (2) more features might be added to this class, such as future offline table support, record retrieval for partial update, etc
##########
File path: pinot-core/src/main/java/org/apache/pinot/core/upsert/UpsertMetadataPartitionManager.java
##########
@@ -0,0 +1,83 @@
+/**
+ * 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.core.upsert;
+
+import java.util.HashSet;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import javax.annotation.concurrent.ThreadSafe;
+import org.apache.pinot.core.realtime.impl.ThreadSafeMutableRoaringBitmap;
+import org.apache.pinot.spi.data.readers.PrimaryKey;
+
+/**
+ * Manages the upsert metadata per partition. This shall be accessed from UpsertMetadataTableManager.
+ */
+@ThreadSafe
+class UpsertMetadataPartitionManager {
Review comment:
Good point
##########
File path: pinot-core/src/main/java/org/apache/pinot/core/upsert/UpsertMetadataPartitionManager.java
##########
@@ -0,0 +1,83 @@
+/**
+ * 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.core.upsert;
+
+import java.util.HashSet;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import javax.annotation.concurrent.ThreadSafe;
+import org.apache.pinot.core.realtime.impl.ThreadSafeMutableRoaringBitmap;
+import org.apache.pinot.spi.data.readers.PrimaryKey;
+
+/**
+ * Manages the upsert metadata per partition. This shall be accessed from UpsertMetadataTableManager.
+ */
+@ThreadSafe
+class UpsertMetadataPartitionManager {
+
+ private final int _partitionId;
+
+ private final Map<PrimaryKey, RecordLocation> _primaryKeyIndex = new ConcurrentHashMap();
+ // the mapping between the (sealed) segment and its validDocuments
+ private final Map<String, ThreadSafeMutableRoaringBitmap> _segmentToValidDocIndexMap = new ConcurrentHashMap();
+
+ UpsertMetadataPartitionManager(int partitionId) {
+ _partitionId = partitionId;
+ }
+
+ synchronized void removeRecordLocation(PrimaryKey primaryKey) {
+ _primaryKeyIndex.remove(primaryKey);
+ }
+
+ synchronized boolean containsKey(PrimaryKey primaryKey) {
+ return _primaryKeyIndex.containsKey(primaryKey);
+ }
+
+ RecordLocation getRecordLocation(PrimaryKey primaryKey) {
+ return _primaryKeyIndex.get(primaryKey);
+ }
+
+ synchronized void updateRecordLocation(PrimaryKey primaryKey, RecordLocation recordLocation) {
+ _primaryKeyIndex.put(primaryKey, recordLocation);
+ }
+
+ synchronized ThreadSafeMutableRoaringBitmap getValidDocIndex(String segmentName) {
+ return _segmentToValidDocIndexMap.get(segmentName);
+ }
+
+ synchronized void putUpsertMetadata(String segmentName, Map<PrimaryKey, RecordLocation> primaryKeyIndex,
+ ThreadSafeMutableRoaringBitmap validDocIndex) {
+ //TODO(upsert) do we need to make a backup before update?
+ _primaryKeyIndex.putAll(primaryKeyIndex);
Review comment:
Don't quite follow. This is a batch addition with the `synchronized` protection?
##########
File path: pinot-core/src/main/java/org/apache/pinot/core/upsert/UpsertMetadataTableManager.java
##########
@@ -0,0 +1,74 @@
+/**
+ * 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.core.upsert;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import javax.annotation.concurrent.ThreadSafe;
+import org.apache.pinot.core.data.manager.realtime.RealtimeTableDataManager;
+import org.apache.pinot.core.realtime.impl.ThreadSafeMutableRoaringBitmap;
+import org.apache.pinot.spi.data.readers.PrimaryKey;
+
+/**
+ * The manager of the upsert metadata of a table.
+ */
+@ThreadSafe
+public class UpsertMetadataTableManager {
Review comment:
Also why would there be concurrent lookup contention, since we don't the synchronized keywords on most methods?
##########
File path: pinot-core/src/main/java/org/apache/pinot/core/upsert/UpsertMetadataPartitionManager.java
##########
@@ -0,0 +1,83 @@
+/**
+ * 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.core.upsert;
+
+import java.util.HashSet;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import javax.annotation.concurrent.ThreadSafe;
+import org.apache.pinot.core.realtime.impl.ThreadSafeMutableRoaringBitmap;
+import org.apache.pinot.spi.data.readers.PrimaryKey;
+
+/**
+ * Manages the upsert metadata per partition. This shall be accessed from UpsertMetadataTableManager.
+ */
+@ThreadSafe
+class UpsertMetadataPartitionManager {
+
+ private final int _partitionId;
+
+ private final Map<PrimaryKey, RecordLocation> _primaryKeyIndex = new ConcurrentHashMap();
+ // the mapping between the (sealed) segment and its validDocuments
+ private final Map<String, ThreadSafeMutableRoaringBitmap> _segmentToValidDocIndexMap = new ConcurrentHashMap();
+
+ UpsertMetadataPartitionManager(int partitionId) {
+ _partitionId = partitionId;
+ }
+
+ synchronized void removeRecordLocation(PrimaryKey primaryKey) {
+ _primaryKeyIndex.remove(primaryKey);
+ }
+
+ synchronized boolean containsKey(PrimaryKey primaryKey) {
+ return _primaryKeyIndex.containsKey(primaryKey);
+ }
+
+ RecordLocation getRecordLocation(PrimaryKey primaryKey) {
+ return _primaryKeyIndex.get(primaryKey);
+ }
+
+ synchronized void updateRecordLocation(PrimaryKey primaryKey, RecordLocation recordLocation) {
+ _primaryKeyIndex.put(primaryKey, recordLocation);
+ }
+
+ synchronized ThreadSafeMutableRoaringBitmap getValidDocIndex(String segmentName) {
+ return _segmentToValidDocIndexMap.get(segmentName);
+ }
+
+ synchronized void putUpsertMetadata(String segmentName, Map<PrimaryKey, RecordLocation> primaryKeyIndex,
+ ThreadSafeMutableRoaringBitmap validDocIndex) {
+ //TODO(upsert) do we need to make a backup before update?
+ _primaryKeyIndex.putAll(primaryKeyIndex);
+ _segmentToValidDocIndexMap.put(segmentName, validDocIndex);
+ }
+
+ synchronized void removeSegment(String segmentName) {
Review comment:
Same reason with synchronization on this?
##########
File path: pinot-core/src/main/java/org/apache/pinot/core/upsert/UpsertProcessorUtil.java
##########
@@ -0,0 +1,69 @@
+/**
+ * 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.core.upsert;
+
+import java.util.Map;
+import org.apache.pinot.core.realtime.impl.ThreadSafeMutableRoaringBitmap;
+import org.apache.pinot.spi.data.readers.PrimaryKey;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+public final class UpsertProcessorUtil {
+ private static final Logger LOGGER = LoggerFactory.getLogger(UpsertProcessorUtil.class);
+
+ private UpsertProcessorUtil() {
+ }
+
+ public static void handleUpsert(PrimaryKey primaryKey, long timestamp, String segmentName, int docId, int partitionId,
Review comment:
hmm, I thought about that. But this logic does not fully belong to the `PartitionUpsertMetadataManager `, but only the part in the `else if` branch.
In fact, it's a common logic used in two places, and that's why I put it in a util class.
----------------------------------------------------------------
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:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org