1400 Commits

Author SHA1 Message Date
Dave Borowitz
e9d0211b16 ChangeNotesState: Add a Builder
Earlier in this series as I was changing fields in this AutoValue class,
I kept messing up the ginormous constructor. It would have been nice to
have this builder to make editing the fields easier; better late than
never.

Change-Id: I4eaea9f8d4fa3920a7c5325729ce463f3ce13583
2018-05-14 14:26:51 -07:00
Dave Borowitz
17625530b6 ChangeNotesState: Remove changeMessagesByPatchSet field
The only caller outside of tests that used this field was
Submit#getConflictMessage, which no longer exists.

Rename the remaining field from allChangeMessages to changeMessages,
since there is no longer overlap with another name.

Change-Id: I8f2846d7b21b41a6e0c934fd73ff87f6dc8e58d9
2018-05-14 14:26:51 -07:00
Dave Borowitz
cb67893742 Submit: Remove code scanning for failed submission message
Back when we had separate SUBMITTED/MERGED states, the merge attempt
process would write a ChangeMessage from the server describing the
problem. This code was intended to pull out that message and report it
as the contents of a ResourceConflictException. The submit process no
longer works like this: errors during submission are supposed to be
thrown directly as IntegrationExceptions, and the code should not reach
this point. At any rate, on changes created in the past few years, this
code will never find a relevant message.

Change the case where change remains NEW after submission to be a 500, since it
reflects an actual server-side error.

Change-Id: Idbd27f7ed8daaf67318c391e9dbb1c8e02ed9e81
2018-05-14 14:26:51 -07:00
Dave Borowitz
3080c7d321 ChangeNotes: Remove fields that read from ChangeColumns
The point of ChangeColumns is that the contents are copied into the
relevant columns in the ChangeNotes's Change instance upon loading.
Callers should just be getting these fields from the Change instead;
there weren't any callers outside of tests doing the wrong thing anyway.

Change-Id: Ib6a592e4a5b28add9ed117dbcffb03ac7a507582
2018-05-14 14:26:51 -07:00
Dave Borowitz
c92b828746 ChangeNotesState: Remove redundant revertOf field
This is a @Column in Change and thus belongs in ChangeColumns. In
ChangeNotes#create it reuses the same value in both places, so they
should always be equal, modulo missing ChangeColumns, in which case the
field in ChangeNotesState should never be accessed.

Change-Id: I63eb5acdcd6c47ea2ceea7d830d5b5b6e4b28d2f
2018-05-14 14:26:50 -07:00
Dave Borowitz
bc4757f740 Clarify ChangeNotesState private/WIP/started bits
There were redundant fields in the ChangeNotesState and the contained
ChangeColumns. They properly belong in ChangeColumns, since they
correspond to actual @Columns in the Change class. Also in the Change
class, they are not nullable (they lack "notNull = false"), so remove
@Nullable in ChangeColumns as well.

A few callers were explicitly depending on the fields in
ChangeNotesState rather than in ChangeColumns; those are easily updated.
Note that the ChangeNotesState#create method always just passed in a
single value for each of these fields, which was then passed to two
different constructors, so they were always in sync.

The only time when the ChangeNotesState and ChangeColumns might
potentially be out of sync is when calling ChangeNotesState#empty, which
would pass a non-null value for these bits to the ChangeNotesState
constructor and leave the ChangeColumns null. However, this is only used
from ChangeNotes when NoteDb is disabled, in which case the
ChangeNotesState fields are never exposed to callers. In this case they
get these bits by calling the relevant methods on getChange(), which
will contain the ReviewDb change (and not have columns populated from
NoteDb via ChangeNotesState#copyColumnsTo).

Change-Id: Id4771f3e305417dc7f8d2040575d0c6746944946
2018-05-14 14:26:50 -07:00
Dave Borowitz
6291a6b18c ChangeNotesState: Remove some @Nullable annotations from create
These args were marked @Nullable, but the corresponding fields in
AutoValue were non-nullable, so remove @Nullable to make them
consistent.

For pastAssignees, any callers passing null would have already
encountered NPE due to the ImmutableSet#copyOf (and, if not that, the
check in the auto-generated constructor). For hashtags, push the logic
guarding against null into the one caller in
ChangeNotesParser#buildState, which already has similar logic to
construct its arguments.

