You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2016/02/03 12:14:44 UTC
[01/10] cassandra git commit: Add comment on DateType explaining that
its kept only for backward compatibility
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 af2b85842 -> 3ec7d8c05
refs/heads/cassandra-3.0 f51e98399 -> 8cb5a20c6
refs/heads/cassandra-3.3 c5feeda6a -> 35a7194e7
refs/heads/trunk eef0ddfab -> f1f52e7bb
Add comment on DateType explaining that its kept only for backward compatibility
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3ec7d8c0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3ec7d8c0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3ec7d8c0
Branch: refs/heads/cassandra-2.2
Commit: 3ec7d8c056c71b3032b1ca1d1fd07462c5091900
Parents: af2b858
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Feb 3 12:08:13 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Feb 3 12:08:13 2016 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/marshal/DateType.java | 5 +++++
src/java/org/apache/cassandra/db/marshal/TimeType.java | 6 ------
2 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3ec7d8c0/src/java/org/apache/cassandra/db/marshal/DateType.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/marshal/DateType.java b/src/java/org/apache/cassandra/db/marshal/DateType.java
index 82ed876..5186ca8 100644
--- a/src/java/org/apache/cassandra/db/marshal/DateType.java
+++ b/src/java/org/apache/cassandra/db/marshal/DateType.java
@@ -31,6 +31,11 @@ import org.apache.cassandra.serializers.TimestampSerializer;
import org.apache.cassandra.serializers.MarshalException;
import org.apache.cassandra.utils.ByteBufferUtil;
+/**
+ * This is the old version of TimestampType, but has been replaced as it wasn't comparing pre-epoch timestamps
+ * correctly. This is kept for backward compatibility but shouldn't be used in new code.
+ */
+@Deprecated
public class DateType extends AbstractType<Date>
{
private static final Logger logger = LoggerFactory.getLogger(DateType.class);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3ec7d8c0/src/java/org/apache/cassandra/db/marshal/TimeType.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/marshal/TimeType.java b/src/java/org/apache/cassandra/db/marshal/TimeType.java
index c241a38..86de574 100644
--- a/src/java/org/apache/cassandra/db/marshal/TimeType.java
+++ b/src/java/org/apache/cassandra/db/marshal/TimeType.java
@@ -52,12 +52,6 @@ public class TimeType extends AbstractType<Long>
}
@Override
- public boolean isCompatibleWith(AbstractType<?> previous)
- {
- return super.isCompatibleWith(previous);
- }
-
- @Override
public boolean isValueCompatibleWithInternal(AbstractType<?> otherType)
{
return this == otherType || otherType == LongType.instance;
[07/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by sl...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8cb5a20c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8cb5a20c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8cb5a20c
Branch: refs/heads/trunk
Commit: 8cb5a20c6f55723eb6e05e75d54230751c340db6
Parents: f51e983 3ec7d8c
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Feb 3 12:09:37 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Feb 3 12:09:37 2016 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/marshal/DateType.java | 5 +++++
src/java/org/apache/cassandra/db/marshal/TimeType.java | 6 ------
2 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8cb5a20c/src/java/org/apache/cassandra/db/marshal/DateType.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8cb5a20c/src/java/org/apache/cassandra/db/marshal/TimeType.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/marshal/TimeType.java
index 780b020,86de574..8cd221e
--- a/src/java/org/apache/cassandra/db/marshal/TimeType.java
+++ b/src/java/org/apache/cassandra/db/marshal/TimeType.java
@@@ -41,12 -46,12 +41,6 @@@ public class TimeType extends AbstractT
}
@Override
- public boolean isCompatibleWith(AbstractType<?> previous)
- public boolean isByteOrderComparable()
-- {
- return super.isCompatibleWith(previous);
- return true;
-- }
--
-- @Override
public boolean isValueCompatibleWithInternal(AbstractType<?> otherType)
{
return this == otherType || otherType == LongType.instance;
[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.3
Posted by sl...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.3
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/35a7194e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/35a7194e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/35a7194e
Branch: refs/heads/cassandra-3.3
Commit: 35a7194e7fc0565768b079f49267b84338f903cb
Parents: c5feeda 8cb5a20
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Feb 3 12:14:16 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Feb 3 12:14:16 2016 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/marshal/DateType.java | 5 +++++
src/java/org/apache/cassandra/db/marshal/TimeType.java | 6 ------
2 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
[09/10] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.3
Posted by sl...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.3
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/35a7194e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/35a7194e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/35a7194e
Branch: refs/heads/trunk
Commit: 35a7194e7fc0565768b079f49267b84338f903cb
Parents: c5feeda 8cb5a20
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Feb 3 12:14:16 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Feb 3 12:14:16 2016 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/marshal/DateType.java | 5 +++++
src/java/org/apache/cassandra/db/marshal/TimeType.java | 6 ------
2 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
[05/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by sl...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8cb5a20c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8cb5a20c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8cb5a20c
Branch: refs/heads/cassandra-3.3
Commit: 8cb5a20c6f55723eb6e05e75d54230751c340db6
Parents: f51e983 3ec7d8c
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Feb 3 12:09:37 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Feb 3 12:09:37 2016 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/marshal/DateType.java | 5 +++++
src/java/org/apache/cassandra/db/marshal/TimeType.java | 6 ------
2 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8cb5a20c/src/java/org/apache/cassandra/db/marshal/DateType.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8cb5a20c/src/java/org/apache/cassandra/db/marshal/TimeType.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/marshal/TimeType.java
index 780b020,86de574..8cd221e
--- a/src/java/org/apache/cassandra/db/marshal/TimeType.java
+++ b/src/java/org/apache/cassandra/db/marshal/TimeType.java
@@@ -41,12 -46,12 +41,6 @@@ public class TimeType extends AbstractT
}
@Override
- public boolean isCompatibleWith(AbstractType<?> previous)
- public boolean isByteOrderComparable()
-- {
- return super.isCompatibleWith(previous);
- return true;
-- }
--
-- @Override
public boolean isValueCompatibleWithInternal(AbstractType<?> otherType)
{
return this == otherType || otherType == LongType.instance;
[10/10] cassandra git commit: Merge branch 'cassandra-3.3' into trunk
Posted by sl...@apache.org.
Merge branch 'cassandra-3.3' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f1f52e7b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f1f52e7b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f1f52e7b
Branch: refs/heads/trunk
Commit: f1f52e7bb88116e440582090cfce615511716f49
Parents: eef0ddf 35a7194
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Feb 3 12:14:22 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Feb 3 12:14:22 2016 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/marshal/DateType.java | 5 +++++
src/java/org/apache/cassandra/db/marshal/TimeType.java | 6 ------
2 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
[03/10] cassandra git commit: Add comment on DateType explaining that
its kept only for backward compatibility
Posted by sl...@apache.org.
Add comment on DateType explaining that its kept only for backward compatibility
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3ec7d8c0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3ec7d8c0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3ec7d8c0
Branch: refs/heads/cassandra-3.3
Commit: 3ec7d8c056c71b3032b1ca1d1fd07462c5091900
Parents: af2b858
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Feb 3 12:08:13 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Feb 3 12:08:13 2016 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/marshal/DateType.java | 5 +++++
src/java/org/apache/cassandra/db/marshal/TimeType.java | 6 ------
2 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3ec7d8c0/src/java/org/apache/cassandra/db/marshal/DateType.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/marshal/DateType.java b/src/java/org/apache/cassandra/db/marshal/DateType.java
index 82ed876..5186ca8 100644
--- a/src/java/org/apache/cassandra/db/marshal/DateType.java
+++ b/src/java/org/apache/cassandra/db/marshal/DateType.java
@@ -31,6 +31,11 @@ import org.apache.cassandra.serializers.TimestampSerializer;
import org.apache.cassandra.serializers.MarshalException;
import org.apache.cassandra.utils.ByteBufferUtil;
+/**
+ * This is the old version of TimestampType, but has been replaced as it wasn't comparing pre-epoch timestamps
+ * correctly. This is kept for backward compatibility but shouldn't be used in new code.
+ */
+@Deprecated
public class DateType extends AbstractType<Date>
{
private static final Logger logger = LoggerFactory.getLogger(DateType.class);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3ec7d8c0/src/java/org/apache/cassandra/db/marshal/TimeType.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/marshal/TimeType.java b/src/java/org/apache/cassandra/db/marshal/TimeType.java
index c241a38..86de574 100644
--- a/src/java/org/apache/cassandra/db/marshal/TimeType.java
+++ b/src/java/org/apache/cassandra/db/marshal/TimeType.java
@@ -52,12 +52,6 @@ public class TimeType extends AbstractType<Long>
}
@Override
- public boolean isCompatibleWith(AbstractType<?> previous)
- {
- return super.isCompatibleWith(previous);
- }
-
- @Override
public boolean isValueCompatibleWithInternal(AbstractType<?> otherType)
{
return this == otherType || otherType == LongType.instance;
[06/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by sl...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8cb5a20c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8cb5a20c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8cb5a20c
Branch: refs/heads/cassandra-3.0
Commit: 8cb5a20c6f55723eb6e05e75d54230751c340db6
Parents: f51e983 3ec7d8c
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Feb 3 12:09:37 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Feb 3 12:09:37 2016 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/marshal/DateType.java | 5 +++++
src/java/org/apache/cassandra/db/marshal/TimeType.java | 6 ------
2 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8cb5a20c/src/java/org/apache/cassandra/db/marshal/DateType.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8cb5a20c/src/java/org/apache/cassandra/db/marshal/TimeType.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/marshal/TimeType.java
index 780b020,86de574..8cd221e
--- a/src/java/org/apache/cassandra/db/marshal/TimeType.java
+++ b/src/java/org/apache/cassandra/db/marshal/TimeType.java
@@@ -41,12 -46,12 +41,6 @@@ public class TimeType extends AbstractT
}
@Override
- public boolean isCompatibleWith(AbstractType<?> previous)
- public boolean isByteOrderComparable()
-- {
- return super.isCompatibleWith(previous);
- return true;
-- }
--
-- @Override
public boolean isValueCompatibleWithInternal(AbstractType<?> otherType)
{
return this == otherType || otherType == LongType.instance;
[04/10] cassandra git commit: Add comment on DateType explaining that
its kept only for backward compatibility
Posted by sl...@apache.org.
Add comment on DateType explaining that its kept only for backward compatibility
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3ec7d8c0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3ec7d8c0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3ec7d8c0
Branch: refs/heads/trunk
Commit: 3ec7d8c056c71b3032b1ca1d1fd07462c5091900
Parents: af2b858
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Feb 3 12:08:13 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Feb 3 12:08:13 2016 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/marshal/DateType.java | 5 +++++
src/java/org/apache/cassandra/db/marshal/TimeType.java | 6 ------
2 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3ec7d8c0/src/java/org/apache/cassandra/db/marshal/DateType.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/marshal/DateType.java b/src/java/org/apache/cassandra/db/marshal/DateType.java
index 82ed876..5186ca8 100644
--- a/src/java/org/apache/cassandra/db/marshal/DateType.java
+++ b/src/java/org/apache/cassandra/db/marshal/DateType.java
@@ -31,6 +31,11 @@ import org.apache.cassandra.serializers.TimestampSerializer;
import org.apache.cassandra.serializers.MarshalException;
import org.apache.cassandra.utils.ByteBufferUtil;
+/**
+ * This is the old version of TimestampType, but has been replaced as it wasn't comparing pre-epoch timestamps
+ * correctly. This is kept for backward compatibility but shouldn't be used in new code.
+ */
+@Deprecated
public class DateType extends AbstractType<Date>
{
private static final Logger logger = LoggerFactory.getLogger(DateType.class);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3ec7d8c0/src/java/org/apache/cassandra/db/marshal/TimeType.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/marshal/TimeType.java b/src/java/org/apache/cassandra/db/marshal/TimeType.java
index c241a38..86de574 100644
--- a/src/java/org/apache/cassandra/db/marshal/TimeType.java
+++ b/src/java/org/apache/cassandra/db/marshal/TimeType.java
@@ -52,12 +52,6 @@ public class TimeType extends AbstractType<Long>
}
@Override
- public boolean isCompatibleWith(AbstractType<?> previous)
- {
- return super.isCompatibleWith(previous);
- }
-
- @Override
public boolean isValueCompatibleWithInternal(AbstractType<?> otherType)
{
return this == otherType || otherType == LongType.instance;
[02/10] cassandra git commit: Add comment on DateType explaining that
its kept only for backward compatibility
Posted by sl...@apache.org.
Add comment on DateType explaining that its kept only for backward compatibility
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3ec7d8c0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3ec7d8c0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3ec7d8c0
Branch: refs/heads/cassandra-3.0
Commit: 3ec7d8c056c71b3032b1ca1d1fd07462c5091900
Parents: af2b858
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Feb 3 12:08:13 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Feb 3 12:08:13 2016 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/marshal/DateType.java | 5 +++++
src/java/org/apache/cassandra/db/marshal/TimeType.java | 6 ------
2 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3ec7d8c0/src/java/org/apache/cassandra/db/marshal/DateType.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/marshal/DateType.java b/src/java/org/apache/cassandra/db/marshal/DateType.java
index 82ed876..5186ca8 100644
--- a/src/java/org/apache/cassandra/db/marshal/DateType.java
+++ b/src/java/org/apache/cassandra/db/marshal/DateType.java
@@ -31,6 +31,11 @@ import org.apache.cassandra.serializers.TimestampSerializer;
import org.apache.cassandra.serializers.MarshalException;
import org.apache.cassandra.utils.ByteBufferUtil;
+/**
+ * This is the old version of TimestampType, but has been replaced as it wasn't comparing pre-epoch timestamps
+ * correctly. This is kept for backward compatibility but shouldn't be used in new code.
+ */
+@Deprecated
public class DateType extends AbstractType<Date>
{
private static final Logger logger = LoggerFactory.getLogger(DateType.class);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3ec7d8c0/src/java/org/apache/cassandra/db/marshal/TimeType.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/marshal/TimeType.java b/src/java/org/apache/cassandra/db/marshal/TimeType.java
index c241a38..86de574 100644
--- a/src/java/org/apache/cassandra/db/marshal/TimeType.java
+++ b/src/java/org/apache/cassandra/db/marshal/TimeType.java
@@ -52,12 +52,6 @@ public class TimeType extends AbstractType<Long>
}
@Override
- public boolean isCompatibleWith(AbstractType<?> previous)
- {
- return super.isCompatibleWith(previous);
- }
-
- @Override
public boolean isValueCompatibleWithInternal(AbstractType<?> otherType)
{
return this == otherType || otherType == LongType.instance;