forked from apache/ambari
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[AMBARI-26076] Upgrade net.sf.ehcache to 3.10.0 (apache#3825)
- Loading branch information
1 parent
7182923
commit b6a3185
Showing
14 changed files
with
466 additions
and
497 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
78 changes: 78 additions & 0 deletions
78
.../ambari/server/controller/metrics/timeline/cache/TimelineAppMetricCacheKeySerializer.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| /* | ||
| * 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.ambari.server.controller.metrics.timeline.cache; | ||
|
|
||
| import java.io.ByteArrayInputStream; | ||
| import java.io.ByteArrayOutputStream; | ||
| import java.io.IOException; | ||
| import java.io.ObjectInputStream; | ||
| import java.io.ObjectOutputStream; | ||
| import java.nio.ByteBuffer; | ||
|
|
||
| import org.ehcache.spi.serialization.Serializer; | ||
| import org.ehcache.spi.serialization.SerializerException; | ||
|
|
||
| public class TimelineAppMetricCacheKeySerializer implements Serializer<TimelineAppMetricCacheKey> { | ||
| private final ClassLoader classLoader; | ||
| public TimelineAppMetricCacheKeySerializer(ClassLoader classLoader) { | ||
| this.classLoader = classLoader; | ||
| } | ||
| @Override | ||
| public ByteBuffer serialize(TimelineAppMetricCacheKey key) throws SerializerException { | ||
| try { | ||
| ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); | ||
| ObjectOutputStream objectOutputStream = new ObjectOutputStream(byteArrayOutputStream); | ||
| objectOutputStream.writeObject(key); | ||
| objectOutputStream.close(); | ||
| return ByteBuffer.wrap(byteArrayOutputStream.toByteArray()); | ||
| } catch (Exception e) { | ||
| throw new SerializerException(e); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public TimelineAppMetricCacheKey read(ByteBuffer binary) throws ClassNotFoundException, SerializerException { | ||
| try { | ||
| ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(binary.array()); | ||
| ObjectInputStream objectInputStream = new ObjectInputStream(byteArrayInputStream); | ||
| return (TimelineAppMetricCacheKey) objectInputStream.readObject(); | ||
| } catch (IOException | ClassNotFoundException e) { | ||
| throw new SerializerException("Error during deserialization", e); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(TimelineAppMetricCacheKey key, ByteBuffer binary) throws ClassNotFoundException, SerializerException { | ||
| try { | ||
| ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(binary.array()); | ||
| ObjectInputStream objectInputStream = new ObjectInputStream(byteArrayInputStream); | ||
| TimelineAppMetricCacheKey deserializedKey = (TimelineAppMetricCacheKey) objectInputStream.readObject(); | ||
|
|
||
| // Now compare key and deserializedKey | ||
| if (key == deserializedKey) return true; | ||
| if (deserializedKey == null || (key.getClass() != deserializedKey.getClass())) return false; | ||
|
|
||
| if (!key.getMetricNames().equals(deserializedKey.getMetricNames())) return false; | ||
| if (!key.getAppId().equals(deserializedKey.getAppId())) return false; | ||
| return !(key.getHostNames() != null ? !key.getHostNames().equals(deserializedKey.getHostNames()) : deserializedKey.getHostNames() != null); | ||
|
|
||
| } catch (IOException e) { | ||
| throw new SerializerException("Error during deserialization", e); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
55 changes: 55 additions & 0 deletions
55
...ache/ambari/server/controller/metrics/timeline/cache/TimelineMetricCacheCustomExpiry.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| /* | ||
| * 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.ambari.server.controller.metrics.timeline.cache; | ||
|
|
||
| import java.util.concurrent.TimeUnit; | ||
|
|
||
| import org.ehcache.ValueSupplier; | ||
| import org.ehcache.expiry.Duration; | ||
| import org.ehcache.expiry.Expiry; | ||
|
|
||
|
|
||
| public class TimelineMetricCacheCustomExpiry implements Expiry<TimelineAppMetricCacheKey, TimelineMetricsCacheValue> { | ||
|
|
||
| private final Duration timeToLive; | ||
| private final Duration timeToIdle; | ||
|
|
||
| public TimelineMetricCacheCustomExpiry(java.time.Duration timeToLive, java.time.Duration timeToIdle) { | ||
| this.timeToLive = convertJavaDurationToEhcacheDuration(timeToLive); | ||
| this.timeToIdle = convertJavaDurationToEhcacheDuration(timeToIdle); | ||
| } | ||
|
|
||
| @Override | ||
| public Duration getExpiryForCreation(TimelineAppMetricCacheKey key, TimelineMetricsCacheValue value) { | ||
| return timeToLive; | ||
| } | ||
|
|
||
| @Override | ||
| public Duration getExpiryForAccess(TimelineAppMetricCacheKey key, ValueSupplier<? extends TimelineMetricsCacheValue> value) { | ||
| return timeToIdle; | ||
| } | ||
|
|
||
| @Override | ||
| public Duration getExpiryForUpdate(TimelineAppMetricCacheKey key, ValueSupplier<? extends TimelineMetricsCacheValue> oldValue, TimelineMetricsCacheValue newValue) { | ||
| return timeToLive; | ||
| } | ||
|
|
||
| private Duration convertJavaDurationToEhcacheDuration(java.time.Duration javaDuration) { | ||
| return Duration.of(javaDuration.toNanos(), TimeUnit.NANOSECONDS); | ||
| } | ||
| } |
Oops, something went wrong.