Change-Id: Idc5123ccab4e1d21f932067d9ffff0f98afa5011
2018-05-14 14:26:50 -07:00
Dave Borowitz
cc7b9a82e3 Move ByteString bytes(int... ints) to test util
Change-Id: If55dac7c1a2df87c412bf0e13afb7a9b57fbfa95
2018-05-14 14:26:50 -07:00
Dave Borowitz
095394c069 Add tests for fields declared in types with custom serializers
When the set of fields changed, it's a very good sign that something
needs to change in the serializer implementation, or at least bumping
the version number in the CacheMoule. Add a simple test utility that
maps declared field names to types, and list the expected types
explicitly in each of the relevant tests.

This simple mechanism can't catch everything, for example:

 * If the serializer implementation changes for an existing type in an
   incompatible way, without altering any fields. In this case, the
   {key,value}Serializer in the CacheModule will change, so hopefully a
   reviewer will notice and ask the author to bump the version as well.
 * If semantics of individual fields change without changing the type,
   such as making a field newly @Nullable.

But it's much better than nothing.

Change-Id: I51e60b83f9c3291d2f8f9ac19ce0192678211676
2018-05-14 14:26:50 -07:00
Dave Borowitz
e6930d73b0 Convert OAuthTokenCache serialization to protobuf
The serializer class lives in OAuthTokenCache.java so the extension
framework doesn't acquire a dep on the cache serialization code, which
currently lives in the server package.

Proto3 doesn't have optional fields, so we can't distinguish between
empty and null for the provider_id field (at least without adding a
separate has_provider_id field). Explicitly treat these the same in
OAuthToken itself, and clarify that other fields are not nullable.

Change-Id: I37bd47ac0c8491e5212fcec4885e063ae50d714d
2018-05-14 14:26:50 -07:00
Dave Borowitz
e62a11110a Convert MergeabilityCacheImpl.Key serialization to protobuf
Change-Id: If3e2d0821b700acd408c2c6052dea2f5e208805b
2018-05-14 14:26:50 -07:00
Dave Borowitz
52e5bbbbc1 Simplify and clarify exception throwing of CacheSerializer
Previously, CacheSerializer threw IOException for the convenience of
implementors, since some implementations were based on APIs like
InputStream/OutputStream that threw IOException. However, this didn't
cover all the possible exceptions that could be thrown; callers also
neded to be prepared to catch RuntimeException. Throwing checked
exceptions in some case and unchecked exceptions in others might have
given the impression that these cases were fundamentally different and
required different handling, which is not the case.

In addition, generally speaking, these classes are null-hostile. Use
checkNotNull in EnumCacheSerializer so the intent is clear.

Also in EnumCacheSerializer, delegate to Enums#stringConverter rather
than rolling our own.

Change-Id: I37f1cf73d961be477af389c4043bb1c10c45972c
2018-05-14 14:26:50 -07:00
Edwin Kempin
0af4aa9095 Merge "Make GerritApiImpl class public" 2018-05-14 08:35:57 +00:00
Edwin Kempin
727d718b77 Make GerritApiImpl class public
This allows us to bind this class in our custom Guice stack at
Google.

Change-Id: I2307538a30e80f388346455ff17ef3710bc9ce8c
Signed-off-by: Edwin Kempin <ekempin@google.com>
2018-05-14 08:33:48 +00:00
Edwin Kempin
43e3c48bbc SshDaemon: Fix logging
All logging of this class should be done through the locally defined
'sshDaemonLog' Logger (and not through the inherited 'log' Logger from
AbstractLoggingBean).

