You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@samza.apache.org by xi...@apache.org on 2018/05/08 01:14:40 UTC

samza git commit: SAMZA-1704: Fix compatibility issues with scala 2.12

Repository: samza
Updated Branches:
  refs/heads/master 9ac221e4e -> 31a9e4aea


SAMZA-1704: Fix compatibility issues with scala 2.12

Need to add override keyword for overriding a method in scala 2.12.

Author: xiliu <xi...@linkedin.com>

Reviewers: Prateek M <pr...@apache.org>

Closes #508 from xinyuiscool/SAMZA-1704


Project: http://git-wip-us.apache.org/repos/asf/samza/repo
Commit: http://git-wip-us.apache.org/repos/asf/samza/commit/31a9e4ae
Tree: http://git-wip-us.apache.org/repos/asf/samza/tree/31a9e4ae
Diff: http://git-wip-us.apache.org/repos/asf/samza/diff/31a9e4ae

Branch: refs/heads/master
Commit: 31a9e4aea8a8233853334b7ed70da8694f42bd52
Parents: 9ac221e
Author: xiliu <xi...@linkedin.com>
Authored: Mon May 7 18:14:29 2018 -0700
Committer: xiliu <xi...@linkedin.com>
Committed: Mon May 7 18:14:29 2018 -0700

----------------------------------------------------------------------
 .../scala/org/apache/samza/storage/kv/RocksDbKeyValueStore.scala   | 2 +-
 .../main/scala/org/apache/samza/storage/kv/AccessLoggedStore.scala | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/samza/blob/31a9e4ae/samza-kv-rocksdb/src/main/scala/org/apache/samza/storage/kv/RocksDbKeyValueStore.scala
----------------------------------------------------------------------
diff --git a/samza-kv-rocksdb/src/main/scala/org/apache/samza/storage/kv/RocksDbKeyValueStore.scala b/samza-kv-rocksdb/src/main/scala/org/apache/samza/storage/kv/RocksDbKeyValueStore.scala
index 06fb584..e0ee576 100644
--- a/samza-kv-rocksdb/src/main/scala/org/apache/samza/storage/kv/RocksDbKeyValueStore.scala
+++ b/samza-kv-rocksdb/src/main/scala/org/apache/samza/storage/kv/RocksDbKeyValueStore.scala
@@ -204,7 +204,7 @@ class RocksDbKeyValueStore(
     new RocksDbIterator(iter)
   }
 
-  def iterate(from: Array[Byte], to: Array[Byte]): KeyValueIterable[Array[Byte], Array[Byte]] = {
+  override def iterate(from: Array[Byte], to: Array[Byte]): KeyValueIterable[Array[Byte], Array[Byte]] = {
     //snapshot the iterator
     val snapshotIter : RocksDbRangeIterator = range(from, to).asInstanceOf[RocksDbRangeIterator]
     new KeyValueIterable[Array[Byte], Array[Byte]] {

http://git-wip-us.apache.org/repos/asf/samza/blob/31a9e4ae/samza-kv/src/main/scala/org/apache/samza/storage/kv/AccessLoggedStore.scala
----------------------------------------------------------------------
diff --git a/samza-kv/src/main/scala/org/apache/samza/storage/kv/AccessLoggedStore.scala b/samza-kv/src/main/scala/org/apache/samza/storage/kv/AccessLoggedStore.scala
index 67fd011..f6fca15 100644
--- a/samza-kv/src/main/scala/org/apache/samza/storage/kv/AccessLoggedStore.scala
+++ b/samza-kv/src/main/scala/org/apache/samza/storage/kv/AccessLoggedStore.scala
@@ -92,7 +92,7 @@ class AccessLoggedStore[K, V](
     store.all()
   }
 
-  def iterate(from: K, to: K): KeyValueIterable[K, V] = {
+  override def iterate(from: K, to: K): KeyValueIterable[K, V] = {
     val list : util.ArrayList[K] = new util.ArrayList[K]()
     list.add(from)
     list.add(to)