Merge branch 'main' into avm99963-monorail
Merged commit 34d8229ae2b51fb1a15bd208e6fe6185c94f6266
GitOrigin-RevId: 7ee0917f93a577e475f8e09526dd144d245593f4
diff --git a/tools/attach-relations.sql b/tools/attach-relations.sql
index 3371c56..9a9ec8c 100644
--- a/tools/attach-relations.sql
+++ b/tools/attach-relations.sql
@@ -1,8 +1,6 @@
--- Copyright 2016 The Chromium Authors. All Rights Reserved.
---
--- Use of this source code is governed by a BSD-style
--- license that can be found in the LICENSE file or at
--- https://developers.google.com/open-source/licenses/bsd
+-- Copyright 2016 The Chromium Authors
+-- Use of this source code is governed by a BSD-style license that can be
+-- found in the LICENSE file.
DROP PROCEDURE IF EXISTS AttachDanglingRelations;
diff --git a/tools/backfill-commentcontent-id.sql b/tools/backfill-commentcontent-id.sql
index 2b2e3c2..76b18c6 100644
--- a/tools/backfill-commentcontent-id.sql
+++ b/tools/backfill-commentcontent-id.sql
@@ -1,8 +1,6 @@
--- Copyright 2016 The Chromium Authors. All Rights Reserved.
---
--- Use of this source code is governed by a BSD-style
--- license that can be found in the LICENSE file or at
--- https://developers.google.com/open-source/licenses/bsd
+-- Copyright 2016 The Chromium Authors
+-- Use of this source code is governed by a BSD-style license that can be
+-- found in the LICENSE file.
DROP PROCEDURE IF EXISTS BackfillCommentContentID;
diff --git a/tools/backfill-issue-snapshots.sql b/tools/backfill-issue-snapshots.sql
index d60ff77..5bbfc8e 100644
--- a/tools/backfill-issue-snapshots.sql
+++ b/tools/backfill-issue-snapshots.sql
@@ -1,8 +1,6 @@
--- Copyright 2018 The Chromium Authors. All Rights Reserved.
---
--- Use of this source code is governed by a BSD-style
--- license that can be found in the LICENSE file or at
--- https://developers.google.com/open-source/licenses/bsd
+-- Copyright 2018 The Chromium Authors
+-- Use of this source code is governed by a BSD-style license that can be
+-- found in the LICENSE file.
DROP PROCEDURE IF EXISTS BackfillIssueSnapshotsCcs;
diff --git a/tools/backfill-issue-timestamps.sql b/tools/backfill-issue-timestamps.sql
index 0cc84a8..3c1302c 100644
--- a/tools/backfill-issue-timestamps.sql
+++ b/tools/backfill-issue-timestamps.sql
@@ -1,8 +1,6 @@
--- Copyright 2016 The Chromium Authors. All Rights Reserved.
---
--- Use of this source code is governed by a BSD-style
--- license that can be found in the LICENSE file or at
--- https://developers.google.com/open-source/licenses/bsd
+-- Copyright 2016 The Chromium Authors
+-- Use of this source code is governed by a BSD-style license that can be
+-- found in the LICENSE file.
DROP PROCEDURE IF EXISTS BackfillIssueTimestampsChunk;
@@ -39,8 +37,8 @@
SELECT c_issue_id AS 'Processing:';
-- Set the fields to the largest timestamp of any relevant update.
- UPDATE Issue
- SET
+ UPDATE Issue
+ SET
owner_modified = (SELECT MAX(created)
FROM IssueUpdate
JOIN Comment ON IssueUpdate.comment_id = Comment.id
@@ -87,4 +85,3 @@
delimiter ;
-
diff --git a/tools/backfill-last-visit-timestamp.sql b/tools/backfill-last-visit-timestamp.sql
index 68b17a9..ededfc7 100644
--- a/tools/backfill-last-visit-timestamp.sql
+++ b/tools/backfill-last-visit-timestamp.sql
@@ -1,8 +1,6 @@
--- Copyright 2016 The Chromium Authors. All Rights Reserved.
---
--- Use of this source code is governed by a BSD-style
--- license that can be found in the LICENSE file or at
--- https://developers.google.com/open-source/licenses/bsd
+-- Copyright 2016 The Chromium Authors
+-- Use of this source code is governed by a BSD-style license that can be
+-- found in the LICENSE file.
DROP PROCEDURE IF EXISTS BackfillLastVisitTimestamp;
@@ -64,4 +62,3 @@
-- CALL BackfillLastVisitTimestamp(1476915669, 120, 30);
-- CALL BackfillLastVisitTimestamp(1476915669, 150, 30);
-- CALL BackfillLastVisitTimestamp(1476915669, 180, 30);
-
diff --git a/tools/backfill-update-duplicate-issue-snapshots.sql b/tools/backfill-update-duplicate-issue-snapshots.sql
index 227a7fa..3c9c0ff 100644
--- a/tools/backfill-update-duplicate-issue-snapshots.sql
+++ b/tools/backfill-update-duplicate-issue-snapshots.sql
@@ -1,8 +1,6 @@
--- Copyright 2019 The Chromium Authors. All Rights Reserved.
---
--- Use of this source code is governed by a BSD-style
--- license that can be found in the LICENSE file or at
--- https://developers.google.com/open-source/licenses/bsd
+-- Copyright 2019 The Chromium Authors
+-- Use of this source code is governed by a BSD-style license that can be
+-- found in the LICENSE file.
-- Update all IssueSnapshot rows that incorrectly have their period_end
-- set to the maximum value 4294967295. For all affected rows, this
diff --git a/tools/backups/restore.sh b/tools/backups/restore.sh
index f585a07..33fa5ca 100755
--- a/tools/backups/restore.sh
+++ b/tools/backups/restore.sh
@@ -1,8 +1,7 @@
#!/bin/bash
-# Copyright 2016 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file or at
-# https://developers.google.com/open-source/licenses/bsd
+# Copyright 2016 The Chromium Authors
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
# The existing replicas all have this prefix:
REPLICA_PREFIX="replica"
diff --git a/tools/build_release.py b/tools/build_release.py
index 02ffcf3..1bc3b90 100755
--- a/tools/build_release.py
+++ b/tools/build_release.py
@@ -1,8 +1,7 @@
#!/usr/bin/env python3
-# Copyright 2022 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file or at
-# https://developers.google.com/open-source/licenses/bsd
+# Copyright 2022 The Chromium Authors
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
"""Script to launch the Monorail release tarball builder.
diff --git a/tools/copy-comment-to-commentcontent.sql b/tools/copy-comment-to-commentcontent.sql
index 9f5a65a..abaaded 100644
--- a/tools/copy-comment-to-commentcontent.sql
+++ b/tools/copy-comment-to-commentcontent.sql
@@ -1,8 +1,6 @@
--- Copyright 2016 The Chromium Authors. All Rights Reserved.
---
--- Use of this source code is governed by a BSD-style
--- license that can be found in the LICENSE file or at
--- https://developers.google.com/open-source/licenses/bsd
+-- Copyright 2016 The Chromium Authors
+-- Use of this source code is governed by a BSD-style license that can be
+-- found in the LICENSE file.
DROP PROCEDURE IF EXISTS CopyCommentToCommentContent;
diff --git a/tools/copy-new-commentcontent-back-to-comment.sql b/tools/copy-new-commentcontent-back-to-comment.sql
index 4eb5f47..ecd58c5 100644
--- a/tools/copy-new-commentcontent-back-to-comment.sql
+++ b/tools/copy-new-commentcontent-back-to-comment.sql
@@ -1,8 +1,6 @@
--- Copyright 2016 The Chromium Authors. All Rights Reserved.
---
--- Use of this source code is governed by a BSD-style
--- license that can be found in the LICENSE file or at
--- https://developers.google.com/open-source/licenses/bsd
+-- Copyright 2016 The Chromium Authors
+-- Use of this source code is governed by a BSD-style license that can be
+-- found in the LICENSE file.
DROP PROCEDURE IF EXISTS CopyNewCommentContentBackToComment;
diff --git a/tools/normalize-casing.sql b/tools/normalize-casing.sql
index 139593e..fd14b30 100644
--- a/tools/normalize-casing.sql
+++ b/tools/normalize-casing.sql
@@ -1,8 +1,6 @@
--- Copyright 2016 The Chromium Authors. All Rights Reserved.
---
--- Use of this source code is governed by a BSD-style
--- license that can be found in the LICENSE file or at
--- https://developers.google.com/open-source/licenses/bsd
+-- Copyright 2016 The Chromium Authors
+-- Use of this source code is governed by a BSD-style license that can be
+-- found in the LICENSE file.
DROP PROCEDURE IF EXISTS InspectStatusCase;
diff --git a/tools/null-comment-table-strings.sql b/tools/null-comment-table-strings.sql
index ae97db3..3f65416 100644
--- a/tools/null-comment-table-strings.sql
+++ b/tools/null-comment-table-strings.sql
@@ -1,8 +1,6 @@
--- Copyright 2016 The Chromium Authors. All Rights Reserved.
---
--- Use of this source code is governed by a BSD-style
--- license that can be found in the LICENSE file or at
--- https://developers.google.com/open-source/licenses/bsd
+-- Copyright 2016 The Chromium Authors
+-- Use of this source code is governed by a BSD-style license that can be
+-- found in the LICENSE file.
DROP PROCEDURE IF EXISTS NullCommentTableStrings;
diff --git a/tools/rewrite-user-id.sql b/tools/rewrite-user-id.sql
index b95a0e4..c558912 100644
--- a/tools/rewrite-user-id.sql
+++ b/tools/rewrite-user-id.sql
@@ -1,8 +1,6 @@
--- Copyright 2019 The Chromium Authors. All Rights Reserved.
---
--- Use of this source code is governed by a BSD-style
--- license that can be found in the LICENSE file or at
--- https://developers.google.com/open-source/licenses/bsd
+-- Copyright 2019 The Chromium Authors
+-- Use of this source code is governed by a BSD-style license that can be
+-- found in the LICENSE file.
-- There have been cases of imported data that used the wrong email
-- address for a user. This script can change all the user_ids in our