Change-Id: I2d1031fe51601f11911b110c482482ff2482ce1a
Signed-off-by: Edwin Kempin <ekempin@google.com>
2018-05-14 09:40:22 +02:00
David Pursehouse
56d5b5b128 Merge "Make GitwebServlet use Provider<CurrentUser>" 2018-05-14 04:08:14 +00:00
Wyatt Allen
78ef01e3af change.allowBlame config only disables in the GWT UI
Because of problems in the GWT UI's display of blame annotations, the
change.allowBlame config was used to disable the Gerrit feature
altogether. Since then, the PolyGerrit UI can display blame annotations
without these problems, but the feature remains disabled.

The change.allowBlame config handling is changed to only disable blame
in the frontend of the GWT UI. Note: this removes the ability to disable
the blame API via server config.

Change-Id: Ic25aed5a533e0044956359587321676b022c21ec
2018-05-10 09:52:21 -07:00
David Pursehouse
308d1fcd5a Merge branch 'stable-2.15'
* stable-2.15:
  Update git submodules
  WorkQueue: Add metrics
  Update git submodules
  Revert "Revert "Filter account entry suggestions""
  Switch to 2.14.9-SNAPSHOT version

Change-Id: I6ba156d6b014336e1faeafa85440a2c86fab0dc6
2018-05-10 11:11:48 +09:00
Maxime Guerreiro
9f95562605 Merge "Bind a DynamicSet to SubmitRule" 2018-05-09 15:59:59 +00:00
Maxime Guerreiro
14aec6f42b Bind a DynamicSet to SubmitRule
Without this, rules can't be used in the offline reindexer.

Change-Id: I2bab5f5385de1a6da5fca7dbafd7ca3148492408
2018-05-09 15:09:51 +00:00
Patrick Hiesel
567a53c016 Make GitwebServlet use Provider<CurrentUser>
This was wrongly changed in I601ea1200a. This commit changes it back to
the correct value (a provider of the CurrentUser).

Change-Id: I6cbee0cd3013e6fc53514db4c1b855e8da52e63b
2018-05-09 13:41:04 +02:00
Patrick Hiesel
e638d589fa Enforce a maximum PER_THREAD_CACHE_SIZE in PerThreadCache
When calling operations that create a lot of ProjectControls (e.g.
ListProjects) we observe OOMs in our Gerrit jobs from time to time. This
commit puts a max. limit on the cache size to prevent this from
happening.

The approach implemented is not an LRU. On purpose, we want to keep
PerThreadCache simple and don't add a dependency on e.g. Guava's LRU.

Change-Id: Ic2f6e11719b52ee2112f72698e887cbf8ca254d0
2018-05-09 12:06:55 +02:00
David Pursehouse
9f7b81b1d6 Merge branch 'stable-2.15'
* stable-2.15:
  Revert "Filter account entry suggestions"
  ChangeIndexedListener: pass project name information
  Set version to 2.15.2-SNAPSHOT

Change-Id: Id36088686621e5ce4c61633d8df732a49d205209
2018-05-09 08:49:33 +09:00
David Pursehouse
bc58feda76 Merge "Replace all lambdas with method references, when possible" 2018-05-08 23:20:32 +00:00
Hugo Arès
8eb1599e95 Merge "Merge branch 'stable-2.15'" 2018-05-08 20:57:16 +00:00
Maxime Guerreiro
609f9826e5 Replace all lambdas with method references, when possible
Every time a lambda taking an argument is created, an object is created.
This object is unique and makes it harder for the JIT compilation to
optimize the code.

By replacing lambdas with method references, we help the JIT better
understand our code, and reduce object creations* and garbage
collection.

Using method references also helps humans better understand the code,
and might even make compilation faster: the method, and where it lives,
is explicitely written: no need to guess it.

    repoUpgraded.stream().map(n -> n.get()).collect(...);
Where does the get method come from? Hard to tell.

    repoUpgraded.stream().map(NameKey::get).collect()
Same line of code, using a method reference. It is clear that the input
objects are NameKey-s, and we call the get method on them.

* This is technically wrong, as a pointer is created even when we use a
method reference, but it is at least smaller than the lambda
counterpart.

