[
https://issues.apache.org/jira/browse/BEAM-12164?focusedWorklogId=769369&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-769369
]
ASF GitHub Bot logged work on BEAM-12164:
-----------------------------------------
Author: ASF GitHub Bot
Created on: 12/May/22 00:33
Start Date: 12/May/22 00:33
Worklog Time Spent: 10m
Work Description: nancyxu123 commented on code in PR #17222:
URL: https://github.com/apache/beam/pull/17222#discussion_r870851375
##########
sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/spanner/changestreams/restriction/PartitionRestrictionProgressChecker.java:
##########
@@ -0,0 +1,100 @@
+/*
+ * 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.beam.sdk.io.gcp.spanner.changestreams.restriction;
+
+import static java.math.MathContext.DECIMAL128;
+import static
org.apache.beam.sdk.io.gcp.spanner.changestreams.restriction.PartitionMode.DONE;
+import static
org.apache.beam.sdk.io.gcp.spanner.changestreams.restriction.PartitionMode.QUERY_CHANGE_STREAM;
+import static
org.apache.beam.sdk.io.gcp.spanner.changestreams.restriction.PartitionMode.STOP;
+import static
org.apache.beam.sdk.io.gcp.spanner.changestreams.restriction.PartitionMode.UPDATE_STATE;
+import static
org.apache.beam.sdk.io.gcp.spanner.changestreams.restriction.PartitionMode.WAIT_FOR_CHILD_PARTITIONS;
+
+import com.google.cloud.Timestamp;
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import
org.apache.beam.sdk.transforms.splittabledofn.RestrictionTracker.Progress;
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+public class PartitionRestrictionProgressChecker {
+
+ private static final BigDecimal TOTAL_MODE_TRANSITIONS =
BigDecimal.valueOf(3L);
+
+ /**
+ * Indicates how many mode transitions have been completed for the current
mode. The transitions
+ * are as follows: * (1) QUERY_CHANGE_STREAM, (2) WAIT_FOR_CHILD_PARTITIONS,
(3) FINISH_PARTITION,
+ * (4) WAIT_FOR_PARENT_PARTITIONS, (5) DELETE_PARTITION, (6) DONE.
+ *
+ * <p>This is used to calculate the units of work left, meaning that 1
transition = 1 unit of
+ * work.
+ */
+ private final Map<PartitionMode, BigDecimal> modeToTransitionsCompleted;
+
+ public PartitionRestrictionProgressChecker() {
+ modeToTransitionsCompleted = new HashMap<>();
+ modeToTransitionsCompleted.put(UPDATE_STATE, BigDecimal.valueOf(0L));
+ modeToTransitionsCompleted.put(QUERY_CHANGE_STREAM,
BigDecimal.valueOf(1L));
+ modeToTransitionsCompleted.put(WAIT_FOR_CHILD_PARTITIONS,
BigDecimal.valueOf(2L));
+ modeToTransitionsCompleted.put(DONE, BigDecimal.valueOf(3L));
+ }
+
+ public Progress getProgress(
Review Comment:
Hmmm, so TimestampRangeTracker sets the total work as either the number of
seconds till now, or the number of seconds in the total restriction right? And
the current work is the number of seconds in the most recently claimed
position. And the remaining work is total work - current work.
I think my restriction tracker does the same, except it includes transition
modes as extra units of work?
##########
sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/spanner/changestreams/restriction/PartitionRestrictionTracker.java:
##########
@@ -0,0 +1,170 @@
+/*
+ * 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.beam.sdk.io.gcp.spanner.changestreams.restriction;
+
+import static
org.apache.beam.sdk.io.gcp.spanner.changestreams.restriction.PartitionMode.DONE;
+import static
org.apache.beam.sdk.io.gcp.spanner.changestreams.restriction.PartitionMode.STOP;
+import static
org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Preconditions.checkState;
+
+import com.google.cloud.Timestamp;
+import java.math.BigDecimal;
+import java.util.Optional;
+import java.util.function.Supplier;
+import org.apache.beam.sdk.transforms.splittabledofn.RestrictionTracker;
+import
org.apache.beam.sdk.transforms.splittabledofn.RestrictionTracker.HasProgress;
+import org.apache.beam.sdk.transforms.splittabledofn.SplitResult;
+import
org.apache.beam.vendor.guava.v26_0_jre.com.google.common.annotations.VisibleForTesting;
+import org.checkerframework.checker.nullness.qual.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+// TODO: Add java docs
+// TODO: Implement duration waiting for returning false on try claim
+public class PartitionRestrictionTracker
+ extends RestrictionTracker<PartitionRestriction, PartitionPosition>
implements HasProgress {
+
+ private static final Logger LOG =
LoggerFactory.getLogger(PartitionRestrictionTracker.class);
+ private final PartitionRestrictionSplitter splitter;
+ private final PartitionRestrictionClaimer claimer;
+ private final PartitionRestrictionProgressChecker progressChecker;
+ protected PartitionRestriction restriction;
+ private @Nullable PartitionPosition lastClaimedPosition;
+ protected Supplier<Timestamp> timeSupplier;
+
+ public PartitionRestrictionTracker(PartitionRestriction restriction) {
+ this(
+ restriction,
+ new PartitionRestrictionSplitter(),
+ new PartitionRestrictionClaimer(),
+ new PartitionRestrictionProgressChecker());
+ }
+
+ PartitionRestrictionTracker(
+ PartitionRestriction restriction,
+ PartitionRestrictionSplitter splitter,
+ PartitionRestrictionClaimer claimer,
+ PartitionRestrictionProgressChecker progressChecker) {
+ this.splitter = splitter;
+ this.claimer = claimer;
+ this.restriction = restriction;
+ this.progressChecker = progressChecker;
+ this.timeSupplier = () -> Timestamp.now();
+ }
+
+ @VisibleForTesting
+ public void setTimeSupplier(Supplier<Timestamp> timeSupplier) {
+ this.timeSupplier = timeSupplier;
+ }
+
+ @Override
+ public @Nullable SplitResult<PartitionRestriction> trySplit(double
fractionOfRemainder) {
+ final String token =
+ Optional.ofNullable(restriction.getMetadata())
+ .map(PartitionRestrictionMetadata::getPartitionToken)
+ .orElse("");
+ final SplitResult<PartitionRestriction> splitResult =
+ splitter.trySplit(fractionOfRemainder, lastClaimedPosition,
restriction);
+ LOG.debug(
Review Comment:
Done
Issue Time Tracking
-------------------
Worklog Id: (was: 769369)
Time Spent: 72h 10m (was: 72h)
> SpannerIO Change Stream Connector
> ---------------------------------
>
> Key: BEAM-12164
> URL: https://issues.apache.org/jira/browse/BEAM-12164
> Project: Beam
> Issue Type: New Feature
> Components: sdk-java-core
> Reporter: Thiago Nunes
> Assignee: Thiago Nunes
> Priority: P2
> Fix For: 2.37.0
>
> Time Spent: 72h 10m
> Remaining Estimate: 0h
>
> We would like to augment the existing Google Cloud SpannerIO connector
> ([https://github.com/apache/beam/blob/master/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/spanner/SpannerIO.java)]
> with the support for Spanner Change Streams (CDC). CDC support is just being
> implemented in Spanner and it will be exposed through a gRPC API. We will use
> such API to create a new SpannerIO.readChangeStream(...) implementation.
--
This message was sent by Atlassian Jira
(v8.20.7#820007)