Change-Id: Ic85b1b593d42968f262d3afe49a2ad87a4b766b9
2018-05-08 15:13:24 +00:00
Patrick Hiesel
4a56ff0171 Instrument RestView#getDescription to analyze slow UIActions
UIActions (GetRevisionActions) calls have a 99.9%ile latency > 1 minute.
We only have metrics on the REST endpoint which does not give much
indication on why this endpoint is slow.

UIActions is implemented in a way that it calls #getDescription on all
RestViews that implement the UIActions interface. This means we do
serial calls to a lot of these methods. This commit adds a latency
metric to instrument these calls. Knowing which actions are slow can
guide futher steps that we take.

Possibilities include reworking slow actions or looking into more
parallelism.

Change-Id: I261bfb1a5a43b81f11dba019d405126198908c5f
2018-05-08 15:33:45 +02:00
David Pursehouse
9b13ad0652 Merge branch 'stable-2.15'
* stable-2.15:
  Disable draft magic branch option per default
  GetUserFilter: Allow to include username in servlet response header
  WorkQueue: Don't lazy-initialize the default queue

Change-Id: I36726fc943df542494925c5f2d1e67ddeb95a21a
2018-05-08 17:03:23 +09:00
David Pursehouse
a72fbf418e Merge changes from topic "change-messages-rest-api"
* changes:
  Add REST endpoint to get one change message
  Add REST endpoint for listing change messages
2018-05-08 01:11:55 +00:00
David Pursehouse
d1aacd1d35 Merge branch 'stable-2.15'
* stable-2.15:
  CommentEvent: Fix parameters in log message
  DiffSummaryLoader: Remove unused logger
  EventUtil: Always say 'event listener' in logs
  EventFactory: Log PatchListNotAvailableException always as error
  EventFactory: Log exception when getting commit message fails
  TrackingFootersProvider: Fix spelling mistake in log message
  WorkQueue: Add comment on additional constructor

Change-Id: I841f6008a9aad198a567d03bce5c6482f1bcb9a6
2018-05-08 09:12:31 +09:00
David Pursehouse
36503ce573 Merge "Restore 'notedb/external_id_update_count' metric" 2018-05-07 23:26:37 +00:00
David Pursehouse
1ed7d702da Merge changes I38c38946,I2ffbba76,I729e7856,I447a00cc,I0104a280, ...
* changes:
  DiffSummaryLoader: Remove unused logger
  CommentEvent: Fix parameters in log message
  AutoReplyMailFilter: Fix parameters in log messages
  EventUtil: Always say 'event listener' in logs
  EventFactory: Log PatchListNotAvailableException always as error
  EventFactory: Log exception when getting commit message fails
  TrackingFootersProvider: Fix spelling mistake in log message
2018-05-07 20:27:36 +00:00
Patrick Hiesel
144e4c52fa Merge "Document that repo in ForProject#filter() must be scoped to the project" 2018-05-07 16:37:05 +00:00
Edwin Kempin
b508fa7178 DiffSummaryLoader: Remove unused logger
Change-Id: I38c3894698dcfd0c97f6d12f04986fb2f0ba0efb
Signed-off-by: Edwin Kempin <ekempin@google.com>
2018-05-07 15:31:09 +02:00
Edwin Kempin
216c67038f CommentEvent: Fix parameters in log message
The log message had 3 parameters, but only 2 placeholders in the format
string.

Change-Id: I2ffbba76837adb92d924a8692913b6ef3e675f30
Signed-off-by: Edwin Kempin <ekempin@google.com>
2018-05-07 15:31:09 +02:00
Edwin Kempin
bb4e518208 AutoReplyMailFilter: Fix parameters in log messages
We must use '{}' as placeholders for the parameters.

Change-Id: I729e7856882c0b37a4c6e19f022c981876ef8c95
Signed-off-by: Edwin Kempin <ekempin@google.com>
2018-05-07 15:31:09 +02:00
Edwin Kempin
3db67d6050 EventUtil: Always say 'event listener' in logs
The debug logs say 'event listener', but the warning logs just
'listener'. Make this consistent and always use 'event listener' which
is more precise.

Change-Id: I447a00cce0b11e5337801ce5d84c7954c1340f59
Signed-off-by: Edwin Kempin <ekempin@google.com>
2018-05-07 15:31:09 +02:00
Edwin Kempin
1ea84c5d83 EventFactory: Log PatchListNotAvailableException always as error
There is only one place where PatchListNotAvailableException is logged
as a warning, everywhere else (EventFactory, ChangeAbandoned,
ChangeMerged, ...) it is logged as an error. Make this consistent.

Change-Id: I0104a280c984e2c8244618fa518b320bad0407af
Signed-off-by: Edwin Kempin <ekempin@google.com>
2018-05-07 15:31:09 +02:00
Edwin Kempin
e73f1ea0bf EventFactory: Log exception when getting commit message fails
Without the stacktrace the error log is not very useful.

Change-Id: I29688404e51f999bc06c6ec47b2de5bd1a6e238d
Signed-off-by: Edwin Kempin <ekempin@google.com>
2018-05-07 15:31:09 +02:00
Edwin Kempin
ef53f46c8e TrackingFootersProvider: Fix spelling mistake in log message
Change-Id: I7ed9ba1eca6e61d86debc47c292e224ed7ffcb7d
Signed-off-by: Edwin Kempin <ekempin@google.com>
2018-05-07 15:31:09 +02:00
David Pursehouse
3650cb9f56 Merge branch 'stable-2.15'
* stable-2.15:
  gr-change-metadata: Change "Hashtag" label to "Hashtags"
  ChangeScreen: Add missing 'Hashtags' label
  WorkQueue: Make defaultQueueSize final

Change-Id: I6b55a11f4b4cfffa66f4e044be325c3c8e81622b
2018-05-07 16:51:51 +09:00
Patrick Hiesel
5c2cb2d668 Document that repo in ForProject#filter() must be scoped to the project
Change-Id: I874124896029aeae85b946bb1a81410e693b3cd4
2018-05-07 09:19:19 +02:00
Edwin Kempin
9e511133ed Restore 'notedb/external_id_update_count' metric
This metric measures the total number of external ID updates. It was
unintentionally removed by change I8946f0de5c when AccountsUpdate took
over the responsibility to update external IDs and ExternalIdsUpdate was
removed [1].

[1] https://gerrit-review.googlesource.com/c/gerrit/+/150333/9/java/com/google/gerrit/server/account/externalids/ExternalIdsUpdate.java

Change-Id: I19c2e847dac3b26109387bd90768e09dc9cd422c
Signed-off-by: Edwin Kempin <ekempin@google.com>
2018-05-07 09:11:10 +02:00
Edwin Kempin
824847b1a8 Merge "GroupBundle.Action: Make 'order' member final" 2018-05-07 06:11:48 +00:00
David Pursehouse
b5e1bee5eb Merge "Add ability to specify base commit in Create Change API" 2018-05-07 05:20:36 +00:00
David Pursehouse
387bcf438b GroupBundle.Action: Make 'order' member final
Change-Id: I19528ca3c10c5c65b38a52621c310282d4de2954
2018-05-07 14:17:51 +09:00
David Pursehouse
469bea568d Merge "Use Collections.addAll to copy elements from an array to collections" 2018-05-06 23:35:29 +00:00
David Pursehouse
6ad528ae8a Merge "Collapse loops using the removeIf syntax" 2018-05-06 23:34:08 +00:00
Maxime Guerreiro
2eca6e58e0 Merge changes I3a964bae,Iefb4984f,I55605153
* changes:
  Add a helper method to fetch the commit message
  Add tests triggering RULE_ERROR in Prolog
  Add a way to disable the account index from tests
2018-05-04 08:47:16 +00:00
Maxime Guerreiro
7d80d5764c Collapse loops using the removeIf syntax
Change-Id: I9d51ad16f375541f6cd0a7f231d5f2771d7c3ef9
2018-05-03 17:14:36 +00:00